New Medbay + Others (#439)

* Yes
Simple Mapping Helpers - DmEd-only simplified sprites for a few mapping elements.
P2P Phones can now have a custom label that's only part of the name
Window spawners show over paint helpers. Might make this DmEd only.
Medical prepainted walls
Bodyscanner and scan console icons are now 32x
I broke meta again boys

* That's enough for tonight

* a

* New
New sign
Cameras
Wires
Vents
More Shit
Fucking kill me

* Minor fixes.
APC Duplication log information includes old APC loc

* Fix last remaining linter screams

* Remove spurious space

* Minor touchups while I'm in here

Christmas Tree gifts now check for abstractness
Bridge-style prepainted walls

* mexico

* More minor changes

* fuck

* Medbay Changes and Bugfixes Final?
Nurse's Desk
Defibs have been moved to said desk
The amount of them has been reduced from 4 to 2
Empty wallmounts have been placed in the ORs
OR doors renamed to be less confusing
Medbay Private Branch phone network stations renamed

* Further fixes
Psychologist phone now has a data terminal

code/_compile_options.dm

@@ -193,6 +193,8 @@
 #warn Building with Dream Maker is no longer supported and will result in errors.
 #warn In order to build, run BUILD.bat in the root directory.
 #warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build.
+//Hi, Hijacking this to do DMEd-Specific Icon Overrides
+#define SIMPLE_MAPHELPERS
 #endif
 
 #ifdef ZASDBG

code/_globalvars/lists/flavor_misc.dm

@@ -283,14 +283,37 @@ GLOBAL_LIST_INIT(scarySounds, list(
 //If you don't want to fuck up disposals, add to this list, and don't change the order.
 //If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
 
-GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
-	"Cargo Bay", "QM Office", "Engineering", "CE Office",
-	"Atmospherics", "Security", "HoS Office", "Medbay",
-	"CMO Office", "Chemistry", "Research", "RD Office",
-	"Robotics", "HoP Office", "Library", "Chapel", "Theatre",
-	"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics",
-	"Experimentor Lab", "Ordnance", "Dormitories", "Virology",
-	"Xenobiology", "Law Office","Detective's Office"))
+GLOBAL_LIST_INIT(TAGGERLOCATIONS, list(
+	/* 1*/"Disposals",
+	/* 2*/"Cargo Bay",
+	/* 3*/"QM Office",
+	/* 4*/"Engineering",
+	/* 5*/"CE Office",
+	/* 6*/"Atmospherics",
+	/* 7*/"Security",
+	/* 8*/"HoS Office",
+	/* 9*/"Medbay",
+	/*10*/"CMO Office",
+	/*11*/"Chemistry",
+	/*12*/"Research",
+	/*13*/"RD Office",
+	/*14*/"Robotics",
+	/*15*/"HoP Office",
+	/*16*/"Library",
+	/*17*/"Chapel",
+	/*18*/"Theatre",
+	/*19*/"Bar",
+	/*20*/"Kitchen",
+	/*21*/"Hydroponics",
+	/*22*/"Janitor Closet",
+	/*23*/"Genetics",
+	/*24*/"Experimentor Lab",
+	/*25*/"Ordnance",
+	/*26*/"Dormitories",
+	/*27*/"Virology",
+	/*28*/"Xenobiology",
+	/*29*/"Law Office",
+	/*30*/"Detective's Office"))
 
 GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt"))
 

code/game/area/areas/station.dm

@@ -966,18 +966,30 @@
 	name = "\improper Medical Cold Room"
 	icon_state = "kitchen_cold"
 
+/area/station/medical/coldroom/port
+	name = "\improper Port Medical Cold Room "
+
+
+/area/station/medical/coldroom/starboard
+	name = "\improper Starboard Medical Cold "
+
 /area/station/medical/patients_rooms
 	name = "\improper Patients' Rooms"
 	icon_state = "patients"
 	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/station/medical/patients_rooms/room_a
 	name = "Patient Room A"
-	icon_state = "patients"
+
 
 /area/station/medical/patients_rooms/room_b
 	name = "Patient Room B"
-	icon_state = "patients"
+
+/area/station/medical/patients_rooms/room_c
+	name = "Patient Room C"
+
+/area/station/medical/patients_rooms/room_d
+	name = "Patient Room D"
 
 /area/station/medical/virology
 	name = "Virology"
@@ -1002,6 +1014,10 @@
 	icon_state = "surgery"
 	ambience_index = AMBIENCE_VIROLOGY
 
+/area/station/medical/surgery/prep
+	name = "\improper Pre-Op Prep"
+	icon_state = "surgeryprep"
+
 /area/station/medical/surgery/fore
 	name = "\improper Fore Operating Room"
 	icon_state = "foresurgery"
@@ -1010,6 +1026,14 @@
 	name = "\improper Aft Operating Room"
 	icon_state = "aftsurgery"
 
+/area/station/medical/surgery/port
+	name = "\improper Port Operating Room"
+	icon_state = "portsurgery"
+
+/area/station/medical/surgery/starboard
+	name = "\improper Startboard Operating Room"
+	icon_state = "starboardsurgery"
+
 /area/station/medical/surgery/theatre
 	name = "\improper Grand Surgery Theatre"
 	icon_state = "surgerytheatre"

code/game/machinery/datanet/p2p_phones/_p2p_phones.dm

@@ -42,6 +42,8 @@
 	var/list/discovered_phones
 	/// The 'common name' of the station. Used in the UI.
 	var/friendly_name = null
+	/// Name 'placard', such as 'Special Hotline', gets appended to the end.
+	var/placard_name
 	/// Do we show netaddrs in the phone UI, or just the names?
 	var/show_netids = FALSE
 
@@ -79,7 +81,7 @@
 ///Recalculate our name.
 /obj/machinery/telephone/proc/recalculate_name()
 	ping_addition = list("user_id"=friendly_name) //Preload this so we can staple this to the ping packet.
-	name = "phone - [friendly_name]"
+	name = "phone - [friendly_name][placard_name ? " - [placard_name]" : null]"
 
 /obj/machinery/telephone/Destroy()
 	if(!QDELETED(handset))
@@ -165,16 +167,22 @@
 
 
 /obj/machinery/telephone/multitool_act(mob/living/user, obj/item/tool)
-	var/static/list/options_list = list("Rename Station", "Reconnect to terminal", "Toggle Address Display")
+	var/static/list/options_list = list("Set Caller ID", "Set Placard", "Reconnect to terminal", "Toggle Address Display")
 	var/selected = input(user, null, "Reconfigure Station", null) as null|anything in options_list
 	switch(selected)
-		if("Rename Station")
+		if("Set Caller ID")
 			var/new_friendly_name = input(user, "New Name?", "Renaming [friendly_name]", friendly_name) as null|text
 			if(!new_friendly_name)
 				return TOOL_ACT_TOOLTYPE_SUCCESS
 			friendly_name = new_friendly_name
 			recalculate_name()
 
+		if("Set Placard")
+			var/new_placard_name = input(user, "New Placard?", "Re-writing [placard_name]", placard_name) as null|text
+			if(!new_placard_name)
+				return TOOL_ACT_TOOLTYPE_SUCCESS
+			placard_name = new_placard_name
+
 		if("Reconnect to terminal")
 			switch(link_to_jack()) //Just in case something stupid happens to the jack.
 				if(NETJACK_CONNECT_SUCCESS)
@@ -185,12 +193,14 @@
 					to_chat(user, span_boldwarning("Reconnect failed! Your terminal is somehow not on the same tile??? Call a coder!"))
 				else
 					to_chat(user, span_boldwarning("Reconnect failed, Invalid error code, call a coder!"))
+
 		if("Toggle Address Display")
 			show_netids = !show_netids
 			if(show_netids)
 				to_chat(user, span_notice("You enabled the display of network IDs."))
 			else
 				to_chat(user, span_notice("You disabled the display of network IDs."))
+		//else fall through
 	return TOOL_ACT_TOOLTYPE_SUCCESS
 
 

code/game/machinery/defibrillator_mount.dm

@@ -24,7 +24,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28)
 	. = ..()
 	defib = new/obj/item/defibrillator/loaded(src)
 
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount/loaded, 28)
 
 /obj/machinery/defibrillator_mount/Destroy()
 	if(defib)

