mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 12:08:55 +01:00
Administrator Cherrypick (#27405)
* Admin Verb Datums MkIII | Now with functional command bar (#82511) * Modular stuffs * Put some admin jump verbs back into the context menu | sorts area jump list again (#82647) ## About The Pull Request See title. ## Why It's Good For The Game Some admins wanted all the jump verbs back, aswell as making them not AGhost you. Also make the Jump To Area verb use a sorted list again * Hey what if admins were allowed to use the player panel (#82682) Re-adds the player panel verb to the verb panel. * Controller Overview UI (#82739) * Fixes a minor spelling mistake on the admin panel/verb list (#82747) ## About The Pull Request Corrects `inisimin` to `invisimin`. This addresses #82728, but only fixes one of the two issues mentioned ## Why It's Good For The Game -1 spelling mistake ## Changelog 🆑 spellcheck: 'inisimin' verb corrected to 'invisimin' /🆑 * Player Panel-age (#82757) * Admin Forced Mob Rename and Preference Update (#82715) --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com> Co-authored-by: chel <64568243+iliyaxox@users.noreply.github.com>
This commit is contained in:
co-authored by
Zephyr
Useroth
chel
parent
8ecd4bf5b1
commit
a9ff046352
@@ -136,40 +136,36 @@
|
||||
// HERE BE DEBUG DRAGONS //
|
||||
///////////////////////////
|
||||
|
||||
/client/proc/debugNatureMapGenerator()
|
||||
set name = "Test Nature Map Generator"
|
||||
set category = "Debug"
|
||||
|
||||
ADMIN_VERB(debug_nature_map_generator, R_DEBUG, "Test Nature Map Generator", "Test the nature map generator", ADMIN_CATEGORY_DEBUG)
|
||||
var/datum/map_generator/nature/N = new()
|
||||
var/startInput = input(usr, "Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1") as text|null
|
||||
var/startInput = input(user, "Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1") as text|null
|
||||
|
||||
if (isnull(startInput))
|
||||
return
|
||||
|
||||
var/endInput = input(usr, "End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]") as text|null
|
||||
|
||||
var/endInput = input(user, "End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[user.mob.z]") as text|null
|
||||
if (isnull(endInput))
|
||||
return
|
||||
|
||||
//maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe
|
||||
if(!startInput || !endInput)
|
||||
to_chat(src, "Missing Input")
|
||||
to_chat(user, "Missing Input")
|
||||
return
|
||||
|
||||
var/list/startCoords = splittext(startInput, ";")
|
||||
var/list/endCoords = splittext(endInput, ";")
|
||||
if(!startCoords || !endCoords)
|
||||
to_chat(src, "Invalid Coords")
|
||||
to_chat(src, "Start Input: [startInput]")
|
||||
to_chat(src, "End Input: [endInput]")
|
||||
to_chat(user, "Invalid Coords")
|
||||
to_chat(user, "Start Input: [startInput]")
|
||||
to_chat(user, "End Input: [endInput]")
|
||||
return
|
||||
|
||||
var/turf/Start = locate(text2num(startCoords[1]),text2num(startCoords[2]),text2num(startCoords[3]))
|
||||
var/turf/End = locate(text2num(endCoords[1]),text2num(endCoords[2]),text2num(endCoords[3]))
|
||||
if(!Start || !End)
|
||||
to_chat(src, "Invalid Turfs")
|
||||
to_chat(src, "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]")
|
||||
to_chat(src, "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]")
|
||||
to_chat(user, "Invalid Turfs")
|
||||
to_chat(user, "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]")
|
||||
to_chat(user, "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]")
|
||||
return
|
||||
|
||||
var/static/list/clusters = list(
|
||||
@@ -191,7 +187,7 @@
|
||||
var/theCluster = 0
|
||||
if(moduleClusters != "None")
|
||||
if(!clusters[moduleClusters])
|
||||
to_chat(src, "Invalid Cluster Flags")
|
||||
to_chat(user, "Invalid Cluster Flags")
|
||||
return
|
||||
theCluster = clusters[moduleClusters]
|
||||
else
|
||||
@@ -202,9 +198,9 @@
|
||||
M.clusterCheckFlags = theCluster
|
||||
|
||||
|
||||
to_chat(src, "Defining Region")
|
||||
to_chat(user, "Defining Region")
|
||||
N.defineRegion(Start, End)
|
||||
to_chat(src, "Region Defined")
|
||||
to_chat(src, "Generating Region")
|
||||
to_chat(user, "Region Defined")
|
||||
to_chat(user, "Generating Region")
|
||||
N.generate()
|
||||
to_chat(src, "Generated Region")
|
||||
to_chat(user, "Generated Region")
|
||||
|
||||
Reference in New Issue
Block a user