From 100e62f4f2ea63f62983c3b7fe879916c4672e46 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Fri, 30 Sep 2022 00:59:37 -0400 Subject: [PATCH 01/16] Adds new helpers for area calculation Fixes champagne --- code/_helpers/unsorted.dm | 26 ++++++++++++++++++++++++++ code/modules/overmap/champagne.dm | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 84844936c4f..d0a7bff2e0e 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -643,6 +643,20 @@ Turf and target are seperate in case you want to teleport some distance from a t for(var/turf/T in N) turfs += T return turfs + +//Takes: An instance of the area. +//Returns: A list of all turfs in that area. +//Side note: I don't know why this was never a thing. Did everyone just ignore the Blueprint item?! - C.L. +/proc/get_current_area_turfs(var/area/checked_area) + if(!checked_area) + return null + + var/list/turfs = new/list() + for(var/turf/counted_turfs in checked_area.contents) //Cheap. Efficient. Lovely. + turfs += counted_turfs + return turfs + + //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all atoms (objs, turfs, mobs) in areas of that type of that type in the world. /proc/get_area_all_atoms(var/areatype) @@ -659,6 +673,18 @@ Turf and target are seperate in case you want to teleport some distance from a t atoms += A return atoms + +//Takes: Area as an instance of the area. +//Returns: A list of all atoms (objs, turfs, mobs) in the selected area. +/proc/get_current_area_atoms(var/area/checked_area) + if(!checked_area) + return null + + var/list/atoms = new/list() + for(var/atom/A in checked_area.contents) + atoms += A + return atoms + /datum/coords //Simple datum for storing coordinates. var/x_pos = null var/y_pos = null diff --git a/code/modules/overmap/champagne.dm b/code/modules/overmap/champagne.dm index 0d36766535b..593be7f2a6d 100644 --- a/code/modules/overmap/champagne.dm +++ b/code/modules/overmap/champagne.dm @@ -47,7 +47,7 @@ to_chat(user, "[comp] is already in a shuttle.") return // Count turfs in the area - var/list/turfs = get_area_turfs(my_area) + var/list/turfs = get_current_area_turfs(my_area) if(turfs.len > max_area_turfs) to_chat(user, "The new shuttle area is too large.") return From c0c8ca6eb6426eb64e0a1c086ef834369d6788d7 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Fri, 30 Sep 2022 20:50:10 -0400 Subject: [PATCH 02/16] god has left us MAJOR: - Completely revamps the blueprints. - Ports /tg/ blueprints and bastardizes them. Blueprint functions: - Create/modify an existing area (in a 3x3 square. Good for expanding an area to include walls or finetuning) - Create new area or merge two areas. (Allows you to make a new area if the room is airtight or merge two areas together.) - Change area name. - Wire Legend. Allows you to see what wires do. (Move this into its own seperate item) MINOR: - Adds a new global list "wire_name_directory" that is important for revealing wires. - Gave vent pumps, vent scrubbers, and air alarms a new update_area proc that is involved when their area is updated due to a blueprints being used. - Gave areas a 'setup' proc that is called when a new area is created via blueprints. Sets the area vars to what would be default (power off) Adds a new 'areasize' variable to areas that lets you know how large they are. - Added procs to areas to check the power in an area and check change the name of an area properly. - adds a new range_turfs and rect_turfs define. Unused for now. --- .../components/unary/vent_pump.dm | 7 + .../components/unary/vent_scrubber.dm | 6 + code/__defines/turfs.dm | 11 + code/_global_vars/lists/misc.dm | 3 +- code/datums/wires/wires.dm | 1 + code/game/area/areas_vr.dm | 41 ++ code/game/machinery/air_alarm.dm | 20 +- code/game/objects/items/blueprints_vr.dm | 695 ++++++++++++++++++ 8 files changed, 776 insertions(+), 8 deletions(-) create mode 100644 code/game/objects/items/blueprints_vr.dm diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 145381146fd..4b8970fd94d 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -94,6 +94,13 @@ assign_uid() id_tag = num2text(uid) +/obj/machinery/atmospherics/unary/vent_pump/proc/update_area() + initial_loc = get_area(loc) + area_uid = "\ref[initial_loc]" + assign_uid() + id_tag = num2text(uid) + + /obj/machinery/atmospherics/unary/vent_pump/Destroy() unregister_radio(src, frequency) if(initial_loc) diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 64a57a744e0..fe3e68130fa 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -43,6 +43,12 @@ assign_uid() id_tag = num2text(uid) +/obj/machinery/atmospherics/unary/vent_scrubber/proc/update_area() + initial_loc = get_area(loc) + area_uid = "\ref[initial_loc]" + assign_uid() + id_tag = num2text(uid) + /obj/machinery/atmospherics/unary/vent_scrubber/Destroy() unregister_radio(src, frequency) if(initial_loc) diff --git a/code/__defines/turfs.dm b/code/__defines/turfs.dm index 1c4b228b63c..421bfc258f4 100644 --- a/code/__defines/turfs.dm +++ b/code/__defines/turfs.dm @@ -28,3 +28,14 @@ #define OUTDOORS_NO 0 // Ditto. #define OUTDOORS_AREA -1 // If a turf has this, it will defer to the area's settings on init. // Note that after init, it will be either YES or NO. + +//supposedly the fastest way to do this according to https://gist.github.com/Giacom/be635398926bb463b42a +///Returns a list of turf in a square +#define RANGE_TURFS(RADIUS, CENTER) \ + RECT_TURFS(RADIUS, RADIUS, CENTER) + +#define RECT_TURFS(H_RADIUS, V_RADIUS, CENTER) \ + block( \ + locate(max(CENTER.x-(H_RADIUS),1), max(CENTER.y-(V_RADIUS),1), CENTER.z), \ + locate(min(CENTER.x+(H_RADIUS),world.maxx), min(CENTER.y+(V_RADIUS),world.maxy), CENTER.z) \ + ) \ No newline at end of file diff --git a/code/_global_vars/lists/misc.dm b/code/_global_vars/lists/misc.dm index a16573905e0..97cc3753a1e 100644 --- a/code/_global_vars/lists/misc.dm +++ b/code/_global_vars/lists/misc.dm @@ -2,7 +2,8 @@ GLOBAL_LIST_INIT(speech_toppings, list("|" = "i", "+" = "b", "_" = "u")) GLOBAL_LIST_EMPTY(meteor_list) /// List of wire colors for each object type of that round. One for airlocks, one for vendors, etc. -GLOBAL_LIST_EMPTY(wire_color_directory) // This is an associative list with the `holder_type` as the key, and a list of colors as the value. +GLOBAL_LIST_EMPTY(wire_color_directory) // This is an associative list with the `holder_type` as the key, and a list of colors as the value. +GLOBAL_LIST_EMPTY(wire_name_directory) // This is an associative list // Reference list for disposal sort junctions. Filled up by sorting junction's New() GLOBAL_LIST_EMPTY(tagger_locations) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 83ebb65fa8f..9a411c60ee3 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -43,6 +43,7 @@ if(!GLOB.wire_color_directory[holder_type]) randomize() GLOB.wire_color_directory[holder_type] = colors + GLOB.wire_name_directory[holder_type] = proper_name else colors = GLOB.wire_color_directory[holder_type] diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm index e356063e2ab..f9326745660 100644 --- a/code/game/area/areas_vr.dm +++ b/code/game/area/areas_vr.dm @@ -5,6 +5,9 @@ var/block_suit_sensors = FALSE //If mob size is limited in the area. var/turf/ceiling_type + // Size of the area in open turfs, only calculated for indoors areas. + var/areasize = 0 + /area/Entered(var/atom/movable/AM, oldLoc) . = ..() if(enter_message && isliving(AM)) @@ -29,3 +32,41 @@ var/turf/TA = GetAbove(T) if(isopenspace(TA)) TA.ChangeTurf(ceiling_type, TRUE, TRUE, TRUE) + +/** + * Setup an area (with the given name) + * + * Sets the area name, sets all status var's to false and adds the area to the sorted area list + * //NOTE: Virgo does not have a sorted area list. + */ +/area/proc/setup(a_name) + name = a_name + power_equip = FALSE + power_light = FALSE + power_environ = FALSE + always_unpowered = FALSE + update_areasize() + +/area/proc/update_areasize() + if(outdoors) + return FALSE + areasize = 0 + for(var/turf/simulated/floor/T in contents) + areasize++ + +/proc/rename_area(a, new_name) + var/area/A = get_area(a) + var/prevname = "[A.name]" + set_area_machinery(A, new_name, prevname) + A.name = new_name + A.update_areasize() + return TRUE + +/area/proc/power_check() + if(!requires_power || !apc) + power_light = 0 + power_equip = 0 + power_environ = 0 + power_change() // all machines set to current power level, also updates lighting icon + if(no_spoilers) + set_spoiler_obfuscation(TRUE) \ No newline at end of file diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index ca40f0dc530..82d6fa0f6f4 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -154,6 +154,12 @@ update_icon() +/obj/machinery/alarm/proc/update_area() + alarm_area = get_area(src) + area_uid = "\ref[alarm_area]" + if(name == "alarm") + name = "[alarm_area.name] Air Alarm" + /obj/machinery/alarm/Initialize() . = ..() set_frequency(frequency) @@ -540,9 +546,9 @@ var/list/list/environment_data = list() data["environment_data"] = environment_data - + DECLARE_TLV_VALUES - + var/pressure = environment.return_pressure() LOAD_TLV_VALUES(TLV["pressure"], pressure) environment_data.Add(list(list( @@ -551,7 +557,7 @@ "unit" = "kPa", "danger_level" = TEST_TLV_VALUES ))) - + var/temperature = environment.temperature LOAD_TLV_VALUES(TLV["temperature"], temperature) environment_data.Add(list(list( @@ -573,7 +579,7 @@ "unit" = "%", "danger_level" = TEST_TLV_VALUES ))) - + if(!locked || issilicon(user) || data["remoteUser"]) var/list/list/vents = list() data["vents"] = vents @@ -595,7 +601,7 @@ "extdefault"= (info["external"] == ONE_ATMOSPHERE), "intdefault"= (info["internal"] == 0), ))) - + var/list/list/scrubbers = list() data["scrubbers"] = scrubbers @@ -622,7 +628,7 @@ data["scrubbers"] = scrubbers data["mode"] = mode - + var/list/list/modes = list() data["modes"] = modes modes[++modes.len] = list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0) @@ -682,7 +688,7 @@ else target_temperature = input_temperature + T0C return TRUE - + // Account for remote users here. // Yes, this is kinda snowflaky; however, I would argue it would be far more snowflakey // to include "custom hrefs" and all the other bullshit that nano states have just for the diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm new file mode 100644 index 00000000000..16a8f71fee6 --- /dev/null +++ b/code/game/objects/items/blueprints_vr.dm @@ -0,0 +1,695 @@ +#define BP_MAX_ROOM_SIZE 300 + +// WARNING: ESOTERIC BULLSHIT INSIDE OF THIS FILE. +// This is a port of /tg/'s blueprints that also have Virgo modifications as well. +// However it is heavily modified and lacking the 't-ray' scanner functionality that /TG/ has. We have our own t-rays after all. +// This works and uses a bunch of really odd hacks and trickery to get it to all function. +// If you're looking at this a few years from now and going 'What the hell were they thinking' just know that this was the best we had at the time. + +// Now that I've scared away half the people looking at this file, here's the relevant info: + +// Banning areas: Go to /obj/item/areaeditor/proc/get_area_type and /proc/create_area and add the /area to: (area_or_turf_fail_types) +// That will bar people from doing ANYTHING to those areas. No creating inside of them. No merging into them. Etc. + +// Disallow creation but allow merge/expansion: Go to the same two above again. +// Add the /area to 'blacklisted_areas' in /proc/create_area + + +/area/tether/surfacebase/outside + name = "Outside - Surface" + +/area/groundbase/unexplored/outdoors + name = "\improper Rascal's Pass" + +/area/groundbase/mining + name = "Mining" + +/area/groundbase/unexplored/rock + name = "\improper Rascal's Pass" + +/area/maintenance/groundbase/level1 + name = "Groundbase Level One Maint" + +/area/submap/groundbase/wilderness + name = "Groundbase Wilderness" + +//TG blueprints. +#define AREA_ERRNONE 0 +#define AREA_STATION 1 +#define AREA_SPACE 2 +#define AREA_SPECIAL 3 + +/obj/item/areaeditor + name = "area modification item" + icon = 'icons/obj/items.dmi' + icon_state = "blueprints" + attack_verb = list("attacked", "bapped", "hit") + in_use = FALSE + preserve_item = 1 + var/uses_charges = 0 // If the area editor has limited uses. + var/charges = 0 // The amount of uses the area editor has. + + var/can_create_areas_in = AREA_SPACE // Must be standing in space to create + var/can_create_areas_into = AREA_SPACE // New areas will only overwrite space area turfs. + var/can_expand_areas_in = AREA_STATION // Must be standing in station to expand + var/can_expand_areas_into = AREA_SPACE // Can expand station areas only into space. + var/can_rename_areas_in = AREA_STATION // Only station areas can be reanamed + + + var/const/ROOM_ERR_LOLWAT = 0 // Don't touch these three consts or BYOND will literally tear out your throat + var/const/ROOM_ERR_SPACE = -1 + var/const/ROOM_ERR_TOOLARGE = -2 + var/const/ROOM_ERR_FORBIDDEN = -3 + + var/list/areaColor_turfs = list() + var/legend = 0 //If viewing wires or not. + + //Allows you to build new areas in these areas easily. + var/static/list/BUILDABLE_AREA_TYPES = list( + /area/space, + /area/mine, + //TETHER STUFF BELOW THIS + /area/tether/surfacebase/outside, + //GROUNDBASE STUFF BELOW THIS + /area/groundbase/unexplored/outdoors, + /area/maintenance/groundbase/level1, + /area/submap/groundbase/wilderness, + /area/groundbase/mining + ) + //Forbids you from doing anything to these areas. + var/static/list/SPECIALS = list( + /turf/space, + /area/shuttle, + /area/admin, + /area/arrival, + /area/centcom, + /area/asteroid, + /area/tdome, + /area/syndicate_station, + /area/wizard_station, + /area/prison, + /area/holodeck, + /area/turbolift + // /area/derelict //commented out, all hail derelict-rebuilders! + ) + + + +/obj/item/areaeditor/attack_self(mob/user) //Convert this to TGUI sometime to disallow browser exploits. + add_fingerprint(user) + . = "[src] \ +

