Skip to content

Commit

Permalink
conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
X0-11 committed Jun 3, 2024
1 parent f225a15 commit 38fe46e
Show file tree
Hide file tree
Showing 448 changed files with 959 additions and 962 deletions.
2 changes: 1 addition & 1 deletion code/_helpers/game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ proc/isInSight(var/atom/A, var/atom/B)
return get_step(start, EAST)

/proc/get_mob_by_key(var/key)
for(var/mob/M in GLOB.mob_list)
for(var/mob/M in SSmobs.mob_list)
if(M.ckey == lowertext(key))
return M
return null
Expand Down
6 changes: 3 additions & 3 deletions code/_helpers/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
//Orders mobs by type then by name
/proc/sortmobs()
var/list/moblist = list()
var/list/sortmob = sortAtom(GLOB.mob_list)
var/list/sortmob = sortAtom(SSmobs.mob_list)
for(var/mob/observer/eye/M in sortmob)
moblist.Add(M)
for(var/mob/living/silicon/ai/M in sortmob)
Expand Down Expand Up @@ -832,7 +832,7 @@ proc/oview_or_orange(distance = world.view , center = usr , type)

proc/get_mob_with_client_list()
var/list/mobs = list()
for(var/mob/M in GLOB.mob_list)
for(var/mob/M in SSmobs.mob_list)
if (M.client)
mobs += M
return mobs
Expand Down Expand Up @@ -1136,7 +1136,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
/mob/dview/Initialize()
..()
// We don't want to be in any mob lists; we're a dummy not a mob.
GLOB.mob_list -= src
SSmobs.mob_list -= src

// call to generate a stack trace and print to runtime logs
/proc/crash_with(msg)
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/ability_screen_objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -408,5 +408,5 @@
/obj/screen/movable/ability_master/proc/silence_spells(var/amount)
for(var/obj/screen/ability/spell/spell in spell_objects)
spell.spell.silenced = amount
spell.spell.process()
spell.spell.Process()
spell.update_charge(1)
2 changes: 1 addition & 1 deletion code/controllers/ProcessScheduler/core/process.dm
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

/datum/controller/process/proc/setup()

/datum/controller/process/proc/process()
/datum/controller/process/Process()
started()
doWork()
finished()
Expand Down
6 changes: 3 additions & 3 deletions code/controllers/ProcessScheduler/core/processScheduler.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ var/global/datum/controller/processScheduler/processScheduler
timeAllowanceMax = world.tick_lag
updateStartDelays()
spawn(0)
process()
Process()

/datum/controller/processScheduler/proc/process()
/datum/controller/processScheduler/Process()
updateCurrentTickData()

for(var/i=world.tick_lag,i<world.tick_lag*50,i+=world.tick_lag)
Expand Down Expand Up @@ -215,7 +215,7 @@ var/global/datum/controller/processScheduler/processScheduler

/datum/controller/processScheduler/proc/runProcess(var/datum/controller/process/process)
spawn(0)
process.process()
process.Process()

/datum/controller/processScheduler/proc/processStarted(var/datum/controller/process/process)
setRunningProcessState(process)
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/Processes/Shuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
shuttle_controller = new

/datum/controller/process/Shuttle/doWork()
shuttle_controller.process()
shuttle_controller.Process()
2 changes: 1 addition & 1 deletion code/controllers/Processes/ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var/list/datum/list_of_ais = list()
var/datum/ai/AI = last_object
if(!QDELETED(AI) && istype(AI))
try
if(AI.process() == PROCESS_KILL)
if(AI.Process() == PROCESS_KILL)
list_of_ais -= AI
catch(var/exception/e)
catchException(e, AI)
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/Processes/alarm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var/datum/controller/process/alarm/alarm_manager
/datum/controller/process/alarm/doWork()
for(last_object in all_handlers)
var/datum/alarm_handler/AH = last_object
AH.process()
AH.Process()
SCHECK

