Skip to content

Commit

Permalink
Yes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
francinum committed Jul 24, 2023
1 parent da014f7 commit 3182ce6
Show file tree
Hide file tree
Showing 16 changed files with 37,240 additions and 10,387 deletions.
16,130 changes: 5,756 additions & 10,374 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

31,426 changes: 31,426 additions & 0 deletions _maps/map_files/MetaStation/medbay_holder.dmm

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions code/_compile_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,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
Expand Down
16 changes: 13 additions & 3 deletions code/game/machinery/datanet/p2p_phones/_p2p_phones.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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)
Expand All @@ -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


Expand Down
1 change: 1 addition & 0 deletions code/game/objects/effects/spawners/structure.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
16 changes: 14 additions & 2 deletions code/game/turfs/closed/wall/prepainted_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -37,3 +39,13 @@
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
7 changes: 7 additions & 0 deletions code/game/turfs/closed/wall/reinf_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
7 changes: 7 additions & 0 deletions code/game/turfs/closed/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 11 additions & 5 deletions code/modules/mapping/mapping_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/surgery/machines/bodyscanner.dm
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -124,7 +124,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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/surgery/machines/bodyscanner_display.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(bodyscanscreens)
/obj/machinery/body_scan_display
name = "body scan display"
desc = "A wall-mounted display linked to a body scanner."
icon = 'icons/obj/cryogenics.dmi'
icon = 'icons/obj/machines/bodyscan_displays.dmi'
icon_state = "telescreen"

var/current_content = ""
Expand Down
Binary file modified icons/effects/paint_helpers.dmi
Binary file not shown.
Binary file added icons/effects/simplified_wall_helpers.dmi
Binary file not shown.
Binary file modified icons/obj/cryogenics.dmi
Binary file not shown.
Binary file added icons/obj/machines/bodyscan_displays.dmi
Binary file not shown.
Binary file added icons/obj/machines/bodyscanner.dmi
Binary file not shown.

0 comments on commit 3182ce6

Please sign in to comment.