[station_name()] [src.name]

" + switch(get_area_type()) + if(AREA_SPACE) + . += "

According to the [src.name], you are now in an unclaimed territory.

" + if(AREA_SPECIAL) + . += "

This place is not noted on the [src.name].

" + return //If we're in a special area, no modifying. + . += "

Create or modify an existing area (3x3 space)

" + . += "

Create new area or merge two areas. (Whole Room)

" + . += "There is a note on the corner of the [src.name]: Use 3x3 for fine-tuning and including walls into your area!" + + +/obj/item/areaeditor/Topic(href, href_list) + if(..()) + return TRUE + if ((usr.restrained() || usr.stat || usr.get_active_hand() != src)) + return + if(href_list["create_area"]) + if(in_use) + return + var/area/A = get_area(usr) + if(A.flags & BLUE_SHIELDED) + to_chat(usr, span_warning("You cannot edit restricted areas.")) + return + in_use = TRUE + create_area(usr) + in_use = FALSE + if(href_list["create_area_whole"]) + if(in_use) + return + in_use = TRUE + var/area/A = create_area_whole(usr) + if(A && (A.flags & BLUE_SHIELDED)) + to_chat(usr, span_warning("You cannot edit restricted areas.")) + in_use = FALSE + return + in_use = FALSE + updateUsrDialog() + +//Station blueprints!!! +/obj/item/areaeditor/blueprints + name = "station blueprints" + desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it." + var/list/image/showing = list() + var/client/viewing + + +/obj/item/areaeditor/blueprints/Destroy() + //clear_viewer() + return ..() + + +/obj/item/areaeditor/blueprints/attack_self(mob/user) + . = ..() + var/area/A = get_area(user) + if(!legend) + if(get_area_type() == AREA_STATION) + . += "

According to \the [src], you are now in \"[html_encode(A.name)]\".

" + . += "

Change area name

" + . += "

View wire colour legend

" + //if(!viewing) + // . += "

View structural data

" + //else + // . += "

Refresh structural data

" + // . += "

Hide structural data

" + else + if(legend == TRUE) + . += "<< Back" + . += view_wire_devices(user); + else + //legend is a wireset + . += "<< Back" + . += view_wire_set(user, legend) + var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) + popup.set_content(.) + popup.open() + onclose(user, "blueprints") + + +/obj/item/areaeditor/blueprints/Topic(href, href_list) + if(..()) + return + if(href_list["edit_area"]) + if(get_area_type()!=AREA_STATION) + return + if(in_use) + return + in_use = TRUE + edit_area() + in_use = FALSE + if(href_list["exit_legend"]) + legend = FALSE; + if(href_list["view_legend"]) + legend = TRUE; + if(href_list["view_wireset"]) + legend = href_list["view_wireset"]; + /* + if(href_list["view_blueprints"]) + set_viewer(usr, span_notice("You flip the blueprints over to view the complex information diagram.")) + if(href_list["hide_blueprints"]) + clear_viewer(usr,span_notice("You flip the blueprints over to view the simple information diagram.")) + if(href_list["refresh"]) + clear_viewer(usr) + set_viewer(usr) + */ + attack_self(usr) //this is not the proper way, but neither of the old update procs work! it's too ancient and I'm tired shush. + + +//Code for viewing pipes or whatnot. Think t-ray scanner. +//Code for viewing pipes or whatnot. Think t-ray scanner. +//Code for viewing pipes or whatnot. Think t-ray scanner. +/* +/obj/item/areaeditor/blueprints/proc/get_images(turf/central_turf, viewsize) + . = list() + var/list/dimensions = getviewsize(viewsize) + var/horizontal_radius = dimensions[1] / 2 + var/vertical_radius = dimensions[2] / 2 + for(var/turf/nearby_turf as anything in RECT_TURFS(horizontal_radius, vertical_radius, central_turf)) + if(nearby_turf.blueprint_data) + . += nearby_turf.blueprint_data +*/ +/* +/obj/item/areaeditor/blueprints/proc/set_viewer(mob/user, message = "") + if(user?.client) + if(viewing) + clear_viewer() + viewing = user.client + showing = get_images(get_turf(viewing.eye || user), viewing.view) + viewing.images |= showing + if(message) + to_chat(user, message) +*/ +/* +/obj/item/areaeditor/blueprints/proc/clear_viewer(mob/user, message = "") + if(viewing) + viewing.images -= showing + viewing = null + showing.Cut() + if(message) + to_chat(user, message) +*/ +/obj/item/areaeditor/blueprints/dropped(mob/user) + ..() + //clear_viewer() + if(areaColor_turfs.len) + seeAreaColors_remove() + legend = FALSE + + + +/obj/item/areaeditor/proc/get_area_type(area/A) + if (!A) + A = get_area(usr) + if(A.outdoors) + return AREA_SPACE + + for (var/type in BUILDABLE_AREA_TYPES) + if ( istype(A,type) ) + return AREA_SPACE + + for (var/type in SPECIALS) + if ( istype(A,type) ) + return AREA_SPECIAL + return AREA_STATION + + +/obj/item/areaeditor/blueprints/proc/view_wire_devices(mob/user) + var/message = "
You examine the wire legend.
" + for(var/wireset in GLOB.wire_color_directory) + //if(istype(wireset,/datum/wires/grid_checker))//Uncomment this in if you want the grid checker minigame to not be revealed here. + // continue + message += "
[GLOB.wire_name_directory[wireset]]" + message += "

" + return message + +/obj/item/areaeditor/blueprints/proc/view_wire_set(mob/user, wireset) + //for some reason you can't use wireset directly as a derefencer so this is the next best :/ + for(var/device in GLOB.wire_color_directory) + if("[device]" == wireset) //I know... don't change it... + var/message = "

[GLOB.wire_name_directory[device]]:" + for(var/Col in GLOB.wire_color_directory[device]) + var/wire_name = GLOB.wire_color_directory[device][Col] + if(!findtext(wire_name, WIRE_DUD_PREFIX)) //don't show duds + message += "

[Col]: [wire_name]

" + message += "

