From 99a2df9dee0e6a7f1a4c1fea5f6082534c920ada Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 4 Apr 2022 14:55:58 -0400 Subject: [PATCH] Various fixes and more GB tweaks --- code/game/objects/items/weapons/manuals_vr.dm | 2 +- code/game/turfs/simulated/floor_types_vr.dm | 4 +- code/modules/holodeck/HolodeckObjects_vr.dm | 6 + maps/groundbase/gb-misc.dmm | 6 +- maps/groundbase/gb-z1.dmm | 409 ++++++++++++++---- maps/groundbase/gb-z2.dmm | 322 +++++++++++--- maps/groundbase/gb-z3.dmm | 38 +- maps/groundbase/groundbase_areas.dm | 4 + vorestation.dme | 1 + 9 files changed, 625 insertions(+), 167 deletions(-) create mode 100644 code/modules/holodeck/HolodeckObjects_vr.dm diff --git a/code/game/objects/items/weapons/manuals_vr.dm b/code/game/objects/items/weapons/manuals_vr.dm index 9d2e85ee628..33087fb0245 100644 --- a/code/game/objects/items/weapons/manuals_vr.dm +++ b/code/game/objects/items/weapons/manuals_vr.dm @@ -345,7 +345,7 @@ /obj/item/weapon/book/manual/rotary_electric_generator name = "Rotary Electric Generator Manual" - icon_state ="bookParticleAccelerator" + icon_state ="rulebook" item_state = "book15" author = "Engineering Encyclopedia" title = "Rotary Electric Generator Manual" diff --git a/code/game/turfs/simulated/floor_types_vr.dm b/code/game/turfs/simulated/floor_types_vr.dm index ae0ca1292e8..e6dfafa9ac3 100644 --- a/code/game/turfs/simulated/floor_types_vr.dm +++ b/code/game/turfs/simulated/floor_types_vr.dm @@ -20,13 +20,13 @@ /turf/simulated/floor/flesh name = "flesh" desc = "This slick flesh ripples and squishes under your touch" - icon_state = "flesh-floor" + icon_state = "flesh_floor" icon = 'icons/turf/stomach_vr.dmi' /turf/simulated/floor/flesh/colour name = "flesh" desc = "This slick flesh ripples and squishes under your touch" - icon_state = "colorable-floor" + icon_state = "c_flesh_floor" icon = 'icons/turf/stomach_vr.dmi' /turf/simulated/floor/flesh/attackby() diff --git a/code/modules/holodeck/HolodeckObjects_vr.dm b/code/modules/holodeck/HolodeckObjects_vr.dm new file mode 100644 index 00000000000..916968c3587 --- /dev/null +++ b/code/modules/holodeck/HolodeckObjects_vr.dm @@ -0,0 +1,6 @@ +/turf/simulated/floor/holofloor/flesh + name = "flesh" + desc = "This slick flesh ripples and squishes under your touch" + icon = 'icons/turf/stomach_vr.dmi' + icon_state = "flesh_floor" + initial_flooring = /decl/flooring/flesh diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm index f0926dfc8e0..0727188e2f6 100644 --- a/maps/groundbase/gb-misc.dmm +++ b/maps/groundbase/gb-misc.dmm @@ -2486,7 +2486,7 @@ /turf/unsimulated/ai_visible, /area/ai_multicam_room) "lp" = ( -/turf/simulated/floor/flesh, +/turf/simulated/floor/holofloor/flesh, /area/holodeck/the_uwu_zone) "lP" = ( /obj/effect/step_trigger/thrower{ @@ -2969,8 +2969,8 @@ }, /area/holodeck/source_gym) "PL" = ( -/turf/simulated/floor/flesh, -/turf/simulated/floor/holofloor/reinforced, +/turf/simulated/floor/holofloor/flesh, +/turf/space, /area/holodeck/the_uwu_zone) "PM" = ( /turf/simulated/floor/smole/megablocks, diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 2c7b2e167d8..442a665c9b4 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -329,6 +329,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/engineering/eva) +"aQ" = ( +/obj/machinery/vending/wardrobe/clowndrobe, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "aR" = ( /turf/simulated/wall/r_wall, /area/groundbase/security/halls) @@ -673,8 +677,18 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "bZ" = ( -/turf/simulated/floor, -/area/groundbase/level1/ne) +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/clown{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/bikehorn{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/machinery/alarm, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "ca" = ( /turf/simulated/floor/outdoors/newdirt/virgo3c{ outdoors = 0 @@ -1009,8 +1023,17 @@ /area/groundbase/engineering/techstorage) "cV" = ( /obj/effect/landmark/start/clown, -/turf/simulated/floor, -/area/groundbase/level1/ne) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "cW" = ( /obj/structure/table/rack/steel, /obj/item/weapon/circuitboard/mech_recharger{ @@ -1347,6 +1370,12 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/northspur) "dO" = ( @@ -1516,6 +1545,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/northspur) "el" = ( @@ -4068,6 +4099,15 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) +"lh" = ( +/obj/structure/curtain/black{ + color = "#361447" + }, +/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/bed/double/padded, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "li" = ( /obj/structure/cable{ icon_state = "1-4" @@ -4378,6 +4418,12 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/northspur) "lV" = ( @@ -5140,6 +5186,10 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"oh" = ( +/obj/structure/barricade/cutout/clown, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "oi" = ( /obj/structure/cryofeed{ dir = 2 @@ -5402,6 +5452,23 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or2) +"oU" = ( +/obj/machinery/door/airlock{ + name = "Giggledome"; + req_access = list(136) + }, +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/clown) "oV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ @@ -6123,13 +6190,22 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "qY" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, +/obj/structure/closet/crate, +/obj/item/weapon/circuitboard/smes, +/obj/item/weapon/circuitboard/smes, +/obj/item/weapon/smes_coil, +/obj/item/weapon/smes_coil, +/obj/item/weapon/smes_coil/super_capacity, +/obj/item/weapon/smes_coil/super_capacity, +/obj/item/weapon/smes_coil/super_io, +/obj/item/weapon/smes_coil/super_io, /obj/machinery/alarm{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, /area/groundbase/engineering/storage) "qZ" = ( /obj/structure/table/reinforced, @@ -6296,6 +6372,21 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/substation/aiciv) +"rr" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "rs" = ( /turf/simulated/wall/r_wall, /area/groundbase/level1/westspur) @@ -7402,6 +7493,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/groundbase/security/halle) +"up" = ( +/obj/structure/bed/chair/comfy/yellow{ + dir = 8 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "uq" = ( /obj/effect/landmark{ name = "JoinLateCryo" @@ -9057,6 +9154,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/civilian/arrivals) +"yN" = ( +/obj/machinery/power/apc{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "yP" = ( /obj/machinery/light{ dir = 4 @@ -9438,7 +9544,7 @@ id = "engineaccess"; name = "Engine Access"; pixel_x = -25; - req_access = list(3) + req_access = list(10) }, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) @@ -9895,6 +10001,21 @@ "AW" = ( /turf/simulated/wall/r_wall, /area/groundbase/level1/sw) +"AX" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "AY" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -10272,6 +10393,21 @@ "BW" = ( /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) +"BX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/groundbase/civilian/clown) "BY" = ( /obj/machinery/alarm{ dir = 4 @@ -10703,6 +10839,21 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) +"De" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "Dh" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 5 @@ -10791,6 +10942,17 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) +"Dv" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "Dw" = ( /obj/machinery/power/grid_checker, /obj/structure/cable, @@ -12173,6 +12335,18 @@ /obj/structure/bed/chair/sofa/bench/left, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/centsquare) +"Hy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "Hz" = ( /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level1/southeastspur) @@ -12880,6 +13054,14 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) +"Jy" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ + outdoors = 0 + }, +/area/groundbase/civilian/clown) "Jz" = ( /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/civilian/arrivals) @@ -15667,6 +15849,24 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) +"Rh" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "Rj" = ( /obj/machinery/atmospherics/pipe/manifold/visible/black, /turf/simulated/floor/tiled/techmaint, @@ -16169,6 +16369,21 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"SA" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "SB" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 @@ -16186,6 +16401,17 @@ }, /turf/simulated/floor/tiled, /area/groundbase/security/processing) +"SD" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "SE" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -16335,6 +16561,21 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"Ta" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/maintenance/groundbase/level1/netunnel) "Tb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16945,6 +17186,18 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/hall) +"UN" = ( +/obj/structure/table/woodentable, +/obj/item/toy/figure/clown, +/obj/item/weapon/pen/crayon/marker/rainbow, +/obj/machinery/firealarm{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "UP" = ( /obj/structure/table/rack/steel, /obj/item/clothing/gloves/arm_guard/laserproof, @@ -17011,6 +17264,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) +"Vc" = ( +/turf/simulated/wall, +/area/groundbase/civilian/clown) "Vd" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 @@ -18616,15 +18872,15 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/northspur) @@ -18654,6 +18910,11 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/robot) +"ZK" = ( +/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ + outdoors = 0 + }, +/area/groundbase/civilian/clown) "ZL" = ( /obj/machinery/newscaster{ layer = 3.3; @@ -28834,7 +29095,7 @@ qE qE tG tG -Ro +De iG iG qE @@ -28976,7 +29237,7 @@ qE qE qE iG -Ro +De UE UE UE @@ -29118,7 +29379,7 @@ iH iH iH iH -Ro +De UE UE UE @@ -29260,7 +29521,7 @@ iH iY iY nk -Ro +De UE UE qE @@ -29402,7 +29663,7 @@ iH iY iY nk -Ro +De UE UE qE @@ -29544,7 +29805,7 @@ iH iH iH iH -Ro +De UE UE qE @@ -29686,7 +29947,7 @@ qE qE qE qE -Ro +De UE qE qE @@ -29828,7 +30089,7 @@ qE qE qE qE -Ro +De UE qE qE @@ -29969,8 +30230,8 @@ qE qE qE qE -Fm -pb +AX +Ta qE qE qE @@ -30111,7 +30372,7 @@ qE qE qE qE -Ro +De qE qE qE @@ -30253,7 +30514,7 @@ qE qE qE pU -Ro +De qE pU qE @@ -30395,7 +30656,7 @@ qE qE pU pU -Ro +De pU pU qE @@ -30537,7 +30798,7 @@ qE qE qE pU -Ro +De pU pU qE @@ -30679,8 +30940,8 @@ qE qE pU pU -Km -ty +SA +rr pU qE qE @@ -30822,7 +31083,7 @@ qE qE pU pU -Ro +De pU qE qE @@ -30964,7 +31225,7 @@ qE qE pU pU -Ro +De pU qE qE @@ -31106,7 +31367,7 @@ qE qE pU pU -Ro +De pU qE qE @@ -31248,7 +31509,7 @@ qE qE qE pU -Ro +De pU qE pU @@ -31390,7 +31651,7 @@ qE qE qE pU -Ro +De qE qE pU @@ -31532,7 +31793,7 @@ qE qE qE qE -Ro +De qE pU pU @@ -31674,11 +31935,11 @@ qE qE qE qE -Km -uO -uO -uO -ty +SA +Dv +Dv +Dv +rr pU qE qE @@ -31820,7 +32081,7 @@ pU pU pU pU -Ro +De pU pU qE @@ -31962,7 +32223,7 @@ qE qE pU pU -Ro +De qE pU qE @@ -32104,10 +32365,10 @@ qE qE qE qE -Km -uO -uO -ty +SA +SD +SD +rr pU pU pU @@ -32249,7 +32510,7 @@ qE pU pU qE -Km +Rh uO uO uO @@ -32390,10 +32651,10 @@ qE qE qE pU -pU -pU -pU -pU +ZK +BX +Jy +sm qE pU pU @@ -32531,11 +32792,11 @@ qE qE qE qE -bb -bb -bZ -bb -bb +Vc +Vc +oU +Vc +Vc qE pU qE @@ -32673,11 +32934,11 @@ qE qE qE qE -bb +Vc bZ -bZ -bZ -bb +Hy +oh +Vc qE qE qE @@ -32815,11 +33076,11 @@ qE qE qE qE -bb -bZ +Vc +lh cV -bZ -bb +UN +Vc qE qE qE @@ -32957,11 +33218,11 @@ qE qE qE qE -bb -bZ -bZ -bZ -bb +Vc +aQ +yN +up +Vc qE qE qE @@ -33099,11 +33360,11 @@ qE qE qE qE -bb -bb -bb -bb -bb +Vc +Vc +Vc +Vc +Vc qE qE qE diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 4e31c550b28..c51731a5007 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -55,6 +55,16 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) +"am" = ( +/obj/item/toy/figure/mime, +/obj/item/weapon/pen/crayon/marker/mime, +/obj/item/weapon/pen/crayon/mime, +/obj/structure/table/standard, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "an" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/tcomms) @@ -1443,6 +1453,15 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/server) +"ex" = ( +/obj/machinery/power/apc{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "ey" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -2695,6 +2714,14 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"il" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/outdoors/sidewalk/virgo3c, +/area/groundbase/level2/nw) "im" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -2930,6 +2957,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) +"iW" = ( +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/civilian/mime) "iX" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -2939,6 +2969,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/tcomms) +"iY" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/area/groundbase/civilian/mime) "iZ" = ( /obj/structure/bed/chair/comfy/blue, /turf/simulated/floor/tiled/dark, @@ -3351,6 +3393,7 @@ "kn" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/firealarm, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "ko" = ( @@ -3683,6 +3726,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"ln" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/civilian/mime) "lp" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/start/chemist, @@ -3906,6 +3955,23 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) +"lY" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Temple of Silence"; + req_access = list(26) + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/mime) "lZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -5353,6 +5419,12 @@ }, /turf/simulated/wall/r_wall, /area/groundbase/command/hop) +"qD" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "qE" = ( /obj/machinery/button/remote/airlock{ dir = 4; @@ -5659,6 +5731,18 @@ /obj/machinery/light/small, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/hall) +"rG" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level2/nw) "rH" = ( /obj/machinery/requests_console/preset/research{ pixel_y = 30 @@ -5717,8 +5801,12 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "rO" = ( -/turf/simulated/floor, -/area/groundbase/level2/nw) +/obj/structure/barricade/cutout/mime, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "rP" = ( /turf/simulated/wall, /area/groundbase/civilian/library) @@ -5750,6 +5838,15 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) +"sb" = ( +/obj/structure/mopbucket, +/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "sc" = ( /obj/structure/bed/chair/comfy/blue{ dir = 4 @@ -7176,6 +7273,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) +"wK" = ( +/turf/simulated/wall, +/area/groundbase/civilian/mime) "wL" = ( /obj/structure/table/glass, /turf/simulated/floor/tiled/white, @@ -7900,6 +8000,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"yW" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level2/nw) "yX" = ( /obj/structure/janitorialcart, /turf/simulated/floor/tiled, @@ -8138,6 +8250,18 @@ edge_blending_priority = -1 }, /area/groundbase/science/rnd) +"zL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level2/nw) "zO" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/light{ @@ -10528,6 +10652,10 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) +"GQ" = ( +/obj/machinery/vending/wardrobe/mimedrobe, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "GS" = ( /obj/structure/railing/grey{ dir = 1 @@ -10580,11 +10708,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/structure/cable/yellow{ icon_state = "2-4" @@ -10993,6 +11121,13 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level2/ne) +"Il" = ( +/obj/item/weapon/bedsheet/mimedouble, +/obj/structure/bed/double/padded, +/obj/structure/curtain/black, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "Im" = ( /obj/structure/closet/secure_closet/personal, /obj/item/weapon/towel/random, @@ -11094,6 +11229,15 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/nw) +"IB" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "IC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -11952,6 +12096,18 @@ /obj/effect/landmark/start/xenobot, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"Lb" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "Lc" = ( /turf/simulated/floor/tiled, /area/groundbase/cargo/office) @@ -12102,6 +12258,12 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/nw) "LB" = ( @@ -13344,6 +13506,15 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/nw) "Pa" = ( @@ -16736,8 +16907,17 @@ /area/groundbase/civilian/library) "Zw" = ( /obj/effect/landmark/start/mime, -/turf/simulated/floor, -/area/groundbase/level2/nw) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "Zx" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level2/sw) @@ -18246,23 +18426,23 @@ xE bY bY bY -bY -bY -bY -bY -bY -bY -Jc -Jc -Jc -Jc -Jc -Jc -Jc -bY -bY -bY -bY +rG +il +il +il +il +il +il +il +il +il +il +il +il +il +il +il +zL bY bY bY @@ -18387,9 +18567,9 @@ xE xE xE bY -bY -bY -bY +ln +iY +iW bY xE bY @@ -18404,7 +18584,7 @@ Jc Jc Jc Jc -Jc +sN Jc bY bY @@ -18528,11 +18708,11 @@ xE xE xE xE -Gp -Gp -bY -Gp -Gp +wK +wK +lY +wK +wK xE xE xE @@ -18546,7 +18726,7 @@ bY bY Jc Jc -Jc +sN bY bY bY @@ -18670,11 +18850,11 @@ xE xE xE xE -Gp +wK rO -rO -rO -Gp +Lb +IB +wK xE xE xE @@ -18688,7 +18868,7 @@ bY bY bY bY -bY +sN pw Gp Gp @@ -18812,11 +18992,11 @@ KW xE xE xE -Gp -rO +wK +Il Zw -rO -Gp +am +wK xE xE xE @@ -18830,7 +19010,7 @@ xE xE bY bY -Hn +yW Ja tZ Pz @@ -18954,11 +19134,11 @@ KW xE xE xE -Gp -rO -rO -rO -Gp +wK +GQ +ex +qD +wK xE xE xE @@ -18972,7 +19152,7 @@ xE xE bY bY -bX +sN pw OU Gp @@ -19096,11 +19276,11 @@ KW KW KW xE -Gp -Gp -Gp -Gp -Gp +wK +wK +wK +wK +wK xE xE Do @@ -19114,7 +19294,7 @@ Do xE bY bY -bX +sN bY OU Gp @@ -19250,13 +19430,13 @@ fZ yX Cy vS -KO +sb KO Do xE xE bY -bX +sN bY OU Gp @@ -19398,7 +19578,7 @@ Do xE xE bY -bX +sN bY OU Gp @@ -19540,7 +19720,7 @@ Do xE xE bY -bX +sN bY OU Gp @@ -19682,7 +19862,7 @@ Do bY bY bY -bX +sN bY OU Gp @@ -19824,7 +20004,7 @@ Do bY bY bY -bX +sN pw OU Gp @@ -20108,7 +20288,7 @@ Do bY Jc bY -Ad +sN pw Gp Gp @@ -20250,7 +20430,7 @@ bY bY bY bY -Ad +sN bY bY bY @@ -20386,12 +20566,12 @@ bY Zg bY GZ -Cw -Cw -Cw -Cw -Cw -Cw +il +il +il +il +il +il LA bY Jc diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index b65c7fd651d..a93ab7b5dd7 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -1200,9 +1200,15 @@ /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "ws" = ( -/obj/machinery/light/bigfloorlamp, -/turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/level3/nw) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = 1 + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level3/escapepad) "wu" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -6398,10 +6404,10 @@ aa qO qO MF -ws -qO -qO -qO +Gf +tM +tM +tM Qn Ii Ii @@ -6540,10 +6546,11 @@ aa qO qO MF -qO +tM rJ vw vw +ws vw vw vw @@ -6551,8 +6558,7 @@ vw vw vw vw -vw -vw +ws vw vw vw @@ -6682,7 +6688,7 @@ aa bi qO MF -qO +tM pC DB DB @@ -6824,7 +6830,7 @@ dE Ts uF mU -qO +tM Sp DB DB @@ -6966,7 +6972,7 @@ aa bi qO Fx -qO +tM Sp DB DB @@ -7108,7 +7114,7 @@ aa qO qO Fx -qO +tM Sp DB DB @@ -7250,7 +7256,7 @@ aa qO qO Fx -qO +tM Sp DB DB @@ -7392,7 +7398,7 @@ aa qO qO Fx -qO +tM Sp DB DB diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 221ecbb8fed..fcf9233dd98 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -316,6 +316,10 @@ name = "Uncle Grumslex's Snack Emporium" /area/groundbase/civilian/apparel name = "Crew Apparel Care" +/area/groundbase/civilian/clown + name = "Giggledome" +/area/groundbase/civilian/mime + name = "Temple of Silence" /area/groundbase/exploration name = "Exploration" diff --git a/vorestation.dme b/vorestation.dme index 57146b8a9b8..1384c2c4717 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2364,6 +2364,7 @@ #include "code\modules\ghosttrap\trap.dm" #include "code\modules\holodeck\HolodeckControl.dm" #include "code\modules\holodeck\HolodeckObjects.dm" +#include "code\modules\holodeck\HolodeckObjects_vr.dm" #include "code\modules\holodeck\HolodeckPrograms.dm" #include "code\modules\holomap\generate_holomap.dm" #include "code\modules\holomap\holomap_area.dm"