From 56d7e8a1a0697a29ff820ceba94ff8edad95a735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Fri, 2 Sep 2016 17:17:05 +0200 Subject: [PATCH 1/6] Adds species-dependent survival kits --- code/game/jobs/job/central.dm | 4 +- code/game/jobs/job/civilian.dm | 7 +-- code/game/jobs/job/engineering.dm | 20 ++----- code/game/jobs/job/job.dm | 8 ++- code/game/jobs/job/medical.dm | 31 +++-------- code/game/jobs/job/science.dm | 11 ++-- code/game/jobs/job/security.dm | 21 +++----- code/game/jobs/job/supervisor.dm | 19 ++++--- code/game/jobs/job/support.dm | 48 ++++++----------- code/game/jobs/job/support_chaplain.dm | 7 +-- .../objects/items/weapons/tanks/tank_types.dm | 51 ++++++++++++------ .../living/carbon/human/species/plasmaman.dm | 4 +- .../living/carbon/human/species/species.dm | 1 + .../living/carbon/human/species/station.dm | 8 +++ icons/obj/tank.dmi | Bin 7694 -> 8259 bytes 15 files changed, 107 insertions(+), 133 deletions(-) diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index d5cba5be3d0..98a417dd07c 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -23,7 +23,7 @@ H.equip_or_collect(new /obj/item/device/pda/centcom(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) + give_kit(H) H.equip_or_collect(new /obj/item/weapon/gun/energy/pulse/pistol(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/implanter/dust(H), slot_in_backpack) @@ -65,7 +65,7 @@ H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/suit/space/deathsquad/officer(H), slot_wear_suit) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) + give_kit(H) H.equip_or_collect(new /obj/item/weapon/implanter/dust(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/gun/energy/pulse/pistol/m1911(H), slot_belt) H.equip_or_collect(new /obj/item/weapon/implanter/death_alarm(H), slot_in_backpack) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 0f33f91769e..09fccf6566a 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -18,14 +18,11 @@ if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/under/color/random(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 /datum/job/civilian/get_access() if(config.assistant_maint) return list(access_maint_tunnels) else - return list() \ No newline at end of file + return list() diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 2217daf0c0e..d7b2b3aaf6c 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -32,11 +32,8 @@ H.equip_or_collect(new /obj/item/clothing/head/hardhat/white(H), slot_head) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_or_collect(new /obj/item/clothing/gloves/color/black/ce(H), slot_gloves) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + give_kit(H) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) return 1 @@ -68,10 +65,7 @@ H.equip_or_collect(new /obj/item/clothing/head/hardhat(H), slot_head) H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_wear_pda) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -101,10 +95,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt) H.equip_or_collect(new /obj/item/device/pda/atmos(H), slot_wear_pda) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) + give_kit(H) return 1 /datum/job/mechanic @@ -133,10 +124,9 @@ H.equip_or_collect(new /obj/item/clothing/head/hardhat(H), slot_head) H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_wear_pda) + give_kit(H) if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H),slot_l_hand) else - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index b8e7f44ecb4..07ab4f9bc23 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -121,4 +121,10 @@ return 1 /datum/job/proc/is_position_available() - return (current_positions < total_positions) || (total_positions == -1) \ No newline at end of file + return (current_positions < total_positions) || (total_positions == -1) + +/datum/job/proc/give_kit(var/mob/living/carbon/human/H)//equips person with a survival kit depending on their species + var/obj/item/weapon/storage/box/kit = new + for(var/I in H.species.starting_gear) + new I(kit) + H.equip_or_collect(kit, slot_in_backpack) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index a064f0247f5..4412640ca0d 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -29,11 +29,8 @@ H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/cmo(H), slot_wear_suit) H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + give_kit(H) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) return 1 @@ -92,10 +89,7 @@ H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -119,7 +113,6 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 switch(H.backbag) - if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/chemistry(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_chem(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) @@ -129,7 +122,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/chemist(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -150,7 +143,6 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 switch(H.backbag) - if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/genetics(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_gen(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) @@ -160,7 +152,7 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/genetics(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 /datum/job/virologist @@ -190,10 +182,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/virologist(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 /datum/job/psychiatrist @@ -230,10 +219,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_wear_pda) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 /datum/job/paramedic @@ -261,10 +247,9 @@ H.equip_or_collect(new /obj/item/clothing/mask/cigarette(H), slot_wear_mask) H.equip_or_collect(new /obj/item/clothing/head/soft/blue(H), slot_head) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) + give_kit(H) if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand) H.equip_or_collect(new /obj/item/device/healthanalyzer(H), slot_l_hand) else - H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index eb23d9a2427..6b6c96bacdd 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -26,7 +26,6 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 switch(H.backbag) - if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/science(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) @@ -36,7 +35,7 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) return 1 @@ -64,7 +63,6 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 switch(H.backbag) - if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/science(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back) if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) @@ -73,7 +71,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -109,8 +107,5 @@ H.equip_or_collect(new /obj/item/device/pda/roboticist(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index b858225caf5..675b5fed346 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -33,11 +33,10 @@ H.equip_or_collect(new /obj/item/clothing/head/HoS(H), slot_head) H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) + give_kit(H) if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_store) else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) @@ -78,11 +77,10 @@ // H.equip_or_collect(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) + give_kit(H) if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H @@ -128,13 +126,11 @@ H.equip_or_collect(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/head/det_hat(H), slot_head) H.equip_or_collect(new /obj/item/weapon/lighter/zippo(H), slot_l_store) - + give_kit(H) if(H.backbag == 1)//Why cant some of these things spawn in his office? - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_r_store) else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) @@ -177,11 +173,10 @@ H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) + give_kit(H) if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H @@ -215,10 +210,7 @@ H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -251,11 +243,10 @@ H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) + give_kit(H) if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 22c114a0f2c..b72789c5ef1 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -19,7 +19,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/captain(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + var/obj/item/weapon/storage/box/kit = new + for(var/I in H.species.starting_gear) + new I(kit) + H.equip_or_collect(kit, slot_in_backpack) var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) var/obj/item/clothing/accessory/medal/gold/captain/M = new /obj/item/clothing/accessory/medal/gold/captain(U) U.accessories += M @@ -80,7 +83,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/head/hopcap(H), slot_head) H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes) @@ -90,6 +92,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) else H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -124,13 +127,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/ntcane(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/lighter/zippo/nt_rep(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/clothing/under/rank/ntrep(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/ntrep(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/shoes/centcom(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/heads/ntrep(H), slot_wear_pda) + give_kit(H) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -164,14 +167,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/security(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/clothing/gloves/combat(H), slot_gloves) H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/glasses/hud/health/health_advanced, slot_glasses) H.equip_or_collect(new /obj/item/clothing/under/rank/blueshield(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda) - + give_kit(H) if(H.backbag == 1) H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_r_hand) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H), slot_l_hand) @@ -210,7 +212,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/clothing/under/suit_jacket/really_black(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/judgerobe(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/shoes/centcom(H), slot_shoes) @@ -219,6 +220,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/device/pda/heads/magistrate(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/device/flash(H), slot_r_store) + give_kit(H) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -255,10 +257,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/weapon/storage/briefcase(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/laser_pointer(H), slot_l_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_r_store) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 982d2be445f..7c149252cc9 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -24,13 +24,8 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform) H.equip_or_collect(new /obj/item/device/pda/bar(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/belt/bandolier/full(H), slot_in_backpack) - - if(H.backbag == 1) - var/obj/item/weapon/storage/box/survival/Barpack = new /obj/item/weapon/storage/box/survival(H) - H.equip_or_collect(Barpack, slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/toy/russian_revolver(H.back), slot_in_backpack) + give_kit(H) + H.equip_or_collect(new /obj/item/toy/russian_revolver(H.back), slot_in_backpack) H.dna.SetSEState(SOBERBLOCK,1) H.mutations += SOBER @@ -65,10 +60,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/head/chefhat(H), slot_head) H.equip_or_collect(new /obj/item/device/pda/chef(H), slot_wear_pda) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -89,7 +81,6 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 switch(H.backbag) - if(1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/botany(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_hyd(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) @@ -100,7 +91,7 @@ H.equip_or_collect(new /obj/item/clothing/suit/apron(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store) H.equip_or_collect(new /obj/item/device/pda/botanist(H), slot_wear_pda) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -131,10 +122,7 @@ H.equip_or_collect(new /obj/item/device/pda/quartermaster(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/clipboard(H), slot_l_hand) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -162,10 +150,7 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/cargo(H), slot_wear_pda) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -200,9 +185,9 @@ H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/pill/patch/styptic(H), slot_l_store) H.equip_or_collect(new /obj/item/device/flashlight/seclite(H), slot_r_store) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival_mining(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/mining_voucher(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -224,8 +209,11 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 + var/obj/item/weapon/storage/box/kit = new + for(var/I in H.species.starting_gear) + new I(kit) H.equip_or_collect(new /obj/item/weapon/storage/backpack/clown(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + H.equip_or_collect(kit, slot_in_backpack) if(H.gender == FEMALE) H.equip_or_collect(new /obj/item/clothing/mask/gas/sexyclown(H), slot_wear_mask) H.equip_or_collect(new /obj/item/clothing/under/sexyclown(H), slot_w_uniform) @@ -281,10 +269,10 @@ H.equip_or_collect(new /obj/item/clothing/gloves/color/white(H), slot_gloves) H.equip_or_collect(new /obj/item/clothing/head/beret(H), slot_head) H.equip_or_collect(new /obj/item/clothing/suit/suspenders(H), slot_wear_suit) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/toy/crayon/mime(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/cane(H), slot_in_backpack) + give_kit(H) if(H.mind) H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null)) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak(null)) @@ -316,10 +304,7 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/janitor(H), slot_wear_pda) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 @@ -352,7 +337,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/bag/books(H), slot_l_hand) H.equip_or_collect(new /obj/item/weapon/barcodescanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/laser_pointer(H), slot_l_store) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) return 1 /datum/job/barber @@ -377,10 +362,7 @@ H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear) H.equip_or_collect(new /obj/item/clothing/under/barber(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + give_kit(H) H.equip_or_collect(new /obj/item/weapon/storage/box/barber(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/lip_stick(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index cec48fd834b..3716dc4cad0 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -23,11 +23,8 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) H.equip_or_collect(new /obj/item/device/pda/chaplain(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/camera/spooky(H.back), slot_in_backpack) + give_kit(H) + H.equip_or_collect(new /obj/item/device/camera/spooky(H.back), slot_in_backpack) spawn(0) var/religion_name = "Christianity" var/new_religion = sanitize(copytext(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name),1,MAX_NAME_LEN)) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 12ba6cbce25..563e6ddd0b5 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -19,7 +19,7 @@ New() ..() - src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return @@ -51,12 +51,12 @@ /obj/item/weapon/tank/anesthetic/New() ..() - src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD + air_contents.oxygen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD var/datum/gas/sleeping_agent/trace_gas = new() trace_gas.moles = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD - src.air_contents.trace_gases += trace_gas + air_contents.trace_gases += trace_gas return /* @@ -77,8 +77,8 @@ /obj/item/weapon/tank/air/New() ..() - src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD - src.air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD + air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD + air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD return /* @@ -93,7 +93,7 @@ /obj/item/weapon/tank/plasma/New() ..() - src.air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) return @@ -103,16 +103,16 @@ if(istype(W, /obj/item/weapon/flamethrower)) var/obj/item/weapon/flamethrower/F = W if((!F.status)||(F.ptank)) return - src.master = F + master = F F.ptank = src user.unEquip(src) - src.loc = F + loc = F F.update_icon() return /obj/item/weapon/tank/plasma/full/New() ..() - src.air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return /obj/item/weapon/tank/plasma/plasmaman @@ -143,7 +143,7 @@ New() ..() - src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return @@ -169,7 +169,7 @@ New() ..() - src.air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return /* @@ -185,7 +185,7 @@ /obj/item/weapon/tank/nitrogen/New() ..() - src.air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) return /obj/item/weapon/tank/nitrogen/examine(mob/user) @@ -202,9 +202,30 @@ item_state = "emergency_vox" volume = 25 + New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + return + +/obj/item/weapon/tank/emergency_oxygen/nitrogen + name = "emergency nitrogen tank" + desc = "An emergency tank designed specifically for Vox." + icon_state = "emergency_nitrogen" + volume = 3 New() ..() - src.air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - src.air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return \ No newline at end of file + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + +/obj/item/weapon/tank/emergency_oxygen/plasma + name = "emergency plasma tank" + desc = "An emergency tank designed specifically for Plasmamen." + icon_state = "emergency_p" + volume = 3 + + New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index bae949dd9af..2521371720a 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -26,6 +26,8 @@ "realizes the existential problem of being made out of plasma!", "shows their true colors, which happens to be the color of plasma!") + starting_gear = list(/obj/item/weapon/tank/emergency_oxygen/plasma, /obj/item/clothing/mask/breath, /obj/item/weapon/reagent_containers/hypospray/autoinjector) + /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking) if(copytext(message, 1, 2) != "*") message = replacetext(message, "s", stutter("ss")) @@ -236,4 +238,4 @@ H.adjust_fire_stacks(0.5) H.IgniteMob() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 33aa58b94d4..7765fa97813 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -156,6 +156,7 @@ ) var/cyborg_type = "Cyborg" var/list/proc/species_abilities = list() + var/list/starting_gear = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/weapon/reagent_containers/hypospray/autoinjector) //for emergency box content at roundstart /datum/species/New() //If the species has eyes, they are the default vision organ diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 0cef74044ce..798f5935d4c 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -328,6 +328,8 @@ "is holding their breath!", "is deeply inhaling oxygen!") + starting_gear = list(/obj/item/weapon/tank/emergency_oxygen/nitrogen, /obj/item/clothing/mask/breath, /obj/item/weapon/reagent_containers/hypospray/autoinjector) + /datum/species/vox/handle_death(var/mob/living/carbon/human/H) H.stop_tail_wagging(1) @@ -526,6 +528,8 @@ "is ripping out their own core!", "is turning a dull, brown color and melting into a puddle!") + starting_gear = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector) + var/list/mob/living/carbon/human/recolor_list = list() species_abilities = list( @@ -793,6 +797,8 @@ "pulls out a secret stash of herbicide and takes a hearty swig!", "is pulling themselves apart!") + starting_gear = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector) + /datum/species/diona/can_understand(var/mob/other) if(istype(other, /mob/living/simple_animal/diona)) return 1 @@ -897,6 +903,8 @@ "is frying their own circuits!", "is blocking their ventilation port!") + starting_gear = list(/obj/item/stack/cable_coil, /obj/item/weapon/weldingtool/mini) + species_abilities = list( /mob/living/carbon/human/proc/change_monitor ) diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index 6322fe65d12f08a07d90e7ee7209932714f76530..66ad2ba488c5221cb66e203919214113b97b5ca6 100644 GIT binary patch literal 8259 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 bxTYyGRpw!l2Xyft2LM`X`l?kb)?xn(<#Z8& literal 7694 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 h_}|vop*$Ak&@Z?<$rf#PbIuFUR@Yaneq Date: Fri, 2 Sep 2016 17:35:51 +0200 Subject: [PATCH 2/6] adds more equip_or_collect --- code/game/jobs/job/engineering.dm | 5 +---- code/game/jobs/job/medical.dm | 5 +---- code/game/jobs/job/security.dm | 32 ++++++++----------------------- code/game/jobs/job/supervisor.dm | 22 ++++++--------------- 4 files changed, 16 insertions(+), 48 deletions(-) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d7b2b3aaf6c..8b44c6a65ee 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -125,8 +125,5 @@ H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_wear_pda) give_kit(H) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H),slot_l_hand) - else - H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 4412640ca0d..0c9caaf9958 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -248,8 +248,5 @@ H.equip_or_collect(new /obj/item/clothing/head/soft/blue(H), slot_head) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) give_kit(H) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/device/healthanalyzer(H), slot_l_hand) - else - H.equip_or_collect(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 675b5fed346..2192e95ea74 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -34,11 +34,8 @@ H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) give_kit(H) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_store) - else - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -78,10 +75,7 @@ H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) give_kit(H) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) - else - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -127,13 +121,9 @@ H.equip_or_collect(new /obj/item/clothing/head/det_hat(H), slot_head) H.equip_or_collect(new /obj/item/weapon/lighter/zippo(H), slot_l_store) give_kit(H) - if(H.backbag == 1)//Why cant some of these things spawn in his office? - H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_l_hand) - H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_r_store) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -174,10 +164,7 @@ H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) give_kit(H) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) - else - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -244,10 +231,7 @@ H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) give_kit(H) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_l_hand) - else - H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index b72789c5ef1..f6098ca6fe7 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -33,11 +33,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/head/caphat(H), slot_head) H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -87,11 +84,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/head/hopcap(H), slot_head) H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) give_kit(H) return 1 @@ -174,12 +168,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda) give_kit(H) - if(H.backbag == 1) - H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_r_hand) - H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H), slot_l_hand) - else - H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 From 7c8e658bc5102bfb9afc516dcce635baa5f17eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sat, 3 Sep 2016 01:34:54 +0200 Subject: [PATCH 3/6] Reverts new survival kits, everyone's back to normal --- code/game/jobs/job/central.dm | 4 +-- code/game/jobs/job/civilian.dm | 2 +- code/game/jobs/job/engineering.dm | 8 +++--- code/game/jobs/job/job.dm | 6 ----- code/game/jobs/job/medical.dm | 14 +++++------ code/game/jobs/job/science.dm | 6 ++--- code/game/jobs/job/security.dm | 12 ++++----- code/game/jobs/job/supervisor.dm | 15 +++++------ code/game/jobs/job/support.dm | 25 ++++++++----------- code/game/jobs/job/support_chaplain.dm | 2 +- .../living/carbon/human/species/plasmaman.dm | 2 -- .../living/carbon/human/species/species.dm | 1 - .../living/carbon/human/species/station.dm | 8 ------ 13 files changed, 41 insertions(+), 64 deletions(-) diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index 98a417dd07c..d5cba5be3d0 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -23,7 +23,7 @@ H.equip_or_collect(new /obj/item/device/pda/centcom(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/gun/energy/pulse/pistol(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/implanter/dust(H), slot_in_backpack) @@ -65,7 +65,7 @@ H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/suit/space/deathsquad/officer(H), slot_wear_suit) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/implanter/dust(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/gun/energy/pulse/pistol/m1911(H), slot_belt) H.equip_or_collect(new /obj/item/weapon/implanter/death_alarm(H), slot_in_backpack) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 09fccf6566a..a6f1ef11749 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -18,7 +18,7 @@ if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) H.equip_or_collect(new /obj/item/clothing/under/color/random(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 /datum/job/civilian/get_access() diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 8b44c6a65ee..97daf562df9 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -32,7 +32,7 @@ H.equip_or_collect(new /obj/item/clothing/head/hardhat/white(H), slot_head) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_or_collect(new /obj/item/clothing/gloves/color/black/ce(H), slot_gloves) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) return 1 @@ -65,7 +65,7 @@ H.equip_or_collect(new /obj/item/clothing/head/hardhat(H), slot_head) H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) return 1 @@ -95,7 +95,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/atmostech/(H), slot_belt) H.equip_or_collect(new /obj/item/device/pda/atmos(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) return 1 /datum/job/mechanic @@ -124,6 +124,6 @@ H.equip_or_collect(new /obj/item/clothing/head/hardhat(H), slot_head) H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 07ab4f9bc23..104ed27bc05 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -122,9 +122,3 @@ /datum/job/proc/is_position_available() return (current_positions < total_positions) || (total_positions == -1) - -/datum/job/proc/give_kit(var/mob/living/carbon/human/H)//equips person with a survival kit depending on their species - var/obj/item/weapon/storage/box/kit = new - for(var/I in H.species.starting_gear) - new I(kit) - H.equip_or_collect(kit, slot_in_backpack) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 0c9caaf9958..0899c2af93a 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -29,7 +29,7 @@ H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/cmo(H), slot_wear_suit) H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) return 1 @@ -89,7 +89,7 @@ H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -122,7 +122,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/chemist(H), slot_wear_suit) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -152,7 +152,7 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/genetics(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 /datum/job/virologist @@ -182,7 +182,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/virologist(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 /datum/job/psychiatrist @@ -219,7 +219,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_wear_pda) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 /datum/job/paramedic @@ -247,6 +247,6 @@ H.equip_or_collect(new /obj/item/clothing/mask/cigarette(H), slot_wear_mask) H.equip_or_collect(new /obj/item/clothing/head/soft/blue(H), slot_head) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 6b6c96bacdd..10c267be851 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -35,7 +35,7 @@ H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) return 1 @@ -71,7 +71,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_wear_pda) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -107,5 +107,5 @@ H.equip_or_collect(new /obj/item/device/pda/roboticist(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 2192e95ea74..a237411e80a 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -33,7 +33,7 @@ H.equip_or_collect(new /obj/item/clothing/head/HoS(H), slot_head) H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) @@ -74,7 +74,7 @@ // H.equip_or_collect(new /obj/item/clothing/mask/gas(H), slot_wear_mask) //Grab one from the armory you donk H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H @@ -120,7 +120,7 @@ H.equip_or_collect(new /obj/item/clothing/suit/storage/det_suit(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/head/det_hat(H), slot_head) H.equip_or_collect(new /obj/item/weapon/lighter/zippo(H), slot_l_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) @@ -163,7 +163,7 @@ H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H @@ -197,7 +197,7 @@ H.equip_or_collect(new /obj/item/device/pda/medical(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -230,7 +230,7 @@ H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_l_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index f6098ca6fe7..be0215b9b22 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -19,10 +19,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack/captain(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_cap(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - var/obj/item/weapon/storage/box/kit = new - for(var/I in H.species.starting_gear) - new I(kit) - H.equip_or_collect(kit, slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/captain(H) var/obj/item/clothing/accessory/medal/gold/captain/M = new /obj/item/clothing/accessory/medal/gold/captain(U) U.accessories += M @@ -86,7 +83,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -127,7 +124,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/suit/storage/ntrep(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/shoes/centcom(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/heads/ntrep(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -167,7 +164,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/under/rank/blueshield(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H.back), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) @@ -210,7 +207,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/device/pda/heads/magistrate(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/device/flash(H), slot_r_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -247,7 +244,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/weapon/storage/briefcase(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/laser_pointer(H), slot_l_store) H.equip_or_collect(new /obj/item/device/flash(H), slot_r_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 7c149252cc9..755989a5112 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -24,7 +24,7 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform) H.equip_or_collect(new /obj/item/device/pda/bar(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/belt/bandolier/full(H), slot_in_backpack) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/toy/russian_revolver(H.back), slot_in_backpack) H.dna.SetSEState(SOBERBLOCK,1) @@ -60,7 +60,7 @@ H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/head/chefhat(H), slot_head) H.equip_or_collect(new /obj/item/device/pda/chef(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -91,7 +91,7 @@ H.equip_or_collect(new /obj/item/clothing/suit/apron(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store) H.equip_or_collect(new /obj/item/device/pda/botanist(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -122,7 +122,7 @@ H.equip_or_collect(new /obj/item/device/pda/quartermaster(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/weapon/clipboard(H), slot_l_hand) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -150,7 +150,7 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/cargotech(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/cargo(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -187,7 +187,7 @@ H.equip_or_collect(new /obj/item/device/flashlight/seclite(H), slot_r_store) H.equip_or_collect(new /obj/item/weapon/mining_voucher(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H.back), slot_in_backpack) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -209,11 +209,8 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - var/obj/item/weapon/storage/box/kit = new - for(var/I in H.species.starting_gear) - new I(kit) H.equip_or_collect(new /obj/item/weapon/storage/backpack/clown(H), slot_back) - H.equip_or_collect(kit, slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) if(H.gender == FEMALE) H.equip_or_collect(new /obj/item/clothing/mask/gas/sexyclown(H), slot_wear_mask) H.equip_or_collect(new /obj/item/clothing/under/sexyclown(H), slot_w_uniform) @@ -272,7 +269,7 @@ H.equip_or_collect(new /obj/item/toy/crayon/mime(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/cane(H), slot_in_backpack) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) if(H.mind) H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null)) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak(null)) @@ -304,7 +301,7 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/janitor(H), slot_wear_pda) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -337,7 +334,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/bag/books(H), slot_l_hand) H.equip_or_collect(new /obj/item/weapon/barcodescanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/laser_pointer(H), slot_l_store) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 /datum/job/barber @@ -362,7 +359,7 @@ H.equip_or_collect(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear) H.equip_or_collect(new /obj/item/clothing/under/barber(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/barber(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/lip_stick(H.back), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index 3716dc4cad0..92aa3ed60d3 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -23,7 +23,7 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) H.equip_or_collect(new /obj/item/device/pda/chaplain(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) - give_kit(H) + H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/camera/spooky(H.back), slot_in_backpack) spawn(0) var/religion_name = "Christianity" diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 2521371720a..d8434a87223 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -26,8 +26,6 @@ "realizes the existential problem of being made out of plasma!", "shows their true colors, which happens to be the color of plasma!") - starting_gear = list(/obj/item/weapon/tank/emergency_oxygen/plasma, /obj/item/clothing/mask/breath, /obj/item/weapon/reagent_containers/hypospray/autoinjector) - /datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking) if(copytext(message, 1, 2) != "*") message = replacetext(message, "s", stutter("ss")) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 7765fa97813..33aa58b94d4 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -156,7 +156,6 @@ ) var/cyborg_type = "Cyborg" var/list/proc/species_abilities = list() - var/list/starting_gear = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/weapon/reagent_containers/hypospray/autoinjector) //for emergency box content at roundstart /datum/species/New() //If the species has eyes, they are the default vision organ diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 798f5935d4c..0cef74044ce 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -328,8 +328,6 @@ "is holding their breath!", "is deeply inhaling oxygen!") - starting_gear = list(/obj/item/weapon/tank/emergency_oxygen/nitrogen, /obj/item/clothing/mask/breath, /obj/item/weapon/reagent_containers/hypospray/autoinjector) - /datum/species/vox/handle_death(var/mob/living/carbon/human/H) H.stop_tail_wagging(1) @@ -528,8 +526,6 @@ "is ripping out their own core!", "is turning a dull, brown color and melting into a puddle!") - starting_gear = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector) - var/list/mob/living/carbon/human/recolor_list = list() species_abilities = list( @@ -797,8 +793,6 @@ "pulls out a secret stash of herbicide and takes a hearty swig!", "is pulling themselves apart!") - starting_gear = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector) - /datum/species/diona/can_understand(var/mob/other) if(istype(other, /mob/living/simple_animal/diona)) return 1 @@ -903,8 +897,6 @@ "is frying their own circuits!", "is blocking their ventilation port!") - starting_gear = list(/obj/item/stack/cable_coil, /obj/item/weapon/weldingtool/mini) - species_abilities = list( /mob/living/carbon/human/proc/change_monitor ) From 2c6ddff88551484a1b59a10120503446a35f5228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sat, 3 Sep 2016 02:17:34 +0200 Subject: [PATCH 4/6] Makes it nicer --- .../objects/items/weapons/tanks/tank_types.dm | 88 ++++++++----------- 1 file changed, 36 insertions(+), 52 deletions(-) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 563e6ddd0b5..122643238ec 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -17,17 +17,15 @@ distribute_pressure = ONE_ATMOSPHERE*O2STANDARD - New() - ..() - air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return +/obj/item/weapon/tank/oxygen/New() + ..() + air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - - examine(mob/user) - if(..(user, 0)) - if(air_contents.oxygen < 10) - to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) - //playsound(usr, 'sound/effects/alert.ogg', 50, 1) +/obj/item/weapon/tank/oxygen/examine(mob/user) + if(..(user, 0)) + if(air_contents.oxygen < 10) + to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) + //playsound(usr, 'sound/effects/alert.ogg', 50, 1) /obj/item/weapon/tank/oxygen/yellow @@ -57,7 +55,6 @@ trace_gas.moles = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD air_contents.trace_gases += trace_gas - return /* * Air @@ -68,18 +65,16 @@ icon_state = "oxygen" - examine(mob/user) - if(..(user, 0)) - if(air_contents.oxygen < 1 && loc==usr) - to_chat(user, "The meter on the [src.name] indicates you are almost out of air!") - user << sound('sound/effects/alert.ogg') +/obj/item/weapon/tank/air/examine(mob/user) + if(..(user, 0)) + if(air_contents.oxygen < 1 && loc==usr) + to_chat(user, "The meter on the [src.name] indicates you are almost out of air!") + user << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/air/New() ..() - air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD - return /* * Plasma @@ -94,8 +89,6 @@ /obj/item/weapon/tank/plasma/New() ..() air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) - return - /obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() @@ -108,12 +101,10 @@ user.unEquip(src) loc = F F.update_icon() - return /obj/item/weapon/tank/plasma/full/New() ..() air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return /obj/item/weapon/tank/plasma/plasmaman desc = "The lifeblood of plasmamen. Warning: Extremely flammable, do not inhale (unless you're a plasman)." @@ -141,17 +132,15 @@ volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) - New() - ..() - air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return +/obj/item/weapon/tank/emergency_oxygen/New() + ..() + air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - - examine(mob/user) - if(..(user, 0)) - if(air_contents.oxygen < 0.2 && loc==usr) - to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) - user << sound('sound/effects/alert.ogg') +/obj/item/weapon/tank/emergency_oxygen/examine(mob/user) + if(..(user, 0)) + if(air_contents.oxygen < 0.2 && loc==usr) + to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) + user << sound('sound/effects/alert.ogg') /obj/item/weapon/tank/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" @@ -167,10 +156,9 @@ name = "pressurized double emergency oxygen tank" desc = "Used for \"emergencies,\" it actually contains a fair amount of oxygen." - New() - ..() - air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return +/obj/item/weapon/tank/emergency_oxygen/double/full/New() + ..() + air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) /* * Nitrogen @@ -184,9 +172,7 @@ /obj/item/weapon/tank/nitrogen/New() ..() - air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) - return /obj/item/weapon/tank/nitrogen/examine(mob/user) if(..(user, 0)) @@ -194,7 +180,6 @@ to_chat(user, text("The meter on the [src.name] indicates you are almost out of air!")) //playsound(usr, 'sound/effects/alert.ogg', 50, 1) - /obj/item/weapon/tank/emergency_oxygen/vox name = "vox specialized nitrogen tank" desc = "A high-tech nitrogen tank designed specifically for Vox." @@ -202,11 +187,10 @@ item_state = "emergency_vox" volume = 25 - New() - ..() - air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - return +/obj/item/weapon/tank/emergency_oxygen/vox/New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) /obj/item/weapon/tank/emergency_oxygen/nitrogen name = "emergency nitrogen tank" @@ -214,10 +198,10 @@ icon_state = "emergency_nitrogen" volume = 3 - New() - ..() - air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/weapon/tank/emergency_oxygen/nitrogen/New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) /obj/item/weapon/tank/emergency_oxygen/plasma name = "emergency plasma tank" @@ -225,7 +209,7 @@ icon_state = "emergency_p" volume = 3 - New() - ..() - air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/weapon/tank/emergency_oxygen/plasma/New() + ..() + air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) From 05c4b61a6ff3448521268f248a193b7627da5994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sat, 3 Sep 2016 15:08:32 +0200 Subject: [PATCH 5/6] Adds tanks to medical storage --- _maps/map_files/cyberiad/cyberiad.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 4aec305efd4..20b7eb22a1a 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -6096,7 +6096,6 @@ "cnl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/obj/machinery/light{dir = 1; in_use = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cnm" = (/obj/structure/rack,/obj/item/clothing/suit/radiation,/obj/item/clothing/head/radiation,/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 101.325; on = 1; pressure_checks = 1},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/plasteel{icon_state = "blue"; dir = 8},/area/medical/biostorage) "cnn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel,/area/medical/biostorage) -"cno" = (/obj/structure/table,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/medical/biostorage) "cnp" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology) "cnq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cnr" = (/obj/structure/rack,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/asmaint) @@ -9010,6 +9009,7 @@ "dro" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_scimaint"; name = "Cyberiad Science Maint"; width = 11},/turf/space,/area/space) "drp" = (/obj/structure/lattice,/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_engshuttle"; name = "Cyberiad Eng Shuttle"; width = 11},/turf/space,/area/space) "drq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall/r_wall,/area/maintenance/asmaint2) +"YDt" = (/obj/structure/table,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/item/weapon/tank/emergency_oxygen/nitrogen{pixel_x = 6; pixel_y = 5},/obj/item/weapon/tank/emergency_oxygen/nitrogen{pixel_x = 4; pixel_y = 3},/obj/item/weapon/tank/emergency_oxygen/plasma{pixel_x = -4; pixel_y = 5},/obj/item/weapon/tank/emergency_oxygen/plasma{pixel_x = -6; pixel_y = 3},/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/medical/biostorage) (1,1,1) = {" bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik @@ -9169,7 +9169,7 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaacaabaabaaccjMdnrdnqdnscqscqsdoxcqscqsdnobUTbUTbUTbUTbUTbUTcekbUTbUTbUTbUTdntdntdntdntdntdntdntdntdntbUTcfScejbikbikbikbikciEbaTciGciHciIciJciKciLciMciNcmPciPciQciRciSciSciTbPSceDceCceCceCceCceEceCbGybGybPlciYciZcjacjbcjccjdchScjecjfbBccjhcjicjjcjkcjlcfdcnicxVcxVcxVcxVckNclSckUcnjcjqcjrcjscjtcbAcwncjvcdCcjwcjxcjycjzcjAcfrcjBcdCcdCbxOcgfbxObxObxOcjDcjEcjFbxObxXciicjGcjHcyJcyJcyJbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbUAbikbikbikbikbikaabbikbikbikbikbikbikbikbWhccvccvccvccvccvccvcjIbXZccuccvcjJbXZbXZbXZbXZbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbUTcjKcjKcjKcjKcjKcjKcjLcjKdnodnubUTcqsdoydnwdnycqsdnydnvdnzdnwdntdnAdnAdntdnBdntdnDdnCdntcqscelcjMbikcjNcjOcjPcjQcjRcjScjTcjUcjVcjWcjXcjYcjZcosckbckcckdckeckfckgckhceDckickjckjckjckkceCbGybGycklcklcklcklckmcklckncknckocklcklckpcklckqckrckscktckscglaPKcmacmmcmlcmocmnckzckAckBckCckDckEckFcdccdCcdCciVcdCckHcdCciXciWcjpcgnckLckMckvckOcwAcjCckRcxTcwAbxXciickTbxXbxXckVckWckXchabxXbxXbxXbxXbxXbxXbxXckYckZcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWhbXZbXZbXZbXZbXZbXZcfNbXZcjJbXZbXZbXZbXZbXZbWhbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdnEclbclbclbclbclbclbclccldcleclfclgclhclicjLdnocnRbUTcqsdozdnwcqscqscqsdnvcwNdnwdntdnAdnFdnCdnCdnGdnCdnHdntcljcelcjMbikclkcllclmclnclocjSclpdhpclrclsciLcltcgdcoaciPcluchyclvchyclwclxclyclzclAclAclAclBceCbGybGycklclCbzsclEclDclGclHclHclFclJclKclMclLclNclOcotcfhcpwckGcmrcmqctbcsZcuoctcckDclVclWclXckzclYcmtcmscmbcmbcmccmdcmecmfcmgcmhcmfcmfcmfcmicmfcmfcmjcmucnpcnlcqRcoXcrGcqScrHcrHcrIcrHcrHcrHcrHcrJcrKcrHcrHcrHcrMcmvbxXcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWhbWhceibXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik -bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcmwcmxcmxcmxcmxcmycmzcmAcmBcmCcmCcmDcjKdnocqscekcqscqscqscqscqscqscqscqscqsdntdntdnCdnIdnCdntdnCdnIdntcmEcfScjMbikclkcmFcmGcmHcmIcmJcmKcmLcmIcmIcmMcmNcmOcpxckIckIcmRbHtchycmTcmUclyclAclAclAclAcmVceCbGybGycklcmWcmXcmYcmZcnacnbcnbclIbvWbulbxBclHconcklcqQcfdcrLcxVcwscvxcwEcwCcxNcxIckDcnmcnncnockDbJGcumctecnqcnqcnqcnqcnqcnrcnscntcnucnvcnvcnwcnwcnvcnxcnycnzcnAcnCcnCcnDcnEcnCcnCcnCcnCcnCcnCcnCcnCcnCcnCcnCcnCcuncnFcnGcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcaUbWhbWhchlchlbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik +bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcmwcmxcmxcmxcmxcmycmzcmAcmBcmCcmCcmDcjKdnocqscekcqscqscqscqscqscqscqscqscqsdntdntdnCdnIdnCdntdnCdnIdntcmEcfScjMbikclkcmFcmGcmHcmIcmJcmKcmLcmIcmIcmMcmNcmOcpxckIckIcmRbHtchycmTcmUclyclAclAclAclAcmVceCbGybGycklcmWcmXcmYcmZcnacnbcnbclIbvWbulbxBclHconcklcqQcfdcrLcxVcwscvxcwEcwCcxNcxIckDcnmcnnYDtckDbJGcumctecnqcnqcnqcnqcnqcnrcnscntcnucnvcnvcnwcnwcnvcnxcnycnzcnAcnCcnCcnDcnEcnCcnCcnCcnCcnCcnCcnCcnCcnCcnCcnCcnCcuncnFcnGcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcaUbWhbWhchlchlbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcnHcnIcnJcnKcnJcnLcnMcnNcnOcnPcnQcjKdnobUTbUTdnJcjMcjMcjMcjMcjMcjMcjMdnKdntdnCdnCdnCdnCdnLdnCdnCdntcnRcelcjMbikclkcnScnTcnUcnVcjScnWcnXcnYcnZciLcltcgdcbkchqcodcoccodciPciPciPckJcofclAclAcogcohceCbGycoicklcoocokcolcomcomcoqcojcnhcomcomcopclHcrCcklcrNcfdcupcxVcxVcxUcxVcxVcxNcEickDcowcoxcoyckDcozcuscoicoAcoAcoAcoAcoAcoDcoDcoDcoAcoAbikbikbikbikckPctdcoFckKcnCcoHcoIcoJcoKcoLcoMcoNcoOcoPcoQcoRcoScoTcoUcnCcuncoWcvtcoYcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcoZcpacpbbWhbZubWhbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcnHcpccpdcpecpfcmBcpgcphcpicmBcpjcpkdnMchobUTcqscjMbikbikbikbikbikcjMcqsdnldnAdnOdnCdnCdnCdnCdnPdnNcplcpmcjMbikcpncjOcpocjQcppcjScjScpqcprcpscptcpucpvcwqchqcodcpycpzcpAcpBcpCceDcpDclAclAclAcpEceCbGybGycpFcpFcpGcpHcpIcpIcrDcyFcrEcpJcpJcpKcpFcpGcpFcqQcfdcrLdbAbjVcEYdbndbmcxNclRckDcoucpNcovckDbGycuscoAcoAaabaabbikbikbikbikbikbikbikbikbikbikbikcpRcpScpTcpUcpVcpWcpXcpXcpYcpXcpXcpXcpXcpXcpZcqacqbcqccqdbwocvvbXSbwobwoaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWhcqhcqicqjbWhbWhbXZbXZcqkbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcnHcqlcnJcqmcnJcqncqocqpcqqcnNcqrcjKdoAcwNbUTcfQcejbikbikbikbikbikcejdnRdntdnSdnSdnAdnUdnTdnCdnVdntcqscelcejbikbikbikbikciEcqtcqucqvcqvciLcqwciLcqxcgdcbkcqyckQcqAcqBcqCcqCcqCcqDcqEclAcqFclAcqGceCbGybGycpFcqHcrFcqJcqKcqLcsPcpFcsUcqMcqKcqNcsVcqPcpFczecyWczgdbAdbpdbodbrdbqdbsctcckDcpOcpPcpQckDbGycuscoAcvyaabaabaabbikbikbikbikbikbikbikbikbikbikcpRcqUcqVcqWcqXcqYcqZcracrbcpXcpXcrccpXcpXcpZcqbcqbcqbcrdbwocvzbxXbwoaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWfcrhcribZvbWgbWhbWhbXZbYabXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik From d64b3b692b7f2bc6491b3ee1b8b7a9f9e7896cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20J=C4=99drzejczak?= Date: Sat, 3 Sep 2016 20:53:15 +0200 Subject: [PATCH 6/6] Recolors tanks, tweaks more things --- code/game/jobs/job/engineering.dm | 4 ++-- code/game/jobs/job/medical.dm | 12 ++++++------ code/game/jobs/job/science.dm | 2 +- code/game/jobs/job/security.dm | 4 ++-- code/game/jobs/job/supervisor.dm | 18 +++++++++--------- code/game/jobs/job/support.dm | 10 +++++----- code/game/jobs/job/support_chaplain.dm | 2 +- icons/obj/tank.dmi | Bin 8259 -> 8270 bytes 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 97daf562df9..a8846f2134a 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -33,7 +33,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_or_collect(new /obj/item/clothing/gloves/color/black/ce(H), slot_gloves) H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) return 1 @@ -125,5 +125,5 @@ H.equip_or_collect(new /obj/item/device/t_scanner(H), slot_r_store) H.equip_or_collect(new /obj/item/device/pda/engineering(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/pod_paint_bucket(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 0899c2af93a..1baceb6a57e 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -30,7 +30,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) return 1 @@ -62,10 +62,10 @@ H.equip_or_collect(new /obj/item/clothing/under/rank/medical/mortician(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/mortician(H), slot_wear_suit) if(H.backbag != 1) - H.equip_or_collect(new /obj/item/clothing/head/surgery/black(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/autopsy_scanner(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/mass_spectrometer(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/bodybags(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/clothing/head/surgery/black(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/autopsy_scanner(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/mass_spectrometer(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/bodybags(H), slot_in_backpack) if("Surgeon") H.equip_or_collect(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) @@ -248,5 +248,5 @@ H.equip_or_collect(new /obj/item/clothing/head/soft/blue(H), slot_head) H.equip_or_collect(new /obj/item/device/flashlight/pen(H), slot_s_store) H.equip_or_collect(new /obj/item/weapon/storage/box/engineer(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/healthanalyzer(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/healthanalyzer(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 10c267be851..f03f5b4c0a1 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -36,7 +36,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index a237411e80a..47532f8d081 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -35,7 +35,7 @@ H.equip_or_collect(new /obj/item/weapon/gun/energy/gun(H), slot_s_store) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/restraints/handcuffs(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -123,7 +123,7 @@ H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/evidence(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/detective_scanner(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index be0215b9b22..66f0ddb2c65 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -30,8 +30,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/head/caphat(H), slot_head) H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses) - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -81,8 +81,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/head/hopcap(H), slot_head) H.equip_or_collect(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/heads/hop(H), slot_wear_pda) - H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/ids(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -118,8 +118,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) if(2) H.equip_or_collect(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/ntcane(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/lighter/zippo/nt_rep(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/ntcane(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/lighter/zippo/nt_rep(H), slot_in_backpack) H.equip_or_collect(new /obj/item/clothing/under/rank/ntrep(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/suit/storage/ntrep(H), slot_wear_suit) H.equip_or_collect(new /obj/item/clothing/shoes/centcom(H), slot_shoes) @@ -165,8 +165,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit) H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/deathimp(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/gun/energy/gun/blueshield(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) L.imp_in = H L.implanted = 1 @@ -205,7 +205,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/head/powdered_wig(H), slot_head) H.equip_or_collect(new /obj/item/clothing/glasses/hud/security/sunglasses(H), slot_glasses) H.equip_or_collect(new /obj/item/device/pda/heads/magistrate(H), slot_wear_pda) - H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/melee/classic_baton/telescopic(H), slot_in_backpack) H.equip_or_collect(new /obj/item/device/flash(H), slot_r_store) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 755989a5112..1f475891103 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -25,7 +25,7 @@ H.equip_or_collect(new /obj/item/device/pda/bar(H), slot_wear_pda) H.equip_or_collect(new /obj/item/weapon/storage/belt/bandolier/full(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/toy/russian_revolver(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/toy/russian_revolver(H), slot_in_backpack) H.dna.SetSEState(SOBERBLOCK,1) H.mutations += SOBER @@ -185,8 +185,8 @@ H.equip_or_collect(new /obj/item/clothing/shoes/workboots(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/pill/patch/styptic(H), slot_l_store) H.equip_or_collect(new /obj/item/device/flashlight/seclite(H), slot_r_store) - H.equip_or_collect(new /obj/item/weapon/mining_voucher(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/mining_voucher(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/bag/ore(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) return 1 @@ -360,6 +360,6 @@ H.equip_or_collect(new /obj/item/clothing/under/barber(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/barber(H.back), slot_in_backpack) - H.equip_or_collect(new /obj/item/weapon/storage/box/lip_stick(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/barber(H), slot_in_backpack) + H.equip_or_collect(new /obj/item/weapon/storage/box/lip_stick(H), slot_in_backpack) return 1 diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index 92aa3ed60d3..5904cd4b020 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -24,7 +24,7 @@ H.equip_or_collect(new /obj/item/device/pda/chaplain(H), slot_wear_pda) H.equip_or_collect(new /obj/item/clothing/shoes/black(H), slot_shoes) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack) - H.equip_or_collect(new /obj/item/device/camera/spooky(H.back), slot_in_backpack) + H.equip_or_collect(new /obj/item/device/camera/spooky(H), slot_in_backpack) spawn(0) var/religion_name = "Christianity" var/new_religion = sanitize(copytext(input(H, "You are the crew services officer. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name),1,MAX_NAME_LEN)) diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index 66ad2ba488c5221cb66e203919214113b97b5ca6..1154fe08e335a52e3f527b272839cbb9fbba092d 100644 GIT binary patch delta 7867 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 delta 7854 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