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 )