Skip to content

Commit

Permalink
Attack log now logs punches. Only when a human hits another human tho.
Browse files Browse the repository at this point in the history
New glove colors: red, orange, purple, blue, green, gray, light brown, brown

New sprite for pirate and mime jumpsuit item

Satchel added as an alternative to the backpack, not in game yet

Sprites can be considered as WIP

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1765 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
baloh.matevz committed Jul 4, 2011
1 parent 7999634 commit c4ce2e9
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 0 deletions.
48 changes: 48 additions & 0 deletions code/defines/obj/clothing/gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,51 @@
permeability_coefficient = 0.9
protective_temperature = 400
heat_transfer_coefficient = 0.70

/obj/item/clothing/gloves/orange
name = "Orange Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "orange"
item_state = "orangegloves"

/obj/item/clothing/gloves/red
name = "Red Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "red"
item_state = "redgloves"

/obj/item/clothing/gloves/blue
name = "Blue Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "blue"
item_state = "bluegloves"

/obj/item/clothing/gloves/purple
name = "Purple Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "purple"
item_state = "purplegloves"

/obj/item/clothing/gloves/green
name = "Green Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "green"
item_state = "greengloves"

/obj/item/clothing/gloves/gray
name = "Gray Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "gray"
item_state = "graygloves"

/obj/item/clothing/gloves/light_brown
name = "Light Brown Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "lightbrown"
item_state = "lightbrowngloves"

/obj/item/clothing/gloves/brown
name = "Brown Gloves"
desc = "A pair of gloves, they don't look special in any way."
icon_state = "brown"
item_state = "browngloves"
5 changes: 5 additions & 0 deletions code/defines/obj/storage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@
desc = "A very robust backpack."
icon_state = "securitypack"

/obj/item/weapon/storage/backpack/satchel
name = "Satchel"
desc = "A very robust satchel to wear on your back."
icon_state = "satchel"

/obj/item/weapon/storage/backpack/industrial
name = "industrial backpack"
desc = "A tough backpack for the daily grind"
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1748,6 +1748,8 @@
playsound(loc, "punch", 25, 1, -1)
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
M.attack_log += text("<font color='red'>[world.time] - has punched [src.name] ([src.ckey])</font>")
src.attack_log += text("<font color='orange'>[world.time] - has been punched by [M.name] ([M.ckey])</font>")

if (def_zone == "head")
if ((((head && head.body_parts_covered & HEAD) || (wear_mask && wear_mask.body_parts_covered & HEAD)) && prob(99)))
Expand Down
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/mob/hands.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.

0 comments on commit c4ce2e9

Please sign in to comment.