mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Merge remote-tracking branch 'origin/master' into luciee
This commit is contained in:
Katherine Kiefer
@@ -16777,7 +16777,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/fitness)
|
||||
"iYZ" = (
|
||||
/obj/effect/landmark/stationroom/gax/ai_whale,
|
||||
/obj/effect/landmark/stationroom/limited_spawn/gax/ai_whale,
|
||||
/turf/open/space/basic,
|
||||
/area/space)
|
||||
"iZa" = (
|
||||
|
||||
@@ -15869,17 +15869,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/lab)
|
||||
"bpp" = (
|
||||
/obj/machinery/door/window/eastright{
|
||||
base_state = "left";
|
||||
dir = 8;
|
||||
icon_state = "left";
|
||||
name = "Research Division Delivery";
|
||||
req_access_txt = "47"
|
||||
},
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/lab)
|
||||
"bpq" = (
|
||||
/obj/machinery/light_switch{
|
||||
pixel_y = -23
|
||||
@@ -16084,17 +16073,6 @@
|
||||
"bqe" = (
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/science/explab)
|
||||
"bqf" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "rnd2";
|
||||
name = "research lab shutters"
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/lab)
|
||||
"bqi" = (
|
||||
/obj/effect/turf_decal/stripes/corner,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
|
||||
@@ -16103,25 +16081,6 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/secondary/entry)
|
||||
"bqk" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "rnd2";
|
||||
name = "research lab shutters"
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/lab)
|
||||
"bqo" = (
|
||||
/obj/machinery/computer/cargo{
|
||||
dir = 1
|
||||
@@ -16256,13 +16215,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/robotics/lab)
|
||||
"brr" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/science/explab)
|
||||
"brs" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/door/window/eastright{
|
||||
@@ -16316,14 +16268,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard)
|
||||
"brx" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "rnd2";
|
||||
name = "research lab shutters"
|
||||
},
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/lab)
|
||||
"brz" = (
|
||||
/obj/item/flashlight/flare/signal,
|
||||
/turf/open/floor/plating,
|
||||
@@ -20516,10 +20460,6 @@
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/turf/open/floor/plasteel/freezer,
|
||||
/area/crew_quarters/toilet)
|
||||
"bMr" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/xenobiology)
|
||||
"bMs" = (
|
||||
/obj/effect/spawner/structure/window/reinforced/shutter,
|
||||
/turf/open/floor/plating,
|
||||
@@ -21103,10 +21043,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/visible,
|
||||
/turf/open/space/basic,
|
||||
/area/engine/atmos_distro)
|
||||
"bPK" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/misc_lab)
|
||||
"bPN" = (
|
||||
/turf/closed/wall,
|
||||
/area/science/misc_lab)
|
||||
@@ -23948,14 +23884,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/central)
|
||||
"ctu" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/sleeper)
|
||||
"ctv" = (
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
@@ -25381,18 +25309,6 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/office)
|
||||
"cQe" = (
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "surgery_shutters";
|
||||
name = "Surgery Shutters"
|
||||
},
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/surgery)
|
||||
"cQr" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
|
||||
@@ -31504,6 +31420,17 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/aft)
|
||||
"giP" = (
|
||||
/obj/machinery/door/window/eastright{
|
||||
base_state = "left";
|
||||
dir = 8;
|
||||
icon_state = "left";
|
||||
name = "Research Division Delivery";
|
||||
req_access_txt = "7"
|
||||
},
|
||||
/obj/effect/turf_decal/delivery,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/lab)
|
||||
"gjl" = (
|
||||
/turf/closed/wall,
|
||||
/area/quartermaster/warehouse)
|
||||
@@ -31836,6 +31763,14 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/genetics/cloning)
|
||||
"gsd" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "rnd2";
|
||||
name = "research lab shutters"
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/lab)
|
||||
"gsx" = (
|
||||
/obj/effect/landmark/start/cyborg,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
|
||||
@@ -33238,6 +33173,18 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/warehouse)
|
||||
"hcZ" = (
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "surgery_shutters";
|
||||
name = "Surgery Shutters"
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/surgery)
|
||||
"hdd" = (
|
||||
/obj/machinery/door/airlock/public/glass{
|
||||
name = "Library"
|
||||
@@ -34857,16 +34804,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"hNl" = (
|
||||
/obj/effect/turf_decal/tile/yellow,
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/computer/rdconsole/production{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/foyer)
|
||||
"hNs" = (
|
||||
/obj/effect/landmark/stationroom/maint/fivexthree,
|
||||
/turf/template_noop,
|
||||
@@ -36286,14 +36223,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/virology)
|
||||
"iuo" = (
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/sleeper)
|
||||
"iuR" = (
|
||||
/obj/machinery/door/window/southleft{
|
||||
base_state = "right";
|
||||
@@ -37671,18 +37600,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"iYd" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "surgery_shutters";
|
||||
name = "Surgery Shutters"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/surgery)
|
||||
"iYj" = (
|
||||
/obj/machinery/meter{
|
||||
target_layer = 4
|
||||
@@ -38561,6 +38478,18 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos_distro)
|
||||
"jte" = (
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "surgery_shutters";
|
||||
name = "Surgery Shutters"
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/surgery)
|
||||
"jtq" = (
|
||||
/obj/machinery/portable_atmospherics/canister/air,
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
@@ -40063,6 +39992,25 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/port)
|
||||
"klU" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "rnd2";
|
||||
name = "research lab shutters"
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/lab)
|
||||
"klZ" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
|
||||
dir = 1
|
||||
@@ -42818,6 +42766,14 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark/telecomms,
|
||||
/area/tcommsat/server)
|
||||
"lEQ" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "robotics2";
|
||||
name = "robotics lab shutters"
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/robotics/lab)
|
||||
"lFb" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
|
||||
dir = 4
|
||||
@@ -47756,6 +47712,14 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/starboard/fore)
|
||||
"obM" = (
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/medbay/lobby)
|
||||
"ocq" = (
|
||||
/obj/machinery/door/poddoor{
|
||||
id = "trash";
|
||||
@@ -48341,14 +48305,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/starboard)
|
||||
"orq" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/medbay/lobby)
|
||||
"orC" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/lattice,
|
||||
@@ -49991,6 +49947,14 @@
|
||||
/obj/effect/turf_decal/box,
|
||||
/turf/open/floor/engine,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"piL" = (
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/sleeper)
|
||||
"piV" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
|
||||
dir = 1
|
||||
@@ -52449,18 +52413,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/engineering)
|
||||
"qzJ" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "surgery_shutters";
|
||||
name = "Surgery Shutters"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/surgery)
|
||||
"qAb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
|
||||
@@ -53352,14 +53304,6 @@
|
||||
/obj/effect/turf_decal/trimline/white,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engine/atmos)
|
||||
"qYz" = (
|
||||
/obj/effect/spawner/structure/window,
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "robotics2";
|
||||
name = "robotics lab shutters"
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/science/robotics/lab)
|
||||
"qZu" = (
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
|
||||
dir = 1
|
||||
@@ -62006,6 +61950,17 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/maintenance/disposal/incinerator)
|
||||
"vku" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "rnd2";
|
||||
name = "research lab shutters"
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/lab)
|
||||
"vkJ" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
@@ -63137,6 +63092,14 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/genetics)
|
||||
"vPZ" = (
|
||||
/obj/machinery/door/firedoor/border_only{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/door/firedoor/border_only,
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/medical/medbay/lobby)
|
||||
"vQq" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
|
||||
dir = 4
|
||||
@@ -63547,14 +63510,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/science/xenobiology)
|
||||
"wci" = (
|
||||
/obj/machinery/door/poddoor/shutters/preopen{
|
||||
id = "robotics2";
|
||||
name = "robotics lab shutters"
|
||||
},
|
||||
/obj/effect/spawner/structure/window,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/robotics/lab)
|
||||
"wcw" = (
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 1
|
||||
@@ -64823,6 +64778,13 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/aft)
|
||||
"wMP" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/explab)
|
||||
"wNo" = (
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 1
|
||||
@@ -67164,6 +67126,17 @@
|
||||
/obj/item/twohanded/rcl/pre_loaded,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/engineering)
|
||||
"xYI" = (
|
||||
/obj/effect/turf_decal/tile/yellow,
|
||||
/obj/effect/turf_decal/tile/yellow{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/computer/rdconsole/production{
|
||||
dir = 8;
|
||||
req_access = list(32)
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/foyer)
|
||||
"xYW" = (
|
||||
/obj/structure/table,
|
||||
/obj/item/clothing/glasses/meson,
|
||||
@@ -100055,7 +100028,7 @@ ahi
|
||||
ajs
|
||||
uxH
|
||||
akB
|
||||
hNl
|
||||
xYI
|
||||
cMv
|
||||
uQS
|
||||
kZP
|
||||
@@ -103623,7 +103596,7 @@ bfF
|
||||
ocA
|
||||
opn
|
||||
wiA
|
||||
ctu
|
||||
piL
|
||||
kJb
|
||||
oCO
|
||||
bZg
|
||||
@@ -104137,7 +104110,7 @@ cfu
|
||||
uYq
|
||||
ogm
|
||||
pZK
|
||||
ctu
|
||||
piL
|
||||
mtT
|
||||
lvO
|
||||
bDR
|
||||
@@ -104390,7 +104363,7 @@ aco
|
||||
dIW
|
||||
rJo
|
||||
hIu
|
||||
mgH
|
||||
vPZ
|
||||
oQi
|
||||
aBB
|
||||
vle
|
||||
@@ -104651,7 +104624,7 @@ gtC
|
||||
mKN
|
||||
kub
|
||||
tva
|
||||
ctu
|
||||
piL
|
||||
tzC
|
||||
rUG
|
||||
bDR
|
||||
@@ -104908,7 +104881,7 @@ gtC
|
||||
sxa
|
||||
kub
|
||||
tva
|
||||
iuo
|
||||
piL
|
||||
iTR
|
||||
vXI
|
||||
gaU
|
||||
@@ -105932,11 +105905,11 @@ fCh
|
||||
dlx
|
||||
vMp
|
||||
wtY
|
||||
orq
|
||||
obM
|
||||
sxa
|
||||
kub
|
||||
hLI
|
||||
ctu
|
||||
piL
|
||||
sTb
|
||||
mxh
|
||||
sgE
|
||||
@@ -106450,7 +106423,7 @@ orY
|
||||
hHy
|
||||
pjc
|
||||
hLI
|
||||
qzJ
|
||||
hcZ
|
||||
qmI
|
||||
xOh
|
||||
shN
|
||||
@@ -106707,7 +106680,7 @@ gtC
|
||||
iBZ
|
||||
kub
|
||||
tva
|
||||
cQe
|
||||
jte
|
||||
jbq
|
||||
vvK
|
||||
vvK
|
||||
@@ -106964,7 +106937,7 @@ bEi
|
||||
mvC
|
||||
cXg
|
||||
tva
|
||||
iYd
|
||||
jte
|
||||
bdw
|
||||
urv
|
||||
uMu
|
||||
@@ -107221,7 +107194,7 @@ luE
|
||||
uSW
|
||||
rTC
|
||||
tva
|
||||
iYd
|
||||
jte
|
||||
jbq
|
||||
lMh
|
||||
uuV
|
||||
@@ -107478,7 +107451,7 @@ bEi
|
||||
hoP
|
||||
kub
|
||||
hLI
|
||||
iYd
|
||||
jte
|
||||
dDo
|
||||
gQe
|
||||
doF
|
||||
@@ -112875,7 +112848,7 @@ sUL
|
||||
jna
|
||||
cIb
|
||||
hlz
|
||||
wci
|
||||
lEQ
|
||||
bgp
|
||||
sRl
|
||||
byf
|
||||
@@ -113132,7 +113105,7 @@ dEU
|
||||
bTv
|
||||
cIb
|
||||
rOz
|
||||
wci
|
||||
lEQ
|
||||
bgp
|
||||
pYr
|
||||
lcM
|
||||
@@ -113389,7 +113362,7 @@ bkr
|
||||
cHW
|
||||
cId
|
||||
hkd
|
||||
wci
|
||||
lEQ
|
||||
nlD
|
||||
bnH
|
||||
byf
|
||||
@@ -114417,7 +114390,7 @@ biN
|
||||
cHX
|
||||
buj
|
||||
buj
|
||||
wci
|
||||
lEQ
|
||||
sGm
|
||||
uCv
|
||||
byj
|
||||
@@ -114931,7 +114904,7 @@ bov
|
||||
bpU
|
||||
brq
|
||||
bsW
|
||||
wci
|
||||
lEQ
|
||||
bgp
|
||||
bnx
|
||||
byk
|
||||
@@ -115185,7 +115158,7 @@ bfV
|
||||
bfV
|
||||
bfV
|
||||
box
|
||||
qYz
|
||||
lEQ
|
||||
brs
|
||||
box
|
||||
box
|
||||
@@ -115202,9 +115175,9 @@ bsn
|
||||
bDc
|
||||
bDc
|
||||
bLe
|
||||
bMr
|
||||
piv
|
||||
uBi
|
||||
bMr
|
||||
piv
|
||||
bDb
|
||||
bDb
|
||||
bDb
|
||||
@@ -115462,7 +115435,7 @@ bHK
|
||||
bzE
|
||||
bID
|
||||
bHI
|
||||
bPK
|
||||
bZZ
|
||||
bQO
|
||||
bSb
|
||||
bOu
|
||||
@@ -115976,7 +115949,7 @@ bHL
|
||||
aPO
|
||||
bBD
|
||||
bJo
|
||||
bPK
|
||||
bZZ
|
||||
bWr
|
||||
bWr
|
||||
aiW
|
||||
@@ -116728,7 +116701,7 @@ blK
|
||||
bnp
|
||||
boA
|
||||
boQ
|
||||
brx
|
||||
gsd
|
||||
bro
|
||||
bmU
|
||||
bvJ
|
||||
@@ -116985,7 +116958,7 @@ blJ
|
||||
bno
|
||||
bkt
|
||||
biW
|
||||
bqf
|
||||
vku
|
||||
bgp
|
||||
bmU
|
||||
bvK
|
||||
@@ -117242,7 +117215,7 @@ bka
|
||||
bka
|
||||
aCl
|
||||
bpo
|
||||
bqk
|
||||
klU
|
||||
brp
|
||||
bmW
|
||||
bvK
|
||||
@@ -117499,7 +117472,7 @@ blL
|
||||
biW
|
||||
bnh
|
||||
biW
|
||||
brx
|
||||
gsd
|
||||
bte
|
||||
bmX
|
||||
bvK
|
||||
@@ -118012,9 +117985,9 @@ bgc
|
||||
bgc
|
||||
bgc
|
||||
bgc
|
||||
bpp
|
||||
giP
|
||||
bgc
|
||||
brr
|
||||
wMP
|
||||
bmZ
|
||||
bvK
|
||||
bvK
|
||||
|
||||
@@ -352,6 +352,8 @@
|
||||
|
||||
/obj/item/circuitboard/computer/rdconsole/attackby(obj/item/I, mob/user, params)
|
||||
if(I.tool_behaviour == TOOL_SCREWDRIVER)
|
||||
if(build_path == /obj/machinery/computer/rdconsole/production)
|
||||
return
|
||||
if(build_path == /obj/machinery/computer/rdconsole/core)
|
||||
name = "R&D Console - Robotics (Computer Board)"
|
||||
build_path = /obj/machinery/computer/rdconsole/robotics
|
||||
|
||||
@@ -699,6 +699,11 @@ Nothing else in the console has ID requirements.
|
||||
/obj/machinery/computer/rdconsole/proc/machine_icon(atom/item)
|
||||
return icon2html(initial(item.icon), usr, initial(item.icon_state), SOUTH)
|
||||
|
||||
/obj/machinery/computer/rdconsole/proc/can_research(mob/user)
|
||||
if(!locked || allowed(user))
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/obj/machinery/computer/rdconsole/proc/ui_techweb_single_node(datum/techweb_node/node, selflink=TRUE, minimal=FALSE)
|
||||
var/list/l = list()
|
||||
if (stored_research.hidden_nodes[node.id])
|
||||
@@ -974,6 +979,9 @@ Nothing else in the console has ID requirements.
|
||||
if(ls["disk_slot"])
|
||||
disk_slot_selected = text2num(ls["disk_slot"])
|
||||
if(ls["research_node"])
|
||||
if(!can_research(usr))
|
||||
to_chat(usr, "ACCESS DENIED")
|
||||
return
|
||||
if(!research_control)
|
||||
return //honestly should call them out for href exploiting :^)
|
||||
if(!SSresearch.science_tech.available_nodes[ls["research_node"]])
|
||||
|
||||
@@ -58,6 +58,30 @@
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
|
||||
<h2 class="date">28 June 2022</h2>
|
||||
<h3 class="author">JamieD1 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscdel">Removes R&D Doors - Because Access instead</li>
|
||||
<li class="rscadd">Research now requires Toxins/Robotics Access and now has Doors</li>
|
||||
</ul>
|
||||
<h3 class="author">redmoogle updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">Hand drill now works as a screwdriver for surgery</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">27 June 2022</h2>
|
||||
<h3 class="author"> actioninja, Ghommie updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Washing machines now support arbitrary dye color</li>
|
||||
<li class="rscadd">Washing machines now dye nearly every item.</li>
|
||||
<li class="experiment">lots of backend changes to clothing overlays, report any issues</li>
|
||||
<li class="imageadd">Different cuffs now come with different worn overlays instead of a generic one.</li>
|
||||
</ul>
|
||||
<h3 class="author">adamsong updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">fixed ai whale on gax</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">26 June 2022</h2>
|
||||
<h3 class="author"> Nmajask, IndusRobot, Mothblocks updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
@@ -2546,32 +2570,6 @@
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">fixed paper being blank when held to AI camera</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">29 March 2022</h2>
|
||||
<h3 class="author">SomeguyManperson updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">you can now repair cybernetic limbs again without the target having to have a wound</li>
|
||||
<li class="bugfix">brazil now only kicks out people who aren't supposed to be there instead of people who are</li>
|
||||
</ul>
|
||||
<h3 class="author">adamsong updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">rotatium has added rotating</li>
|
||||
<li class="bugfix">fixed the possibility of a malf AI not spawning on a malf round</li>
|
||||
</ul>
|
||||
<h3 class="author">tattax updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">fixed a bug that made borgs not unrest people and the message when clicking on a resting person</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">28 March 2022</h2>
|
||||
<h3 class="author">adamsong updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscdel">Removed player access to edit variables on any apc on station</li>
|
||||
</ul>
|
||||
<h3 class="author">nmajask updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">telescopic batons now have the right sprites again</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<b>GoonStation 13 Development Team</b>
|
||||
|
||||
@@ -32372,3 +32372,18 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
- tweak: Nanite fake death now has a 4.5 use rate from 3.5
|
||||
- tweak: ghost role chemical dispensers are now fully upgraded
|
||||
- tweak: VR chemical dispensers are now fully upgraded
|
||||
2022-06-27:
|
||||
' actioninja, Ghommie':
|
||||
- rscadd: Washing machines now support arbitrary dye color
|
||||
- rscadd: Washing machines now dye nearly every item.
|
||||
- experiment: lots of backend changes to clothing overlays, report any issues
|
||||
- imageadd: Different cuffs now come with different worn overlays instead of a generic
|
||||
one.
|
||||
adamsong:
|
||||
- bugfix: fixed ai whale on gax
|
||||
2022-06-28:
|
||||
JamieD1:
|
||||
- rscdel: Removes R&D Doors - Because Access instead
|
||||
- rscadd: Research now requires Toxins/Robotics Access and now has Doors
|
||||
redmoogle:
|
||||
- bugfix: Hand drill now works as a screwdriver for surgery
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
author: " actioninja, Ghommie"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "Washing machines now support arbitrary dye color"
|
||||
- rscadd: "Washing machines now dye nearly every item."
|
||||
- experiment: "lots of backend changes to clothing overlays, report any issues"
|
||||
- imageadd: "Different cuffs now come with different worn overlays instead of a generic one."
|
||||
@@ -166,9 +166,28 @@ GLOBAL_LIST_EMPTY(chosen_station_templates)
|
||||
template_names = list("Maint aquarium", "Maint bigconstruction", "Maint bigtheatre", "Maint deltalibrary", "Maint graffitiroom", "Maint junction", "Maint podrepairbay", "Maint pubbybar", "Maint roosterdome", "Maint sanitarium", "Maint snakefighter", "Maint vault", "Maint ward", "Maint assaultpod", "Maint maze", "Maint maze2", "Maint boxfactory",
|
||||
"Maint sixsectorsdown", "Maint advbotany", "Maint beach", "Maint botany_apiary", "Maint gamercave", "Maint ladytesla_altar", "Maint olddiner", "Maint smallmagician", "Maint fourshops")
|
||||
|
||||
/obj/effect/landmark/stationroom/gax/ai_whale
|
||||
unique = TRUE
|
||||
template_names = list("AI Whale",EMPTY_SPAWN,EMPTY_SPAWN,EMPTY_SPAWN)
|
||||
/// Type of landmark that find all others of the same type, and only spawns count number of ruins at them
|
||||
/obj/effect/landmark/stationroom/limited_spawn
|
||||
var/choose_result = ""
|
||||
var/count = 1
|
||||
|
||||
/obj/effect/landmark/stationroom/limited_spawn/choose()
|
||||
if(choose_result != "")
|
||||
return choose_result
|
||||
var/list/landmarks = list()
|
||||
for(var/obj/effect/landmark/stationroom/limited_spawn/L in GLOB.stationroom_landmarks)
|
||||
if(L.type == src.type)
|
||||
landmarks |= L
|
||||
|
||||
for(var/i = 0, i < count, i++)
|
||||
var/obj/effect/landmark/stationroom/limited_spawn/L = pick_n_take(landmarks)
|
||||
L.choose_result = pick(L.template_names)
|
||||
|
||||
for(var/obj/effect/landmark/stationroom/limited_spawn/L in landmarks)
|
||||
L.choose_result = EMPTY_SPAWN
|
||||
|
||||
/obj/effect/landmark/stationroom/limited_spawn/gax/ai_whale
|
||||
template_names = list("AI Whale")
|
||||
|
||||
/obj/effect/landmark/start/infiltrator
|
||||
name = "infiltrator"
|
||||
|
||||
@@ -99,6 +99,7 @@
|
||||
usesound = 'sound/items/drill_use.ogg'
|
||||
toolspeed = 0.7
|
||||
tool_behaviour = TOOL_SCREWDRIVER
|
||||
sharpness = SHARP_POINTY
|
||||
|
||||
/obj/item/handdrill/attack_self(mob/user)
|
||||
if (tool_behaviour == TOOL_SCREWDRIVER)
|
||||
@@ -114,6 +115,7 @@
|
||||
desc = "A simple powered hand drill. It's fitted with a bolt bit."
|
||||
icon_state = "drill_bolt"
|
||||
tool_behaviour = TOOL_WRENCH
|
||||
sharpness = SHARP_NONE
|
||||
playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
|
||||
if (iscyborg(user))
|
||||
to_chat(user,span_notice("Your servos whirr as the drill reconfigures into bolt mode."))
|
||||
@@ -125,6 +127,7 @@
|
||||
desc = "A simple powered hand drill. It's fitted with a screw bit."
|
||||
icon_state = "drill_screw"
|
||||
tool_behaviour = TOOL_SCREWDRIVER
|
||||
sharpness = SHARP_POINTY
|
||||
playsound(get_turf(user),'sound/items/change_drill.ogg',50,1)
|
||||
if (iscyborg(user))
|
||||
to_chat(user,span_notice("Your servos whirr as the drill reconfigures into screw mode."))
|
||||
|
||||
Reference in New Issue
Block a user