/datum/controller/process/alarm/proc/active_alarms()
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/Processes/emergencyShuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
evacuation_controller.set_up()

/datum/controller/process/evac/doWork()
evacuation_controller.process()
evacuation_controller.Process()
6 changes: 3 additions & 3 deletions code/controllers/Processes/scheduler.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
if(world.time > scheduled_task.trigger_time)
unschedule(scheduled_task)
scheduled_task.pre_process()
scheduled_task.process()
scheduled_task.Process()
scheduled_task.post_process()
catch(var/exception/e)
catchException(e, last_object)
Expand Down Expand Up @@ -96,7 +96,7 @@
/datum/scheduled_task/proc/pre_process()
task_triggered_event.raise_event(src)

/datum/scheduled_task/proc/process()
/datum/scheduled_task/Process()
if(procedure)
call(procedure)(arglist(arguments))

Expand All @@ -120,7 +120,7 @@
source = null
return ..()

/datum/scheduled_task/source/process()
/datum/scheduled_task/source/Process()
call(source, procedure)(arglist(arguments))

/datum/scheduled_task/source/proc/source_destroyed()
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/Processes/supply.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
schedule_interval = 300 // every 30 seconds

/datum/controller/process/supply/doWork()
supply_controller.process()
supply_controller.Process()
2 changes: 1 addition & 1 deletion code/controllers/Processes/tgui.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var/global/datum/controller/process/tgui/tgui_process
for(var/gui in processing_uis)
var/datum/tgui/ui = gui
if(ui && ui.user && ui.src_object)
ui.process()
ui.Process()
SCHECK
continue
processing_uis.Remove(ui)
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/Processes/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var/global/datum/controller/process/ticker/tickerProcess

lastTickerTime = currentTime

ticker.process()
ticker.Process()

/datum/controller/process/ticker/proc/getLastTickerTimeDuration()
return lastTickerTimeDuration
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/Processes/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var/global/list/turf/processing_turfs = list()
/datum/controller/process/turf/doWork()
for(last_object in processing_turfs)
var/turf/T = last_object
if(T.process() == PROCESS_KILL)
if(T.Process() == PROCESS_KILL)
processing_turfs.Remove(T)
SCHECK

Expand Down
2 changes: 1 addition & 1 deletion code/controllers/Processes/vote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
schedule_interval = 10 // every second

/datum/controller/process/vote/doWork()
vote.process()
vote.Process()
6 changes: 3 additions & 3 deletions code/controllers/autotransfer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ var/datum/controller/transfer_controller/transfer_controller

/datum/controller/transfer_controller/New()
timerbuffer = config.vote_autotransfer_initial
GLOB.processing_objects += src
START_PROCESSING(SSobj, src)

/datum/controller/transfer_controller/Destroy()
GLOB.processing_objects -= src
STOP_PROCESSING(SSobj, src)
. = ..()

/datum/controller/transfer_controller/proc/process()
/datum/controller/transfer_controller/Process()
if (time_till_transfer_vote() <= 0)
vote.autotransfer()
timerbuffer += config.vote_autotransfer_interval
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/evacuation/evacuation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ var/datum/evacuation_controller/evacuation_controller
/datum/evacuation_controller/proc/finish_evacuation()
state = EVAC_COMPLETE

/datum/evacuation_controller/proc/process()
/datum/evacuation_controller/Process()

if(state == EVAC_PREPPING && recall && world.time >= auto_recall_time)
cancel_evacuation()
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/evacuation/evacuation_shuttle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
return ..()

// This is largely handled by the emergency shuttle datum.
/datum/evacuation_controller/shuttle/process()
/datum/evacuation_controller/shuttle/Process()
if(state == EVAC_PREPPING)
if(!isnull(shuttle_launch_time) && world.time > shuttle_launch_time && shuttle.moving_status == SHUTTLE_IDLE)
shuttle.launch()
Expand Down
8 changes: 4 additions & 4 deletions code/controllers/master_controller.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//simplified MC that is designed to fail when procs 'break'. When it fails it's just replaced with a new one.
//It ensures master_controller.process() is never doubled up by killing the MC (hence terminating any of its sleeping procs)
//It ensures master_controller.Process() is never doubled up by killing the MC (hence terminating any of its sleeping procs)
//WIP, needs lots of work still

