mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 13:37:58 +01:00
Delta Standardisation
This commit is contained in:
+3983
-8403
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@ SUBSYSTEM_DEF(mobs)
|
||||
|
||||
var/list/currentrun = list()
|
||||
var/static/list/clients_by_zlevel[][]
|
||||
var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when z2 is created and new_players can login before that.
|
||||
var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when CC is created and new_players can login before that.
|
||||
var/static/list/cubemonkeys = list()
|
||||
|
||||
/datum/controller/subsystem/mobs/stat_entry()
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@
|
||||
var/assigned_role //assigned role is what job you're assigned to when you join the station.
|
||||
var/playtime_role //if set, overrides your assigned_role for the purpose of playtime awards. Set by IDcomputer when your ID is changed.
|
||||
var/special_role //special roles are typically reserved for antags or roles like ERT. If you want to avoid a character being automatically announced by the AI, on arrival (becuase they're an off station character or something); ensure that special_role and assigned_role are equal.
|
||||
var/offstation_role = FALSE //set to true for ERT, deathsquad, abductors, etc, that can go from and to z2 at will and shouldn't be antag targets
|
||||
var/offstation_role = FALSE //set to true for ERT, deathsquad, abductors, etc, that can go from and to CC at will and shouldn't be antag targets
|
||||
var/list/restricted_roles = list()
|
||||
|
||||
var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
|
||||
|
||||
@@ -120,7 +120,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
|
||||
var/smoke_amt = 0 //cropped at 10
|
||||
|
||||
var/critfailchance = 0
|
||||
var/centcom_cancast = 1 //Whether or not the spell should be allowed on z2
|
||||
var/centcom_cancast = TRUE //Whether or not the spell should be allowed on the admin zlevel
|
||||
|
||||
var/datum/action/spell_action/action = null
|
||||
var/action_icon = 'icons/mob/actions/actions.dmi'
|
||||
|
||||
@@ -425,7 +425,7 @@ GLOBAL_VAR(bomb_set)
|
||||
to_chat(holder, "<span class='danger'>You can't help but feel that you just lost something back there...</span>")
|
||||
qdel(src)
|
||||
|
||||
//station disk is allowed on z1, escape shuttle/pods, CC, and syndicate shuttles/base, reset otherwise
|
||||
//station disk is allowed on the station level, escape shuttle/pods, CC, and syndicate shuttles/base, reset otherwise
|
||||
/obj/item/disk/nuclear/proc/check_disk_loc()
|
||||
var/turf/T = get_turf(src)
|
||||
var/area/A = get_area(src)
|
||||
|
||||
@@ -319,7 +319,7 @@
|
||||
active_power_usage = 2000
|
||||
var/obj/machinery/teleport/station/power_station
|
||||
var/calibrated //Calibration prevents mutation
|
||||
var/admin_usage = FALSE // if 1, works on z2. If 0, doesn't. Used for admin room teleport.
|
||||
var/admin_usage = FALSE // if 1, works on CC level. If 0, doesn't. Used for admin room teleport.
|
||||
|
||||
/obj/machinery/teleport/hub/New()
|
||||
..()
|
||||
|
||||
@@ -133,7 +133,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
|
||||
new_syndicate_infiltrator.mind_initialize()
|
||||
new_syndicate_infiltrator.mind.assigned_role = "Syndicate Infiltrator"
|
||||
new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
|
||||
new_syndicate_infiltrator.mind.offstation_role = TRUE //they can flee to z2 so make them inelligible as antag targets
|
||||
new_syndicate_infiltrator.mind.offstation_role = TRUE //they can flee to the syndicate base on the admin level so make them inelligible as antag targets
|
||||
SSticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
|
||||
new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)
|
||||
return new_syndicate_infiltrator
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
var/list/possible_areas = list()
|
||||
//setup, sets all station areas (and subtypes) to weight 1
|
||||
for(var/A in GLOB.the_station_areas)
|
||||
if(A == /area/holodeck) //don't allow holodeck areas as possible spawns since it will allow it to spawn in the holodeck rooms on z2 as well
|
||||
if(A == /area/holodeck) //don't allow holodeck areas as possible spawns since it will allow it to spawn in the holodeck rooms on CC level as well
|
||||
continue
|
||||
if(A in possible_areas)
|
||||
continue
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
. = ..()
|
||||
GLOB.navigation_computers += src
|
||||
if(access_station)
|
||||
jumpto_ports += list("nav_z2" = level_name_to_num(MAIN_STATION))
|
||||
jumpto_ports += list("nav_z[level_name_to_num(MAIN_STATION)]" = 1)
|
||||
if(access_mining)
|
||||
jumpto_ports += list("nav_z3" = level_name_to_num(MINING))
|
||||
jumpto_ports += list("nav_z[level_name_to_num(MINING)]" = 1)
|
||||
|
||||
/obj/machinery/computer/camera_advanced/shuttle_docker/Destroy()
|
||||
GLOB.navigation_computers -= src
|
||||
|
||||
Reference in New Issue
Block a user