diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index ced5136f0eb..82b34074027 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -83,8 +83,8 @@ pda = /obj/item/pda/centcom r_pocket = /obj/item/storage/box/matches back = /obj/item/storage/backpack/satchel + box = /obj/item/storage/box/centcomofficer backpack_contents = list( - /obj/item/storage/box/centcomofficer = 1, /obj/item/clothing/shoes/magboots/advance = 1, /obj/item/storage/box/zipties = 1 ) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 3466773007b..f0832e467b3 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -586,3 +586,9 @@ name = "emergency response team janitor backpack" desc = "A spacious backpack with lots of pockets, worn by janitorial members of a Nanotrasen Emergency Response Team." icon_state = "ert_janitor" + +//Solgov +/obj/item/storage/backpack/ert/solgov + name = "\improper TSF marine backpack" + desc = "A spacious backpack with lots of pockets, worn by marines of the Trans-Solar Federation." + icon_state = "ert_solgov" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index dd99bba3211..728884e263f 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -206,11 +206,13 @@ icon_state = "solgovcberet" item_color = "solgovc" dog_fashion = null - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) strip_delay = 80 /obj/item/clothing/head/beret/solgov/command/elite name = "\improper Trans-Solar Federation Specops Lieutenant's beret" - desc = "A beret worn by marines of the Trans-Solar Federation Psiops division. The insignia signifies the wearer bears the rank of a Lieutenant." + desc = "A beret worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant." + armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovceliteberet" item_color = "solgovcelite" + resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index ca0e6d5aad5..f55be1d578e 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -125,28 +125,32 @@ dog_fashion = null /obj/item/clothing/head/soft/solgov/marines - armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50) - strip_delay = 60 + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) icon_state = "solgovsoft_flipped" + strip_delay = 60 flipped = TRUE /obj/item/clothing/head/soft/solgov/marines/elite name = "\improper Trans-Solar Federation Specops marine cap" - desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division." + desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is!" + armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovelitesoft_flipped" item_color = "solgovelite" + resistance_flags = FIRE_PROOF /obj/item/clothing/head/soft/solgov/marines/command name = "\improper Trans-Solar Federation lieutenant's cap" desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) icon_state = "solgovcsoft_flipped" item_color = "solgovc" dog_fashion = null - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) strip_delay = 80 /obj/item/clothing/head/soft/solgov/marines/command/elite name = "\improper Trans-Solar Federation Specops Lieutenant's cap" - desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant." + desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant." + armor= list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovcelitesoft" item_color = "solgovcelite" + resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index db127c5b100..6d448af9bd9 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -232,6 +232,25 @@ strip_delay = 70 put_on_delay = 50 +/obj/item/clothing/suit/armor/bulletproof/full + name = "\improper Trans-Solar Federation marine armor" + icon_state = "bulletproof_full" + item_state = "bulletproof_full" + armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 50, "rad" = 50, "fire" = 80, "acid" = 80) + desc = "A bulletproof suit used by elite TSF marines. It excels in protecting the wearer against traditional projectile weaponry. Oorah!" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS + resistance_flags = FIRE_PROOF + strip_delay = 80 + put_on_delay = 80 + +/obj/item/clothing/suit/armor/bulletproof/full/officer + name = "\improper Trans-Solar Federation officer coat" + icon_state = "lt_jacket" + item_state = "lt_jacket" + desc = "A bulletproof overcoat used by TSF officers. Quite how this reduces the effect of impacting bullets is a mystery to you." + /obj/item/clothing/suit/armor/laserproof name = "ablative armor vest" desc = "A vest that excels in protecting the wearer against energy projectiles. Projects an energy field around the user, allowing a chance of energy projectile deflection no matter where on the user it would hit." diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 3b14253d173..dd4704e8f33 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -543,7 +543,7 @@ rt_mob_job = "ERT Security" uniform = /obj/item/clothing/under/solgov suit = /obj/item/clothing/suit/armor/bulletproof - back = /obj/item/storage/backpack/security + back = /obj/item/storage/backpack/ert/solgov belt = /obj/item/storage/belt/military/assault/marines/full head = /obj/item/clothing/head/soft/solgov/marines glasses = /obj/item/clothing/glasses/night @@ -621,6 +621,7 @@ rt_assignment = "Solar Federation Specops Marine" rt_job = "Solar Federation Specops Marine" uniform = /obj/item/clothing/under/solgov/elite + suit = /obj/item/clothing/suit/armor/bulletproof/full head = /obj/item/clothing/head/soft/solgov/marines/elite belt = /obj/item/storage/belt/military/assault/marines/elite/full l_hand = /obj/item/gun/projectile/automatic/ar @@ -646,6 +647,7 @@ rt_mob_job = "ERT Commander" uniform = /obj/item/clothing/under/solgov/command/elite head = /obj/item/clothing/head/beret/solgov/command/elite + suit = /obj/item/clothing/suit/armor/bulletproof/full/officer glasses = /obj/item/clothing/glasses/night back = /obj/item/storage/backpack/satchel belt = /obj/item/melee/baton/loaded diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index ec7e6827b19..4d372becbcc 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index c5b31326afe..da505ed5c63 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index c53771fdad3..7e8327cc1eb 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