From c2be8936eba27de66d1fef1477b6c0c53c410d88 Mon Sep 17 00:00:00 2001 From: AlAtEx <16675024+AlAtEX@users.noreply.github.com> Date: Wed, 21 Nov 2018 15:59:39 -0500 Subject: [PATCH] Revert --- code/game/jobs/job/job.dm | 16 ++-------- code/game/jobs/job/support.dm | 1 - .../objects/items/weapons/storage/boxes.dm | 32 ------------------- 3 files changed, 2 insertions(+), 47 deletions(-) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 023506439c7..92424dd2bcb 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -168,20 +168,8 @@ back = backpack //Department backpack if(box) - switch(H.dna.species.name) // For race-special starting boxes - if("Machine") - if(box == /obj/item/storage/box/survival) // Normal box - backpack_contents.Insert(1, /obj/item/storage/box/survival_machine) // Box always takes a first slot in backpack - backpack_contents[/obj/item/storage/box/survival_machine] = 1 - if(box == /obj/item/storage/box/survival_mining) // + Crowbar - backpack_contents.Insert(1, /obj/item/storage/box/survival_mining_machine) // Box always takes a first slot in backpack - backpack_contents[/obj/item/storage/box/survival_mining_machine] = 1 - if(box == /obj/item/storage/box/engineer) // Different icon as normal box - backpack_contents.Insert(1, /obj/item/storage/box/engineer_machine) // Box always takes a first slot in backpack - backpack_contents[/obj/item/storage/box/engineer_machine] = 1 - else - backpack_contents.Insert(1, box) // Box always takes a first slot in backpack - backpack_contents[box] = 1 + backpack_contents.Insert(1, box) // Box always takes a first slot in backpack + backpack_contents[box] = 1 if(allow_loadout && H.client && (H.client.prefs.gear && H.client.prefs.gear.len)) for(var/gear in H.client.prefs.gear) diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 50dd19689c2..1b8d4894a23 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -189,7 +189,6 @@ backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel_eng - box = /obj/item/storage/box/survival_mining //Griff //BS12 EDIT diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 429430a39cc..1d23049064f 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -74,16 +74,6 @@ new /obj/item/reagent_containers/hypospray/autoinjector( src ) return -/obj/item/storage/box/survival_machine - icon_state = "box_civ_ipc" - New() - ..() - contents = list() - new /obj/item/weldingtool/mini( src ) - new /obj/item/stack/cable_coil( src, 10 ) - new /obj/item/reagent_containers/food/drinks/oilcan/full( src ) - return - /obj/item/storage/box/engineer icon_state = "box_eng" New() @@ -94,17 +84,6 @@ new /obj/item/reagent_containers/hypospray/autoinjector( src ) return -/obj/item/storage/box/engineer_machine - icon_state = "box_eng_ipc" - New() - ..() - contents = list() - new /obj/item/weldingtool/mini( src ) - new /obj/item/stack/cable_coil( src, 10 ) - new /obj/item/reagent_containers/food/drinks/oilcan/full( src ) - return - - /obj/item/storage/box/survival_mining icon_state = "box_min" New() @@ -115,17 +94,6 @@ new /obj/item/crowbar/red(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) -/obj/item/storage/box/survival_mining_machine - icon_state = "box_min_ipc" - New() - ..() - contents = list() - new /obj/item/weldingtool/mini( src ) - new /obj/item/stack/cable_coil( src, 10 ) - new /obj/item/reagent_containers/food/drinks/oilcan/full( src ) - new /obj/item/crowbar/red(src) - return - /obj/item/storage/box/gloves name = "box of latex gloves" desc = "Contains white gloves."