diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index d675dee55b4..246f3550eae 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -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." diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index e811b43c6b4..600c3ce8310 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -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." diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 5a9de51da09..2048943ea46 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -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 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 5fae6ebc2b7..a10f0891f01 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -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 @@ -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 diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 3a7d663243e..e503c129501 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -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) diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 9b7bc036f66..933ddce15c3 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d95d7291efa..3517d5152f4 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 6ddf79bb744..d774f90ebf8 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index d8950b6a986..49da22e3e15 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index cdbee2db2e1..b55f6349e60 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 131270bd284..9b300f547bc 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index ca036998b1b..734f8675e4f 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