9x10 Holodeck and New Holodeck Simulations (#52793)

9x10 Holodeck and New Holodeck Simulations
This commit is contained in:
Kylerace
2020-08-27 07:58:03 +02:00
committed by GitHub
parent 72f8b257c6
commit 90be19087d
10 changed files with 6936 additions and 5307 deletions
File diff suppressed because it is too large Load Diff
+226 -236
View File
@@ -7085,18 +7085,16 @@
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aqr" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 6
},
/turf/open/floor/plating,
/turf/closed/wall,
/area/crew_quarters/fitness)
"aqs" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 4
dir = 8
},
/turf/open/floor/plating,
/turf/closed/wall,
/area/crew_quarters/fitness)
"aqt" = (
/obj/structure/toilet/greyscale{
@@ -7116,13 +7114,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/prison/safe)
"aqu" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10
},
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"aqv" = (
/obj/machinery/door/airlock/external{
name = "External Access";
@@ -7961,12 +7952,6 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"asx" = (
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;38"
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"asy" = (
/obj/machinery/door/airlock/maintenance{
name = "Firefighting Equipment";
@@ -8587,12 +8572,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
"auf" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance/two,
/obj/machinery/light/small,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aug" = (
/obj/machinery/firealarm{
dir = 1;
@@ -8758,35 +8737,10 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"auz" = (
/obj/machinery/camera{
c_tag = "Holodeck"
},
/obj/machinery/airalarm{
pixel_y = 24
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"auA" = (
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"auB" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"auC" = (
/obj/machinery/light/small,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"auD" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -9197,18 +9151,6 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/ai_monitored/security/armory)
"avC" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"avD" = (
/obj/machinery/computer/holodeck{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"avE" = (
/obj/machinery/door/poddoor/preopen{
id = "maint3"
@@ -9623,20 +9565,10 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"awC" = (
/obj/structure/table,
/obj/item/paper/fluff/holodeck/disclaimer,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"awD" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"awE" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/loot_site_spawner,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"awF" = (
/obj/effect/loot_site_spawner,
/turf/open/floor/plating,
@@ -10210,18 +10142,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aya" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ayb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ayc" = (
/obj/machinery/button/flasher{
id = "visitorflash";
@@ -10786,11 +10706,9 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"azr" = (
/obj/structure/rack,
/obj/item/pressure_plate,
/obj/item/pressure_plate,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3,
/turf/closed/wall,
/area/crew_quarters/fitness)
"azt" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer3,
@@ -11763,13 +11681,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aBE" = (
/obj/item/clothing/under/misc/mailman,
/obj/item/clothing/head/mailman,
/obj/structure/closet,
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aBF" = (
/obj/machinery/space_heater,
/turf/open/floor/plating,
@@ -12101,25 +12012,16 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aCu" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
dir = 5
},
/turf/open/floor/plating,
/turf/closed/wall,
/area/crew_quarters/fitness)
"aCv" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
dir = 4
},
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"aCw" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
dir = 9
},
/turf/open/floor/plating,
/turf/closed/wall,
/area/crew_quarters/fitness)
"aCx" = (
/obj/effect/turf_decal/stripes/corner{
@@ -49697,6 +49599,17 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cRr" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/structure/chair/office{
dir = 1
},
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"cSb" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -50353,6 +50266,14 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"dMS" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/computer/holodeck,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"dMZ" = (
/obj/item/transfer_valve{
pixel_x = -5
@@ -50970,11 +50891,16 @@
/turf/closed/wall,
/area/quartermaster/warehouse)
"gjD" = (
/obj/structure/window,
/obj/structure/rack,
/obj/item/assembly/signaler,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/camera{
c_tag = "Holodeck Control";
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"gkC" = (
/obj/structure/closet/l3closet/virology,
/obj/effect/turf_decal/stripes/line{
@@ -51257,6 +51183,12 @@
/mob/living/simple_animal/pet/fox/renault,
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"hgK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
dir = 9
},
/turf/closed/wall,
/area/crew_quarters/fitness)
"hhs" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
@@ -51344,6 +51276,10 @@
/obj/item/storage/box/disks_nanite,
/turf/open/floor/plasteel/dark,
/area/science/nanite)
"hBw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/turf/closed/wall,
/area/crew_quarters/fitness)
"hBY" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 4
@@ -51483,6 +51419,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark,
/area/science/nanite)
"ibL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10
},
/turf/closed/wall,
/area/crew_quarters/fitness)
"icS" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -52049,6 +51991,16 @@
/obj/structure/disposalpipe/trunk,
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"kbz" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"kbG" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -52581,6 +52533,12 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/aft)
"lvJ" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"lxa" = (
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/medical/virology";
@@ -53206,6 +53164,16 @@
/obj/effect/turf_decal/trimline/blue/filled/warning,
/turf/open/floor/plasteel/white,
/area/medical/medbay)
"ndD" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"ndR" = (
/obj/structure/cable,
/obj/machinery/photocopier,
@@ -54149,6 +54117,15 @@
/obj/effect/mapping_helpers/airlock/unres,
/turf/open/floor/plasteel,
/area/medical/medbay/lobby)
"pFO" = (
/obj/machinery/camera{
c_tag = "Holodeck - Fore";
name = "holodeck camera"
},
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
},
/area/holodeck/rec_center)
"pHl" = (
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel/white,
@@ -54183,10 +54160,6 @@
},
/turf/open/floor/plasteel/dark,
/area/science/nanite)
"pKr" = (
/obj/structure/fermenting_barrel,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"pLn" = (
/obj/machinery/conveyor/inverted{
dir = 5;
@@ -54742,6 +54715,10 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/maintenance/port)
"rQR" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"rTE" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
@@ -54803,6 +54780,16 @@
/obj/item/stock_parts/cell/emproof,
/turf/open/floor/plasteel/dark,
/area/engine/engine_smes)
"sgh" = (
/obj/machinery/camera{
c_tag = "Holodeck - Aft";
dir = 1;
name = "holodeck camera"
},
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
},
/area/holodeck/rec_center)
"sgR" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/green,
@@ -55106,13 +55093,6 @@
/obj/machinery/dna_scannernew,
/turf/open/floor/plasteel/white,
/area/science/genetics)
"tdZ" = (
/obj/structure/frame/computer{
anchored = 1;
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"tgl" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -56493,6 +56473,16 @@
/obj/structure/cable,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"xec" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"xeJ" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -93154,7 +93144,7 @@ boP
boP
boP
aqr
asY
hBw
asY
asY
atZ
@@ -93163,7 +93153,7 @@ auB
anW
azp
azp
azp
azr
aCu
cVb
wom
@@ -94439,6 +94429,7 @@ boP
boP
boP
aqs
pFO
aro
aro
aro
@@ -94447,8 +94438,7 @@ aro
aro
aro
aro
aro
aro
sgh
aCv
cVb
ijI
@@ -94695,18 +94685,18 @@ boP
boP
boP
boP
aqu
asY
asY
asY
auy
auB
auB
axZ
azp
azp
azp
aCw
aqs
aro
aro
aro
aro
aro
aro
aro
aro
aro
aro
aCv
dJS
xLr
tve
@@ -94952,18 +94942,18 @@ boP
boP
boP
boP
boP
arj
arj
arj
auA
avD
awC
ayb
arj
boP
boP
boP
aqs
aro
aro
aro
aro
aro
aro
aro
aro
aro
aro
aCv
fPh
qkI
hxq
@@ -95209,18 +95199,18 @@ boP
boP
boP
boP
boP
boP
boP
arj
auz
avC
avC
aya
arj
boP
boP
boP
aqs
aro
aro
aro
aro
aro
aro
aro
aro
aro
aro
aCv
dJS
qzO
pOR
@@ -95466,18 +95456,18 @@ boP
boP
boP
boP
boP
boP
boP
arj
auB
auB
arj
asx
alP
alP
boP
boP
aqs
aro
aro
aro
aro
aro
aro
aro
aro
aro
aro
aCv
fPh
qzO
aGB
@@ -95723,18 +95713,18 @@ boP
boP
boP
boP
boP
boP
boP
boP
boP
boP
alP
anf
ibL
hBw
hBw
hBw
auy
auB
auB
axZ
azr
alP
boP
boP
azr
azr
hgK
cVb
cSk
eAT
@@ -95983,15 +95973,15 @@ boP
boP
boP
boP
auB
xec
aua
aua
kbz
arj
boP
boP
boP
alO
anf
pKr
alO
boP
boP
cVb
xWM
pOR
@@ -96239,14 +96229,14 @@ boP
boP
boP
boP
alO
alO
alO
alP
alP
anf
auf
alP
boP
auB
dMS
cRr
aua
aua
arj
boP
alP
alP
alP
@@ -96493,19 +96483,19 @@ boP
boP
boP
boP
asU
alO
arp
alO
awD
anf
boP
boP
boP
boP
auB
ndD
gjD
anf
anf
anf
aBE
aua
ndD
arj
boP
alP
tdZ
anf
aDX
alP
aGH
@@ -96750,17 +96740,17 @@ boP
boP
boP
boP
asU
cxW
anf
aqv
anf
anf
anf
aEl
anf
anf
anf
alO
arp
alO
alP
alP
alP
alP
lvJ
alP
alP
alP
alP
twX
fDD
@@ -97007,14 +96997,14 @@ boP
boP
boP
boP
asU
alO
alO
alO
bqg
auC
alP
auD
cxW
anf
aqv
anf
anf
anf
anf
anf
anf
anf
anf
@@ -97264,14 +97254,14 @@ boP
boP
boP
boP
boP
boP
boP
alO
arp
alO
aqy
anf
alP
awE
anf
awF
anf
anf
anf
anf
@@ -97787,7 +97777,7 @@ auD
apC
awF
anf
anf
rQR
anf
anf
aCz
@@ -98048,7 +98038,7 @@ apl
apl
apl
aCA
anf
aEl
awD
aGW
anf
+167 -157
View File
@@ -1962,13 +1962,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"aeE" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
dir = 10
},
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
"aeF" = (
/obj/effect/landmark/xeno_spawn,
/obj/structure/lattice/catwalk,
@@ -4619,12 +4612,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"ajY" = (
/obj/structure/chair{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"ajZ" = (
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
@@ -5307,20 +5294,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"alo" = (
/obj/machinery/camera{
c_tag = "Holodeck";
dir = 1
},
/obj/item/radio/intercom{
pixel_y = -28
},
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"alp" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
dir = 8
@@ -5990,15 +5963,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/turf/closed/wall,
/area/crew_quarters/fitness/recreation)
"amG" = (
/obj/machinery/light/small{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"amH" = (
/obj/machinery/door/airlock/external{
req_one_access_txt = "13,8"
@@ -6512,12 +6476,6 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/maintenance/starboard)
"anN" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"anO" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer3{
dir = 4
@@ -63437,13 +63395,6 @@
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"dht" = (
/obj/item/cigbutt,
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"dhu" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/sign/poster/contraband/random{
@@ -65075,10 +65026,9 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"dCi" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"dCk" = (
/obj/effect/turf_decal/stripes/line{
@@ -68448,6 +68398,12 @@
},
/turf/open/floor/wood,
/area/vacant_room/office)
"ijD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer3{
dir = 10
},
/turf/closed/wall,
/area/crew_quarters/fitness/recreation)
"ilm" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 1
@@ -68583,6 +68539,12 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"ixc" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/lootdrop/costume,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ixg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -70892,6 +70854,12 @@
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"mfN" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
"mha" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -72713,6 +72681,15 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"pvY" = (
/obj/machinery/camera{
c_tag = "Holodeck - Fore";
name = "holodeck camera"
},
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
},
/area/holodeck/rec_center)
"pwn" = (
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
@@ -73253,6 +73230,16 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
"qhy" = (
/obj/machinery/camera{
c_tag = "Holodeck - Aft";
dir = 1;
name = "holodeck camera"
},
/turf/open/floor/engine{
name = "Holodeck Projector Floor"
},
/area/holodeck/rec_center)
"qif" = (
/obj/machinery/power/apc{
areastring = "/area/medical/morgue";
@@ -74843,6 +74830,20 @@
},
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
"sFe" = (
/obj/machinery/camera{
c_tag = "Holodeck Control";
dir = 1
},
/obj/item/radio/intercom{
pixel_y = -28
},
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"sFv" = (
/turf/closed/wall/r_wall,
/area/science/explab)
@@ -75530,6 +75531,10 @@
/obj/effect/spawner/lootdrop/gross_decal_spawner,
/turf/open/floor/wood,
/area/maintenance/port/aft)
"tUa" = (
/obj/structure/table,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"tXK" = (
/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
/turf/open/floor/engine/vacuum,
@@ -76205,6 +76210,11 @@
/obj/structure/cable,
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai)
"vnL" = (
/obj/structure/closet/crate/hydroponics,
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"vnZ" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -116168,7 +116178,7 @@ aaa
aaa
aaa
aeB
afC
aho
afC
afC
aib
@@ -116952,7 +116962,7 @@ afD
aqo
arG
asB
dhB
vnL
dnR
dnh
axN
@@ -117453,6 +117463,7 @@ aaa
aag
aaa
aeC
pvY
afD
afD
afD
@@ -117461,8 +117472,7 @@ afD
afD
afD
afD
afD
afD
qhy
aqo
arI
atd
@@ -117709,22 +117719,22 @@ aaa
aaa
aai
aaa
aeE
afC
afC
aho
aic
acQ
acQ
aln
amE
amE
amE
aqp
dnh
dnR
aus
dnS
aeC
afD
afD
afD
afD
afD
afD
afD
afD
afD
afD
aqo
arI
atd
atd
atd
dnh
aAm
oeK
@@ -117966,22 +117976,22 @@ aaa
aaa
aaf
aaa
aaa
aaf
aaa
acP
aid
aiZ
ajX
alo
acP
dnz
dnR
dht
dnh
dnh
dnh
dnh
aeC
afD
afD
afD
afD
afD
afD
afD
afD
afD
afD
aqo
arI
atd
dnS
atd
dnh
axQ
ayR
@@ -118223,23 +118233,23 @@ aaa
aaa
aaf
aaf
aaf
aaf
aaa
acP
aie
aja
ajY
alp
dtE
anN
dnS
doh
dnS
dnS
aeC
afD
afD
afD
afD
afD
afD
afD
afD
afD
afD
aqo
dnR
aus
dCi
dnS
dnS
tUa
dnh
axO
dnS
axY
@@ -118480,18 +118490,18 @@ aaa
aaa
aaa
aaa
aaa
aaf
aaa
acP
acQ
acQ
acQ
acP
acP
dnh
dnh
dnh
aeC
afD
afD
afD
afD
afD
afD
afD
afD
afD
afD
aqo
dnh
dnh
dnh
@@ -118737,19 +118747,19 @@ aaa
aaa
aaa
aaa
aaa
aaf
aaa
aaa
aaa
aaa
aaf
dni
amG
amH
anN
dnS
dhB
ijD
aho
aho
aho
aic
acQ
acQ
aln
amE
amE
amE
aqp
ixc
arI
dnh
dqu
@@ -118997,15 +119007,15 @@ aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaf
dnh
amH
acP
aid
aiZ
ajX
sFe
acP
dnh
apd
dnS
ape
arK
dnS
dnh
@@ -119254,14 +119264,14 @@ aaa
aaa
aaa
aaa
aaa
aaf
aaa
aaf
aaa
ack
dnh
ape
acP
aie
aja
ahg
alp
mfN
dnS
dnS
dnS
arL
ate
@@ -119511,17 +119521,17 @@ aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
ack
dni
acP
acP
acP
acP
acP
acP
bcO
dnS
dnS
dnS
dnS
dnh
avu
axY
@@ -119769,12 +119779,12 @@ aaa
aaa
aaa
aaa
aaf
aaa
aaf
aaa
aaf
dnh
amH
dnS
amH
dnS
dnS
apg
aqs
arM
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+6
View File
@@ -83,6 +83,9 @@
/area/holodeck/rec_center/spacechess
name = "Holodeck - Space Chess"
/area/holodeck/rec_center/spacecheckers
name = "Holodeck - Space Checkers"
/area/holodeck/rec_center/kobayashi
name = "Holodeck - Kobayashi Maru"
@@ -92,6 +95,9 @@
/area/holodeck/rec_center/photobooth
name = "Holodeck - Photobooth"
/area/holodeck/rec_center/skatepark
name = "Holodeck - Skate Park"
// Bad programs
/area/holodeck/rec_center/medical
+7 -5
View File
@@ -87,11 +87,13 @@
qdel(src)
/obj/effect/holodeck_effect/mobspawner/pet
mobtype = list(
/mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo,
/mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten,
/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy,
/mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/pet/fox)
/obj/effect/holodeck_effect/mobspawner/pet/Initialize()
. = ..()
mobtype = list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/chick/holo, /mob/living/simple_animal/pet/fox)
mobtype += pick(/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/dog/corgi/puppy,
/mob/living/simple_animal/pet/dog/pug)
mobtype += pick(/mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/cat/kitten)
/obj/effect/holodeck_effect/mobspawner/bee
mobtype = /mob/living/simple_animal/hostile/poison/bees/toxin
+8
View File
@@ -227,3 +227,11 @@
/obj/item/paper/fluff/holodeck/disclaimer
name = "Holodeck Disclaimer"
info = "Bruises sustained in the holodeck can be healed simply by sleeping."
/obj/vehicle/ridden/scooter/skateboard/pro/holodeck
name = "holographic skateboard"
desc = "A holographic copy of the RaDSTORMz brand professional skateboard."
instability = 6
/obj/vehicle/ridden/scooter/skateboard/pro/holodeck/pick_up_board() //picking up normal skateboards spawned in the holodeck gets rid of the holo flag, now you cant pick them up.
return
+3
View File
@@ -136,3 +136,6 @@
/turf/open/floor/holofloor/snow/cold
initial_gas_mix = "nob=7500;TEMP=2.7"
/turf/open/floor/holofloor/dark
icon_state = "darkfull"
+13 -8
View File
@@ -149,16 +149,21 @@
/obj/vehicle/ridden/scooter/skateboard/MouseDrop(atom/over_object)
. = ..()
var/mob/living/carbon/M = usr
if(!istype(M) || M.incapacitated() || !Adjacent(M))
var/mob/living/carbon/Skater = usr
if(!istype(Skater))
return
if(has_buckled_mobs() && over_object == M)
to_chat(M, "<span class='warning'>You can't lift this up when somebody's on it.</span>")
if (over_object == Skater)
pick_up_board(Skater)
/obj/vehicle/ridden/scooter/skateboard/proc/pick_up_board(mob/living/carbon/Skater)
if (Skater.incapacitated() || !Adjacent(Skater))
return
if(over_object == M)
var/board = new board_item_type(get_turf(M))
M.put_in_hands(board)
qdel(src)
if(has_buckled_mobs())
to_chat(Skater, "<span class='warning'>You can't lift this up when somebody's on it.</span>")
return
var/board = new board_item_type(get_turf(Skater))
Skater.put_in_hands(board)
qdel(src)
/obj/vehicle/ridden/scooter/skateboard/pro
name = "skateboard"