Skip to content

Commit

Permalink
Wall mapping helpers
Browse files Browse the repository at this point in the history
  • Loading branch information
thgvr committed Mar 8, 2024
1 parent 8954a2d commit f775d51
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 113 deletions.
97 changes: 65 additions & 32 deletions code/_globalvars/lists/objects.dm
Original file line number Diff line number Diff line change
@@ -1,42 +1,75 @@
GLOBAL_LIST_EMPTY(cable_list) //Index for all cables, so that powernets don't have to look through the entire world all the time
GLOBAL_LIST_EMPTY(portals) //list of all /obj/effect/portal
GLOBAL_LIST_EMPTY(airlocks) //list of all airlocks
GLOBAL_LIST_EMPTY(mechas_list) //list of all mechs. Used by hostile mobs target tracking.
GLOBAL_LIST_EMPTY(machines) //NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing !
GLOBAL_LIST_EMPTY(navbeacons) //list of all bot nagivation beacons, used for patrolling.
GLOBAL_LIST_EMPTY(teleportbeacons) //list of all tracking beacons used by teleporters
GLOBAL_LIST_EMPTY(deliverybeacons) //list of all MULEbot delivery beacons.
GLOBAL_LIST_EMPTY(deliverybeacontags) //list of all tags associated with delivery beacons.
GLOBAL_LIST_EMPTY(wayfindingbeacons) //list of all navigation beacons used by wayfinding pinpointers
/// Index for all cables, so that powernets don't have to look through the entire world all the time
GLOBAL_LIST_EMPTY(cable_list)
/// list of all /obj/effect/portal
GLOBAL_LIST_EMPTY(portals)
/// List of all airlocks
GLOBAL_LIST_EMPTY(airlocks)
/// List of all mechs. Used by hostile mobs target tracking.
GLOBAL_LIST_EMPTY(mechas_list)
/// NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing!
GLOBAL_LIST_EMPTY(machines)
/// List of all bot nagivation beacons, used for patrolling.
GLOBAL_LIST_EMPTY(navbeacons)
/// List of all tracking beacons used by teleporters
GLOBAL_LIST_EMPTY(teleportbeacons)
/// List of all MULEbot delivery beacons.
GLOBAL_LIST_EMPTY(deliverybeacons)
/// List of all tags associated with delivery beacons.
GLOBAL_LIST_EMPTY(deliverybeacontags)
/// List of all navigation beacons used by wayfinding pinpointers
GLOBAL_LIST_EMPTY(wayfindingbeacons)
/// List of all navigation beacons used by wayfinding pinpointers
GLOBAL_LIST_EMPTY(nuke_list)
GLOBAL_LIST_EMPTY(alarmdisplay) //list of all machines or programs that can display station alerts
GLOBAL_LIST_EMPTY(singularities) //list of all singularities on the station (actually technically all engines)
GLOBAL_LIST_EMPTY(fax_machines) //list of all fax machines
/// List of all machines or programs that can display station alerts
GLOBAL_LIST_EMPTY(alarmdisplay)
/// List of all singularities (actually technically all engines)
GLOBAL_LIST_EMPTY(singularities)
/// List of all fax machines
GLOBAL_LIST_EMPTY(fax_machines)
/// List of all /datum/chemical_reaction datums. Used during chemical reactions
GLOBAL_LIST(chemical_reactions_list)
/// List of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
GLOBAL_LIST(chemical_reagents_list)
/// List of all /datum/material datums indexed by material id.
GLOBAL_LIST_EMPTY(materials_list)
/// List of all /datum/tech datums indexed by id.
GLOBAL_LIST_EMPTY(tech_list)
/// List of all surgeries by name, associated with their path.
GLOBAL_LIST_EMPTY(surgeries_list)
/// List of all table craft recipes
GLOBAL_LIST_EMPTY(crafting_recipes)
/// List of Rapid Construction Devices.
GLOBAL_LIST_EMPTY(rcd_list)
/// List of all Area Power Controller machines, separate from machines for powernet speeeeeeed.
GLOBAL_LIST_EMPTY(apcs_list)
/// List of all current implants that are tracked to work out what sort of trek everyone is on.
GLOBAL_LIST_EMPTY(tracked_implants)
/// List of implants the prisoner console can track and send inject commands too
GLOBAL_LIST_EMPTY(tracked_chem_implants)
/// List of points of interest for observe/follow
GLOBAL_LIST_EMPTY(poi_list)
/// List of all pinpointers. Used to change stuff they are pointing to all at once.
GLOBAL_LIST_EMPTY(pinpointer_list)
/// List of all zombie_infection organs, for any mass "animation"
GLOBAL_LIST_EMPTY(zombie_infection_list)
/// List of all meteors.
GLOBAL_LIST_EMPTY(meteor_list)
/// List of active radio jammers
GLOBAL_LIST_EMPTY(active_jammers)

