cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict fix

Browse Source
This commit is contained in:
Firecage
2017-10-05 11:22:57 +02:00
parent 2ae0380fef f700cb6331
commit ee3e8d2846
882 changed files with 77089 additions and 8339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/area_copy.dm
+1 -1
View File
@@ -31,7 +31,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs",
I.damtype = STAMINA // thou shalt not
N.update_icon()
if(istype(O, /obj/machinery))
if(ismachinery(O))
var/obj/machinery/M = O
M.power_change()