From c15f37babc83405ce0791b7c82da44f98e9eaf4d Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 4 May 2014 01:25:18 +0300 Subject: [PATCH] ERT Update Added the ERT Duty Jacket, changed how parenting is handled for the undersuits. Also changes default ERT spawn gear. --- .../crates_lockers/closets/job_closets.dm | 13 +++++---- code/game/response_team.dm | 3 +- code/modules/clothing/suits/jobs.dm | 29 ++++++++++++++++++- code/modules/clothing/under/jobs/ert.dm | 27 ++++++++--------- 4 files changed, 49 insertions(+), 23 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 24d59936..752bc254 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -97,9 +97,10 @@ new /obj/item/device/radio/headset/ert(src) new /obj/item/device/radio/headset/ert(src) new /obj/item/device/radio/headset/ert(src) - new /obj/item/clothing/under/rank/ert_soldier(src) - new /obj/item/clothing/under/rank/ert_soldier(src) - new /obj/item/clothing/under/rank/ert_nco(src) - new /obj/item/clothing/under/rank/ert_nco(src) - new /obj/item/clothing/under/rank/ert_officer(src) - new /obj/item/clothing/under/rank/ert_officer(src) \ No newline at end of file + new /obj/item/clothing/under/rank/ert/soldier(src) + new /obj/item/clothing/under/rank/ert/soldier(src) + new /obj/item/clothing/under/rank/ert/soldier(src) + new /obj/item/clothing/under/rank/ert/nco(src) + new /obj/item/clothing/under/rank/ert/nco(src) + new /obj/item/clothing/under/rank/ert/nco(src) + new /obj/item/clothing/under/rank/ert/officer(src) \ No newline at end of file diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 51c5b28d..010356af 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -283,7 +283,8 @@ proc/trigger_armed_response_team(var/force = 0) equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(src), slot_l_ear) //Replaced with new ERT uniform - equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(src), slot_w_uniform) + equip_to_slot_or_del(new /obj/item/clothing/under/rank/ert(src), slot_w_uniform) + equip_to_slot_or_del(new /obj/item/clothing/suit/storage/ert(src), slot_wear_suit) equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(src), slot_shoes) equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(src), slot_gloves) equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 3f5a64a2..de2c0f0f 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -188,4 +188,31 @@ desc = "They suspend the illusion of the mime's play." icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" - blood_overlay_type = "armor" //it's the less thing that I can put here \ No newline at end of file + blood_overlay_type = "armor" //it's the less thing that I can put here + +obj/item/clothing/suit/storage/ert + name = "Emergency Response Team duty jacket" + desc = "A militaristic duty jacket worn by members of the NanoTrasen Emergency Response Teams." + icon_state = "dwu_open" + item_state = "dwu_open" + allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) + + verb/toggle() + set name = "Toggle coat zipper" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + switch(icon_state) + if("dwu_open") + src.icon_state = "dwu_closed" + usr << "You zip the coat's zipper shut." + if("dwu_closed") + src.icon_state = "dwu_open" + usr << "You unzip the coat's zipper." + else + usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are." + return + usr.update_inv_wear_suit() //so our overlays update \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/ert.dm b/code/modules/clothing/under/jobs/ert.dm index 63e32955..268b1809 100644 --- a/code/modules/clothing/under/jobs/ert.dm +++ b/code/modules/clothing/under/jobs/ert.dm @@ -1,40 +1,37 @@ -/obj/item/clothing/under/rank/ert_soldier +/obj/item/clothing/under/rank/ert/soldier desc = "An under-armour combat shirt worn by troopers of the NanoTrasen Emergency Response Teams." name = "ERT trooper jumpsuit" icon_state = "ert_soldier" item_state = "ert_soldier" item_color = "ert_soldier" - armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS - siemens_coefficient = 0.8 -/obj/item/clothing/under/rank/ert_nco +/obj/item/clothing/under/rank/ert/nco desc = "An under-armour combat shirt worn by the leading troopers of the NanoTrasen Emergency Response Teams." name = "ERT leading trooper jumpsuit" icon_state = "ert_nco" item_state = "ert_nco" item_color = "ert_nco" - armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS - siemens_coefficient = 0.8 -/obj/item/clothing/under/rank/ert_officer +/obj/item/clothing/under/rank/ert/officer desc = "An under-armour combat shirt worn by the sub-officers of the NanoTrasen Emergency Response Teams." name = "ERT sub-officer jumpsuit" icon_state = "ert_officer" item_state = "ert_officer" item_color = "ert_officer" - armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0) - flags = FPRINT | TABLEPASS - siemens_coefficient = 0.8 -/obj/item/clothing/under/rank/ert_commander +/obj/item/clothing/under/rank/ert/commander desc = "An under-armour combat shirt worn by the commanders of the NanoTrasen Emergency Response Teams." name = "ERT commander jumpsuit" icon_state = "ert_cdr" item_state = "ert_cdr" item_color = "ert_cdr" + +obj/item/clothing/under/rank/ert + name = "ERT duty uniform" + desc = "An uniform worn by members of the NanoTrasen Emergency Response Teams while not on combat duties." + icon_state = "ert_uniform" + item_state = "ert_uniform" + item_color = "ert_uniform" armor = list(melee = 10, bullet = 0, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0) flags = FPRINT | TABLEPASS - siemens_coefficient = 0.8 - + siemens_coefficient = 0.8 \ No newline at end of file