cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 00:26:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 04:11:30 -04:00
parent 09b01407e3
commit 4e67e1b9ab
7 changed files with 4 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/geiger.dm
-7
View File
@@ -12,12 +12,6 @@
var/radiation_count = 0
var/datum/looping_sound/geiger/soundloop
<<<<<<< HEAD
/obj/item/device/geiger/New()
START_PROCESSING(SSobj, src)
/obj/item/device/geiger/Destroy()
=======
/obj/item/device/geiger/Initialize()
START_PROCESSING(SSobj, src)
soundloop = new(list(src), FALSE)
@@ -26,7 +20,6 @@
/obj/item/device/geiger/Destroy()
STOP_PROCESSING(SSobj, src)
QDEL_NULL(soundloop)
>>>>>>> 5fb77b3... Merge pull request #5791 from Neerti/looping_sounds
return ..()
/obj/item/device/geiger/process()