" + return message + return "" + + +/obj/item/areaeditor/proc/edit_area() + var/area/A = get_area(usr) + var/prevname = "[A.name]" + var/str = tgui_input_text(usr, "New area name", "Area Creation", max_length = MAX_NAME_LEN) + str = sanitize(str,MAX_NAME_LEN) + if(!str || !length(str) || str==prevname) //cancel + return + if(length(str) > 50) + to_chat(usr, span_warning("The given name is too long. The area's name is unchanged.")) + return + + rename_area(A, str) + + to_chat(usr, span_notice("You rename the '[prevname]' to '[str]'.")) + log_and_message_admins("has changed the area '[prevname]' title to '[str]'.") + A.update_areasize() + interact() + return TRUE + +//Blueprint Subtypes + +/obj/item/areaeditor/blueprints/cyborg + name = "station schematics" + desc = "A digital copy of the station blueprints stored in your memory." + + +/proc/set_area_machinery(area/area, title, oldtitle) + if(!oldtitle) // or replacetext goes to infinite loop + return + for(var/obj/machinery/alarm/airpanel in area) + airpanel.name = replacetext(airpanel.name,oldtitle,title) + airpanel.update_area() + for(var/obj/machinery/power/apc/apcpanel in area) + apcpanel.name = replacetext(apcpanel.name,oldtitle,title) + apcpanel.update_area() //DECIDE IF THIS IS WANTED OR NOT. This can mean that the APC will overwrite the current APC the area being expanded has since areas cant have multiple APCs. + for(var/obj/machinery/atmospherics/unary/vent_scrubber/scrubber in area) + scrubber.name = replacetext(scrubber.name,oldtitle,title) + scrubber.update_area() + for(var/obj/machinery/atmospherics/unary/vent_pump/vent in area) + vent.name = replacetext(vent.name,oldtitle,title) + vent.update_area() + for(var/obj/machinery/door/door in area) + door.name = replacetext(door.name,oldtitle,title) + for(var/obj/machinery/firealarm/firepanel in area) + firepanel.name = replacetext(firepanel.name,oldtitle,title) + area.update_areasize() + //TODO: much much more. Unnamed airlocks, cameras, etc. + +/proc/detect_room(turf/origin, list/break_if_found, max_size=INFINITY) + if(origin.blocks_air) + return list(origin) + + . = list() + var/list/checked_turfs = list() + var/list/found_turfs = list(origin) + while(length(found_turfs)) + var/turf/sourceT = found_turfs[1] + found_turfs.Cut(1, 2) + var/dir_flags = checked_turfs[sourceT] + for(var/dir in GLOB.alldirs) + if(length(.) > max_size) + return + if(dir_flags & dir) // This means we've checked this dir before, probably from the other turf + continue + var/turf/checkT = get_step(sourceT, dir) + if(!checkT) + continue + + checked_turfs[sourceT] |= dir + checked_turfs[checkT] |= turn(dir, 180) + .[sourceT] |= dir + .[checkT] |= turn(dir, 180) + if(break_if_found[checkT.type] || break_if_found[checkT.loc.type]) + return FALSE + + //BEGIN ESOTERIC BULLSHIT + //log_debug("Origin: [origin.c_airblock(checkT)] SourceT: [sourceT.c_airblock(checkT)] 0=NB 1=AB 2=ZB, 3=B") + if(origin.c_airblock(checkT)) //If everything breaks and it doesn't want to work, turn on the above debug and check this line. C.L. 0 = not blocked. + continue + //END ESOTERIC BULLSHIT + + found_turfs += checkT // Since checkT is connected, add it to the list to be processed + if(found_turfs.len) + found_turfs += origin //If this isn't done, it just adds the 8 tiles around the user. + return found_turfs + +/proc/create_area(mob/creator) + // Passed into the above proc as list/break_if_found + // WHATEVER YOU DO, DO NOT LEAVE THE LAST THING IN THE LIST BELOW HAVE A COMMA OR EVERYTHING EVER WILL BREAK + // AND ENGINEERS ALL OVER THE WORLD WILL HARMBATON YOU + // ENSURE THE LAST AREA OR TURF LISTED IS SIMPLY "/area/clownhideout" AND NOT "/area/clownhideout," OR YOU WILL IMMEDIATELY DIE + var/static/list/area_or_turf_fail_types = typecacheof(list( + /turf/space, + /area/shuttle, + /area/admin, + /area/arrival, + /area/centcom, + /area/asteroid, + /area/tdome, + /area/syndicate_station, + /area/wizard_station, + /area/prison, + /area/holodeck, + /turf/simulated/wall/elevator, + /area/turbolift + )) + + // Ignore these areas and dont let people expand them. They can expand into them though + var/static/list/blacklisted_areas = typecacheof(list( + /area/space, + /area/mine, + //TETHER STUFF BELOW THIS + /area/tether/surfacebase/outside, + //GROUNDBASE STUFF BELOW THIS + /area/groundbase/unexplored/outdoors, + /area/maintenance/groundbase/level1, + /area/submap/groundbase/wilderness, + /area/groundbase/mining + )) + + var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) + if(!turfs) + to_chat(creator, span_warning("The new area must have a floor and not a part of a shuttle.")) + return + if(length(turfs) > BP_MAX_ROOM_SIZE) + to_chat(creator, span_warning("The room you're in is too big. It is [length(turfs) >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((length(turfs) / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.")) + return + var/list/areas = list("New Area" = /area) + + for(var/i in 1 to length(turfs)) + var/area/place = get_area(turfs[i]) + if(blacklisted_areas[place.type]) + continue + if(!place.requires_power || (place.flags & BLUE_SHIELDED)) + continue // No expanding powerless rooms etc + areas[place.name] = place + + var/area_choice = tgui_input_list(creator, "Choose an area to expand or make a new area", "Area Expansion", areas) + if(isnull(area_choice)) + to_chat(creator, span_warning("No choice selected. No adjustments made.")) + return + area_choice = areas[area_choice] + + var/area/newA + var/area/oldA = get_area(get_turf(creator)) + if(!isarea(area_choice)) + var/str = tgui_input_text(creator, "New area name", "Blueprint Editing", max_length = MAX_NAME_LEN) + str = sanitize(str,MAX_NAME_LEN) + if(!str || !length(str)) //cancel + return + if(length(str) > 50) + to_chat(creator, "Name too long.") + return + for(var/area/A in world) //Check to make sure we're not making a duplicate name. Sanity. + if(A.name == str) + to_chat(creator, "An area in the world alreay has this name.") + return + newA = new area_choice + newA.setup(str) + newA.has_gravity = oldA.has_gravity + else + newA = area_choice + + for(var/i in 1 to length(turfs)) + var/turf/thing = turfs[i] + newA.contents += thing + + + set_area_machinery(newA, newA.name, oldA.name)// Change the name and area defines of all the machinery to the correct area. + oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. + to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) + return TRUE + + + +// USED FOR VARIANT ROOM CREATION. +// OLD CODE. DON'T TOUCH OR 100 RABID SQUIRRELS WILL DEVOUR YOU. +// I say old code, but it truly isn't. It's a bastardization of the new create_area code and the old create_area code. +// In essence, it does a few things: Ensure no blacklisted areas are nearby, get the nearby areas (to allow merging), and allow you to make a whole near area. +/obj/item/areaeditor/proc/create_area_whole(mob/creator) //Gets the entire enclosed space and makes a new area out of it. Can overwrite old areas. + + //TODO: Convert this and the one in create_area to a global list. + var/static/list/area_or_turf_fail_types = typecacheof(list( + /turf/space, + /area/shuttle, + /area/admin, + /area/arrival, + /area/centcom, + /area/asteroid, + /area/tdome, + /area/syndicate_station, + /area/wizard_station, + /area/prison, + /area/holodeck, + /turf/simulated/wall/elevator, + /area/turbolift + )) + + var/static/list/blacklisted_areas = typecacheof(list( + /area/space, + /area/mine, + //TETHER STUFF BELOW THIS + /area/tether/surfacebase/outside, + //GROUNDBASE STUFF BELOW THIS + /area/groundbase/unexplored/outdoors, + /area/maintenance/groundbase/level1, + /area/submap/groundbase/wilderness, + /area/groundbase/mining + )) + + var/res = detect_room_ex(get_turf(creator), can_create_areas_into, area_or_turf_fail_types) + if(!res) + to_chat(creator, span_warning("There is an area forbidden from being edited here! Use the fine-tune area creator! (3x3)")) + return + + if(!istype(res,/list)) + switch(res) + if(ROOM_ERR_SPACE) + to_chat(creator, "The new area must be completely airtight!") + return + if(ROOM_ERR_TOOLARGE) + to_chat(creator, "The new area too large!") + return + if(ROOM_ERR_FORBIDDEN) + to_chat(creator, "There is an area forbidden from being edited here!") + return + else + to_chat(creator, "Error! Please notify administration!") + return + var/list/turf/turfs = res + + var/list/areas = list("New Area" = /area) //The list of areas surrounding the user. + var/area/newA //The new area + var/area/oldA = get_area(get_turf(creator)) //The old area (area currently standing in) + var/str //What the new area is named. + + var/list/nearby_turfs_to_check = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) //Get the nearby areas. + + if(!nearby_turfs_to_check) + to_chat(creator, span_warning("The new area must have a floor and not a part of a shuttle.")) + return + if(length(turfs) > BP_MAX_ROOM_SIZE) + to_chat(creator, span_warning("The room you're in is too big. It is [length(turfs) >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((length(turfs) / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.")) + return + + for(var/i in 1 to length(nearby_turfs_to_check)) + var/area/place = get_area(nearby_turfs_to_check[i]) + if(blacklisted_areas[place.type]) + if(!creator.lastarea != place) //Stops them from merging a blacklisted area to make it larger. Allows them to merge a blacklisted area into an allowed area. (Expansion!) + continue + if(!place.requires_power || (place.flags & BLUE_SHIELDED)) + continue // No expanding powerless rooms etc + areas[place.name] = place + + var/area_choice = tgui_input_list(creator, "Choose an area to merge into the area you are currently standing on OR make a new area..", "Area Expansion", areas) + if(isnull(area_choice)) //They pressed cancel. + to_chat(creator, "No changes made.") + return + + area_choice = areas[area_choice] + + if(!isarea(area_choice)) //They chose "New Area" + str = tgui_input_text(creator, "New area name", "Blueprint Editing", max_length = MAX_NAME_LEN) + str = sanitize(str,MAX_NAME_LEN) + if(!str || !length(str)) //cancel + return + if(length(str) > 50) + to_chat(creator, "Name too long.") + return + for(var/area/A in world) //Check to make sure we're not making a duplicate name. Sanity. + if(A.name == str) + to_chat(creator, "An area in the world alreay has this name.") + return + newA = new area_choice + newA.setup(str) + newA.has_gravity = oldA.has_gravity + else + newA = area_choice + + if(str) //New area, new name. + newA.setup(str) + else + newA.setup(newA.name) + move_turfs_to_area(turfs, newA) + newA.has_gravity = oldA.has_gravity + set_area_machinery(newA, newA.name, oldA.name) + oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. + to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) + + + spawn(5) + interact() + return + +/obj/item/areaeditor/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) + for(var/T in turfs) + ChangeArea(T, A) + + +/obj/item/areaeditor/proc/detect_room_ex(var/turf/first, var/allowedAreas = AREA_SPACE, list/forbiddenAreas) + if(!istype(first)) + return ROOM_ERR_LOLWAT + if(forbiddenAreas[first.loc.type] || forbiddenAreas[first.type]) //Is the area of the starting turf a banned area? Is the turf a banned area? + return ROOM_ERR_FORBIDDEN + var/list/turf/found = new + var/list/turf/pending = list(first) + while(pending.len) + if (found.len+pending.len > BP_MAX_ROOM_SIZE) + return ROOM_ERR_TOOLARGE + var/turf/T = pending[1] //why byond havent list::pop()? + pending -= T + for (var/dir in cardinal) + var/turf/NT = get_step(T,dir) + if (!isturf(NT) || (NT in found) || (NT in pending)) + continue + if(forbiddenAreas[NT.loc.type]) + return ROOM_ERR_FORBIDDEN + // We ask ZAS to determine if its airtight. Thats what matters anyway right? + if(air_master.air_blocked(T, NT)) + // Okay thats the edge of the room + if(get_area_type(NT.loc) == AREA_SPACE && air_master.air_blocked(NT, NT)) + found += NT // So we include walls/doors not already in any area + continue + if (istype(NT, /turf/space)) + return ROOM_ERR_SPACE //omg hull breach we all going to die here + if (istype(NT, /turf/simulated/shuttle)) + return ROOM_ERR_SPACE // Unsure why this, but was in old code. Trusting for now. + if (NT.loc != first.loc && !(get_area_type(NT.loc) & allowedAreas)) + // Edge of a protected area. Lets stop here... + continue + if (!istype(NT, /turf/simulated)) + // Great, unsimulated... eh, just stop searching here + continue + // Okay, NT looks promising, lets continue the search there! + pending += NT + found += T + // end while + return found + + + + + + + +//Nice verbs for the engineer to see where areas start/end. + +/obj/item/areaeditor/verb/seeRoomColors() + set src in usr + set category = "Blueprints" + set name = "Show Room Colors" + + // If standing somewhere we can expand from, use expand perms, otherwise create + var/canOverwrite = (get_area_type() & can_expand_areas_in) ? can_expand_areas_into : can_create_areas_into + var/res = detect_room_ex(get_turf(usr), canOverwrite) + if(!istype(res, /list)) + switch(res) + if(ROOM_ERR_SPACE) + to_chat(usr, "The new area must be completely airtight!") + return + if(ROOM_ERR_TOOLARGE) + to_chat(usr, "The new area too large!") + return + else + to_chat(usr, "Error! Please notify administration!") + return + // Okay we got a room, lets color it + seeAreaColors_remove() + var/icon/green = new('icons/misc/debug_group.dmi', "green") + for(var/turf/T in res) + usr << image(green, T, "blueprints", TURF_LAYER) + areaColor_turfs += T + to_chat(usr, "The space covered by the new area is highlighted in green.") + +/obj/item/areaeditor/verb/seeAreaColors() + set src in usr + set category = "Blueprints" + set name = "Show Area Colors" + + // Remove any existing + seeAreaColors_remove() + + to_chat(usr, "\The [src] shows nearby areas in different colors.") + var/i = 0 + for(var/area/A in range(usr)) + if(get_area_type(A) == AREA_SPACE) + continue // Don't overlay all of space! + var/icon/areaColor = new('icons/misc/debug_rebuild.dmi', "[++i]") + to_chat(usr, "- [A] as [i]") + for(var/turf/T in A.contents) + usr << image(areaColor, T, "blueprints", TURF_LAYER) + areaColor_turfs += T + +/obj/item/areaeditor/verb/seeAreaColors_remove() + set src in usr + set category = "Blueprints" + set name = "Remove Area Colors" + + areaColor_turfs.Cut() + if(usr.client.images.len) + for(var/image/i in usr.client.images) + if(i.icon_state == "blueprints") + usr.client.images.Remove(i) + + +#undef BP_MAX_ROOM_SIZE \ No newline at end of file From 6aa0349467cc18325fbbfc20571414b438c75a49 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Fri, 30 Sep 2022 20:50:44 -0400 Subject: [PATCH 03/16] Enable the blueprints themselves Had to disable minitest. --- vorestation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vorestation.dme b/vorestation.dme index b2b6af79404..6953386ee78 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1159,7 +1159,7 @@ #include "code\game\objects\items\antag_spawners.dm" #include "code\game\objects\items\apc_frame.dm" #include "code\game\objects\items\bells.dm" -#include "code\game\objects\items\blueprints.dm" +#include "code\game\objects\items\blueprints_vr.dm" #include "code\game\objects\items\bodybag.dm" #include "code\game\objects\items\contraband.dm" #include "code\game\objects\items\contraband_vr.dm" From 77434d2297dd48c2a9b7fa5330bbea76e3089d6e Mon Sep 17 00:00:00 2001 From: "C.L" Date: Fri, 30 Sep 2022 21:54:33 -0400 Subject: [PATCH 04/16] Makes global lists. Fixes show color. --- code/_helpers/global_lists_vr.dm | 65 +++++++++++++- code/game/objects/items/blueprints_vr.dm | 104 +++-------------------- 2 files changed, 76 insertions(+), 93 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index d7d180d4dfa..f97919ddaf1 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -825,4 +825,67 @@ var/global/list/xenobio_rainbow_extracts = list( /obj/item/slime_extract/ruby = 3, /obj/item/slime_extract/emerald = 3, /obj/item/slime_extract/light_pink = 1, - /obj/item/slime_extract/rainbow = 1) \ No newline at end of file + /obj/item/slime_extract/rainbow = 1) + + +// BLUEPRINT STUFF BELOW HERE +// typecacheof(list) and list() are two completely separate things, don't break! + +// WHATEVER YOU DO, DO NOT LEAVE THE LAST THING IN THE LIST BELOW HAVE A COMMA OR EVERYTHING EVER WILL BREAK +// ENSURE THE LAST AREA OR TURF LISTED IS SIMPLY "/area/clownhideout" AND NOT "/area/clownhideout," OR YOU WILL IMMEDIATELY DIE + +var/global/list/BUILDABLE_AREA_TYPES = list( + /area/space, + /area/mine, + //TETHER STUFF BELOW THIS + /area/tether/surfacebase/outside, + //GROUNDBASE STUFF BELOW THIS + /area/groundbase/unexplored/outdoors, + /area/maintenance/groundbase/level1, + /area/submap/groundbase/wilderness, + /area/groundbase/mining +) + +var/static/list/blacklisted_areas = typecacheof(list( + /area/space, + /area/mine, + //TETHER STUFF BELOW THIS + /area/tether/surfacebase/outside, + //GROUNDBASE STUFF BELOW THIS + /area/groundbase/unexplored/outdoors, + /area/maintenance/groundbase/level1, + /area/submap/groundbase/wilderness, + /area/groundbase/mining + )) + +var/global/list/SPECIALS = list( + /turf/space, + /area/shuttle, + /area/admin, + /area/arrival, + /area/centcom, + /area/asteroid, + /area/tdome, + /area/syndicate_station, + /area/wizard_station, + /area/prison, + /area/holodeck, + /area/turbolift + // /area/derelict //commented out, all hail derelict-rebuilders! +) + +var/global/list/area_or_turf_fail_types = typecacheof(list( + /turf/space, + /area/shuttle, + /area/admin, + /area/arrival, + /area/centcom, + /area/asteroid, + /area/tdome, + /area/syndicate_station, + /area/wizard_station, + /area/prison, + /area/holodeck, + /turf/simulated/wall/elevator, + /area/turbolift + )) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 16a8f71fee6..59aec7a8a23 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -64,36 +64,6 @@ var/list/areaColor_turfs = list() var/legend = 0 //If viewing wires or not. - //Allows you to build new areas in these areas easily. - var/static/list/BUILDABLE_AREA_TYPES = list( - /area/space, - /area/mine, - //TETHER STUFF BELOW THIS - /area/tether/surfacebase/outside, - //GROUNDBASE STUFF BELOW THIS - /area/groundbase/unexplored/outdoors, - /area/maintenance/groundbase/level1, - /area/submap/groundbase/wilderness, - /area/groundbase/mining - ) - //Forbids you from doing anything to these areas. - var/static/list/SPECIALS = list( - /turf/space, - /area/shuttle, - /area/admin, - /area/arrival, - /area/centcom, - /area/asteroid, - /area/tdome, - /area/syndicate_station, - /area/wizard_station, - /area/prison, - /area/holodeck, - /area/turbolift - // /area/derelict //commented out, all hail derelict-rebuilders! - ) - - /obj/item/areaeditor/attack_self(mob/user) //Convert this to TGUI sometime to disallow browser exploits. add_fingerprint(user) @@ -378,34 +348,7 @@ // WHATEVER YOU DO, DO NOT LEAVE THE LAST THING IN THE LIST BELOW HAVE A COMMA OR EVERYTHING EVER WILL BREAK // AND ENGINEERS ALL OVER THE WORLD WILL HARMBATON YOU // ENSURE THE LAST AREA OR TURF LISTED IS SIMPLY "/area/clownhideout" AND NOT "/area/clownhideout," OR YOU WILL IMMEDIATELY DIE - var/static/list/area_or_turf_fail_types = typecacheof(list( - /turf/space, - /area/shuttle, - /area/admin, - /area/arrival, - /area/centcom, - /area/asteroid, - /area/tdome, - /area/syndicate_station, - /area/wizard_station, - /area/prison, - /area/holodeck, - /turf/simulated/wall/elevator, - /area/turbolift - )) - // Ignore these areas and dont let people expand them. They can expand into them though - var/static/list/blacklisted_areas = typecacheof(list( - /area/space, - /area/mine, - //TETHER STUFF BELOW THIS - /area/tether/surfacebase/outside, - //GROUNDBASE STUFF BELOW THIS - /area/groundbase/unexplored/outdoors, - /area/maintenance/groundbase/level1, - /area/submap/groundbase/wilderness, - /area/groundbase/mining - )) var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) if(!turfs) @@ -468,35 +411,6 @@ // In essence, it does a few things: Ensure no blacklisted areas are nearby, get the nearby areas (to allow merging), and allow you to make a whole near area. /obj/item/areaeditor/proc/create_area_whole(mob/creator) //Gets the entire enclosed space and makes a new area out of it. Can overwrite old areas. - //TODO: Convert this and the one in create_area to a global list. - var/static/list/area_or_turf_fail_types = typecacheof(list( - /turf/space, - /area/shuttle, - /area/admin, - /area/arrival, - /area/centcom, - /area/asteroid, - /area/tdome, - /area/syndicate_station, - /area/wizard_station, - /area/prison, - /area/holodeck, - /turf/simulated/wall/elevator, - /area/turbolift - )) - - var/static/list/blacklisted_areas = typecacheof(list( - /area/space, - /area/mine, - //TETHER STUFF BELOW THIS - /area/tether/surfacebase/outside, - //GROUNDBASE STUFF BELOW THIS - /area/groundbase/unexplored/outdoors, - /area/maintenance/groundbase/level1, - /area/submap/groundbase/wilderness, - /area/groundbase/mining - )) - var/res = detect_room_ex(get_turf(creator), can_create_areas_into, area_or_turf_fail_types) if(!res) to_chat(creator, span_warning("There is an area forbidden from being edited here! Use the fine-tune area creator! (3x3)")) @@ -541,13 +455,19 @@ continue // No expanding powerless rooms etc areas[place.name] = place - var/area_choice = tgui_input_list(creator, "Choose an area to merge into the area you are currently standing on OR make a new area..", "Area Expansion", areas) + //They can select an area they want to turn their current area into. + var/area_choice = tgui_input_list(creator, "What area do you want to turn the area YOU ARE CURRENTLY STANDING IN to? Or do you want to make a new area?", "Area Expansion", areas) if(isnull(area_choice)) //They pressed cancel. to_chat(creator, "No changes made.") return area_choice = areas[area_choice] + var/confirm = tgui_alert(creator, "Are you sure you want to turn [oldA.name] into [area_choice]?", "READ CAREFULLY", list("No", "Yes")) + if(confirm == "No") + to_chat(creator, "No changes made.") + return + if(!isarea(area_choice)) //They chose "New Area" str = tgui_input_text(creator, "New area name", "Blueprint Editing", max_length = MAX_NAME_LEN) str = sanitize(str,MAX_NAME_LEN) @@ -564,7 +484,7 @@ newA.setup(str) newA.has_gravity = oldA.has_gravity else - newA = area_choice + newA = area_choice //They selected to turn the area they're standing on into the selected area. if(str) //New area, new name. newA.setup(str) @@ -586,10 +506,10 @@ ChangeArea(T, A) -/obj/item/areaeditor/proc/detect_room_ex(var/turf/first, var/allowedAreas = AREA_SPACE, list/forbiddenAreas) +/obj/item/areaeditor/proc/detect_room_ex(var/turf/first, var/allowedAreas = AREA_SPACE, var/list/forbiddenAreas = list(), var/visual) if(!istype(first)) return ROOM_ERR_LOLWAT - if(forbiddenAreas[first.loc.type] || forbiddenAreas[first.type]) //Is the area of the starting turf a banned area? Is the turf a banned area? + if(!visual && forbiddenAreas[first.loc.type] || forbiddenAreas[first.type]) //Is the area of the starting turf a banned area? Is the turf a banned area? return ROOM_ERR_FORBIDDEN var/list/turf/found = new var/list/turf/pending = list(first) @@ -602,7 +522,7 @@ var/turf/NT = get_step(T,dir) if (!isturf(NT) || (NT in found) || (NT in pending)) continue - if(forbiddenAreas[NT.loc.type]) + if(!visual && forbiddenAreas[NT.loc.type]) return ROOM_ERR_FORBIDDEN // We ask ZAS to determine if its airtight. Thats what matters anyway right? if(air_master.air_blocked(T, NT)) @@ -641,7 +561,7 @@ // If standing somewhere we can expand from, use expand perms, otherwise create var/canOverwrite = (get_area_type() & can_expand_areas_in) ? can_expand_areas_into : can_create_areas_into - var/res = detect_room_ex(get_turf(usr), canOverwrite) + var/res = detect_room_ex(get_turf(usr), canOverwrite, visual = 1) if(!istype(res, /list)) switch(res) if(ROOM_ERR_SPACE) From b5a51abd16ee4b5ca86d90568f9e05ae86cf3cfb Mon Sep 17 00:00:00 2001 From: "C.L" Date: Fri, 30 Sep 2022 23:00:15 -0400 Subject: [PATCH 05/16] Fixes lighting. Fixes lighting bug. Will apply to buildmode as well. --- code/game/objects/items/blueprints_vr.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 59aec7a8a23..1b9f60f91c3 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -393,9 +393,10 @@ else newA = area_choice - for(var/i in 1 to length(turfs)) + for(var/i in 1 to length(turfs)) //Fix lighting. Praise the lord. var/turf/thing = turfs[i] newA.contents += thing + thing.change_area(oldA, newA) set_area_machinery(newA, newA.name, oldA.name)// Change the name and area defines of all the machinery to the correct area. @@ -490,6 +491,12 @@ newA.setup(str) else newA.setup(newA.name) + + for(var/i in 1 to length(turfs)) //Fix lighting. Praise the lord. + var/turf/thing = turfs[i] + newA.contents += thing + thing.change_area(oldA, newA) + move_turfs_to_area(turfs, newA) newA.has_gravity = oldA.has_gravity set_area_machinery(newA, newA.name, oldA.name) From 10776a38536a6303f84c8175327e0d83f17ac74d Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 00:37:44 -0400 Subject: [PATCH 06/16] Removes comments made for elsewhere --- code/game/objects/items/blueprints_vr.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 1b9f60f91c3..dcc5485681f 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -344,12 +344,6 @@ return found_turfs /proc/create_area(mob/creator) - // Passed into the above proc as list/break_if_found - // WHATEVER YOU DO, DO NOT LEAVE THE LAST THING IN THE LIST BELOW HAVE A COMMA OR EVERYTHING EVER WILL BREAK - // AND ENGINEERS ALL OVER THE WORLD WILL HARMBATON YOU - // ENSURE THE LAST AREA OR TURF LISTED IS SIMPLY "/area/clownhideout" AND NOT "/area/clownhideout," OR YOU WILL IMMEDIATELY DIE - // Ignore these areas and dont let people expand them. They can expand into them though - var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) if(!turfs) to_chat(creator, span_warning("The new area must have a floor and not a part of a shuttle.")) From 29e354c55e32de9432c40036371a3cc90cf1cbc5 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 01:43:55 -0400 Subject: [PATCH 07/16] Fixes buildmode. - Allows for the creation of areas via build mode. - If an area is made via buildmode, the area will be fully lit. This is the only compromise I could do it as space areas worked fine when turned into new areas, but preexisting areas bugged out massively and were full dark (just like it currently is on live) --- code/game/objects/items/blueprints_vr.dm | 4 + code/modules/admin/verbs/buildmode.dm | 113 ++++++++++++++++++++++- 2 files changed, 113 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index dcc5485681f..b71dd323867 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -332,6 +332,10 @@ if(break_if_found[checkT.type] || break_if_found[checkT.loc.type]) return FALSE + //The below checks to make sure air can pass between the two turfs. If not, it can't be added to the area. + //This means walls can not be added to an area. The turf must first be added and then the wall. + //COMMENT THIS OUT IF YOU WANT THE BLUEPRINTS TO ADD WALLS TO AN AREA. + //BEGIN ESOTERIC BULLSHIT //log_debug("Origin: [origin.c_airblock(checkT)] SourceT: [sourceT.c_airblock(checkT)] 0=NB 1=AB 2=ZB, 3=B") if(origin.c_airblock(checkT)) //If everything breaks and it doesn't want to work, turn on the above debug and check this line. C.L. 0 = not blocked. diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 485cc88e226..28ec8b49997 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -128,7 +128,7 @@ to_chat(usr, "***********************************************************
\ Left Mouse Button on turf = Select as point A
\ Right Mouse Button on turf = Select as point B
\ - Right Mouse Button on buildmode button = Change floor/wall type
\ + Right Mouse Button on buildmode button = Change floor/wall type/area name
\ ***********************************************************") if(BUILDMODE_LADDER) @@ -226,6 +226,8 @@ var/floor_holder = /turf/simulated/floor/plating var/turf/coordA = null var/turf/coordB = null + var/area_enabled = 0 + var/area_name = "New Area" var/new_light_color = "#FFFFFF" var/new_light_range = 3 @@ -275,6 +277,18 @@ master.buildmode.valueholder = tgui_input_list(usr,"Enter variable value:", "Value", world) if(BUILDMODE_ROOM) + var/area_choice = tgui_alert(usr, "Would you like to generate a new area as well?","Room Builder", list("No", "Yes")) + switch(area_choice) + if("No") + area_enabled = 0 + if("Yes") + area_enabled = 1 + area_name = tgui_input_text(usr, "New area name", "Room Buildmode", max_length = MAX_NAME_LEN) + if(isnull(area_name)) + to_chat(usr, "You must enter a non-null name.") + area_enabled = 0 + return + area_name = sanitize(area_name,MAX_NAME_LEN) var/choice = tgui_alert(usr, "Would you like to change the floor or wall holders?","Room Builder", list("Floor", "Wall")) switch(choice) if("Floor") @@ -411,13 +425,19 @@ to_chat(user, "Defined [object] ([object.type]) as point B.") if(holder.buildmode.coordA && holder.buildmode.coordB) + if(isnull(holder.buildmode.area_name)) + to_chat(user, "ERROR: Insert area name before use.") + holder.buildmode.coordA = null + holder.buildmode.coordB = null + return to_chat(user, "A and B set, creating rectangle.") holder.buildmode.make_rectangle( holder.buildmode.coordA, holder.buildmode.coordB, holder.buildmode.wall_holder, - holder.buildmode.floor_holder - ) + holder.buildmode.floor_holder, + holder.buildmode.area_enabled, + holder.buildmode.area_name) holder.buildmode.coordA = null holder.buildmode.coordB = null @@ -651,7 +671,7 @@ result = default_path 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, var/area_enabled, var/area_name) if(!A || !B) // No coords return if(A.z != B.z) // Not same z-level @@ -685,6 +705,10 @@ var/high_bound_x = lower_left_corner.x + abs(width) var/high_bound_y = lower_left_corner.y + abs(height) + var/origin_x = lower_left_corner.x + round((abs(width)/2)) + var/origin_y = lower_left_corner.y + round((abs(height)/2)) + var/turf/origin + for(var/i = low_bound_x, i <= high_bound_x, i++) for(var/j = low_bound_y, j <= high_bound_y, j++) var/turf/T = locate(i, j, z_level) @@ -693,11 +717,92 @@ T.ChangeTurf(wall_type) else new wall_type(T) + else + if(T.x == origin_x && T.y == origin_y) //Get the middle of the square. + origin = T if(isturf(floor_type)) T.ChangeTurf(floor_type) else new floor_type(T) + log_debug("area_enabled is set to [area_enabled]") + if(area_enabled) //Let's try not to make a new area unless you got walls and a floor. + create_buildmode_area(area_name, origin) //Generates a new area. + +/proc/create_buildmode_area(var/area_name, var/turf/origin) + var/turfs = detect_room_buildmode(origin) + + var/area/newA + var/area/oldA = get_area(origin) + var/str = area_name + str = sanitize(str,MAX_NAME_LEN) + if(!str || !length(str)) //cancel + return + newA = new /area/buildmode + newA.dynamic_lighting = FALSE // Without this it's pitch black if you build anywhere but space. + newA.luminosity = TRUE // Without this it's pitch black if you build anywhere but space. + newA.setup(str) + newA.has_gravity = oldA.has_gravity + + for(var/i in 1 to length(turfs)) //Fix lighting. Praise the lord. + var/turf/thing = turfs[i] + newA.contents += thing + thing.change_area(oldA, newA) + + set_area_machinery(newA, newA.name, oldA.name)// Change the name and area defines of all the machinery to the correct area. + oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. + return TRUE + +/proc/detect_room_buildmode(var/turf/first, var/allowedAreas = AREA_SPACE) + if(!istype(first)) + return + var/list/turf/found = new + var/list/turf/pending = list(first) + while(pending.len) + var/turf/T = pending[1] + pending -= T + for (var/dir in cardinal) + var/turf/NT = get_step(T,dir) + if (!isturf(NT) || (NT in found) || (NT in pending)) + continue + // We ask ZAS to determine if its airtight. Thats what matters anyway right? + if(air_master.air_blocked(T, NT)) + // Okay thats the edge of the room + if(get_area_type_buildmode(NT.loc) == AREA_SPACE && air_master.air_blocked(NT, NT)) + found += NT // So we include walls/doors not already in any area + continue + if (istype(NT, /turf/space)) + return //omg hull breach we all going to die here + if (istype(NT, /turf/simulated/shuttle)) + return // Unsure why this, but was in old code. Trusting for now. + if (NT.loc != first.loc && !(get_area_type_buildmode(NT.loc) & allowedAreas)) + // Edge of a protected area. Lets stop here... + continue + if (!istype(NT, /turf/simulated)) + // Great, unsimulated... eh, just stop searching here + continue + // Okay, NT looks promising, lets continue the search there! + pending += NT + found += T + // end while + return found + +/proc/get_area_type_buildmode(area/A) + if(A.outdoors) + return AREA_SPACE + + for (var/type in BUILDABLE_AREA_TYPES) + if ( istype(A,type) ) + return AREA_SPACE + + for (var/type in SPECIALS) + if ( istype(A,type) ) + return AREA_SPECIAL + return AREA_STATION + +/area/buildmode + dynamic_lighting = FALSE + luminosity = FALSE #undef BUILDMODE_BASIC #undef BUILDMODE_ADVANCED From edb72f2fc7e4045ece987d8ecbcb6425baea156f Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 01:48:44 -0400 Subject: [PATCH 08/16] travis --- code/__defines/turfs.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/__defines/turfs.dm b/code/__defines/turfs.dm index 421bfc258f4..fe327cd6327 100644 --- a/code/__defines/turfs.dm +++ b/code/__defines/turfs.dm @@ -31,8 +31,6 @@ //supposedly the fastest way to do this according to https://gist.github.com/Giacom/be635398926bb463b42a ///Returns a list of turf in a square -#define RANGE_TURFS(RADIUS, CENTER) \ - RECT_TURFS(RADIUS, RADIUS, CENTER) #define RECT_TURFS(H_RADIUS, V_RADIUS, CENTER) \ block( \ From 8ad793293cd17329eb6d1d07fcba86bd8618454d Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 01:54:08 -0400 Subject: [PATCH 09/16] Reenables adding walls via blueprints. I forgot to reenable this. Left a comment noting down to uncomment it if people want to block walls from being added to areas. --- code/game/objects/items/blueprints_vr.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index b71dd323867..953adbdc1ee 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -334,12 +334,15 @@ //The below checks to make sure air can pass between the two turfs. If not, it can't be added to the area. //This means walls can not be added to an area. The turf must first be added and then the wall. - //COMMENT THIS OUT IF YOU WANT THE BLUEPRINTS TO ADD WALLS TO AN AREA. + //UNCOMMENT THIS IF YOU WANT THE BLUEPRINTS TO NOT ADD WALLS TO AN AREA. + //I personally think adding walls to an area is a big deal, so this is commented out. //BEGIN ESOTERIC BULLSHIT //log_debug("Origin: [origin.c_airblock(checkT)] SourceT: [sourceT.c_airblock(checkT)] 0=NB 1=AB 2=ZB, 3=B") + /* if(origin.c_airblock(checkT)) //If everything breaks and it doesn't want to work, turn on the above debug and check this line. C.L. 0 = not blocked. continue + */ //END ESOTERIC BULLSHIT found_turfs += checkT // Since checkT is connected, add it to the list to be processed From b103587ec6c110f2b14ada4b2df106fba86269d3 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 02:04:59 -0400 Subject: [PATCH 10/16] Replaces references to blueprints. Old blueprints are gone now. --- code/_helpers/global_lists_vr.dm | 2 +- code/game/gamemodes/newobjective.dm | 2 +- code/game/gamemodes/objective.dm | 2 +- .../structures/crates_lockers/closets/secure/engineering.dm | 2 +- code/modules/flufftext/Hallucination.dm | 2 +- code/modules/vore/eating/digest_act_vr.dm | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index f97919ddaf1..48b1949a86e 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -43,7 +43,7 @@ var/global/list/item_vore_blacklist = list( /obj/item/weapon/gun, /obj/item/weapon/pinpointer, /obj/item/clothing/shoes/magboots, - /obj/item/blueprints, + /obj/item/areaeditor/blueprints, /obj/item/clothing/head/helmet/space, /obj/item/weapon/disk/nuclear, /obj/item/clothing/suit/storage/hooded/wintercoat/roiz) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index c52e51d5b53..1b3a1147a1e 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -749,7 +749,7 @@ datum blueprints - steal_target = /obj/item/blueprints + steal_target = /obj/item/areaeditor/blueprints explanation_text = "Steal the station's blueprints." weight = 20 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 9b6b532f964..2818e3e7b4d 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -431,7 +431,7 @@ var/global/list/all_objectives = list() "a site manager's jumpsuit" = /obj/item/clothing/under/rank/captain, "a functional AI" = /obj/item/device/aicard, "a pair of magboots" = /obj/item/clothing/shoes/magboots, - "the station blueprints" = /obj/item/blueprints, + "the station blueprints" = /obj/item/areaeditor/blueprints, "a nasa voidsuit" = /obj/item/clothing/suit/space/void, "28 moles of phoron (full tank)" = /obj/item/weapon/tank, "a sample of slime extract" = /obj/item/slime_extract, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 1c60a1b5c52..53dfbe471e8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -5,7 +5,7 @@ starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, - /obj/item/blueprints, + /obj/item/areaeditor/blueprints, ///obj/item/clamp, //VOREStation Removal: without leaks those are pointless, ///obj/item/clamp, //VOREStation Removal: without leaks those are pointless, /obj/item/clothing/under/rank/chief_engineer, diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 963b869439e..e4fc9ac89ca 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -347,7 +347,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite /obj/item/toy/syndicateballoon, /obj/item/weapon/gun/energy/captain,\ /obj/item/weapon/hand_tele, /obj/item/weapon/rcd, /obj/item/weapon/tank/jetpack,\ /obj/item/clothing/under/rank/captain, /obj/item/device/aicard,\ - /obj/item/clothing/shoes/magboots, /obj/item/blueprints, /obj/item/weapon/disk/nuclear,\ + /obj/item/clothing/shoes/magboots, /obj/item/areaeditor/blueprints, /obj/item/weapon/disk/nuclear,\ /obj/item/clothing/suit/space/void, /obj/item/weapon/tank) /proc/fake_attack(var/mob/living/target) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 9e8851bdfb0..1979fc925c2 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -82,7 +82,7 @@ return FALSE /obj/item/weapon/pinpointer/digest_act(var/atom/movable/item_storage = null) return FALSE -/obj/item/blueprints/digest_act(var/atom/movable/item_storage = null) +/obj/item/areaeditor/blueprints/digest_act(var/atom/movable/item_storage = null) return FALSE /obj/item/weapon/disk/nuclear/digest_act(var/atom/movable/item_storage = null) return FALSE From 6eb311dc1d237ee07a5009279b33ff2ce4b3e62a Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 21:04:47 -0400 Subject: [PATCH 11/16] More changes - Makes a special wire reader tool that the CE starts with - Makes CE blueprints able to add charges to Engineer's blueprints. - Makes it so CE blueprints don't have the wire legend. - Adds Engineer's blueprints to the Engineer's lockers. - Adds Engineer's blueprints. - Makes it so you can't make a new area in a non 'BUILDABLE_AREA_TYPES' area without CE blueprints. (See global_lists_vr). --- code/game/objects/items/blueprints_vr.dm | 194 ++++++++++++++---- .../closets/secure/engineering.dm | 4 +- 2 files changed, 161 insertions(+), 37 deletions(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 953adbdc1ee..d8ce2021bfc 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -47,7 +47,11 @@ in_use = FALSE preserve_item = 1 var/uses_charges = 0 // If the area editor has limited uses. - var/charges = 0 // The amount of uses the area editor has. + var/initial_charges = 10 + var/charges = 10 // The amount of uses the area editor has. + var/station_master = 1 // If the areaeditor can add charges to others. + var/wire_schematics = 0 // If the areaeditor can see wires. + var/can_override = 0 // If you want the areaeditor to override the 'Don't make a new area where one already exists' logic. Only given to CE blueprints. var/can_create_areas_in = AREA_SPACE // Must be standing in space to create var/can_create_areas_into = AREA_SPACE // New areas will only overwrite space area turfs. @@ -64,8 +68,38 @@ var/list/areaColor_turfs = list() var/legend = 0 //If viewing wires or not. +/obj/item/areaeditor/examine(mob/user) + . =..() + if(uses_charges && !isnull(charges)) + . += "There appears to be enough space for a total of [charges] more changes!" + if(!charges) + . += "There seems to be no more room for any more edits!" -/obj/item/areaeditor/attack_self(mob/user) //Convert this to TGUI sometime to disallow browser exploits. +/obj/item/areaeditor/attackby(obj/item/W, mob/user, params) + if(uses_charges && (charges < initial_charges) && istype(W, /obj/item/areaeditor)) //Do we have a reason to add charges? And is it something that COULD add charges? + var/missing_charges = initial_charges-charges + var/obj/item/areaeditor/blueprint = W + if(blueprint.station_master) //Master can refill. + charges = initial_charges + to_chat(user, span_notice("You add some more writing material to the [src] with the [blueprint]!")) + return + else if(blueprint.uses_charges && blueprint.charges) //Getting from another with limited charges. + var/to_add = tgui_input_number(user, "How many charges do you want to add to the [src]?", "[blueprint]", missing_charges) + if(!isnull(to_add) && blueprint.charges >= to_add) + to_chat(user, span_notice("You add some more writing material to the [src] with the [blueprint]!")) + blueprint.charges -= to_add + charges += to_add + return + + else + to_chat(user, span_notice("You decide not to add any more material to the [src]")) + return + else if(!blueprint.uses_charges || !blueprint.charges) // The item it's being hit by doesn't use charges OR doesn't have any charges. + to_chat(user, span_warning("You can't add find any suitable material to add from the [blueprint]!")) + else + ..() + +/obj/item/areaeditor/attack_self(mob/user) //Convert this to TGUI some time. add_fingerprint(user) . = "[src] \

