Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check_grep.sh part ??: adds all global vars to the global controller #4940

Merged
merged 24 commits into from
Nov 25, 2023
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d154788
that's a lot of globbing
hry-gh Nov 16, 2023
41297e7
Merge remote-tracking branch 'upstream/master' into globbification
hry-gh Nov 16, 2023
10b16fe
last minute change fail + TESTING and UNIT_TEST define fails
hry-gh Nov 16, 2023
6c55a67
huh :dizzy_face:
hry-gh Nov 16, 2023
f53438c
nano plz
hry-gh Nov 16, 2023
077ffce
waaaa
hry-gh Nov 16, 2023
854edc1
Merge branch 'master' into globbification
hry-gh Nov 16, 2023
4a6db12
missed tihs one
hry-gh Nov 16, 2023
8534571
Update code/__DEFINES/atmospherics.dm
hry-gh Nov 16, 2023
048a9a8
Update code/__HELPERS/cmp.dm
hry-gh Nov 16, 2023
f77fe31
Update code/_globalvars/misc.dm
hry-gh Nov 16, 2023
8f5701e
Update code/modules/mob/living/silicon/ai/freelook/read_me.dm
hry-gh Nov 16, 2023
0c25de3
Update code/controllers/mc/admin.dm
hry-gh Nov 16, 2023
33e6ef5
Update code/_globalvars/global_lists.dm
hry-gh Nov 16, 2023
58e32a6
firaview
hry-gh Nov 16, 2023
cc02ef8
Merge remote-tracking branch 'refs/remotes/origin/globbification' int…
hry-gh Nov 16, 2023
c2cf4dd
goodbye z1 turfs
hry-gh Nov 16, 2023
1b85258
unedits the cl (lol)
hry-gh Nov 16, 2023
a7576c8
Merge branch 'master' into globbification
hry-gh Nov 17, 2023
0839f0d
removes dead comment
hry-gh Nov 17, 2023
78529cf
Merge branch 'master' into globbification
hry-gh Nov 17, 2023
cd7951a
resolves soft conflict with minimaps
hry-gh Nov 17, 2023
2922cf1
Merge remote-tracking branch 'upstream/master' into globbification
hry-gh Nov 22, 2023
2705bbb
Merge remote-tracking branch 'upstream/master' into globbification
hry-gh Nov 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
firaview
hry-gh committed Nov 16, 2023
commit 58e32a6706b2d53a6ceaeacfa3db5ea783bd6799
2 changes: 1 addition & 1 deletion code/__HELPERS/logging.dm
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
// will get logs that are one big line if the system is Linux and they are using notepad. This solves it by adding CR to every line ending
// in the logs. ascii character 13 = CR

GLOBAL_LIST_INIT(log_end, world.system_type == UNIX ? ascii2text(13) : "")
GLOBAL_VAR_INIT(log_end, world.system_type == UNIX ? ascii2text(13) : "")

/proc/error(msg)
world.log << "## ERROR: [msg][GLOB.log_end]"
4 changes: 0 additions & 4 deletions code/_globalvars/misc.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
GLOBAL_VAR_INIT(game_year, 2182)

/// If this is anything but "secret", the secret rotation will forceably choose this mode.
GLOBAL_VAR_INIT(secret_force_mode, "secret")

GLOBAL_VAR_INIT(ooc_allowed, TRUE)
GLOBAL_VAR_INIT(looc_allowed, TRUE)
GLOBAL_VAR_INIT(dsay_allowed, TRUE)
@@ -38,7 +35,6 @@ GLOBAL_LIST_EMPTY(IClog)
GLOBAL_LIST_EMPTY(OOClog)
GLOBAL_LIST_EMPTY(adminlog)

GLOBAL_DATUM_INIT(mods, /datum/moduletypes, new())

GLOBAL_VAR(join_motd)
GLOBAL_VAR(current_tms)
4 changes: 2 additions & 2 deletions code/controllers/subsystem/init/landmarks.dm
Original file line number Diff line number Diff line change
@@ -48,8 +48,8 @@ SUBSYSTEM_DEF(landmark_init)
continue

if (pool.quota > pool.turfs.len)
log_debug("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [GLOB.turfs.len] instances of [pool.type_to_spawn] instead. Code: ITEM_POOL_4")
message_admins("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [GLOB.turfs.len] instances of [pool.type_to_spawn] instead. Tell the devs. Code: ITEM_POOL_4")
log_debug("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [pool.turfs.len] instances of [pool.type_to_spawn] instead. Code: ITEM_POOL_4")
message_admins("Item pool [pool.pool_name] wants to spawn more items than it has landmarks for. Spawning [pool.turfs.len] instances of [pool.type_to_spawn] instead. Tell the devs. Code: ITEM_POOL_4")
pool.quota = pool.turfs.len

// Quota times, pick a random turf, spawn an item there, then remove that turf from the list.
62 changes: 0 additions & 62 deletions code/datums/modules.dm

This file was deleted.

2 changes: 2 additions & 0 deletions code/game/machinery/computer/camera_console.dm
Original file line number Diff line number Diff line change
@@ -40,6 +40,8 @@
instance.del_on_map_removal = FALSE
if(instance.blend_mode_override)
instance.blend_mode = instance.blend_mode_override
if(istype(instance, /atom/movable/screen/plane_master/lighting))
instance.add_filter("awooga", 1, color_matrix_filter(color_matrix_from_string("#90ee90")))
instance.screen_loc = "[map_name]:CENTER"
cam_plane_masters += instance

16 changes: 1 addition & 15 deletions code/game/machinery/hologram.dm
Original file line number Diff line number Diff line change
@@ -59,12 +59,6 @@ Possible to do for anyone motivated enough:
Itegrate EMP effect to disable the unit.
*/


