cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 23:29:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

areas, closets, other miscellaneous adjustments

Browse Source
This commit is contained in:
Killian
2020-07-21 17:29:34 +01:00
parent 943b4a1d6c
commit 5d7cff1f7d
14 changed files with 11120 additions and 7765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/Space Station 13 areas_yw.dm
+28
View File
@@ -116,6 +116,23 @@
name = "\improper Abandoned Office"
icon_state = "vacant_site"
/area/civilian/atrium
name = "\improper Atrium"
icon = 'icons/turf/areas_yw.dmi'
icon_state = "atrium_central"
/area/civilian/atrium/lower
name = "\improper Lower Atrium"
icon_state = "atrium_lower"
/area/civilian/atrium/central
name = "\improper Central Atrium"
/area/civilian/atrium/upper
name = "\improper Upper Atrium"
icon_state = "atrium_upper"
//area/vacant/vacant_office
// name = "\improper Abandoned Office"
// icon_state = "vacant_site"
@@ -171,11 +188,22 @@
/area/security/labor
name = "Labor camp access"
icon_state = "security"
/area/medical/medbaymain
name = "\improper Medbay Primary Hallway"
icon_state = "medbay"
music = 'sound/ambience/signal.ogg'
/area/medical/medbayupper
name = "\improper Medbay Upper Hallway"
icon_state = "medbay2"
music = 'sound/ambience/signal.ogg'
/area/medical/medbayskybridge
name = "\improper Medbay/Departures Skybridge"
icon_state = "medbay4"
music = 'sound/ambience/signal.ogg'
/area/security/shuttledock
name = "\improper Security Interceptor Dock"
icon_state = "security"
code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
+8
View File
@@ -1,3 +1,11 @@
/decl/closet_appearance/medical_yw
color = COLOR_OFF_WHITE
decals = null
extra_decals = list(
"circle" = COLOR_BLUE_GRAY,
"stripes_horizontal" = COLOR_BLUE_GRAY
)
/decl/closet_appearance/wall/autolok/shuttleemerg
color = COLOR_YELLOW_GRAY
decals = list(
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
-1
View File
@@ -12,7 +12,6 @@
/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 2,
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 2)
/obj/structure/closet/secure_closet/medical2
name = "anesthetics closet"
desc = "Used to knock people out."
code/game/objects/structures/crates_lockers/closets/utility_closets_yw.dm
+6 -1
View File
@@ -15,4 +15,9 @@
/obj/item/weapon/tank/oxygen/red,
/obj/item/weapon/storage/briefcase/inflatable,
/obj/item/clothing/head/helmet/space/emergency,
/obj/item/clothing/suit/space/emergency)
/obj/item/clothing/suit/space/emergency)
/obj/structure/closet/medical
name = "medical supply closet"
desc = "May or may not contain medical junk."
closet_appearance = /decl/closet_appearance/medical_yw
code/modules/power/lighting.dm
+5
View File
@@ -313,6 +313,11 @@ var/global/list/light_type_cache = list()
light_type = /obj/item/weapon/light/tube/large
shows_alerts = FALSE //VOREStation Edit
//YW ADDITION START
/obj/machinery/light/spot/no_nightshift
nightshift_allowed = FALSE
//YW ADDITION END
/obj/machinery/light/spot/flicker
auto_flicker = TRUE
icons/turf/areas_yw.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

