Fixes for vorestation merge of "Rewrites the Rewritten Event System"

- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
This commit is contained in:
Leshana
2020-04-06 16:54:40 -04:00
parent 08c2d2db6e
commit d66f508541
8 changed files with 8 additions and 26 deletions

View File

@@ -54,20 +54,6 @@
return TRUE
return FALSE
// Picks a turf that is clearance tiles away from the map edge given by dir, on z-level Z
/proc/pick_random_edge_turf(var/dir, var/Z, var/clearance = TRANSITIONEDGE + 1)
if(!dir)
return
switch(dir)
if(NORTH)
return locate(rand(clearance, world.maxx - clearance), world.maxy - clearance, Z)
if(SOUTH)
return locate(rand(clearance, world.maxx - clearance), clearance, Z)
if(EAST)
return locate(world.maxx - clearance, rand(clearance, world.maxy - clearance), Z)
if(WEST)
return locate(clearance, rand(clearance, world.maxy - clearance), Z)
/*
Turf manipulation
*/

View File

@@ -3,4 +3,4 @@
/datum/game_master/proc/choose_event()
/datum/game_master/proc/log_game_master(message)
SSgame_master.log_game_master(message)
// SSgame_master.log_game_master(message) // VOREStation Edit - We don't use SSgame_master yet.

View File

@@ -502,7 +502,7 @@
M.emote("gasp")
M.Weaken(rand(10,25))
M.updatehealth()
SSgame_master.adjust_danger(-20)
// SSgame_master.adjust_danger(-20) // VOREStation Edit - We don't use SSgame_master yet.
apply_brain_damage(M, deadtime)
/obj/item/weapon/shockpaddles/proc/apply_brain_damage(mob/living/carbon/human/H, var/deadtime)

View File

@@ -231,7 +231,7 @@ var/list/admin_verbs_debug = list(
/client/proc/toggle_debug_logs,
/client/proc/admin_ghost, //allows us to ghost/reenter body at will,
/datum/admins/proc/view_runtimes,
/client/proc/show_gm_status,
// /client/proc/show_gm_status, // VOREStation Edit - We don't use SSgame_master yet.
/datum/admins/proc/change_weather,
/datum/admins/proc/change_time,
/client/proc/admin_give_modifier,
@@ -407,7 +407,7 @@ var/list/admin_verbs_event_manager = list(
/client/proc/callproc,
/client/proc/callproc_datum,
/client/proc/debug_controller,
/client/proc/show_gm_status,
// /client/proc/show_gm_status, // VOREStation Edit - We don't use SSgame_master yet.
/datum/admins/proc/change_weather,
/datum/admins/proc/change_time,
/client/proc/admin_give_modifier,

View File

@@ -177,7 +177,7 @@ This allows for events that have their announcement happen after the end itself.
abort()
message_admins("Event '[type]' was aborted by [usr.key].")
SSgame_master.interact(usr) // To refresh the UI.
// SSgame_master.interact(usr) // To refresh the UI. // VOREStation Edit - We don't use SSgame_master yet.
/*
* Procs to Override

View File

@@ -71,11 +71,11 @@
return
if(href_list["force"])
SSevent_ticker.start_event(event_type)
// SSevent_ticker.start_event(event_type) // VOREStation Edit - We don't use SSgame_master yet.
message_admins("Event '[name]' was forced by [usr.key].")
if(href_list["toggle"])
enabled = !enabled
message_admins("Event '[name]' was toggled [enabled ? "on" : "off"] by [usr.key].")
SSgame_master.interact(usr) // To refresh the UI.
// SSgame_master.interact(usr) // To refresh the UI. // VOREStation Edit - We don't use SSgame_master yet.

View File

@@ -82,7 +82,7 @@
callHook("death", list(src, gibbed))
if(mind)
SSgame_master.adjust_danger(gibbed ? 40 : 20)
// SSgame_master.adjust_danger(gibbed ? 40 : 20) // VOREStation Edit - We don't use SSgame_master yet.
for(var/mob/observer/dead/O in mob_list)
if(O.client && O.client.is_preference_enabled(/datum/client_preference/show_dsay))
to_chat(O, "<span class='deadsay'><b>[src]</b> has died in <b>[get_area(src)]</b>. [ghost_follow_link(src, O)] </span>")

View File

@@ -236,8 +236,6 @@
#include "code\controllers\subsystems\chat.dm"
#include "code\controllers\subsystems\circuits.dm"
#include "code\controllers\subsystems\events.dm"
#include "code\controllers\subsystems\events2.dm"
#include "code\controllers\subsystems\game_master.dm"
#include "code\controllers\subsystems\garbage.dm"
#include "code\controllers\subsystems\holomaps.dm"
#include "code\controllers\subsystems\inactivity.dm"
@@ -312,8 +310,6 @@
#include "code\datums\autolathe\tools.dm"
#include "code\datums\autolathe\tools_vr.dm"
#include "code\datums\game_masters\_common.dm"
#include "code\datums\game_masters\default.dm"
#include "code\datums\game_masters\other_game_masters.dm"
#include "code\datums\helper_datums\construction_datum.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"