[station_name()] [src.name]

" @@ -75,9 +109,15 @@ if(AREA_SPECIAL) . += "

This place is not noted on the [src.name].

" return //If we're in a special area, no modifying. - . += "

Create or modify an existing area (3x3 space)

" - . += "

Create new area or merge two areas. (Whole Room)

" - . += "There is a note on the corner of the [src.name]: Use 3x3 for fine-tuning and including walls into your area!" + if(!uses_charges || (uses_charges && charges)) //No charges OR it has charges available. + . += "

Create or modify an existing area (3x3 space) (1 Charge)

" + . += "

Create new area or merge two areas. (Whole Room.) (5 Charges)

" + . += "There is a note on the corner of the [src.name]: Use 3x3 for fine-tuning and including walls into your area!" + if(uses_charges) + if(!charges) //We're out! + . += "Your [src.name] has been completely filled! You would need to get some extra blueprint paper from the CE's blueprints to expand further!" + else + . += "Your [src.name] seems like it has enough room for [charges] more edits!" /obj/item/areaeditor/Topic(href, href_list) @@ -93,13 +133,13 @@ to_chat(usr, span_warning("You cannot edit restricted areas.")) return in_use = TRUE - create_area(usr) + create_area(usr, src) in_use = FALSE if(href_list["create_area_whole"]) if(in_use) return in_use = TRUE - var/area/A = create_area_whole(usr) + var/area/A = create_area_whole(usr, src) if(A && (A.flags & BLUE_SHIELDED)) to_chat(usr, span_warning("You cannot edit restricted areas.")) in_use = FALSE @@ -107,12 +147,82 @@ in_use = FALSE updateUsrDialog() + + + +//Station Wire Tool. +/obj/item/wire_reader //Not really a blueprint, but it's included here as such. + name = "wire schematics" + desc = "A blueprint detailing the various internal wiring of machinery around the station." + icon = 'icons/obj/items.dmi' + icon_state = "blueprints" + attack_verb = list("attacked", "bapped", "hit") + preserve_item = 1 + var/legend = 1 + +/obj/item/wire_reader/attack_self(mob/user) //Convert this to TGUI some time. + add_fingerprint(user) + . = "[src] \ +

