cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 03:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports the TG globals controller and converts globals. (#18057)

Browse Source 
* SDQL2 update

* fix that verb

* cl

* fix that

* toworld

* this is pointless

* update info

* siiiiick..

* vv edit update

* fix that

* fix editing vars

* fix VV

* Port the /TG/ globals controller.

* part 1

* part 2

* oops

* part 3

* Hollow Purple

* sadas

* bsbsdb

* muda na agaki ta

* ids 1-15

* 16-31

* 41-75

* bring me back to how things used to be before i lost it all

* the strength of mayhem

* final touches

* cl

* protect some vars

* update sdql2 to use glob

* stuff?

* forgot that is not defined there

* whoops

* observ

* but it never gets better

* a

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-12-26 02:16:02 +01:00
committed by GitHub
parent 19292f01d3
commit cadd19beac
966 changed files with 4785 additions and 4784 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/random_map/drop/droppod.dm
+3 -3
View File
@@ -173,7 +173,7 @@
spawned_mobs |= M
else
var/list/candidates = list()
for(var/client/player in clients)
for(var/client/player in GLOB.clients)
if(player.mob && istype(player.mob, /mob/abstract/observer))
candidates |= player
@@ -192,9 +192,9 @@
// Equip them, if they are human and it is desirable.
if(istype(spawned_mob, /mob/living/carbon/human))
var/antag_type = input("Select an equipment template to use or cancel for nude.", null) as null|anything in all_antag_types
var/antag_type = input("Select an equipment template to use or cancel for nude.", null) as null|anything in GLOB.all_antag_types
if(antag_type)
var/datum/antagonist/A = all_antag_types[antag_type]
var/datum/antagonist/A = GLOB.all_antag_types[antag_type]
A.equip(spawned_mob)
if(alert("Are you SURE you wish to deploy this drop pod? It will cause a sizable explosion and gib anyone underneath it.",,"No","Yes") == "No")
code/modules/random_map/random_map.dm
+7 -7
View File
@@ -1,6 +1,6 @@
// Generates cave systems for the asteroid, and places ore tiles.
var/global/list/random_maps = list()
var/global/list/map_count = list()
GLOBAL_LIST_EMPTY(random_maps)
GLOBAL_LIST_EMPTY(map_count)
/datum/random_map
@@ -38,12 +38,12 @@ var/global/list/map_count = list()
/datum/random_map/New(var/seed, var/tx, var/ty, var/tz, var/tlx, var/tly, var/do_not_apply, var/do_not_announce, var/never_be_priority = 0, var/used_area)
// Store this for debugging.
if(!map_count[descriptor])
map_count[descriptor] = 1
if(!GLOB.map_count[descriptor])
GLOB.map_count[descriptor] = 1
else
map_count[descriptor]++
name = "[descriptor] #[map_count[descriptor]]"
if(preserve_map) random_maps[name] = src
GLOB.map_count[descriptor]++
name = "[descriptor] #[GLOB.map_count[descriptor]]"
if(preserve_map) GLOB.random_maps[name] = src
// Get origins for applying the map later.
set_origins(tx, ty, tz)
code/modules/random_map/random_map_verbs.dm
+11 -11
View File
@@ -5,10 +5,10 @@
if(!holder) return
var/choice = input("Choose a map to display.") as null|anything in random_maps
var/choice = input("Choose a map to display.") as null|anything in GLOB.random_maps
if(!choice)
return
var/datum/random_map/M = random_maps[choice]
var/datum/random_map/M = GLOB.random_maps[choice]
if(istype(M))
M.display_map(usr)
@@ -19,11 +19,11 @@
if(!holder) return
var/choice = input("Choose a map to delete.") as null|anything in random_maps
var/choice = input("Choose a map to delete.") as null|anything in GLOB.random_maps
if(!choice)
return
var/datum/random_map/M = random_maps[choice]
random_maps[choice] = null
var/datum/random_map/M = GLOB.random_maps[choice]
GLOB.random_maps[choice] = null
if(istype(M))
message_admins("[key_name_admin(usr)] has deleted [M.name].")
log_admin("[key_name(usr)] has deleted [M.name].",admin_key=key_name(usr))
@@ -60,10 +60,10 @@
if(!holder) return
var/choice = input("Choose a map to apply.") as null|anything in random_maps
var/choice = input("Choose a map to apply.") as null|anything in GLOB.random_maps
if(!choice)
return
var/datum/random_map/M = random_maps[choice]
var/datum/random_map/M = GLOB.random_maps[choice]
if(istype(M))
var/tx = input("X? (default to current turf)") as num|null
var/ty = input("Y? (default to current turf)") as num|null
@@ -85,17 +85,17 @@
if(!holder) return
var/choice = input("Choose a map as base.") as null|anything in random_maps
var/choice = input("Choose a map as base.") as null|anything in GLOB.random_maps
if(!choice)
return
var/datum/random_map/base_map = random_maps[choice]
var/datum/random_map/base_map = GLOB.random_maps[choice]
choice = null
choice = input("Choose a map to overlay.") as null|anything in random_maps
choice = input("Choose a map to overlay.") as null|anything in GLOB.random_maps
if(!choice)
return
var/datum/random_map/overlay_map = random_maps[choice]
var/datum/random_map/overlay_map = GLOB.random_maps[choice]
if(istype(base_map) && istype(overlay_map))
var/tx = input("X? (default to 1)") as num|null