From eac13356079dced2ba1ac3f679eec262080eebf1 Mon Sep 17 00:00:00 2001 From: FireFishie Date: Tue, 31 Jul 2012 01:21:44 -0400 Subject: [PATCH] Added the warden jacket and pepperspray to the warden's wardrobe, and added fingerless gloves to the cargo technician and shaft miner wardrobes. The janitor spawns with a portalathe but doesn't have one in his wardrobe, so this adds that. If the librarian gets a barcode scanner in his, then the janitor's should include the portalathe. The captain has taken a few lessons from the head of security! When joining, the captain will now start with matching gloves, a pair of jackboots, and the more sensible captain's cap. The old Napoleonic hat is still available in the captain's closet, and both the closets and wardrobes were updated to reflect this change. The quartermaster started with brown shoes, but only had black ones available in his wardrobes. This change should make his starting equipment more consistent. The head of personnel should no longer be so paranoid, and now spawns without wearing body armor or a helmet. Additionally, the body armor and helmet from the wardrobe closet and bag were removed. A gun, helmet, and body armor are still available in the secure locker for emergencies. The breath mask inside the engineer box included with the ERT backpack looked terrible when worn with the ERT helmet, yet was required if any of the team were operating near a breach or anything. This change only returns the removed SWAT mask (which leaves the helmet sprite intact) to the response team's basic equipment. Both the secure closet and the wardrobe bag have the medsci headset in it, and the chemist lab is conjoined with research, so why shouldn't the chemist start with that headset? This commit also moves the chemist to Medical on the roster because that's where the job shows up everywhere else. --- code/WorkInProgress/SkyMarshal/wardrobes.dm | 17 +++++++++++------ code/game/jobs/job/captain.dm | 9 +++++---- code/game/jobs/job/medical.dm | 2 +- code/game/jobs/jobs.dm | 4 ++-- code/game/objects/closets/secure/security.dm | 4 +++- code/game/objects/closets/wardrobe.dm | 10 +++++----- code/game/response_team.dm | 2 +- 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm index ba100653404..009c4c3b6bd 100755 --- a/code/WorkInProgress/SkyMarshal/wardrobes.dm +++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm @@ -208,11 +208,11 @@ new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/suit/storage/captunic(src) new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/head/caphat(src) + new /obj/item/clothing/head/helmet/cap(src) new /obj/item/clothing/gloves/captain(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/device/radio/headset/heads/captain(src) - new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/under/rank/captain(src) /obj/item/wardrobe/hop @@ -226,10 +226,10 @@ new /obj/item/weapon/pen(src) new /obj/item/device/pda/heads/hop(src) new /obj/item/weapon/storage/id_kit(src) - new /obj/item/weapon/gun/energy/gun(src) + //new /obj/item/weapon/gun/energy/gun(src) new /obj/item/device/flash(src) - new /obj/item/clothing/suit/armor/vest(src) - new /obj/item/clothing/head/helmet(src) + //new /obj/item/clothing/suit/armor/vest(src) + //new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/gloves/blue(src) new /obj/item/device/radio/headset/heads/hop(src) @@ -410,6 +410,8 @@ new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/under/rank/warden(src) + new /obj/item/clothing/suit/armor/vest/warden(src) + new /obj/item/weapon/pepperspray(src) /obj/item/wardrobe/detective name = "\improper Detective Wardrobe" @@ -525,7 +527,7 @@ new /obj/item/device/pda/quartermaster(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/device/radio/headset/heads/qm(src) - new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/under/rank/cargo(src) /obj/item/wardrobe/cargo_tech @@ -541,6 +543,7 @@ new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/under/rank/cargotech(src) + new /obj/item/clothing/gloves/fingerless/black(src) /obj/item/wardrobe/mining name = "\improper Shaft Miner Wardrobe" @@ -561,6 +564,7 @@ new /obj/item/device/radio/headset/headset_mine(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/under/rank/miner(src) + new /obj/item/clothing/gloves/fingerless/black(src) /obj/item/wardrobe/janitor name = "\improper Janitor Wardrobe" @@ -574,6 +578,7 @@ new /obj/item/device/pda/janitor(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/under/rank/janitor(src) + new /obj/item/device/portalathe(src) /obj/item/wardrobe/librarian name = "\improper Librarian Wardrobe" diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 5e829357092..bdec1b8a2f1 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -18,9 +18,10 @@ if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_norm(H), H.slot_back) H.equip_if_possible(new /obj/item/clothing/under/rank/captain(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/device/pda/captain(H), H.slot_belt) - H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) - H.equip_if_possible(new /obj/item/clothing/head/caphat(H), H.slot_head) + H.equip_if_possible(new /obj/item/clothing/shoes/jackboots(H), H.slot_shoes) + H.equip_if_possible(new /obj/item/clothing/head/helmet/cap(H), H.slot_head) H.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(H), H.slot_glasses) + H.equip_if_possible(new /obj/item/clothing/gloves/captain(H), H.slot_gloves) if(H.backbag == 1) H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_r_hand) else @@ -51,8 +52,8 @@ H.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/brown(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/heads/hop(H), H.slot_belt) - H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit) - H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head) + //H.equip_if_possible(new /obj/item/clothing/suit/armor/vest(H), H.slot_wear_suit) + //H.equip_if_possible(new /obj/item/clothing/head/helmet(H), H.slot_head) H.equip_if_possible(new /obj/item/clothing/gloves/blue(H), H.slot_gloves) if(H.backbag == 1) H.equip_if_possible(new /obj/item/weapon/storage/id_kit(H), H.slot_r_hand) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 333d958a1cb..b0d348f30e2 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -87,7 +87,7 @@ if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack(H), H.slot_back) if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back) if(H.backbag == 4) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel_chem(H), H.slot_back) - H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears) + H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears) H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/chemist(H), H.slot_belt) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 76222aac341..79b12fc3ae1 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -73,14 +73,14 @@ var/list/engineering_positions = list( var/list/medical_positions = list( "Chief Medical Officer", "Medical Doctor", - "Geneticist" + "Geneticist", + "Chemist" ) var/list/science_positions = list( "Research Director", "Scientist", - "Chemist" ) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 7f1e915628d..d518816555d 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -16,7 +16,7 @@ new /obj/item/device/pda/captain(src) new /obj/item/weapon/storage/id_kit(src) new /obj/item/clothing/suit/armor/captain(src) - new /obj/item/clothing/head/helmet/cap(src) + new /obj/item/clothing/head/caphat(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/suit/armor/vest(src) new /obj/item/weapon/cartridge/captain(src) @@ -52,6 +52,8 @@ new /obj/item/weapon/storage/id_kit(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/device/flash(src) + new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/glasses/sunglasses(src) return diff --git a/code/game/objects/closets/wardrobe.dm b/code/game/objects/closets/wardrobe.dm index 41521dea964..3f6ea4ebc38 100644 --- a/code/game/objects/closets/wardrobe.dm +++ b/code/game/objects/closets/wardrobe.dm @@ -46,10 +46,10 @@ obj/structure/closet/wardrobe/hos/New() obj/structure/closet/wardrobe/hop/New() new /obj/item/clothing/under/rank/head_of_personnel(src) - new /obj/item/clothing/suit/armor/vest(src) + //new /obj/item/clothing/suit/armor/vest(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/gloves/blue(src) - new /obj/item/clothing/head/helmet(src) + //new /obj/item/clothing/head/helmet(src) /obj/structure/closet/wardrobe/pink/New() new /obj/item/clothing/under/color/pink(src) @@ -357,6 +357,6 @@ obj/structure/closet/wardrobe/hop/New() new /obj/item/clothing/under/rank/cargo(src) new /obj/item/clothing/under/rank/cargo(src) new /obj/item/clothing/under/rank/cargo(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/black(src) - new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) + new /obj/item/clothing/shoes/brown(src) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index fb413c85579..4de7441aff3 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -207,6 +207,7 @@ proc/trigger_armed_response_team(var/force = 0) equip_if_possible(new /obj/item/device/flashlight(src), slot_l_store) equip_if_possible(new /obj/item/weapon/clipboard(src), slot_r_store) equip_if_possible(new /obj/item/weapon/gun/energy/gun(src), slot_belt) + equip_if_possible(new /obj/item/clothing/mask/gas/swat(src), slot_wear_mask) //Glasses equip_if_possible(new /obj/item/clothing/glasses/sunglasses/sechud(src), slot_glasses) @@ -218,7 +219,6 @@ proc/trigger_armed_response_team(var/force = 0) //Removed // equip_if_possible(new /obj/item/clothing/suit/armor/swat(src), slot_wear_suit) // equip_if_possible(new /obj/item/clothing/head/helmet/space/deathsquad(src), slot_head) -// equip_if_possible(new /obj/item/clothing/mask/gas/swat(src), slot_wear_mask) //Backpack equip_if_possible(new /obj/item/weapon/storage/backpack/security(src), slot_back)