code/game/objects/effects/spawners/structure.dm

@@ -21,6 +21,7 @@ again.
 	name = "window spawner"
 	spawn_list = list(/obj/structure/low_wall, /obj/structure/window/fulltile)
 	dir = SOUTH
+	layer = ABOVE_OBJ_LAYER
 
 /obj/effect/spawner/structure/window/Initialize(mapload)
 	. = ..()

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -807,7 +807,7 @@
 /obj/item/circuitboard/machine/bodyscanner_console
 	name = "Body Scanner Console (Machine Board)"
 	greyscale_colors = CIRCUIT_COLOR_MEDICAL
-	build_path = /obj/machinery/bodyscanner
+	build_path = /obj/machinery/bodyscanner_console
 	req_components = list(
 		/obj/item/stack/cable_coil = 1,
 		/obj/item/stack/sheet/glass = 1

code/game/objects/items/gift.dm

@@ -108,7 +108,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 		var/list/gift_types_list = subtypesof(/obj/item)
 		for(var/V in gift_types_list)
 			var/obj/item/I = V
-			if((!initial(I.icon_state)) || (!initial(I.inhand_icon_state)) || (initial(I.item_flags) & ABSTRACT))
+			if((isabstract(I)) || (!initial(I.icon_state)) || (!initial(I.inhand_icon_state)) || (initial(I.item_flags) & ABSTRACT))
 				gift_types_list -= V
 		GLOB.possible_gifts = gift_types_list
 	var/gift_type = pick(GLOB.possible_gifts)

code/game/objects/items/storage/storage.dm

@@ -42,8 +42,8 @@
 	return ..()
 
 /obj/item/storage/contents_explosion(severity, target)
-//Cyberboss says: "USE THIS TO FILL IT, NOT INITIALIZE OR NEW"
 
+//Cyberboss says: "USE THIS TO FILL IT, NOT INITIALIZE OR NEW"
 /obj/item/storage/proc/PopulateContents()
 
 /obj/item/storage/proc/emptyStorage()

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -132,3 +132,10 @@
 			new /obj/item/food/breadslice/moldy/bacteria(src)
 	else if(prob(30))
 		new /obj/item/food/syndicake(src)
+
+/obj/structure/closet/mini_fridge/clean
+	name = "mini-fridge"
+	desc = "A small contraption designed to imbue a few drinks with a pleasant chill."
+
+
+/obj/structure/closet/mini_fridge/clean/PopulateContents()

code/game/objects/structures/signs/signs_warning.dm

@@ -194,3 +194,9 @@
 	icon_state = "radshelter"
 	is_editable = TRUE
 
+/obj/structure/sign/exitonly
+	name = "\improper EXIT ONLY sign"
+	sign_change_name = "Exit ONly"
+	desc = "A sign informing you that you will not be able to re-enter this area without access."
+	icon_state = "exitonly"
+	is_editable = TRUE

code/game/turfs/closed/wall/prepainted_walls.dm

@@ -22,10 +22,12 @@
 
 ///Dummy types for prepainted walls
 /turf/closed/wall/prepainted
-	name = "dummy"
+	name = "Pre-Painted Wall"
 
 /turf/closed/wall/r_wall/prepainted
-	name = "dummy"
+	name = "PRe-Painted Reinforced Wall"
+
+//Daedalus/"Standard" walls
 
 /turf/closed/wall/prepainted/daedalus
 	color = PAINT_WALL_DAEDALUS
@@ -37,3 +39,23 @@
 	wall_paint = PAINT_WALL_DAEDALUS
 	stripe_paint = PAINT_STRIPE_DAEDALUS
 
+/turf/closed/wall/prepainted/medical
+	color = PAINT_WALL_MEDICAL
+	wall_paint = PAINT_WALL_MEDICAL
+	stripe_paint = PAINT_STRIPE_MEDICAL
+
+
+/turf/closed/wall/r_wall/prepainted/medical
+	color = PAINT_WALL_MEDICAL
+	wall_paint = PAINT_WALL_MEDICAL
+	stripe_paint = PAINT_STRIPE_MEDICAL
+
+/turf/closed/wall/prepainted/bridge
+	color = PAINT_WALL_COMMAND
+	wall_paint = PAINT_WALL_COMMAND
+	stripe_paint = PAINT_STRIPE_COMMAND
+
+/turf/closed/wall/r_wall/prepainted/bridge
+	color = PAINT_WALL_COMMAND
+	wall_paint = PAINT_WALL_COMMAND
+	stripe_paint = PAINT_STRIPE_COMMAND

code/game/turfs/closed/wall/reinf_walls.dm

@@ -10,6 +10,13 @@
 	explosion_block = 2
 	rad_insulation = RAD_HEAVY_INSULATION
 
+// DMEd Specific Simplified wall icons
+#if defined(SIMPLE_MAPHELPERS)
+/turf/closed/wall/r_wall
+	icon='icons/effects/simplified_wall_helpers.dmi'
+	icon_state="r_generic"
+#endif
+
 /turf/closed/wall/r_wall/syndicate
 	name = "hull"
 	desc = "The armored hull of an ominous looking ship."

code/game/turfs/closed/walls.dm

@@ -72,6 +72,13 @@ GLOBAL_REAL_VAR(wall_overlays_cache) = list()
 	///Appearance cache key. This is very touchy.
 	VAR_PRIVATE/cache_key
 
+// DMEd Specific Simplified wall icons
+#if defined(SIMPLE_MAPHELPERS)
+/turf/closed/wall
+	icon='icons/effects/simplified_wall_helpers.dmi'
+	icon_state="generic"
+#endif
+
 /turf/closed/wall/has_material_type(datum/material/mat_type, exact=FALSE, mat_amount=0)
 	if(plating_material == mat_type)
 		return TRUE

code/game/turfs/open/floor/catwalk_plating.dm

@@ -21,6 +21,12 @@
 	var/catwalk_type = "maint"
 	var/static/list/catwalk_underlays = list()
 
+#ifdef SIMPLE_MAPHELPERS
+// Set these back to the turf layer so that they don't block underfloor equipment
+/turf/open/floor/catwalk_floor
+	layer = TURF_LAYER
+#endif
+
 /turf/open/floor/catwalk_floor/Initialize(mapload)
 	. = ..()
 	if(!catwalk_underlays[catwalk_type])

code/modules/mapping/mapping_helpers.dm

@@ -726,6 +726,12 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
 	query_in_progress = FALSE
 	return json_data
 
+//DM Editor 'simplified' maphelpers.
+#if defined(SIMPLE_MAPHELPERS)
+#define PAINT_PREFIX "s_"
+#else
+#define PAINT_PREFIX ""
+#endif
 
 /obj/effect/mapping_helpers/paint_wall
 	name = "Paint Wall Helper"
@@ -792,31 +798,31 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
 	name = "Command Wall Paint"
 	wall_paint = PAINT_WALL_COMMAND
 	stripe_paint = PAINT_STRIPE_COMMAND
-	icon_state = "paint_bridge"
+	icon_state = PAINT_PREFIX+"paint_bridge"
 
 /obj/effect/mapping_helpers/paint_wall/medical
 	name = "Medical Wall Paint"
 	wall_paint = PAINT_WALL_MEDICAL
 	stripe_paint = PAINT_STRIPE_MEDICAL
-	icon_state = "paint_medical"
+	icon_state = PAINT_PREFIX+"paint_medical"
 
 /obj/effect/mapping_helpers/paint_wall/daedalus
 	name = "Daedalus Wall Paint"
 	wall_paint = PAINT_WALL_DAEDALUS
 	stripe_paint = PAINT_STRIPE_DAEDALUS
-	icon_state = "paint_daedalus"
+	icon_state = PAINT_PREFIX+"paint_daedalus"
 
 /obj/effect/mapping_helpers/paint_wall/priapus
 	name = "Priapus Wall Paint"
 	wall_paint = PAINT_WALL_PRIAPUS
 	stripe_paint = PAINT_STRIPE_PRIAPUS
-	icon_state = "paint_priapus"
+	icon_state = PAINT_PREFIX+"paint_priapus"
 
 /obj/effect/mapping_helpers/paint_wall/centcom
 	name = "Central Command Wall Paint"
 	wall_paint = PAINT_WALL_CENTCOM
 	stripe_paint = PAINT_STRIPE_CENTCOM
-	icon_state = "paint_centcom"
+	icon_state = PAINT_PREFIX+"paint_centcom"
 
 
 /obj/effect/mapping_helpers/broken_floor

code/modules/power/apc/apc_main.dm

@@ -179,7 +179,7 @@ GLOBAL_REAL_VAR(default_apc_armor) = list(MELEE = 20, BULLET = 20, LASER = 10, E
 
 	if(area)
 		if(area.apc)
-			log_mapping("Duplicate APC created at [AREACOORD(src)]")
+			log_mapping("Duplicate APC created at [AREACOORD(src)] (Original APC at[COORD(area.apc)])")
 		area.apc = src
 
 	update_appearance()

code/modules/surgery/machines/bodyscanner.dm

@@ -1,7 +1,7 @@
 /obj/machinery/bodyscanner
 	name = "body scanner"
 	desc = "A large full-body scanning machine that provides a complete physical assessment of a patient placed inside. Operated using an adjacent console."
-	icon = 'icons/obj/cryogenics.dmi'
+	icon = 'icons/obj/machines/bodyscanner.dmi'
 	icon_state = "body_scanner_open"
 	dir = EAST
 	density = TRUE
@@ -125,7 +125,7 @@
 /////// The Console ////////
 /obj/machinery/bodyscanner_console
 	name = "body scanner console"
-	icon = 'icons/obj/cryogenics.dmi'
+	icon = 'icons/obj/machines/bodyscanner.dmi'
 	icon_state = "bodyscanner_console_powered"
 	dir = EAST