// HOLOPAD MODE
// 0 = RANGE BASED
// 1 = AREA BASED
GLOBAL_VAR_INIT(HOLOPAD_MODE, 0)

/obj/structure/machinery/hologram/holopad
name = "\improper AI holopad"
desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely."
@@ -167,17 +161,9 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(hologram)//If there is a hologram.
if(master && !master.stat && master.client && master.eyeobj)//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
if(!(stat & NOPOWER))//If the machine has power.
if((GLOB.HOLOPAD_MODE == 0 && (get_dist(master.eyeobj, src) <= holo_range)))
if(get_dist(master.eyeobj, src) <= holo_range)
return 1

else if (GLOB.HOLOPAD_MODE == 1)

var/area/holo_area = get_area(src)
var/area/eye_area = get_area(master.eyeobj)

if(eye_area == holo_area)
return 1

clear_holo()//If not, we want to get rid of the hologram.
return 1

1 change: 0 additions & 1 deletion code/game/world.dm
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
LoadBans()
load_motd()
load_tm_message()
loadShuttleInfoDatums()
populate_gear_list()
initialize_global_regex()

2 changes: 0 additions & 2 deletions code/modules/admin/admin.dm
Original file line number Diff line number Diff line change
@@ -138,8 +138,6 @@
var/dat = {"
<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];c_mode=1'>Change Game Mode</A><br>
"}
if(GLOB.master_mode == "secret")
dat += "<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];f_secret=1'>(Force Secret Mode)</A><br>"

dat += {"
<BR>
27 changes: 0 additions & 27 deletions code/modules/admin/topic/topic.dm
Original file line number Diff line number Diff line change
@@ -565,20 +565,6 @@
dat += {"Now: [GLOB.master_mode]"}
show_browser(usr, dat, "Change Gamemode", "c_mode")

else if(href_list["f_secret"])
if(!check_rights(R_ADMIN)) return

if(SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
if(GLOB.master_mode != "secret")
return alert(usr, "The game mode has to be secret!", null, null, null, null)
var/dat = {"<B>What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.</B><HR>"}
for(var/mode in config.modes)
dat += {"<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];f_secret2=[mode]'>[config.mode_names[mode]]</A><br>"}
dat += {"<A HREF='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];f_secret2=secret'>Random (default)</A><br>"}
dat += {"Now: [GLOB.secret_force_mode]"}
show_browser(usr, dat, "Change Secret Gamemode", "f_secret")

else if(href_list["c_mode2"])
if(!check_rights(R_ADMIN|R_SERVER)) return

@@ -588,19 +574,6 @@
Game() // updates the main game menu
SSticker.save_mode(GLOB.master_mode)


else if(href_list["f_secret2"])
if(!check_rights(R_ADMIN|R_SERVER)) return

if(SSticker.mode)
return alert(usr, "The game has already started.", null, null, null, null)
if(GLOB.master_mode != "secret")
return alert(usr, "The game mode has to be secret!", null, null, null, null)
GLOB.secret_force_mode = href_list["f_secret2"]
message_admins("[key_name_admin(usr)] set the forced secret mode as [GLOB.secret_force_mode].")
Game() // updates the main game menu
.(href, list("f_secret"=1))

else if(href_list["monkeyone"])
if(!check_rights(R_SPAWN)) return

5 changes: 0 additions & 5 deletions code/modules/cm_marines/shuttle_backend.dm
Original file line number Diff line number Diff line change
@@ -87,11 +87,6 @@ DOCUMENTATION ON HOW TO ADD A NEW SHUTTLE: Fourkhan, 6/7/19

*/

GLOBAL_LIST(s_info)

/proc/loadShuttleInfoDatums()
GLOB.s_info = list()
return 1


/proc/get_shuttle_turfs(turf/ref, list/L)
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/attack_alien.dm
Original file line number Diff line number Diff line change
@@ -769,7 +769,7 @@
last_locked = world.time
if(GLOB.almayer_orbital_cannon)
GLOB.almayer_orbital_cannon.is_disabled = TRUE
addtimer(CALLBACK(GLOB.almayer_orbital_cannon, .obj/structure/orbital_cannon/proc/enable), 10 MINUTES, TIMER_UNIQUE)
addtimer(CALLBACK(GLOB.almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE)
queen_locked = 1

/datum/shuttle/ferry/marine/proc/door_override(mob/living/carbon/xenomorph/M, shuttle_tag)
7 changes: 0 additions & 7 deletions code/modules/shuttles/marine_ferry.dm
Original file line number Diff line number Diff line change
@@ -73,13 +73,6 @@
control.visible_message(SPAN_WARNING(fail_flavortext))
return //Kill it so as not to repeat

/datum/shuttle/ferry/marine/proc/load_datums()
if(!(info_tag in GLOB.s_info))
message_admins(SPAN_WARNING("Error with shuttles: Shuttle tag does not exist. Code: MSD10.\n WARNING: DROPSHIP LAUNCH WILL PROBABLY FAIL"))

var/list/L = GLOB.s_info[info_tag]
info_datums = L.Copy()

/datum/shuttle/ferry/marine/proc/set_automated_launch(bool_v)
automated_launch = bool_v
if(bool_v)
1 change: 0 additions & 1 deletion colonialmarines.dme
Original file line number Diff line number Diff line change
@@ -327,7 +327,6 @@
#include "code\datums\mind.dm"
#include "code\datums\mixed.dm"
#include "code\datums\mob_hud.dm"
#include "code\datums\modules.dm"
#include "code\datums\movement_detector.dm"
#include "code\datums\mutable_appearance.dm"
#include "code\datums\quadtree.dm"