GLOBAL_LIST(chemical_reactions_list) //list of all /datum/chemical_reaction datums. Used during chemical reactions
GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
GLOBAL_LIST_EMPTY(materials_list) //list of all /datum/material datums indexed by material id.
GLOBAL_LIST_EMPTY(tech_list) //list of all /datum/tech datums indexed by id.
GLOBAL_LIST_EMPTY(surgeries_list) //list of all surgeries by name, associated with their path.
GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes
GLOBAL_LIST_EMPTY(rcd_list) //list of Rapid Construction Devices.
GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, separate from machines for powernet speeeeeeed.
GLOBAL_LIST_EMPTY(tracked_implants) //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented...
GLOBAL_LIST_EMPTY(tracked_chem_implants) //list of implants the prisoner console can track and send inject commands too
GLOBAL_LIST_EMPTY(poi_list) //list of points of interest for observe/follow
GLOBAL_LIST_EMPTY(pinpointer_list) //list of all pinpointers. Used to change stuff they are pointing to all at once.
GLOBAL_LIST_EMPTY(zombie_infection_list) // A list of all zombie_infection organs, for any mass "animation"
GLOBAL_LIST_EMPTY(meteor_list) // List of all meteors.
GLOBAL_LIST_EMPTY(active_jammers) // List of active radio jammers
GLOBAL_LIST_EMPTY(ladders)

GLOBAL_LIST_EMPTY(trophy_cases)
///This is a global list of all signs you can change an existing sign or new sign backing to, when using a pen on them.

/// This is a global list of all signs you can change an existing sign or new sign backing to, when using a pen on them.
GLOBAL_LIST_EMPTY(editable_sign_types)

GLOBAL_LIST_EMPTY(wire_color_directory)

GLOBAL_LIST_EMPTY(wire_name_directory)

GLOBAL_LIST_EMPTY(ai_status_displays)

GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects
GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert
/// List of All mob_spawn objects
GLOBAL_LIST_EMPTY(mob_spawners)
/// List of Station alert consoles, /obj/machinery/computer/station_alert
GLOBAL_LIST_EMPTY(alert_consoles)
106 changes: 25 additions & 81 deletions code/game/objects/structures/crates_lockers/closets/wallmount.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,105 +6,37 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "generic_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall, 28)

/obj/structure/closet/wall/red
icon_state = "sec_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/red, 28)

/obj/structure/closet/wall/orange
icon_state = "cargo_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/orange, 28)

/obj/structure/closet/wall/blue
icon_state = "solgov_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/blue, 28)

/obj/structure/closet/wall/white
icon_state = "freezer_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/white, 28)

/obj/structure/closet/wall/white/chem
icon_door = "chemical_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/chem, 28)

/obj/structure/closet/wall/white/med
icon_door = "med_wall"

//wardrobes

/obj/structure/closet/wardrobe/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "blue_wall"

/obj/structure/closet/wardrobe/pink/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "pink_wall"

/obj/structure/closet/wardrobe/black/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "black_wall"

/obj/structure/closet/wardrobe/green/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "green_wall"

/obj/structure/closet/wardrobe/orange/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "orange_wall"

/obj/structure/closet/wardrobe/yellow/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "yellow_wall"

/obj/structure/closet/wardrobe/white/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "white_wall"

/obj/structure/closet/wardrobe/pjs/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "white_wall"

/obj/structure/closet/wardrobe/grey/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "grey_wall"

/obj/structure/closet/wardrobe/mixed/wall
wall_mounted = TRUE
anchored = TRUE
density = TRUE
can_be_unanchored = FALSE
icon = 'icons/obj/wallcloset.dmi'
icon_door = "mixed_wall"
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/wall/med, 28)

//special

Expand All @@ -116,6 +48,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "fire_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/firecloset/wall, 28)

/obj/structure/closet/emcloset/wall
wall_mounted = TRUE
anchored = TRUE
Expand All @@ -124,6 +58,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "emergency_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/emcloset/wall, 28)

//secure closets/freezers
/obj/structure/closet/secure_closet/wall
wall_mounted = TRUE
Expand All @@ -133,6 +69,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "freezer_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/wall, 28)

/obj/structure/closet/secure_closet/freezer/wall
wall_mounted = TRUE
anchored = TRUE
Expand All @@ -141,6 +79,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "freezer_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/freezer/wall, 28)

/obj/structure/closet/secure_closet/freezer/kitchen/wall
wall_mounted = TRUE
anchored = TRUE
Expand All @@ -149,6 +89,8 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "freezer_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/freezer/kitchen/wall, 28)

/obj/structure/closet/secure_closet/brig/wall
wall_mounted = TRUE
anchored = TRUE
Expand All @@ -157,3 +99,5 @@
icon = 'icons/obj/wallcloset.dmi'
icon_state = "generic_wall"
icon_door = "generic_wall"

MAPPING_DIRECTIONAL_HELPERS(/obj/structure/closet/secure_closet/brig/wall, 28)
Binary file modified icons/obj/wallcloset.dmi
Binary file not shown.

0 comments on commit f775d51

Please sign in to comment.