[station_name()] [src.name]

" + if(legend == TRUE) + . += view_station_wire_devices(user); + else + //legend is a wireset + . += "<< Back" + . += view_station_wire_set(user, legend) + + var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) + popup.set_content(.) + popup.open() + onclose(user, "blueprints") + +/obj/item/wire_reader/Topic(href, href_list) + if(..()) + return + if(href_list["view_wireset"]) + legend = href_list["view_wireset"]; + if(href_list["view_legend"]) + legend = TRUE + attack_self(usr) + +/obj/item/wire_reader/proc/view_station_wire_devices(mob/user) + var/message = "
You examine the wire legend.
" + for(var/wireset in GLOB.wire_color_directory) + //if(istype(wireset,/datum/wires/grid_checker))//Uncomment this in if you want the grid checker minigame to not be revealed here. + // continue + message += "
[GLOB.wire_name_directory[wireset]]" + message += "

" + return message + +/obj/item/wire_reader/proc/view_station_wire_set(mob/user, wireset) + //for some reason you can't use wireset directly as a derefencer so this is the next best :/ + for(var/device in GLOB.wire_color_directory) + if("[device]" == wireset) //I know... don't change it... + var/message = "

[GLOB.wire_name_directory[device]]:" + for(var/Col in GLOB.wire_color_directory[device]) + var/wire_name = GLOB.wire_color_directory[device][Col] + if(!findtext(wire_name, WIRE_DUD_PREFIX)) //don't show duds + message += "