var/global/datum/controller/game_controller/master_controller //Set in world.New()
Expand Down Expand Up @@ -72,11 +72,11 @@ datum/controller/game_controller/proc/setup_objects()
CHECK_SLEEP_MASTER

report_progress("Initializing atmos machinery")
for(var/obj/machinery/atmospherics/A in GLOB.machines)
for(var/obj/machinery/atmospherics/A in SSmachines.machinery)
A.atmos_init()
CHECK_SLEEP_MASTER

for(var/obj/machinery/atmospherics/unary/U in GLOB.machines)
for(var/obj/machinery/atmospherics/unary/U in SSmachines.machinery)
if(istype(U, /obj/machinery/atmospherics/unary/vent_pump))
var/obj/machinery/atmospherics/unary/vent_pump/T = U
T.broadcast_status()
Expand All @@ -86,7 +86,7 @@ datum/controller/game_controller/proc/setup_objects()
CHECK_SLEEP_MASTER

report_progress("Initializing pipe networks")
for(var/obj/machinery/atmospherics/machine in GLOB.machines)
for(var/obj/machinery/atmospherics/machine in SSmachines.machinery)
machine.build_network()
CHECK_SLEEP_MASTER

Expand Down
4 changes: 2 additions & 2 deletions code/controllers/shuttle_controller.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ var/global/datum/shuttle_controller/shuttle_controller
var/list/shuttles //maps shuttle tags to shuttle datums, so that they can be looked up.
var/list/process_shuttles //simple list of shuttles, for processing

/datum/shuttle_controller/proc/process()
/datum/shuttle_controller/Process()
//process ferry shuttles
for (var/datum/shuttle/autodock/shuttle in process_shuttles)
if (shuttle.process_state)
shuttle.process()
shuttle.Process()

//This is called by gameticker after all the machines and radio frequencies have been properly initialized
/datum/shuttle_controller/proc/initialize_shuttles()
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystems/event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ SUBSYSTEM_DEF(event)
var/datum/event/E = processing_events[processing_events.len]
processing_events.len--

E.process()
E.Process()

if (MC_TICK_CHECK)
return

while (pos <= EVENT_LEVEL_MAJOR)
var/list/datum/event_container/EC = event_containers[pos]
EC.process()
EC.Process()
pos++

if (MC_TICK_CHECK)
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/voting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ SUBSYSTEM_DEF(vote)
else
return (ticker.mode.addantag_allowed & ADDANTAG_PLAYER) && !antag_add_finished

/datum/controller/subsystem/vote/proc/process()
/datum/controller/subsystem/vote/Process()
for(var/datum/vote/curvote in active_votes)
curvote.process()
curvote.Process()

/datum/controller/subsystem/vote/proc/vote_start(var/datum/vote/curvote)
inactive_votes -= curvote
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/voting/initiate_vote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

time_remaining = round(config.vote_period)

GLOB.processing_objects.Add(src)
START_PROCESSING(SSobj, src)
last_process = world.time
active = 1

Expand Down
4 changes: 2 additions & 2 deletions code/controllers/voting/process.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

/datum/vote/proc/process()
/datum/vote/Process()
// Calculate how much time is remaining by comparing current time, to time of vote start,
// plus vote duration
if(!delayed)
Expand All @@ -11,7 +11,7 @@

/datum/vote/proc/end_vote(var/end_early = 0)
active = 0
GLOB.processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)

vote.vote_finish(src)

Expand Down
2 changes: 1 addition & 1 deletion code/controllers/voting/vote_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
if(ticker.current_state <= GAME_STATE_SETTING_UP)
pregame_vote = 1

