shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update implant.dm

Browse Source
This commit is contained in:
deathride58
2018-05-01 21:16:05 -04:00
committed by GitHub
parent 34321883cc
commit e8f4602716
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/storage/concrete/implant.dm
-20
View File
@@ -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)