cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

More SoftReservedKeyword fixes (#29712)

Browse Source 
* Update shieldgen.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update station_alert.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update plasmafire_generator.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update turf.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update atmospherics.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update silicon_mob.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update ai_mob.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update robot_mob.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

* Update on_move.dm

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>

---------

Signed-off-by: Amy <3855802+amylizzle@users.noreply.github.com>
This commit is contained in:
Amy
2025-07-04 18:51:32 +00:00
committed by GitHub
parent 5cccfc3a6d
commit 85f8017ab6
9 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/station_alert.dm
+2 -2
View File
@@ -58,7 +58,7 @@
return data
/obj/machinery/computer/station_alert/proc/alarm_triggered(src, class, area/A, list/O, obj/alarmsource)
/obj/machinery/computer/station_alert/proc/alarm_triggered(source, class, area/A, list/O, obj/alarmsource)
if(!(class in alarms_listend_for))
return
if(alarmsource.z != z)
@@ -67,7 +67,7 @@
return
update_icon()
/obj/machinery/computer/station_alert/proc/alarm_cancelled(src, class, area/A, obj/origin, cleared)
/obj/machinery/computer/station_alert/proc/alarm_cancelled(source, class, area/A, obj/origin, cleared)
if(!(class in alarms_listend_for))
return
if(origin.z != z)
code/game/machinery/shieldgen.dm
+1 -1
View File
@@ -294,7 +294,7 @@
/obj/machinery/shieldgen/update_icon_state()
icon_state = "shield[active ? "on" : "off"][malfunction ? "br" : ""]"
/obj/machinery/shieldgen/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller)
/obj/machinery/shieldgen/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob)
. = ..()
if(active)
shields_down()
code/game/objects/structures/plasmafire_generator.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/structure/plasmafire_generator/shadow
var/enabled = FALSE
/obj/structure/plasmafire_generator/shadow/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller)
/obj/structure/plasmafire_generator/shadow/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob)
if(T1.z != 1)
enabled = TRUE
return ..()
code/game/turfs/turf.dm
+1 -1
View File
@@ -818,7 +818,7 @@
overlay.blend_mode = BLEND_OVERLAY
overlay.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
/obj/effect/abstract/pressure_overlay/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller)
/obj/effect/abstract/pressure_overlay/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob)
// No, I don't think I will.
return FALSE
code/modules/atmospherics/machinery/atmospherics.dm
+1 -1
View File
@@ -76,7 +76,7 @@ Pipelines + Other Objects -> Pipe network
// Updates all pipe overlays and underlays
update_underlays()
/obj/machinery/atmospherics/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller)
/obj/machinery/atmospherics/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob)
. = ..()
update_underlays()
code/modules/mob/living/silicon/ai/ai_mob.dm
+2 -2
View File
@@ -897,7 +897,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
Bot.call_bot(src, waypoint)
/mob/living/silicon/ai/alarm_triggered(src, class, area/A, list/O, obj/alarmsource)
/mob/living/silicon/ai/alarm_triggered(source, class, area/A, list/O, obj/alarmsource)
if(!(class in alarms_listened_for))
return
if(alarmsource.z != z)
@@ -924,7 +924,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(viewalerts)
ai_alerts()
/mob/living/silicon/ai/alarm_cancelled(src, class, area/A, obj/origin, cleared)
/mob/living/silicon/ai/alarm_cancelled(source, class, area/A, obj/origin, cleared)
if(cleared)
if(!(class in alarms_listened_for))
return
code/modules/mob/living/silicon/robot/robot_mob.dm
+2 -2
View File
@@ -885,7 +885,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/InCritical()
return low_power_mode
/mob/living/silicon/robot/alarm_triggered(src, class, area/A, list/O, obj/alarmsource)
/mob/living/silicon/robot/alarm_triggered(source, class, area/A, list/O, obj/alarmsource)
if(!(class in alarms_listened_for))
return
if(alarmsource.z != z)
@@ -894,7 +894,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
return
queueAlarm(text("--- [class] alarm detected in [A.name]!"), class)
/mob/living/silicon/robot/alarm_cancelled(src, class, area/A, obj/origin, cleared)
/mob/living/silicon/robot/alarm_cancelled(source, class, area/A, obj/origin, cleared)
if(cleared)
if(!(class in alarms_listened_for))
return
code/modules/mob/living/silicon/silicon_mob.dm
+2 -2
View File
@@ -129,10 +129,10 @@
/mob/living/silicon/proc/get_radio()
return
/mob/living/silicon/proc/alarm_triggered(src, class, area/A, list/O, obj/alarmsource)
/mob/living/silicon/proc/alarm_triggered(source, class, area/A, list/O, obj/alarmsource)
return
/mob/living/silicon/proc/alarm_cancelled(src, class, area/A, obj/origin, cleared)
/mob/living/silicon/proc/alarm_cancelled(source, class, area/A, obj/origin, cleared)
return
/mob/living/silicon/proc/queueAlarm(message, type, incoming = TRUE)
code/modules/shuttle/on_move.dm
+2 -2
View File
@@ -1,5 +1,5 @@
// Shuttle on-movement //
/atom/movable/proc/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller)
/atom/movable/proc/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob)
var/turf/newT = get_turf(src)
if(newT.z != oldT.z)
on_changed_z_level(oldT, newT)
@@ -10,7 +10,7 @@
abstract_move(T1)
return 1
/atom/movable/lighting_object/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller)
/atom/movable/lighting_object/onShuttleMove(turf/oldT, turf/T1, rotation, mob/calling_mob)
// lighting objects should not be moved from their parent turfs
return 0