shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes all checks for subsystem existence (#2252)

Browse Source
This commit is contained in:
CitadelStationBot
2017-08-04 10:41:52 -05:00
committed by kevinz000
parent 6ac8123117
commit ef715b7837
42 changed files with 109 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/blob/overmind.dm
+1 -1
View File
@@ -151,7 +151,7 @@
if(blob_core)
stat(null, "Core Health: [blob_core.obj_integrity]")
stat(null, "Power Stored: [blob_points]/[max_blob_points]")
if(SSticker && istype(SSticker.mode, /datum/game_mode/blob))
if(istype(SSticker.mode, /datum/game_mode/blob))
var/datum/game_mode/blob/B = SSticker.mode
stat(null, "Blobs to Win: [GLOB.blobs_legit.len]/[B.blobwincount]")
else
code/game/gamemodes/game_mode.dm
+1 -1
View File
@@ -83,7 +83,7 @@
if(SSdbcore.Connect())
var/sql
if(SSticker && SSticker.mode)
if(SSticker.mode)
sql += "game_mode = '[SSticker.mode]'"
if(GLOB.revdata.originmastercommit)
if(sql)
code/game/gamemodes/meteor/meteors.dm
+1 -2
View File
@@ -125,8 +125,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
/obj/effect/meteor/New()
..()
GLOB.meteor_list += src
if(SSaugury)
SSaugury.register_doom(src, threat)
SSaugury.register_doom(src, threat)
SpinAnimation()
QDEL_IN(src, lifetime)
code/game/gamemodes/objective.dm
+10 -11
View File
@@ -623,17 +623,16 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6)
target_amount = rand (lowbound,highbound)
if (SSticker)
var/n_p = 1 //autowin
if (SSticker.current_state == GAME_STATE_SETTING_UP)
for(var/mob/dead/new_player/P in GLOB.player_list)
if(P.client && P.ready == PLAYER_READY_TO_PLAY && P.mind!=owner)
n_p ++
else if (SSticker.IsRoundInProgress())
for(var/mob/living/carbon/human/P in GLOB.player_list)
if(P.client && !(P.mind in SSticker.mode.changelings) && P.mind!=owner)
n_p ++
target_amount = min(target_amount, n_p)
var/n_p = 1 //autowin
if (SSticker.current_state == GAME_STATE_SETTING_UP)
for(var/mob/dead/new_player/P in GLOB.player_list)
if(P.client && P.ready == PLAYER_READY_TO_PLAY && P.mind!=owner)
n_p ++
else if (SSticker.IsRoundInProgress())
for(var/mob/living/carbon/human/P in GLOB.player_list)
if(P.client && !(P.mind in SSticker.mode.changelings) && P.mind!=owner)
n_p ++
target_amount = min(target_amount, n_p)
explanation_text = "Extract [target_amount] compatible genome\s."
return target_amount
code/game/machinery/airlock_control.dm
+1 -2
View File
@@ -147,6 +147,5 @@
set_frequency(frequency)
/obj/machinery/airlock_sensor/Destroy()
if(SSradio)
SSradio.remove_object(src,frequency)
SSradio.remove_object(src,frequency)
return ..()
code/game/machinery/computer/atmos_alert.dm
+1 -2
View File
@@ -16,8 +16,7 @@
set_frequency(receive_frequency)
/obj/machinery/computer/atmos_alert/Destroy()
if(SSradio)
SSradio.remove_object(src, receive_frequency)
SSradio.remove_object(src, receive_frequency)
return ..()
/obj/machinery/computer/atmos_alert/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
code/game/machinery/computer/atmos_control.dm
+2 -4
View File
@@ -52,8 +52,7 @@
/obj/machinery/air_sensor/Destroy()
SSair.atmos_machinery -= src
if(SSradio)
SSradio.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
return ..()
/////////////////////////////////////////////////////////////
@@ -89,8 +88,7 @@
set_frequency(frequency)
/obj/machinery/computer/atmos_control/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
return ..()
/obj/machinery/computer/atmos_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
code/game/machinery/doors/alarmlock.dm
+1 -2
View File
@@ -16,8 +16,7 @@
air_connection = new
/obj/machinery/door/airlock/alarmlock/Destroy()
if(SSradio)
SSradio.remove_object(src,air_frequency)
SSradio.remove_object(src,air_frequency)
air_connection = null
return ..()
code/game/machinery/embedded_controller/embedded_controller_base.dm
+1 -2
View File
@@ -73,8 +73,7 @@
var/datum/radio_frequency/radio_connection
/obj/machinery/embedded_controller/radio/Destroy()
if(SSradio)
SSradio.remove_object(src,frequency)
SSradio.remove_object(src,frequency)
return ..()
/obj/machinery/embedded_controller/radio/Initialize()
code/game/machinery/magnet.dm
+4 -8
View File
@@ -36,15 +36,13 @@
center = T
spawn(10) // must wait for map loading to finish
if(SSradio)
SSradio.add_object(src, freq, GLOB.RADIO_MAGNETS)
SSradio.add_object(src, freq, GLOB.RADIO_MAGNETS)
spawn()
magnetic_process()
/obj/machinery/magnetic_module/Destroy()
if(SSradio)
SSradio.remove_object(src, freq)
SSradio.remove_object(src, freq)
. = ..()
center = null
@@ -228,16 +226,14 @@
spawn(45) // must wait for map loading to finish
if(SSradio)
radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_MAGNETS)
radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_MAGNETS)
if(path) // check for default path
filter_path() // renders rpath
/obj/machinery/magnetic_controller/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
magnets = null
rpath = null
. = ..()
code/game/machinery/status_display.dm
+1 -2
View File
@@ -50,8 +50,7 @@
SSradio.add_object(src, frequency)
/obj/machinery/status_display/Destroy()
if(SSradio)
SSradio.remove_object(src,frequency)
SSradio.remove_object(src,frequency)
GLOB.ai_status_displays.Remove(src)
return ..()
code/game/objects/effects/effect_system/effect_system.dm
+2 -4
View File
@@ -13,12 +13,10 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/particle_effect/New()
..()
if(SSticker)
GLOB.cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
/obj/effect/particle_effect/Destroy()
if(SSticker)
GLOB.cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
. = ..()
/datum/effect_system
code/game/objects/items/devices/PDA/radio.dm
+1 -2
View File
@@ -25,8 +25,7 @@
var/datum/radio_frequency/radio_connection
/obj/item/radio/integrated/signal/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
radio_connection = null
return ..()
code/game/objects/items/devices/radio/electropack.dm
+1 -2
View File
@@ -24,8 +24,7 @@
SSradio.add_object(src, frequency, GLOB.RADIO_CHAT)
/obj/item/device/electropack/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
return ..()
/obj/item/device/electropack/attack_hand(mob/user)
code/game/objects/structures.dm
+2 -4
View File
@@ -16,12 +16,10 @@
queue_smooth(src)
queue_smooth_neighbors(src)
icon_state = ""
if(SSticker)
GLOB.cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
/obj/structure/Destroy()
if(SSticker)
GLOB.cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
if(smooth)
queue_smooth_neighbors(src)
return ..()
code/game/turfs/turf.dm
+1 -2
View File
@@ -373,8 +373,7 @@
return can_have_cabling() & !intact
/turf/proc/visibilityChanged()
if(SSticker)
GLOB.cameranet.updateVisibility(src)
GLOB.cameranet.updateVisibility(src)
/turf/proc/burn_tile()