Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Maps and Map Related Stuff #811

Merged
merged 18 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
304 changes: 152 additions & 152 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

361 changes: 179 additions & 182 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm

Large diffs are not rendered by default.

182 changes: 91 additions & 91 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

247 changes: 120 additions & 127 deletions _maps/map_files/tramstation/tramstation.dmm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion code/game/area/areas/station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@
icon_state = "patients"

/area/station/medical/virology
name = "Pathology"
name = "Virology"
icon_state = "virology"
ambience_index = AMBIENCE_VIROLOGY

Expand Down
5 changes: 5 additions & 0 deletions monkestation/_maps/RandomBars/Tram/tram_bar_beachside.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@
/obj/structure/window/reinforced/spawner/directional/west,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/effect/turf_decal/sand,
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/iron,
/area/station/commons/lounge)
"nU" = (
Expand Down Expand Up @@ -607,6 +608,7 @@
name = "Kitchen";
req_one_access = list("kitchen")
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/turf/open/floor/wood,
/area/station/service/kitchen)
"sb" = (
Expand Down Expand Up @@ -827,6 +829,7 @@
id = "playerscantreadthis";
name = "Kitchen Counter Shutters"
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/turf/open/floor/wood,
/area/station/service/kitchen)
"zt" = (
Expand Down Expand Up @@ -883,6 +886,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/wood,
/area/station/service/bar)
"AR" = (
Expand Down Expand Up @@ -1563,6 +1567,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
/turf/open/floor/wood/large,
/area/station/service/kitchen)
"Ua" = (
Expand Down
12 changes: 8 additions & 4 deletions monkestation/_maps/RandomBars/Tram/tram_bar_cult.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
/turf/open/floor/cult,
/area/station/commons/lounge)
"aL" = (
/mob/living/carbon/human/species/monkey/punpun,
/turf/open/floor/cult,
/turf/open/openspace,
/area/station/service/kitchen)
"br" = (
/obj/machinery/door/airlock/cult/glass/friendly{
Expand Down Expand Up @@ -488,6 +487,10 @@
/obj/effect/turf_decal/trimline/yellow/corner,
/turf/open/floor/cult,
/area/station/service/kitchen)
"lc" = (
/obj/machinery/griddle,
/turf/open/floor/cult,
/area/station/service/kitchen)
"lg" = (
/obj/structure/table/wood/fancy/red,
/obj/item/clothing/neck/cross{
Expand Down Expand Up @@ -975,6 +978,7 @@
"yE" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/mob/living/carbon/human/species/monkey/punpun,
/turf/open/floor/cult,
/area/station/service/bar)
"yL" = (
Expand Down Expand Up @@ -2567,7 +2571,7 @@ lb
Fb
CJ
up
up
lc
up
up
jA
Expand Down Expand Up @@ -2621,7 +2625,7 @@ oN
JN
Co
up
up
lc
XA
up
jA
Expand Down
27 changes: 15 additions & 12 deletions monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/fake_seafloor/spawning,
/area/station/commons/lounge)
"di" = (
/obj/machinery/elevator_control_panel/directional/north{
desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
linked_elevator_id = "dumbwaiter_lift";
name = "Dumbwaiter Control Panel";
preset_destination_names = list("2"="Hydroponics","3"="Kitchen")
},
/turf/open/floor/fake_seafloor,
/area/station/commons/lounge)
"dr" = (
/turf/closed/wall,
/area/station/service/kitchen)
Expand Down Expand Up @@ -630,6 +621,18 @@
/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
/turf/open/floor/fake_seafloor,
/area/station/commons/lounge)
"BQ" = (
/obj/structure/railing{
dir = 1
},
/obj/machinery/elevator_control_panel/directional/north{
desc = "A small control panel used to move the kitchen dumbwaiter up and down.";
linked_elevator_id = "dumbwaiter_lift";
name = "Dumbwaiter Control Panel";
preset_destination_names = list("2"="Hydroponics","3"="Kitchen")
},
/turf/open/floor/fake_seafloor,
/area/station/commons/lounge)
"Cp" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/fake_seafloor/spawning,
Expand Down Expand Up @@ -1418,7 +1421,7 @@ Um
Um
"}
(11,1,1) = {"
di
aw
Le
Le
AF
Expand Down Expand Up @@ -1555,8 +1558,8 @@ Um
(16,1,1) = {"
pR
pR
pR
EF
Um
BQ
BO
jZ
Uk
Expand Down
2 changes: 1 addition & 1 deletion monkestation/_maps/RandomBars/Tram/tram_rvb_bar.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,6 @@
/turf/open/floor/iron,
/area/station/commons/lounge)
"rV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/structure/disposalpipe/trunk{
dir = 4
},
Expand Down Expand Up @@ -2952,6 +2951,7 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/iron/kitchen/small,
/area/station/service/kitchen)
"Tz" = (
Expand Down
14 changes: 13 additions & 1 deletion monkestation/code/area/areas/station.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
/area/station/maintenance/department/medical/pathology/
name = "Pathology Maintenance"
icon_state = "virology"
icon = 'monkestation/icons/area/areas_station.dmi'
icon_state = "patho_maint"
sound_environment = SOUND_AREA_SMALL_ENCLOSED

/area/station/medical/pathology
name = "Pathology"
icon = 'monkestation/icons/area/areas_station.dmi'
icon_state = "patho"
ambience_index = AMBIENCE_VIROLOGY

/area/station/medical/pathology/isolation
name = "Pathology Isolation"
icon = 'monkestation/icons/area/areas_station.dmi'
icon_state = "patho_iso"
18 changes: 17 additions & 1 deletion monkestation/code/modules/ghost_players/area_changes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

/area/centcom/central_command_areas/ghost_spawn
name = "Centcom Ghost Spawn"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_ghostspawn"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_EXPLOSIONS_DURING


/area/centcom/central_command_areas/supply
area_flags = UNIQUE_AREA | NOTELEPORT | NO_EXPLOSIONS_DURING

Expand All @@ -21,28 +22,41 @@

/area/centcom/central_command_areas/supply
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_EXPLOSIONS_DURING | NO_GHOSTS_DURING_ROUND

/area/centcom/central_command_areas/borbop
name = "Borbop's Bar"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "borbop"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_EXPLOSIONS_DURING

/area/centcom/central_command_areas/kitchen
name = "Papa's Pizzeria"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_kitchen"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_EXPLOSIONS_DURING

/area/centcom/central_command_areas/medical
name = "Centcom Medical"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_medical"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_EXPLOSIONS_DURING

/area/centcom/central_command_areas/botany
name = "Centcom Botany"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_botany"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | NO_EXPLOSIONS_DURING

/area/centcom/central_command_areas/hall
name = "Centcom Hall"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_hall"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_EXPLOSIONS_DURING

/area/centcom/central_command_areas/admin_hangout
name = "Admin Hangout"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_hangout"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | PASSIVE_AREA | NO_EXPLOSIONS_DURING | NO_GHOSTS_DURING_ROUND

/area/centcom/central_command_areas/ghost_blocker
Expand All @@ -57,6 +71,8 @@

/area/centcom/central_command_areas/firing_range
name = "Centcom Firing Range"
icon = 'monkestation/icons/area/areas_centcom.dmi'
icon_state = "centcom_firingrange"
area_flags = UNIQUE_AREA | NOTELEPORT | GHOST_AREA | NO_EXPLOSIONS_DURING

/area/centcom/central_command_areas/firing_range_checkpoint_control
Expand Down
Binary file added monkestation/icons/area/areas_centcom.dmi
Binary file not shown.
Binary file added monkestation/icons/area/areas_station.dmi
Binary file not shown.
Loading