cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-19 07:44:54 -04:00
committed by Darlantan
parent c445a1ad4e
commit 6b9dc2a135
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/food/kitchen/smartfridge.dm
View File

@@ -31,8 +31,20 @@
icon_base = "fridge_sci"
icon_contents = "chem"
<<<<<<< HEAD:code/modules/food/kitchen/smartfridge.dm
/obj/machinery/smartfridge/New()
..()
||||||| parent of ba346f5f63... Merge pull request #10325 from VOREStation/Arokha/persistsheets:code/modules/food/kitchen/smartfridge/smartfridge.dm
/obj/machinery/smartfridge/New()
..()
if(persistent)
SSpersistence.track_value(src, persistent)
=======
/obj/machinery/smartfridge/Initialize()
. = ..()
if(persistent)
SSpersistence.track_value(src, persistent)
>>>>>>> ba346f5f63... Merge pull request #10325 from VOREStation/Arokha/persistsheets:code/modules/food/kitchen/smartfridge/smartfridge.dm
if(is_secure)
wires = new/datum/wires/smartfridge/secure(src)
else