From 34321883ccf0b0ecf9d523c09b6a7bd14a7ac538 Mon Sep 17 00:00:00 2001 From: Tad Hardesty Date: Tue, 1 May 2018 05:29:41 -0700 Subject: [PATCH 1/2] Fix placing boxes in storage implants --- .../components/storage/concrete/implant.dm | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/code/datums/components/storage/concrete/implant.dm b/code/datums/components/storage/concrete/implant.dm index d3f3d6b586..3a3636e0f6 100644 --- a/code/datums/components/storage/concrete/implant.dm +++ b/code/datums/components/storage/concrete/implant.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /datum/component/storage/concrete/implant max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 6 @@ -15,3 +16,23 @@ return ..() max_combined_w_class += I.max_combined_w_class max_items += I.max_items +======= +/datum/component/storage/concrete/implant + max_w_class = WEIGHT_CLASS_NORMAL + max_combined_w_class = 6 + max_items = 2 + drop_all_on_destroy = TRUE + drop_all_on_deconstruct = TRUE + silent = TRUE + allow_big_nesting = TRUE + +/datum/component/storage/concrete/implant/Initialize() + . = ..() + cant_hold = typecacheof(list(/obj/item/disk/nuclear)) + +/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original) + if(!istype(I)) + return ..() + max_combined_w_class += I.max_combined_w_class + max_items += I.max_items +>>>>>>> e268d6f... Fix placing boxes in storage implants (#37579) From e8f460271610aab8610b764884f5a47c6405f9ca Mon Sep 17 00:00:00 2001 From: deathride58 Date: Tue, 1 May 2018 21:16:05 -0400 Subject: [PATCH 2/2] Update implant.dm --- .../components/storage/concrete/implant.dm | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/code/datums/components/storage/concrete/implant.dm b/code/datums/components/storage/concrete/implant.dm index 3a3636e0f6..0348d340ae 100644 --- a/code/datums/components/storage/concrete/implant.dm +++ b/code/datums/components/storage/concrete/implant.dm @@ -1,22 +1,3 @@ -<<<<<<< HEAD -/datum/component/storage/concrete/implant - max_w_class = WEIGHT_CLASS_NORMAL - max_combined_w_class = 6 - max_items = 2 - drop_all_on_destroy = TRUE - drop_all_on_deconstruct = TRUE - silent = TRUE - -/datum/component/storage/concrete/implant/Initialize() - . = ..() - cant_hold = typecacheof(list(/obj/item/disk/nuclear)) - -/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original) - if(!istype(I)) - return ..() - max_combined_w_class += I.max_combined_w_class - max_items += I.max_items -======= /datum/component/storage/concrete/implant max_w_class = WEIGHT_CLASS_NORMAL max_combined_w_class = 6 @@ -35,4 +16,3 @@ return ..() max_combined_w_class += I.max_combined_w_class max_items += I.max_items ->>>>>>> e268d6f... Fix placing boxes in storage implants (#37579)