/datum/vote/gamemode/process()
/datum/vote/gamemode/Process()
. = ..()

// No more change mode votes after the game has started.
Expand Down
2 changes: 1 addition & 1 deletion code/datums/ai/ai.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/datum/ai
var/name

/datum/ai/proc/process()
/datum/ai/Process()
return PROCESS_KILL
6 changes: 3 additions & 3 deletions code/datums/chatmessage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@

// Prepare for destruction
scheduled_destruction = world.time + (lifespan - CHAT_MESSAGE_EOL_FADE)
GLOB.processing_objects += src
START_PROCESSING(SSobj, src)
//I wish we didn't have to do this, but we don't have a timer subsystem. More load for processing.

/datum/chatmessage/proc/process()
/datum/chatmessage/Process()
if(world.time >= scheduled_destruction)
GLOB.processing_objects -= src
STOP_PROCESSING(SSobj, src)
end_of_life()
return PROCESS_KILL

Expand Down
4 changes: 2 additions & 2 deletions code/datums/datacore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@
misc[name] = rank

// Synthetics don't have actual records, so we will pull them from here.
for(var/mob/living/silicon/ai/ai in GLOB.mob_list)
for(var/mob/living/silicon/ai/ai in SSmobs.mob_list)
bot[ai.name] = "Artificial Intelligence"

for(var/mob/living/silicon/robot/robot in GLOB.mob_list)
for(var/mob/living/silicon/robot/robot in SSmobs.mob_list)
// No combat/syndicate cyborgs, no drones.
if(robot.module && robot.module.hide_on_manifest)
continue
Expand Down
4 changes: 2 additions & 2 deletions code/datums/datum.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
/datum/proc/Destroy(force=FALSE)
tag = null
GLOB.nanomanager && GLOB.nanomanager.close_uis(src)
SSnano && SSnano.close_uis(src)
return QDEL_HINT_QUEUE

/datum/proc/Process()
set waitfor = 0
return PROCESS_KILL
return PROCESS_KILL
4 changes: 2 additions & 2 deletions code/datums/helper_datums/global_iterator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Data storage vars:
if(check_for_null && has_null_args())
stop()
return 0
result = process(arglist(arg_list))
result = Process(arglist(arg_list))
for(var/sleep_time=delay;sleep_time>0;sleep_time--) //uhh, this is ugly. But I see no other way to terminate sleeping proc. Such disgrace.
if(!control_switch)
return 0
Expand Down Expand Up @@ -109,7 +109,7 @@ Data storage vars:
CRASH("The global_iterator loop \ref[src] failed to terminate in designated timeframe. This may be caused by server lagging.")
return 1

proc/process()
Process()
return

proc/active()
Expand Down
2 changes: 1 addition & 1 deletion code/datums/repositories/crew/crew.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ var/global/datum/repository/crew/crew_repository = new()
/datum/repository/crew/proc/scan()
var/list/tracked = list()
. = tracked
//for(var/mob/living/carbon/human/H in GLOB.mob_list)
//for(var/mob/living/carbon/human/H in SSmobs.mob_list)
for(var/datum/mind/M in my_faction.assigned_minds)
var/mob/living/carbon/human/H = M.current
if(M.current.faction != my_faction.name)
Expand Down
2 changes: 1 addition & 1 deletion code/game/antagonist/alien/borer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var/datum/antagonist/xenos/borer/borers
var/mob/living/simple_animal/borer/borer = mob
if(istype(borer))
var/mob/living/carbon/human/host
for(var/mob/living/carbon/human/H in GLOB.mob_list)
for(var/mob/living/carbon/human/H in SSmobs.mob_list)
if(H.stat != DEAD && !H.has_brain_worms())
var/obj/item/organ/external/head = H.get_organ(BP_HEAD)
if(head && !(head.robotic >= ORGAN_ROBOT))
Expand Down
Loading

0 comments on commit 38fe46e

Please sign in to comment.