Skip to content

Commit

Permalink
-Riot Shields and Fire Axes now fit in the back slot (credit to Falam…
Browse files Browse the repository at this point in the history
…azeer for the fireaxe sprites)

-Captain Armor and Space Helmet now have in hand sprites
-Another silly costume, credit to Noize for the effect

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2070 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
kortgstation@gmail.com committed Aug 29, 2011
1 parent 090ce00 commit 4404b6e
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 3 deletions.
8 changes: 8 additions & 0 deletions code/defines/obj/clothing/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@
protective_temperature = 500
heat_transfer_coefficient = 0.10

/obj/item/clothing/head/helmet/cueball
name = "cueball helmet"
desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?"
icon_state = "cueball"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH
item_state="cueball"
armor = list(melee = 75, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)

/obj/item/clothing/head/secsoft
name = "Soft Cap"
desc = "A baseball hat in tasteful red."
Expand Down
8 changes: 8 additions & 0 deletions code/defines/obj/clothing/jumpsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,14 @@
item_state = "lawyer_blue"
color = "lawyer_blue"

/obj/item/clothing/under/scratch
desc = "White Suit"
name = "A white suit, suitable for an excellent host"
flags = FPRINT | TABLEPASS
icon_state = "scratch"
item_state = "scratch"
color = "scratch"


/obj/item/clothing/under/sl_suit
desc = "A very amish looking suit."
Expand Down
2 changes: 1 addition & 1 deletion code/defines/obj/clothing/suit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
name = "Captain's armor"
desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!"
icon_state = "caparmor"
item_state = "caparmor"
item_state = "capspacesuit"
w_class = 4//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
Expand Down
3 changes: 2 additions & 1 deletion code/defines/obj/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
icon = 'weapons.dmi'
icon_state = "riot"
flags = FPRINT | TABLEPASS| CONDUCT
flags = FPRINT | TABLEPASS| CONDUCT| ONBACK
force = 5.0
throwforce = 5.0
throw_speed = 1
Expand Down Expand Up @@ -600,6 +600,7 @@
desc = "Truly, the tool of a madman. Who would possibly think to fight fire with an axe?"
force = 5
w_class = 4.0
flags = ONBACK
twohanded = 1
force_unwielded = 5
force_wielded = 30
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/spacesuits/miscellaneous.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/obj/item/clothing/head/helmet/space/capspace
name = "space helmet"
icon_state = "capspace"
item_state = "capspacehelmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES
see_face = 0.0
item_state = "capspace"
permeability_coefficient = 0.01
armor = list(melee = 60, bullet = 50, laser = 50, taser = 25, bomb = 50, bio = 20, rad = 20)

Expand Down
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/items_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/items_righthand.dmi
Binary file not shown.
Binary file modified icons/mob/uniform.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/uniforms.dmi
Binary file not shown.

0 comments on commit 4404b6e

Please sign in to comment.