maps/yw/cryogaia-01-centcomm.dmm
-3
View File
@@ -2581,9 +2581,6 @@
/area/shuttle/arrival/pre_game)
"hd" = (
/obj/machinery/hologram/holopad,
/obj/effect/landmark{
name = "Observer-Start"
},
/turf/simulated/shuttle/floor,
/area/shuttle/arrival/pre_game)
"he" = (
maps/yw/cryogaia-04-maintenance.dmm
+899 -935
View File
File diff suppressed because it is too large Load Diff
maps/yw/cryogaia-05-main.dmm
+1741 -1663
View File
File diff suppressed because it is too large Load Diff
maps/yw/cryogaia-06-upper.dmm
+8391 -5157
View File
File diff suppressed because it is too large Load Diff
maps/yw/cryogaia_areas.dm
+16
View File
@@ -4,6 +4,8 @@
/area/borealis2/elevator/medbasement
name = "Elevator shaft - Lower Medical"
/area/borealis2/elevator/medbay
name = "Elevator shaft - Main Medical"
/area/borealis2/elevator/medupper
name = "Elevator shaft - Upper Medical"
/area/borealis2/elevator/dorms
name = "Elevator shaft - Dorms"
@@ -13,6 +15,8 @@
name = "Elevator shaft - Sci-Mining"
/area/borealis2/elevator/sciminingtransit
name = "Elevator shaft - Depth tranist"
/area/borealis2/elevator/uppermining
name = "Elevator shaft - Upper Level"
/area/borealis2/outdoors
name = "Outside - Surface"
icon_state = "outside1"
@@ -277,6 +281,14 @@
/area/cryogaia/station/ert_arrival
name = "\improper Emergency Responder Point"
/area/cryogaia/station/hallway/primary/upper
name = "\improper Upper Level Hallways"
icon_state = "hallC1"
/area/cryogaia/station/medical/upper
name = "\improper Medical Loft"
icon_state = "medbay_primary_storage"
/area/constructionsite/cryogaia/upper
name = "\improper Upper Level Construction Area"
@@ -378,6 +390,10 @@
name = "Underground Medical Maintenance"
icon_state = "maint_medbay_fore"
/area/maintenance/medical_upper
name = "Upper Level Medical Maintenance"
icon_state = "maint_medbay_aft"
/area/mine/unexplored/underdark
name = "Underground rock"
icon_state = "explored"
maps/yw/cryogaia_shuttles.dm
+7 -1
View File
@@ -53,4 +53,10 @@
name = "NSB Cryogaia (Security Dock)"
landmark_tag = "cryogaia_security_hangar"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/security/hangar
base_area = /area/security/hangar
/obj/effect/shuttle_landmark/premade/mining/cryogaia
name = "NSB Cryogaia (Belter Dock)"
landmark_tag = "belter_colony"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/quartermaster/miningdock
maps/yw/elevator_areas.dm
+14 -2
View File
@@ -35,6 +35,12 @@
lift_announce_str = "Arriving at Apartment level."
delay_time = 5 SECONDS
/area/turbolift/lumber_floor_upper_level
name = "surface (level 2)"
lift_floor_label = "Surface 2"
lift_floor_name = "Upper Level (Construction Area!)"
lift_announce_str = "Arriving at Upper Level."
/area/turbolift/lumber_floor_main_level
name = "surface (level 1)"
lift_floor_label = "Surface 1"
@@ -72,5 +78,11 @@
/area/turbolift/lumber_floor_medibasement
name = "Medbay (sublevel 1)"
lift_floor_label = "Medical Annex"
lift_floor_name = "Virology, Chemistry, EVA, Break room, Storage"
lift_announce_str = "Arriving at Medical Annex."
lift_floor_name = "Virology, Chemistry, EVA, Storage"
lift_announce_str = "Arriving at Medical Annex."
/area/turbolift/lumber_floor_mediupper
name = "Medbay (level 2)"
lift_floor_label = "Medical Loft"
lift_floor_name = "Break Room, Storage, Skybridge to Departures"
lift_announce_str = "Arriving at Medical Loft."
maps/yw/service_elevator_things.dm
+5 -2
View File
@@ -1,6 +1,6 @@
/obj/turbolift_map_holder/lumber
icon = 'icons/obj/turbolift_preview_5x5.dmi'
depth = 4
depth = 5
lift_size_x = 4
lift_size_y = 4
@@ -13,10 +13,12 @@
/area/turbolift/lumber_floor_underground_transit,
/area/turbolift/lumber_floor_basement,
/area/turbolift/lumber_floor_main_level,
/area/turbolift/lumber_floor_upper_level,
)
/obj/turbolift_map_holder/lumber/medevator
icon = 'icons/obj/turbolift_preview_3x3.dmi'
depth = 2
depth = 3
lift_size_x = 3
lift_size_y = 3
dir = EAST
@@ -25,4 +27,5 @@
areas_to_use = list(
/area/turbolift/lumber_floor_medibasement,
/area/turbolift/lumber_floor_medical,
/area/turbolift/lumber_floor_mediupper,
)