[Col]: [wire_name]

" + message += "

" + return message + return "" + //Station blueprints!!! /obj/item/areaeditor/blueprints name = "station blueprints" desc = "Blueprints of the station. There is a \"Classified\" stamp and several coffee stains on it." - var/list/image/showing = list() - var/client/viewing + //var/list/image/showing = list() //For viewing pipes. Unused. + //var/client/viewing //For viewing pipes. Unused. + can_override = 1 //In case there is a reason for building in a non-blacklisted, non-buildable area. + +/obj/item/areaeditor/blueprints/engineers + name = "writing blueprints" + desc = "A piece of paper that allows for expansion of the station and creaiton of new areas. There is a \"For Official Use Only\" stamp on it. NOT to be mistaken with the staion blueprints." + station_master = 0 + uses_charges = 1 + can_override = 0 + + /obj/item/areaeditor/blueprints/Destroy() @@ -126,13 +236,9 @@ if(!legend) if(get_area_type() == AREA_STATION) . += "

According to \the [src], you are now in \"[html_encode(A.name)]\".

" - . += "

Change area name

" - . += "

View wire colour legend

" - //if(!viewing) - // . += "

View structural data

" - //else - // . += "

Refresh structural data

" - // . += "

Hide structural data

" + . += "

Change area name

