cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13820 from Cameron653/BUILD_MODE_PLEASE

Browse Source 
Fixes build mode and makes it not terrible.
This commit is contained in:
Casey
2022-10-02 13:56:25 -04:00
committed by CHOMPStation2
parent dbc2cba71c
commit 04e399ea92
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/modules/admin/verbs/buildmode.dm
View File

@@ -189,6 +189,7 @@
var/atom/movable/throw_atom = null var/atom/movable/throw_atom = null
var/list/selected_mobs = list() var/list/selected_mobs = list()
var/copied_faction = null var/copied_faction = null
var/warned = 0
/obj/effect/bmode/buildholder/Destroy() /obj/effect/bmode/buildholder/Destroy()
qdel(builddir) qdel(builddir)
@@ -219,7 +220,7 @@
screen_loc = "NORTH,WEST+2" screen_loc = "NORTH,WEST+2"
var/varholder = "name" var/varholder = "name"
var/valueholder = "derp" var/valueholder = "derp"
var/objholder = /obj/structure/closet var/objholder = null
var/objsay = 1 var/objsay = 1
var/wall_holder = /turf/simulated/wall var/wall_holder = /turf/simulated/wall
@@ -252,7 +253,7 @@
return 1 return 1
if(BUILDMODE_ADVANCED) if(BUILDMODE_ADVANCED)
objholder = get_path_from_partial_text(/obj/structure/closet) objholder = get_path_from_partial_text()
if(BUILDMODE_EDIT) if(BUILDMODE_EDIT)
var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine") var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
@@ -330,7 +331,13 @@
return return
else if(istype(object,/turf/simulated/floor)) else if(istype(object,/turf/simulated/floor))
var/turf/T = object var/turf/T = object
T.ChangeTurf(/turf/space) if(!holder.warned)
var/warning = tgui_alert(user, "Are you -sure- you want to delete this turf and make it the base turf for this Z level?", "GRIEF ALERT", list("No", "Yes"))
if(warning == "Yes")
holder.warned = 1
else
return
T.ChangeTurf(get_base_turf_by_area(T)) //Defaults to Z if area does not have a special base turf.
return return
else if(istype(object,/turf/simulated/wall/r_wall)) else if(istype(object,/turf/simulated/wall/r_wall))
var/turf/T = object var/turf/T = object
@@ -358,6 +365,13 @@
if(NORTHWEST) if(NORTHWEST)
var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object)) var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
WIN.set_dir(NORTHWEST) WIN.set_dir(NORTHWEST)
else if(istype(object,/turf) && pa.Find("ctrl") && pa.Find("alt") && pa.Find("middle"))
var/turf/T = object
var/obj/item/toy/plushie/teshari/easter_egg = new /obj/item/toy/plushie/teshari(T)
easter_egg.name = "coding teshari plushie"
easter_egg.desc = "A small purple teshari with a plush keyboard attached to it. Where did this come from?"
easter_egg.color = "#a418c7"
if(BUILDMODE_ADVANCED) if(BUILDMODE_ADVANCED)
if(pa.Find("left") && !pa.Find("ctrl")) if(pa.Find("left") && !pa.Find("ctrl"))
@@ -647,8 +661,6 @@
result = matches[1] result = matches[1]
else else
result = tgui_input_list(usr, "Select an atom type", "Spawn Atom", matches, strict_modern = TRUE) result = tgui_input_list(usr, "Select an atom type", "Spawn Atom", matches, strict_modern = TRUE)
if(!objholder)
result = default_path
return result return result
/obj/effect/bmode/buildmode/proc/make_rectangle(var/turf/A, var/turf/B, var/turf/wall_type, var/turf/floor_type) /obj/effect/bmode/buildmode/proc/make_rectangle(var/turf/A, var/turf/B, var/turf/wall_type, var/turf/floor_type)