cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 15:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-icon merge conflicts

Browse Source
This commit is contained in:
DZD
2015-07-10 19:57:59 -04:00
parent d4cf433e7c 43ebf2445d
commit 412443dbf1
412 changed files with 3631 additions and 3603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/communications.dm
View File

@@ -226,7 +226,7 @@ var/global/datum/controller/radio/radio_controller
frequency.remove_listener(device)
if(frequency.devices.len == 0)
del(frequency)
qdel(frequency)
frequencies -= f_text
return 1
@@ -251,7 +251,7 @@ var/global/datum/controller/radio/radio_controller
if(range)
start_point = get_turf(source)
if(!start_point)
del(signal)
qdel(signal)
return 0
if (filter)
send_to_filter(source, signal, filter, start_point, range)
@@ -300,7 +300,7 @@ var/global/datum/controller/radio/radio_controller
devices_line -= null
if (devices_line.len==0)
devices -= devices_filter
del(devices_line)
qdel(devices_line)
/datum/signal
var/obj/source

4
code/controllers/emergency_shuttle_controller.dm
View File

@@ -215,7 +215,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
if (online())
if (is_stranded())
return "ETA-ERR"
if (waiting_to_leave())
if (shuttle.moving_status == SHUTTLE_WARMUP)
return "Departing..."
@@ -256,7 +256,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
sleep(speed)
step(src, direction)
for(var/obj/effect/starender/E in loc)
del(src)
qdel(src)
/obj/effect/starender