" //You can change the name without charges. + if(wire_schematics) + . += "

View wire colour legend

" else if(legend == TRUE) . += "<< Back" @@ -161,19 +267,12 @@ if(href_list["exit_legend"]) legend = FALSE; if(href_list["view_legend"]) - legend = TRUE; + if(wire_schematics) //No href hacks allow for you, my friend! + legend = TRUE; if(href_list["view_wireset"]) - legend = href_list["view_wireset"]; - /* - if(href_list["view_blueprints"]) - set_viewer(usr, span_notice("You flip the blueprints over to view the complex information diagram.")) - if(href_list["hide_blueprints"]) - clear_viewer(usr,span_notice("You flip the blueprints over to view the simple information diagram.")) - if(href_list["refresh"]) - clear_viewer(usr) - set_viewer(usr) - */ - attack_self(usr) //this is not the proper way, but neither of the old update procs work! it's too ancient and I'm tired shush. + if(wire_schematics) //No href hacks allow for you, my friend! + legend = href_list["view_wireset"]; + attack_self(usr) //Code for viewing pipes or whatnot. Think t-ray scanner. @@ -350,7 +449,12 @@ found_turfs += origin //If this isn't done, it just adds the 8 tiles around the user. return found_turfs -/proc/create_area(mob/creator) +/proc/create_area(mob/creator, var/obj/item/areaeditor/AO) + if(AO && istype(AO,/obj/item/areaeditor)) + if(AO.uses_charges && AO.charges < 1) + to_chat(creator, span_warning("You need more paper before you can even think of editing this area!")) + return + var/list/turfs = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) if(!turfs) to_chat(creator, span_warning("The new area must have a floor and not a part of a shuttle.")) @@ -403,6 +507,9 @@ set_area_machinery(newA, newA.name, oldA.name)// Change the name and area defines of all the machinery to the correct area. oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) + if(AO && istype(AO,/obj/item/areaeditor)) + if(AO.uses_charges) + AO.charges -= 1 return TRUE @@ -411,7 +518,10 @@ // OLD CODE. DON'T TOUCH OR 100 RABID SQUIRRELS WILL DEVOUR YOU. // I say old code, but it truly isn't. It's a bastardization of the new create_area code and the old create_area code. // In essence, it does a few things: Ensure no blacklisted areas are nearby, get the nearby areas (to allow merging), and allow you to make a whole near area. -/obj/item/areaeditor/proc/create_area_whole(mob/creator) //Gets the entire enclosed space and makes a new area out of it. Can overwrite old areas. +/obj/item/areaeditor/proc/create_area_whole(mob/creator, var/override = 0) //Gets the entire enclosed space and makes a new area out of it. Can overwrite old areas. + if(uses_charges && charges < 5) + to_chat(creator, span_warning("You need more paper before you can even think of editing this area!")) + return var/res = detect_room_ex(get_turf(creator), can_create_areas_into, area_or_turf_fail_types) if(!res) @@ -438,6 +548,7 @@ var/area/newA //The new area var/area/oldA = get_area(get_turf(creator)) //The old area (area currently standing in) var/str //What the new area is named. + var/can_make_new_area = 1 //If they can make a new area here or not. var/list/nearby_turfs_to_check = detect_room(get_turf(creator), area_or_turf_fail_types, BP_MAX_ROOM_SIZE*2) //Get the nearby areas. @@ -453,6 +564,8 @@ if(blacklisted_areas[place.type]) if(!creator.lastarea != place) //Stops them from merging a blacklisted area to make it larger. Allows them to merge a blacklisted area into an allowed area. (Expansion!) continue + if(!BUILDABLE_AREA_TYPES[place.type]) //TODOTODOTODO + can_make_new_area = 0 if(!place.requires_power || (place.flags & BLUE_SHIELDED)) continue // No expanding powerless rooms etc areas[place.name] = place @@ -465,12 +578,11 @@ area_choice = areas[area_choice] - var/confirm = tgui_alert(creator, "Are you sure you want to turn [oldA.name] into [area_choice]?", "READ CAREFULLY", list("No", "Yes")) - if(confirm == "No") - to_chat(creator, "No changes made.") - return if(!isarea(area_choice)) //They chose "New Area" + if(!can_make_new_area && !can_override) + to_chat(creator, "Making a new area here would be meaningless. Renaming it would be a better option.") + return str = tgui_input_text(creator, "New area name", "Blueprint Editing", max_length = MAX_NAME_LEN) str = sanitize(str,MAX_NAME_LEN) if(!str || !length(str)) //cancel @@ -482,10 +594,20 @@ if(A.name == str) to_chat(creator, "An area in the world alreay has this name.") return + + var/confirm = tgui_alert(creator, "Are you sure you want to change [oldA.name] into a new area named [str]?", "READ CAREFULLY", list("No", "Yes")) + if(confirm == "No") + to_chat(creator, "No changes made.") + return + newA = new area_choice newA.setup(str) newA.has_gravity = oldA.has_gravity else + var/confirm = tgui_alert(creator, "Are you sure you want to change [oldA.name] into [area_choice]?", "READ CAREFULLY", list("No", "Yes")) + if(confirm == "No") + to_chat(creator, "No changes made.") + return newA = area_choice //They selected to turn the area they're standing on into the selected area. if(str) //New area, new name. @@ -503,7 +625,7 @@ set_area_machinery(newA, newA.name, oldA.name) oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) - + charges -= 5 spawn(5) interact() @@ -620,4 +742,4 @@ usr.client.images.Remove(i) -#undef BP_MAX_ROOM_SIZE \ No newline at end of file +#undef BP_MAX_ROOM_SIZE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 53dfbe471e8..7aa869ac15f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -6,6 +6,7 @@ starts_with = list( /obj/item/clothing/accessory/storage/brown_vest, /obj/item/areaeditor/blueprints, + /obj/item/wire_reader, ///obj/item/clamp, //VOREStation Removal: without leaks those are pointless, ///obj/item/clamp, //VOREStation Removal: without leaks those are pointless, /obj/item/clothing/under/rank/chief_engineer, @@ -99,7 +100,8 @@ /obj/item/clothing/shoes/boots/winter/engineering, /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/storage/belt/utility, //VOREStation Add - /obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add + /obj/item/weapon/reagent_containers/spray/windowsealant, //VOREStation Add + /obj/item/areaeditor/blueprints/engineers) //VOREStation Add /obj/structure/closet/secure_closet/engineering_personal/Initialize() if(prob(50)) From 0f7f886ae148d3bb45aad0f60a246d2b0d5d55c0 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 23:27:49 -0400 Subject: [PATCH 12/16] Adds innate ability for people to create small areas With paper. Also adds two Southern Cross areas to the lists. Also makes some global procs for ultra-quick area generation that anything can use and badmins can call. https://i.imgur.com/wnm3joF.png Removes a debug message --- code/_helpers/global_lists_vr.dm | 17 ++- code/game/objects/items/blueprints_vr.dm | 163 ++++++++++++++++++++++- code/modules/admin/verbs/buildmode.dm | 1 - 3 files changed, 178 insertions(+), 3 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 48b1949a86e..577fb7cabce 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -828,15 +828,28 @@ var/global/list/xenobio_rainbow_extracts = list( /obj/item/slime_extract/rainbow = 1) -// BLUEPRINT STUFF BELOW HERE +// AREA GENERATION AND BLUEPRINT STUFF BELOW HERE // typecacheof(list) and list() are two completely separate things, don't break! // WHATEVER YOU DO, DO NOT LEAVE THE LAST THING IN THE LIST BELOW HAVE A COMMA OR EVERYTHING EVER WILL BREAK // ENSURE THE LAST AREA OR TURF LISTED IS SIMPLY "/area/clownhideout" AND NOT "/area/clownhideout," OR YOU WILL IMMEDIATELY DIE +// These lists are, obviously, unfinished. + +// ALLOWING BUILDING IN AN AREA: +// If you want someone to be able to build a new area in a place, add the area to the 'BUILDABLE_AREA_TYPES' and 'blacklisted_areas' +// BUILDABLE_AREA_TYPES means they can build an area there. The blacklisted_areas means they CAN NOT EXPAND that area. No making space bigger! + +// DISALLOW BUILDING/AREA MANIPULATION IN AN AREA (OR A TURF TYPE): +// Likewise, if you want someone to never ever EVER be able to do anything area generation/expansion related to an area +// Then add it to SPECIALS and area_or_turf_fail_types + +// If you want someone to var/global/list/BUILDABLE_AREA_TYPES = list( /area/space, /area/mine, +// /area/surface/outside, //SC +// /area/surface/cave, //SC //TETHER STUFF BELOW THIS /area/tether/surfacebase/outside, //GROUNDBASE STUFF BELOW THIS @@ -849,6 +862,8 @@ var/global/list/BUILDABLE_AREA_TYPES = list( var/static/list/blacklisted_areas = typecacheof(list( /area/space, /area/mine, +// /area/surface/outside, //SC +// /area/surface/cave, //SC //TETHER STUFF BELOW THIS /area/tether/surfacebase/outside, //GROUNDBASE STUFF BELOW THIS diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index d8ce2021bfc..28d577d989d 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -631,7 +631,7 @@ interact() return -/obj/item/areaeditor/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) +/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A) for(var/T in turfs) ChangeArea(T, A) @@ -742,4 +742,165 @@ usr.client.images.Remove(i) + + + + + + + + + +//GLOBAL VERB FOR PAPER TO ENABLE ANYONE TO MAKE AN AREA IN BUILDABLE AREAS. +//THIS IS 70 TILES. ANYTHING LARGER SHOULD USE ACTUAL BLUEPRINTS. + +/obj/item/weapon/paper + var/created_area = 0 + var/area_cooldown = 0 + +/obj/item/weapon/paper/verb/create_area() + set name = "Create Area" + set category = "Object" + set src in usr + + if(created_area) + to_chat(usr, "This paper has already been used to create an area.") + return + + if(usr.stat || world.time < area_cooldown) + to_chat(usr, "You recently used this paper to try to create an area. Wait one minute before using it again.") + return + + area_cooldown = world.time + 600 //Anti spam. + + create_new_area(usr) + add_fingerprint(usr) + return + +proc/get_new_area_type(area/A) //1 = can build in. 0 = can not build in. + if (!A) + A = get_area(usr) + if(A.outdoors) //ALWAYS able to build outdoors. This means if it's missed in BUILDABLE_AREA_TYPES it's fine. + return 1 + + for (var/type in BUILDABLE_AREA_TYPES) //This works well. + if ( istype(A,type) ) + return 1 + + for (var/type in SPECIALS) + if ( istype(A,type) ) + return 0 + return 0 //If it's not a buildable area, don't let them build in it. + + +/proc/detect_new_area(var/turf/first, var/user) //Heavily simplified version for creating an area yourself. + if(!istype(first)) //Not on a turf. + to_chat(usr, "") + return + if(get_new_area_type(first.loc) == 1) //Are they in an area they can build? I tried to do this BUILDABLE_AREA_TYPES[first.loc.type] but it refused. + var/list/turf/found = new + var/list/turf/pending = list(first) + while(pending.len) + if (found.len+pending.len > 70) + return 1 //TOOLARGE + var/turf/T = pending[1] + pending -= T + for (var/dir in cardinal) + var/turf/NT = get_step(T,dir) + if (!isturf(NT) || (NT in found) || (NT in pending)) + continue + if(!get_new_area_type(NT.loc) == 1) //The contains somewhere that is NOT a buildable area. + return 3 //NOT A BUILDABLE AREA + + if(air_master.air_blocked(T, NT)) //Is the room airtight? + // Okay thats the edge of the room + if(get_new_area_type(NT.loc) == 1 && air_master.air_blocked(NT, NT)) + found += NT // So we include walls/doors not already in any area + continue + if (istype(NT, /turf/space)) + return 2 //SPACE + if (istype(NT, /turf/simulated/shuttle)) + return 2 //SPACE + if (NT.loc != first.loc && !(get_new_area_type(NT.loc) & 1)) + // Edge of a protected area. Lets stop here... + continue + if (!istype(NT, /turf/simulated)) + // Great, unsimulated... eh, just stop searching here + continue + // Okay, NT looks promising, lets continue the search there! + pending += NT + found += T + // end while + return found + else + return 3 + +/proc/create_new_area(mob/creator) //Heavily simplified version of the blueprint version. + var/res = detect_new_area(get_turf(creator), creator) + if(!res) + to_chat(creator, span_warning("Something went wrong.")) + return + + if(!istype(res,/list)) + switch(res) + if(1) + to_chat(creator, "The new area too large! You can only have an area that is up to 70 tiles.") + return + if(2) + to_chat(creator, "The new area must be completely airtight and not be part of a shuttle!") + return + if(3) + to_chat(creator, "There is an area not permitted to be built in somewhere in the room!") + return + else + to_chat(creator, "Error! Please notify administration!") + return + var/list/turf/turfs = res + + var/area/newA //The new area + var/area/oldA = get_area(get_turf(creator)) //The old area (area currently standing in) + var/str //What the new area is named. + + var/list/nearby_turfs_to_check = detect_room(get_turf(creator), area_or_turf_fail_types, 70) //Get the nearby areas. + + if(!nearby_turfs_to_check) + to_chat(creator, span_warning("The new area must have a floor and not a part of a shuttle.")) + return + if(length(turfs) > 70) //Sanity + to_chat(creator, span_warning("The room you're in is too big. It can only be 70 tiles in size, excluding walls.")) + return + + //They can select an area they want to turn their current area into. + str = sanitizeSafe(tgui_input_text(usr, "What would you like to name the area?", "Area Name", null, MAX_NAME_LEN), MAX_NAME_LEN) + if(isnull(str)) //They pressed cancel. + to_chat(creator, "No new area made. Cancelling.") + return + if(!str || !length(str)) //sanity + to_chat(creator, "No new area made. Cancelling.") + return + if(length(str) > MAX_NAME_LEN) + to_chat(creator, "Name too long.") + return + for(var/area/A in world) //Check to make sure we're not making a duplicate name. Sanity. + if(A.name == str) + to_chat(creator, "An area in the world alreay has this name.") + return + newA = new /area + newA.setup(str) + newA.has_gravity = oldA.has_gravity + newA.setup(str) + + for(var/i in 1 to length(turfs)) //Fix lighting. Praise the lord. + var/turf/thing = turfs[i] + newA.contents += thing + thing.change_area(oldA, newA) + + move_turfs_to_area(turfs, newA) + newA.has_gravity = oldA.has_gravity + set_area_machinery(newA, newA.name, oldA.name) + oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. + to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) + return + + #undef BP_MAX_ROOM_SIZE diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm index 28ec8b49997..fc46bd8f16e 100644 --- a/code/modules/admin/verbs/buildmode.dm +++ b/code/modules/admin/verbs/buildmode.dm @@ -725,7 +725,6 @@ T.ChangeTurf(floor_type) else new floor_type(T) - log_debug("area_enabled is set to [area_enabled]") if(area_enabled) //Let's try not to make a new area unless you got walls and a floor. create_buildmode_area(area_name, origin) //Generates a new area. From 1cae91ff059cf95993d5726bd3339acb4101fc6f Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 23:30:11 -0400 Subject: [PATCH 13/16] forgot a / --- code/game/objects/items/blueprints_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 28d577d989d..40686cb7b43 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -777,7 +777,7 @@ add_fingerprint(usr) return -proc/get_new_area_type(area/A) //1 = can build in. 0 = can not build in. +/proc/get_new_area_type(area/A) //1 = can build in. 0 = can not build in. if (!A) A = get_area(usr) if(A.outdoors) //ALWAYS able to build outdoors. This means if it's missed in BUILDABLE_AREA_TYPES it's fine. From 9f429580db7866128194aa675c347846696d62e7 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sat, 1 Oct 2022 23:44:28 -0400 Subject: [PATCH 14/16] Admin logging. Tells admins when a new area is created. Doesn't tell admins if an area is being expanded, but still logs it. (You're welcome!) --- code/game/objects/items/blueprints_vr.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 40686cb7b43..ad8fac64ce4 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -463,6 +463,7 @@ to_chat(creator, span_warning("The room you're in is too big. It is [length(turfs) >= BP_MAX_ROOM_SIZE *2 ? "more than 100" : ((length(turfs) / BP_MAX_ROOM_SIZE)-1)*100]% larger than allowed.")) return var/list/areas = list("New Area" = /area) + var/annoy_admins = 0 for(var/i in 1 to length(turfs)) var/area/place = get_area(turfs[i]) @@ -492,6 +493,7 @@ if(A.name == str) to_chat(creator, "An area in the world alreay has this name.") return + annoy_admins = 1 //They just made a new area entirely. newA = new area_choice newA.setup(str) newA.has_gravity = oldA.has_gravity @@ -507,6 +509,9 @@ set_area_machinery(newA, newA.name, oldA.name)// Change the name and area defines of all the machinery to the correct area. oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) + if(annoy_admins) + message_admins("[key_name(creator, creator.client)] just made a new area called [newA.name] ](?) at ([creator.x],[creator.y],[creator.z] - JMP)",0,1) + log_game("[key_name(creator, creator.client)] just made a new area called [newA.name]") if(AO && istype(AO,/obj/item/areaeditor)) if(AO.uses_charges) AO.charges -= 1 @@ -625,6 +630,8 @@ set_area_machinery(newA, newA.name, oldA.name) oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) + message_admins("[key_name(creator, creator.client)] just made a new area called [newA.name] ](?) at ([creator.x],[creator.y],[creator.z] - JMP)",0,1) + log_game("[key_name(creator, creator.client)] just made a new area called [newA.name]") charges -= 5 spawn(5) @@ -900,6 +907,9 @@ set_area_machinery(newA, newA.name, oldA.name) oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it. to_chat(creator, span_notice("You have created a new area, named [newA.name]. It is now weather proof, and constructing an APC will allow it to be powered.")) + message_admins("[key_name(creator, creator.client)] just made a new area called [newA.name] ](?) at ([creator.x],[creator.y],[creator.z] - JMP)",0,1) + log_game("[key_name(creator, creator.client)] just made a new area called [newA.name]") + return From d99dd77c6e9692de04a5eaaaf3be8884dded2983 Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sun, 2 Oct 2022 01:20:37 -0400 Subject: [PATCH 15/16] Adds more blacklist/whitelist areas. --- code/_helpers/global_lists_vr.dm | 26 ++++++++++++++++++------ code/game/objects/items/blueprints_vr.dm | 7 +++---- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 577fb7cabce..513154dafdb 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -850,13 +850,14 @@ var/global/list/BUILDABLE_AREA_TYPES = list( /area/mine, // /area/surface/outside, //SC // /area/surface/cave, //SC - //TETHER STUFF BELOW THIS /area/tether/surfacebase/outside, - //GROUNDBASE STUFF BELOW THIS /area/groundbase/unexplored/outdoors, /area/maintenance/groundbase/level1, /area/submap/groundbase/wilderness, - /area/groundbase/mining + /area/groundbase/mining, + /area/offmap/aerostat/surface, + /area/tether_away/beach, + /area/tether_away/cave, ) var/static/list/blacklisted_areas = typecacheof(list( @@ -870,7 +871,10 @@ var/static/list/blacklisted_areas = typecacheof(list( /area/groundbase/unexplored/outdoors, /area/maintenance/groundbase/level1, /area/submap/groundbase/wilderness, - /area/groundbase/mining + /area/groundbase/mining, + /area/offmap/aerostat/surface, + /area/tether_away/beach, + /area/tether_away/cave )) var/global/list/SPECIALS = list( @@ -885,7 +889,12 @@ var/global/list/SPECIALS = list( /area/wizard_station, /area/prison, /area/holodeck, - /area/turbolift + /area/turbolift, + /area/tether/elevator, + /turf/unsimulated/wall/planetary, + /area/submap/virgo2, + /area/submap/event, + /area/submap/casino_event // /area/derelict //commented out, all hail derelict-rebuilders! ) @@ -902,5 +911,10 @@ var/global/list/area_or_turf_fail_types = typecacheof(list( /area/prison, /area/holodeck, /turf/simulated/wall/elevator, - /area/turbolift + /area/turbolift, + /area/tether/elevator, + /turf/unsimulated/wall/planetary, + /area/submap/virgo2, + /area/submap/event, + /area/submap/casino_event )) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index ad8fac64ce4..7eae0ec1c6d 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -8,12 +8,11 @@ // Now that I've scared away half the people looking at this file, here's the relevant info: -// Banning areas: Go to /obj/item/areaeditor/proc/get_area_type and /proc/create_area and add the /area to: (area_or_turf_fail_types) -// That will bar people from doing ANYTHING to those areas. No creating inside of them. No merging into them. Etc. +// Banning areas: Go to global_lists_vr, jump to the BUILDABLE_AREA_TYPES and read the comments left there. -// Disallow creation but allow merge/expansion: Go to the same two above again. -// Add the /area to 'blacklisted_areas' in /proc/create_area +/area/tether/elevator + name = "Tether Elevator" /area/tether/surfacebase/outside name = "Outside - Surface" From 0bf4d210209d98a0506ec1330e171075b9e4d22a Mon Sep 17 00:00:00 2001 From: "C.L" Date: Sun, 2 Oct 2022 01:33:59 -0400 Subject: [PATCH 16/16] Integration --- code/game/objects/items/blueprints_vr.dm | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm index 7eae0ec1c6d..accae37f6b1 100644 --- a/code/game/objects/items/blueprints_vr.dm +++ b/code/game/objects/items/blueprints_vr.dm @@ -10,6 +10,10 @@ // Banning areas: Go to global_lists_vr, jump to the BUILDABLE_AREA_TYPES and read the comments left there. + + + +// These areas are defined here so they can be blacklisted in global_lists_vr /area/tether/elevator name = "Tether Elevator" @@ -32,6 +36,27 @@ /area/submap/groundbase/wilderness name = "Groundbase Wilderness" +/area/offmap/aerostat/surface + name = "Aerostat Surface" + +/area/tether_away/beach + name = "\improper Away Mission - Virgo 4 Beach" + +/area/tether_away/cave + name = "Tether Away Cave" + +/area/offmap/aerostat/surface + + name = "Aerostat Surface" + +/area/submap/virgo2 + name = "Submap Area" + +/area/submap/casino_event + name = "\improper Space Casino" + + + //TG blueprints. #define AREA_ERRNONE 0 #define AREA_STATION 1