cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update objs.dm

Browse Source
This commit is contained in:
Novacat
2021-02-27 13:31:02 -05:00
committed by GitHub
parent 797c182615
commit 208e6ee06d
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/objs.dm
-14
View File
@@ -24,21 +24,7 @@
STOP_PROCESSING(SSobj, src)
return ..()
<<<<<<< HEAD
/obj/Moved(atom/oldloc)
. = ..()
if(register_as_dangerous_object)
var/turf/old_turf = get_turf(oldloc)
var/turf/new_turf = get_turf(src)
if(old_turf != new_turf)
old_turf.unregister_dangerous_object(src)
new_turf.register_dangerous_object(src)
/obj/Topic(href, href_list, var/datum/tgui_state/state = GLOB.tgui_default_state)
=======
/obj/Topic(href, href_list, var/datum/topic_state/state = default_state)
>>>>>>> b22a056... Sideports a couple of init unit tests from Neb. (#7893)
if(usr && ..())
return 1