From 0a560b171c8869e239e68f7bc1e49bf0db4e599a Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sat, 27 Jul 2019 13:01:27 +0200 Subject: [PATCH] [s] ports "Fixes ore satchel exploits, various storage size circumventions." --- code/game/objects/items/storage/storage.dm | 2 +- code/modules/jobs/job_types/cargo_service.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 7c2694016b..b69567a2a5 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -16,7 +16,7 @@ AddComponent(component_type) /obj/item/storage/AllowDrop() - return TRUE + return FALSE /obj/item/storage/contents_explosion(severity, target) for(var/atom/A in contents) diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index 22ef2a9211..22d10b88b0 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -88,9 +88,9 @@ Shaft Miner gloves = /obj/item/clothing/gloves/color/black uniform = /obj/item/clothing/under/rank/miner/lavaland l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival - r_pocket = /obj/item/flashlight/seclite + r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack backpack_contents = list( - /obj/item/storage/bag/ore=1,\ + /obj/item/flashlight/seclite=1,\ /obj/item/kitchen/knife/combat/survival=1,\ /obj/item/mining_voucher=1,\ /obj/item/suit_voucher=1,\ @@ -116,7 +116,7 @@ Shaft Miner suit_store = /obj/item/tank/internals/oxygen internals_slot = SLOT_S_STORE backpack_contents = list( - /obj/item/storage/bag/ore=1, + /obj/item/flashlight/seclite=1,\ /obj/item/kitchen/knife/combat/survival=1, /obj/item/mining_voucher=1, /obj/item/t_scanner/adv_mining_scanner/lesser=1,