cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-feb12-2026

Browse Source
This commit is contained in:
Alexis
2026-03-02 07:42:16 -05:00
parent 4dc38c0ad6 b721351dd4
commit 5c5a636485
385 changed files with 227785 additions and 5757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -7,7 +7,7 @@
| Website | Link |
| ----------------------- | ----------------------------------------------------------------- |
| Git / GitHub cheatsheet | https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833 |
| Guide to Modularization | [./modular_skyrat/readme.md](./modular_skyrat/readme.md) |
| Guide to Modularization | [./modular_zubbers/readme.md](./modular_zubbers/readme.md) |
| Website | https://wiki.bubberstation.org/index.php?title=Main_Page |
| Code | https://github.com/Bubberstation/Bubberstation |
| Wiki | https://tgstation13.org/wiki/Main_Page |
_maps/RandomRuins/LavaRuins/bubberstation/lavaland_surface_seed_vault_bubber.dmm
+2972 -1115
View File
File diff suppressed because it is too large Load Diff
_maps/RandomRuins/SpaceRuins/bubberstation/thelizardsgas_bubber.dmm
+5 -5
View File
@@ -161,7 +161,7 @@
/obj/machinery/atmospherics/components/binary/pump/off{
dir = 8
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/thelizardsgas)
"dz" = (
/obj/machinery/telecomms/relay/preset/ruskie{
@@ -659,7 +659,7 @@
/obj/machinery/atmospherics/components/binary/pump/off{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/thelizardsgas)
"Cv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -785,7 +785,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/thelizardsgas)
"Jt" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
@@ -882,7 +882,7 @@
/obj/machinery/atmospherics/pipe/smart/simple/pink/hidden{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/thelizardsgas)
"MJ" = (
/obj/effect/turf_decal/siding/white,
@@ -951,7 +951,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector{
dir = 8
},
/turf/open/floor/plating,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/thelizardsgas)
"QQ" = (
/obj/item/toy/plush/lizard_plushie/space/green{
_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm
+3 -3
View File
@@ -11040,9 +11040,9 @@
/obj/item/clothing/under/tarkon/sec,
/obj/item/clothing/under/tarkon/sec,
/obj/item/clothing/under/tarkon/sec,
/obj/item/storage/backpack/duffelbag/sec/redsec,
/obj/item/storage/backpack/satchel/sec/redsec,
/obj/item/storage/backpack/security/redsec,
/obj/item/storage/backpack/duffelbag/sec,
/obj/item/storage/backpack/satchel/sec,
/obj/item/storage/backpack/security,
/obj/item/clothing/head/utility/welding/hat,
/obj/item/clothing/head/utility/welding/hat,
/turf/open/floor/wood,
_maps/RandomRuins/SpaceRuins/skyrat/vaulttango.dmm
+1 -9
View File
@@ -1437,14 +1437,6 @@
dir = 1
},
/area/ruin/space/has_grav/vaulttango)
"WB" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
},
/obj/structure/cable,
/obj/machinery/light/small/directional/east,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/vaulttango)
"WN" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 10
@@ -3399,7 +3391,7 @@ Im
KW
Qg
RR
WB
RR
ZM
ai
PK
_maps/_basemap.dm
+1
View File
@@ -33,6 +33,7 @@
#include "map_files\biodome\biodome.dmm"
#include "map_files\moonstation\moonstation.dmm"
#include "map_files\BoxStation\BoxStation.dmm"
#include "map_files\Ouroboros\Ouroboros.dmm"
// BUBBER EDIT ADDITION END
#endif
#ifdef ALL_TEMPLATES
_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_barber.dmm
+20 -17
View File
@@ -31,6 +31,9 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"e" = (
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"f" = (
/obj/structure/mirror/directional/west,
/obj/effect/turf_decal/tile/purple{
@@ -44,14 +47,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/door/airlock/public{
name = "Massage Parlour"
},
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple,
/obj/effect/landmark/navigate_destination/autoname,
/obj/machinery/door/airlock/public{
name = "Massage Parlour"
},
/turf/open/floor/iron,
/area/station/service/barber)
"j" = (
@@ -137,12 +140,11 @@
/turf/open/floor/iron,
/area/station/service/barber)
"B" = (
/obj/structure/disposalpipe/junction{
dir = 4
/obj/structure/sign/barber/directional/north{
pixel_y = 16
},
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/starboard/fore)
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"C" = (
/obj/structure/bed/pod,
/obj/structure/window/spawner/directional/south,
@@ -185,6 +187,11 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/service/barber)
"M" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/light/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"N" = (
/obj/structure/chair/comfy/barber_chair{
dir = 8
@@ -205,10 +212,6 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/station/service/barber)
"U" = (
/obj/structure/sign/barber/directional/north,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"V" = (
/obj/machinery/vending/barbervend,
/obj/effect/turf_decal/tile/purple{
@@ -255,10 +258,10 @@ o
f
c
x
a
e
"}
(3,1,1) = {"
B
a
S
l
K
@@ -275,7 +278,7 @@ I
m
b
x
U
e
"}
(5,1,1) = {"
a
@@ -285,7 +288,7 @@ C
L
V
w
a
B
"}
(6,1,1) = {"
a
@@ -295,5 +298,5 @@ w
w
w
w
a
M
"}
_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm
+50 -54
View File
@@ -368,7 +368,7 @@
/obj/structure/emergency_shield/cult/weak{
name = "Energy Shield"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"aQ" = (
/obj/effect/turf_decal/siding/dark{
@@ -789,7 +789,7 @@
network = list("persistence_ext");
name = "persistence exterior east"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"by" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -954,7 +954,7 @@
name = "Persistence Exterior South";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"bM" = (
/obj/effect/turf_decal/siding/wood,
@@ -1088,7 +1088,7 @@
network = list("persistence_ext");
name = "persistence exterior east"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/command/vault)
"cc" = (
/obj/effect/turf_decal/siding/wideplating_new/dark{
@@ -3188,7 +3188,7 @@
/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/service/hydro)
"gF" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
@@ -3878,7 +3878,7 @@
/obj/structure/emergency_shield/cult/weak{
name = "Energy Shield"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"hZ" = (
/obj/structure/lattice/catwalk/mining,
@@ -4103,7 +4103,7 @@
dir = 8
},
/obj/structure/disposaloutlet,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"it" = (
/turf/closed/wall/r_wall/plastitanium/syndicate/cruiser,
@@ -4123,7 +4123,7 @@
name = "Persistence Exterior West";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"ix" = (
/obj/structure/showcase/cyborg{
@@ -4348,7 +4348,7 @@
pixel_x = -32;
pixel_y = -32
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"iX" = (
/obj/structure/disposalpipe/trunk{
@@ -4947,7 +4947,7 @@
name = "Energy Shield"
},
/obj/structure/lattice/catwalk/mining,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"kj" = (
/obj/structure/flora/bush/flowers_pp/style_random,
@@ -5278,7 +5278,7 @@
network = list("persistence_ext");
name = "persistence exterior east"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"kQ" = (
/obj/machinery/atmospherics/components/unary/portables_connector{
@@ -6767,7 +6767,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/service)
"nT" = (
/obj/machinery/airalarm/directional/west,
@@ -7072,7 +7072,7 @@
/obj/structure/emergency_shield/cult/weak{
name = "Energy Shield"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"oy" = (
/obj/structure/cable,
@@ -7163,7 +7163,7 @@
icon_state = "tram";
base_icon_state = "tram"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/evac)
"oK" = (
/obj/effect/turf_decal/siding/wideplating_new/dark/end,
@@ -7884,7 +7884,7 @@
pixel_y = 5;
base_icon_state = "tram"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/service)
"qv" = (
/obj/machinery/power/turbine/inlet_compressor{
@@ -8807,7 +8807,7 @@
},
/obj/structure/sign/warning/biohazard/directional/west,
/obj/structure/lattice/catwalk/mining,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"sn" = (
/obj/structure/hedge/opaque,
@@ -9378,7 +9378,7 @@
pixel_y = 5;
base_icon_state = "tram"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/service)
"tt" = (
/obj/machinery/airalarm/directional/north,
@@ -10504,7 +10504,7 @@
pixel_x = 32;
faction = list("Syndicate","neutral")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"vG" = (
/obj/machinery/duct,
@@ -10639,7 +10639,7 @@
/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/service/hydro)
"vS" = (
/turf/closed/wall/r_wall/plastitanium/syndicate/cruiser,
@@ -12366,7 +12366,7 @@
name = "Persistence Exterior North";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"zk" = (
/obj/effect/turf_decal/trimline/dark/filled/line{
@@ -12439,7 +12439,7 @@
name = "Persistence Exterior South";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"zt" = (
/obj/effect/turf_decal/siding/wood{
@@ -12752,7 +12752,7 @@
},
/obj/structure/lattice/catwalk/mining,
/obj/structure/sign/warning/xeno_mining/directional/east,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"zV" = (
/obj/structure/disposalpipe/trunk{
@@ -12982,7 +12982,7 @@
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/evac)
"AB" = (
/obj/machinery/flasher/directional/north{
@@ -13655,7 +13655,7 @@
name = "Persistence Exterior South";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Cl" = (
/obj/effect/mapping_helpers/airlock/access/all/syndicate/leader,
@@ -13863,7 +13863,7 @@
/obj/structure/emergency_shield/cult/weak{
name = "Energy Shield"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"CG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -14119,9 +14119,7 @@
base_icon_state = "tram";
req_access = list("syndicate")
},
/turf/open/floor/engine/hull{
initial_gas_mix = "LAVALAND_ATMOS"
},
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/med)
"CZ" = (
/obj/structure/disposalpipe/segment{
@@ -14252,7 +14250,7 @@
/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/service/hydro)
"Dl" = (
/obj/structure/table/reinforced/plastitaniumglass,
@@ -14298,7 +14296,7 @@
name = "Energy Shield"
},
/obj/machinery/porta_turret/syndicate,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Dp" = (
/obj/effect/turf_decal/trimline/dark_red/filled/line,
@@ -15252,7 +15250,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/cargo)
"EP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
@@ -15629,7 +15627,7 @@
name = "Persistence Exterior West";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Fu" = (
/obj/machinery/suit_storage_unit/industrial/bloodredsuit{
@@ -15803,7 +15801,7 @@
id = "QMLoad"
},
/obj/structure/lattice/catwalk/mining,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"FR" = (
/obj/structure/railing/wooden_fencing{
@@ -15932,7 +15930,7 @@
name = "Energy Shield"
},
/obj/structure/sign/warning/docking/directional/west,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"Gb" = (
/obj/structure/disposalpipe/segment{
@@ -16022,7 +16020,7 @@
/obj/structure/emergency_shield/cult/weak{
name = "Energy Shield"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Gm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -16269,7 +16267,7 @@
icon_state = "tram";
base_icon_state = "tram"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/cargo)
"GO" = (
/obj/machinery/camera/autoname/directional/south{
@@ -16286,7 +16284,7 @@
dir = 8;
pixel_x = -32
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"GP" = (
/obj/machinery/newscaster/directional/east,
@@ -17831,7 +17829,7 @@
id = "QMLoad"
},
/obj/structure/lattice/catwalk/mining,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Kj" = (
/obj/effect/turf_decal/siding/wideplating_new/dark,
@@ -18449,7 +18447,7 @@
dir = 8;
id = "QMLoad"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"LF" = (
/mob/living/basic/snail{
@@ -18914,7 +18912,7 @@
dir = 8;
id = "QMLoad"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"MC" = (
/obj/effect/turf_decal/siding/dark{
@@ -19250,7 +19248,7 @@
network = list("persistence_ext");
name = "persistence exterior east"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Nh" = (
/obj/structure/chair/sofa/bench{
@@ -19819,7 +19817,7 @@
network = list("persistence_ext");
name = "persistence exterior east"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Oq" = (
/obj/structure/flora/bush/flowers_yw/style_random,
@@ -21682,7 +21680,7 @@
icon_state = "tram";
base_icon_state = "tram"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/cargo)
"Sv" = (
/obj/machinery/space_heater/wall_mounted/directional/west,
@@ -21898,7 +21896,7 @@
name = "Persistence Exterior North";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/command/vault)
"SS" = (
/obj/machinery/newscaster/directional/south,
@@ -21955,7 +21953,7 @@
name = "Energy Shield"
},
/obj/structure/lattice/catwalk/mining,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/lavaland/surface/outdoors)
"SZ" = (
/turf/closed/wall/r_wall/plastitanium/syndicate/cruiser,
@@ -22981,7 +22979,7 @@
pixel_y = -32;
pixel_x = 32
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Vf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
@@ -23342,7 +23340,7 @@
name = "Persistence Exterior North";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"VS" = (
/obj/structure/fans/tiny,
@@ -24421,7 +24419,7 @@
name = "Persistence Exterior North";
network = list("persistence_ext")
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"Yq" = (
/obj/effect/turf_decal/stripes/line{
@@ -24774,9 +24772,7 @@
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/turf/open/floor/engine/hull{
initial_gas_mix = "LAVALAND_ATMOS"
},
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/med)
"Zb" = (
/obj/machinery/griddle,
@@ -24937,7 +24933,7 @@
pixel_x = 32;
pixel_y = 32
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/persistance/command/vault)
"Zv" = (
/obj/effect/turf_decal/siding/wideplating_new/dark{
@@ -25025,7 +25021,7 @@
dir = 8;
id = "QMLoad"
},
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"ZA" = (
/turf/closed/wall/r_wall/plastitanium/syndicate/nodiagonal,
@@ -25055,7 +25051,7 @@
id = "QMLoad"
},
/obj/structure/lattice/catwalk/mining,
/turf/open/floor/engine/hull/air,
/turf/open/floor/engine/hull/lavaland,
/area/ruin/space/has_grav/bubbers/dauntless/command/vault)
"ZE" = (
/obj/structure/table/reinforced/plastitaniumglass,
_maps/map_files/Blueshift/Blueshift.dmm
+28 -39
View File
@@ -12922,11 +12922,11 @@
/obj/machinery/door/airlock/security/glass{
name = "Permabrig Visitation"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark/side{
dir = 8
},
@@ -19975,7 +19975,7 @@
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/caution/stand_clear/blue{
/obj/effect/turf_decal/caution/stand_clear{
dir = 4
},
/turf/open/floor/iron/dark,
@@ -36797,7 +36797,6 @@
name = "Prison Blast Door"
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery/blue,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
@@ -36805,6 +36804,7 @@
/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/security/brig,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/prison)
"gZk" = (
@@ -37616,7 +37616,6 @@
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
@@ -37625,6 +37624,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/machinery/scanner_gate/preset_guns,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"hhy" = (
@@ -38007,12 +38007,12 @@
/obj/effect/turf_decal/trimline/red/filled/corner{
dir = 1
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
},
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"hlr" = (
@@ -41563,9 +41563,9 @@
/obj/machinery/door/airlock/security/glass{
name = "Equipment Room"
},
/obj/effect/turf_decal/delivery/blue,
/obj/effect/mapping_helpers/airlock/red_alert_access,
/obj/effect/mapping_helpers/airlock/access/all/security/armory,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"hVk" = (
@@ -42448,7 +42448,7 @@
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/caution/stand_clear/blue{
/obj/effect/turf_decal/caution/stand_clear{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -45375,10 +45375,10 @@
/obj/machinery/door/airlock/security{
name = "Interrogation"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
"iHq" = (
@@ -51382,8 +51382,6 @@
/turf/open/floor/iron/smooth,
/area/station/cargo/miningdock)
"jPv" = (
/obj/effect/turf_decal/caution/stand_clear/blue,
/obj/effect/turf_decal/bot_blue,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -60224,10 +60222,9 @@
/turf/closed/wall/r_wall,
/area/station/command/heads_quarters/ce)
"lze" = (
/obj/effect/turf_decal/caution/stand_clear/blue,
/obj/effect/turf_decal/bot_blue,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"lzq" = (
@@ -62231,10 +62228,10 @@
/obj/machinery/door/window/brigdoor/security/holding/right{
name = "Holding Cell"
},
/obj/effect/turf_decal/delivery/blue,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"lSb" = (
@@ -71503,11 +71500,11 @@
name = "Security Desk"
},
/obj/structure/cable,
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/firedoor,
/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/security/general,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"nJT" = (
@@ -73468,13 +73465,12 @@
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"ocS" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted{
dir = 8;
use_holiday_colors = 0
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/station/cargo/sorting)
"ocY" = (
@@ -78197,7 +78193,6 @@
/obj/machinery/door/airlock/security/glass{
name = "Warden's Office"
},
/obj/effect/turf_decal/delivery/blue,
/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -78206,6 +78201,7 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/security/armory,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/warden)
"oVd" = (
@@ -78683,7 +78679,6 @@
name = "Prison Wing"
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery/blue,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -78691,6 +78686,7 @@
/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/security/brig,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/prison)
"paj" = (
@@ -91181,7 +91177,6 @@
id_tag = "innerbrig";
name = "Brig"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
@@ -91189,6 +91184,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rsZ" = (
@@ -92132,7 +92128,6 @@
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/poddoor/preopen{
id = "brigfront";
name = "Brig Blast Door"
@@ -92141,6 +92136,7 @@
/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
/obj/machinery/scanner_gate/preset_guns,
/obj/effect/landmark/navigate_destination/sec,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"rCH" = (
@@ -93728,13 +93724,13 @@
/obj/machinery/door/airlock/security/glass{
name = "Equipment Requisition"
},
/obj/effect/turf_decal/delivery/blue,
/obj/structure/cable,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/office)
"rTs" = (
@@ -93892,7 +93888,7 @@
"rVq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/caution/stand_clear/blue{
/obj/effect/turf_decal/caution/stand_clear{
dir = 8
},
/turf/open/floor/iron/dark,
@@ -96043,12 +96039,6 @@
/obj/effect/spawner/random/structure/steam_vent,
/turf/open/floor/plating,
/area/station/maintenance/department/science/xenobiology)
"sqV" = (
/obj/effect/turf_decal/caution/stand_clear/blue,
/obj/effect/turf_decal/bot_blue,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"srd" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -97356,10 +97346,10 @@
/obj/machinery/door/airlock/security/glass{
name = "Gear Room"
},
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/firedoor,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"sCX" = (
@@ -103805,7 +103795,7 @@
"tNE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/caution/stand_clear/blue{
/obj/effect/turf_decal/caution/stand_clear{
dir = 4
},
/turf/open/floor/iron/dark,
@@ -104525,13 +104515,13 @@
/obj/machinery/door/airlock/security{
name = "Interrogation Monitoring"
},
/obj/effect/turf_decal/delivery/blue,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
"tUj" = (
@@ -105469,11 +105459,11 @@
},
/area/station/hallway/primary/port)
"ueB" = (
/obj/effect/turf_decal/delivery/blue,
/obj/machinery/door/airlock/security/glass{
name = "Gear Room"
},
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"ueE" = (
@@ -109941,7 +109931,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
dir = 8
},
/obj/effect/turf_decal/delivery/blue,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/maintenance/department/engineering/atmos_aux_port)
"uXj" = (
@@ -112633,9 +112623,8 @@
/turf/open/floor/wood/parquet,
/area/station/common/gaskiosk)
"vxA" = (
/obj/effect/turf_decal/caution/stand_clear/blue,
/obj/effect/turf_decal/bot_blue,
/obj/effect/landmark/firealarm_sanity,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark,
/area/station/security/brig)
"vxB" = (
@@ -114021,8 +114010,8 @@
/obj/machinery/door/airlock/security/glass{
name = "Secure Gear Storage"
},
/obj/effect/turf_decal/delivery/blue,
/obj/effect/mapping_helpers/airlock/access/all/security/armory,
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/dark,
/area/station/security/lockers)
"vJJ" = (
@@ -157640,7 +157629,7 @@ pvr
msQ
hlp
vxA
sqV
rvL
rCE
sjH
tOv
_maps/map_files/BoxStation/BoxStation.dmm
+576 -633
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Ouroboros/Ouroboros.dmm
+214992
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/VoidRaptor/VoidRaptor.dmm
+21 -22
View File
@@ -741,7 +741,7 @@
/area/station/science/genetics)
"akv" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/turf_decal/bot_red,
/obj/effect/turf_decal/bot_blue,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"akR" = (
@@ -3462,7 +3462,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/station/science/research)
"aXO" = (
/obj/effect/turf_decal/stripes/red/corner{
/obj/effect/turf_decal/stripes/blue/corner{
dir = 8
},
/turf/open/floor/iron/dark/smooth_large,
@@ -4026,10 +4026,10 @@
/area/station/service/chapel/office)
"bfF" = (
/obj/machinery/requests_console/auto_name/directional/south,
/obj/effect/turf_decal/stripes/red/line{
/obj/machinery/light/cold/directional/south,
/obj/effect/turf_decal/stripes/blue{
dir = 8
},
/obj/machinery/light/cold/directional/south,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"bfK" = (
@@ -5653,10 +5653,7 @@
/area/station/engineering/atmos)
"bIx" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/red/line{
dir = 1
},
/obj/effect/turf_decal/stripes/red/line{
/obj/effect/turf_decal/stripes/blue{
dir = 1
},
/turf/open/floor/iron/dark/smooth_large,
@@ -6488,6 +6485,7 @@
req_access = list("kitchen")
},
/obj/machinery/door/firedoor,
/obj/effect/landmark/firealarm_sanity,
/turf/open/floor/iron/large,
/area/station/service/janitor)
"bUS" = (
@@ -41283,10 +41281,10 @@
"lGZ" = (
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/dead_body_placer,
/obj/effect/turf_decal/stripes/red/line{
/obj/machinery/light/cold/directional/east,
/obj/effect/turf_decal/stripes/blue{
dir = 1
},
/obj/machinery/light/cold/directional/east,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"lHf" = (
@@ -42610,7 +42608,7 @@
/turf/open/floor/iron/smooth,
/area/station/engineering/atmos)
"lXh" = (
/obj/effect/turf_decal/stripes/red/line{
/obj/effect/turf_decal/stripes/blue{
dir = 8
},
/turf/open/floor/iron/dark/smooth_large,
@@ -46744,7 +46742,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/red/line,
/obj/effect/turf_decal/stripes/blue,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"nfC" = (
@@ -46838,10 +46836,10 @@
"nho" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/stripes/red/corner{
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/stripes/blue/corner{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"nhx" = (
@@ -49281,6 +49279,7 @@
name = "Hydroponics Deliveries";
req_access = list("hydroponics")
},
/obj/effect/landmark/firealarm_sanity,
/turf/open/floor/iron/large,
/area/station/service/hydroponics)
"nQs" = (
@@ -49954,7 +49953,7 @@
/turf/open/floor/grass,
/area/station/medical/medbay/central)
"nYs" = (
/obj/effect/turf_decal/stripes/red/corner,
/obj/effect/turf_decal/stripes/blue/corner,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"nYt" = (
@@ -52241,10 +52240,10 @@
},
/area/station/command/eva)
"oGw" = (
/obj/effect/turf_decal/bot_red,
/obj/structure/bodycontainer/morgue/beeper_off{
dir = 2
},
/obj/effect/turf_decal/bot_blue,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"oGz" = (
@@ -58861,7 +58860,7 @@
/turf/open/floor/catwalk_floor/iron_smooth,
/area/station/maintenance/department/medical)
"qta" = (
/obj/effect/turf_decal/stripes/red/line{
/obj/effect/turf_decal/stripes/blue{
dir = 4
},
/turf/open/floor/iron/dark/smooth_large,
@@ -64870,7 +64869,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
/obj/effect/turf_decal/stripes/red/line,
/obj/effect/turf_decal/stripes/blue,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"sga" = (
@@ -75630,10 +75629,10 @@
/turf/open/floor/iron/smooth_edge,
/area/station/hallway/primary/aft)
"uXa" = (
/obj/effect/turf_decal/stripes/red/line{
/obj/structure/mannequin/skeleton,
/obj/effect/turf_decal/stripes/blue{
dir = 4
},
/obj/structure/mannequin/skeleton,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"uXb" = (
@@ -79176,7 +79175,7 @@
/obj/structure/bodycontainer/morgue{
dir = 8
},
/obj/effect/turf_decal/bot_red,
/obj/effect/turf_decal/bot_blue,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"vXr" = (
@@ -81629,7 +81628,7 @@
"wEj" = (
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/south,
/obj/effect/turf_decal/stripes/red/line{
/obj/effect/turf_decal/stripes/blue{
dir = 4
},
/turf/open/floor/iron/dark/smooth_large,
_maps/map_files/moonstation/moonstation.dmm
+9 -13
View File
@@ -740,7 +740,7 @@
/area/station/engineering/break_room)
"ajr" = (
/obj/effect/turf_decal/vg_decals/numbers/two,
/obj/effect/turf_decal/bot_blue,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_half,
/area/station/security/prison)
"aju" = (
@@ -1255,7 +1255,7 @@
/area/station/maintenance/department/medical/chemistry)
"aqr" = (
/obj/effect/turf_decal/vg_decals/numbers/one,
/obj/effect/turf_decal/bot_blue,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_half,
/area/station/security/prison)
"aqx" = (
@@ -9031,9 +9031,9 @@
/area/station/security/detectives_office)
"cqS" = (
/obj/effect/turf_decal/vg_decals/numbers/three,
/obj/effect/turf_decal/bot_blue,
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_half,
/area/station/security/prison)
"cqZ" = (
@@ -20430,6 +20430,7 @@
"fnK" = (
/obj/effect/turf_decal/bot,
/obj/machinery/recharge_station,
/obj/structure/fireaxecabinet/jawsofrecovery/directional/west,
/turf/open/floor/iron/dark,
/area/station/medical/storage)
"fnP" = (
@@ -28700,7 +28701,7 @@
/area/station/maintenance/port/aft)
"hvp" = (
/obj/effect/turf_decal/vg_decals/numbers/four,
/obj/effect/turf_decal/bot_blue,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_half,
/area/station/security/prison)
"hvw" = (
@@ -36046,12 +36047,11 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/structure/closet/secure_closet/medical3,
/obj/item/clothing/glasses/hud/health,
/obj/item/storage/belt/medical,
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 1
},
/obj/structure/closet/secure_closet/paramedic,
/obj/item/surgicaldrill,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"jmo" = (
@@ -43989,7 +43989,7 @@
/area/station/hallway/secondary/exit/departure_lounge)
"loo" = (
/obj/effect/turf_decal/vg_decals/numbers/five,
/obj/effect/turf_decal/bot_blue,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/dark/textured_half,
/area/station/security/prison)
"los" = (
@@ -45538,11 +45538,8 @@
/turf/open/floor/engine,
/area/station/engineering/supermatter/room)
"lHW" = (
/obj/structure/table,
/obj/machinery/plantgenes{
pixel_y = 8
},
/obj/item/radio/intercom/directional/west,
/obj/item/kirbyplants/random,
/turf/open/floor/iron/terracotta,
/area/station/service/hydroponics)
"lIe" = (
@@ -61631,7 +61628,6 @@
/area/station/medical/medbay/central)
"pQI" = (
/obj/structure/table,
/obj/machinery/smartfridge/disks,
/obj/item/book/manual/hydroponics_pod_people,
/obj/item/toy/figure/botanist,
/turf/open/floor/iron/terracotta,
_maps/ouroboros.json
+29
View File
@@ -0,0 +1,29 @@
{
"version": 1,
"map_name": "Ouroboros",
"map_path": "map_files/Ouroboros",
"map_file": "Ouroboros.dmm",
"exclude_from_ci": false,
"shuttles": {
"emergency": "emergency_skyrat",
"ferry": "ferry_skyrat",
"mining": "mining_large_skyrat",
"cargo": "cargo_ouroboros",
"whiteship": "whiteship_ouroboros"
},
"traits": [
{
"Baseturf": "/turf/open/misc/asteroid/moon/airless",
"Linkage": "Cross"
},
{
"Baseturf": "/turf/open/openspace",
"Linkage": "Cross"
}
],
"job_changes": {
"Captain": {
"special_charter": "asteroid field"
}
}
}
_maps/shuttles/skyrat/cargo_ouroboros.dmm
+220
View File
@@ -0,0 +1,220 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/open/floor/catwalk_floor/iron,
/area/shuttle/supply)
"d" = (
/obj/machinery/light/cold/no_nightlight/directional/south,
/turf/open/floor/catwalk_floor/iron,
/area/shuttle/supply)
"e" = (
/obj/machinery/conveyor{
id = "QMLoad2";
dir = 4
},
/obj/structure/fans/tiny/invisible,
/obj/machinery/door/poddoor{
id = "QMLoaddoor3";
name = "Supply Shuttle Loading Door"
},
/turf/open/floor/plating,
/area/shuttle/supply)
"f" = (
/obj/machinery/light/cold/no_nightlight/directional/north,
/turf/open/floor/catwalk_floor/iron,
/area/shuttle/supply)
"g" = (
/obj/machinery/light/cold/no_nightlight/directional/west,
/turf/open/floor/catwalk_floor/iron,
/area/shuttle/supply)
"h" = (
/obj/structure/railing,
/turf/open/floor/catwalk_floor/iron,
/area/shuttle/supply)
"i" = (
/obj/structure/marker_beacon/bronze,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/supply)
"j" = (
/obj/machinery/light/cold/no_nightlight/directional/east,
/obj/machinery/button/door/directional/east{
id = "QMLoaddoor3";
name = "Supply Shuttle Loading Door"
},
/turf/open/floor/catwalk_floor/iron,
/area/shuttle/supply)
"m" = (
/obj/machinery/conveyor{
dir = 8;
id = "QMLoad"
},
/turf/open/floor/plating,
/area/shuttle/supply)
"s" = (
/obj/machinery/power/shuttle_engine/heater,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/supply)
"v" = (
/turf/closed/wall/mineral/titanium/spaceship/nodiagonal,
/area/shuttle/supply)
"y" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/power/shuttle_engine/propulsion,
/turf/open/floor/plating/airless,
/area/shuttle/supply)
"z" = (
/obj/machinery/light/cold/no_nightlight/directional/east,
/turf/open/floor/catwalk_floor/iron,
/area/shuttle/supply)
"B" = (
/obj/machinery/conveyor{
dir = 8;
id = "QMLoad"
},
/obj/machinery/door/poddoor{
id = "QMLoaddoor3";
name = "Supply Shuttle Loading Door"
},
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/supply)
"C" = (
/obj/machinery/conveyor{
id = "QMLoad2";
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/supply)
"D" = (
/obj/structure/marker_beacon/burgundy,
/turf/closed/wall/mineral/titanium/spaceship/nodiagonal,
/area/shuttle/supply)
"F" = (
/turf/open/floor/iron/half{
dir = 1
},
/area/shuttle/supply)
"M" = (
/obj/machinery/door/airlock/shuttle{
name = "Supply Shuttle Airlock"
},
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/obj/docking_port/mobile/supply,
/turf/open/floor/plating,
/area/shuttle/supply)
"Q" = (
/obj/structure/marker_beacon/bronze,
/turf/closed/wall/mineral/titanium,
/area/shuttle/supply)
"S" = (
/obj/machinery/door/airlock/shuttle{
name = "Supply Shuttle Airlock"
},
/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/plating,
/area/shuttle/supply)
"X" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/supply)
(1,1,1) = {"
Q
X
X
X
i
X
X
X
i
v
v
D
"}
(2,1,1) = {"
X
a
F
a
g
a
F
a
g
a
s
y
"}
(3,1,1) = {"
X
a
F
a
a
a
F
a
a
a
s
y
"}
(4,1,1) = {"
X
f
F
a
a
a
F
a
a
d
v
v
"}
(5,1,1) = {"
X
a
F
a
a
a
F
a
a
a
s
y
"}
(6,1,1) = {"
X
h
C
a
j
a
m
a
z
a
s
y
"}
(7,1,1) = {"
Q
X
e
S
i
M
B
X
i
v
v
D
"}
_maps/shuttles/skyrat/whiteship_ouroboros.dmm
+962
View File
@@ -0,0 +1,962 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"bl" = (
/obj/machinery/suit_storage_unit/spaceruin,
/obj/effect/turf_decal/bot_white,
/obj/machinery/light/warm/directional/north,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"bp" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/machinery/vending/dinnerware,
/obj/machinery/light/warm/directional/west,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"bv" = (
/obj/machinery/door/airlock/shuttle{
name = "Kitchen Access"
},
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"by" = (
/obj/structure/table/wood,
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"cx" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plating,
/area/shuttle/abandoned)
"cz" = (
/obj/machinery/computer/order_console/cook{
dir = 8
},
/obj/effect/turf_decal/box/white,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"di" = (
/obj/machinery/atmospherics/components/tank/air{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"dN" = (
/obj/item/storage/box/coffeepack/robusta{
pixel_x = 6
},
/obj/item/storage/box/coffeepack/robusta{
pixel_x = -6
},
/obj/item/storage/box/coffeepack/robusta{
pixel_y = 3
},
/obj/item/storage/box/coffeepack{
pixel_y = -3;
pixel_x = 6
},
/obj/item/storage/box/coffeepack{
pixel_y = -3;
pixel_x = -6
},
/obj/item/storage/box/coffeepack{
pixel_y = -6
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"dY" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Exterior Window Blast Door"
},
/turf/open/floor/plating,
/area/shuttle/abandoned/bridge)
"ea" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/turf_decal/bot_white,
/obj/effect/turf_decal/caution{
dir = 1
},
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"eR" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship,
/obj/effect/turf_decal/box/white,
/obj/machinery/button/door/directional/west{
id = "whiteship_windows";
name = "Blast Door Control"
},
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"eW" = (
/obj/effect/decal/cleanable/blood/old,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood/tracks{
dir = 10
},
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
},
/obj/effect/mob_spawn/corpse/human/assistant{
name = "Jim Nortons Employee"
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"fd" = (
/obj/machinery/microwave,
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"fq" = (
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"fr" = (
/obj/structure/chair/wood{
dir = 1
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"ft" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/abandoned/engine)
"gf" = (
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"gD" = (
/obj/structure/chair/wood,
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"hH" = (
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"ix" = (
/turf/template_noop,
/area/template_noop)
"iH" = (
/obj/effect/decal/cleanable/blood/gibs/core,
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
},
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
},
/obj/effect/decal/cleanable/blood,
/obj/item/clothing/head/soft/green{
color = "#00a62e";
desc = "It's a baseball hat in a tasteful green colour.";
name = "Jim Norton's Quebecois Coffee cap"
},
/obj/effect/mob_spawn/corpse/human/assistant{
name = "Jim Nortons Employee"
},
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"iW" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/spawner/random/trash/mess,
/obj/effect/decal/cleanable/blood/tracks{
dir = 9
},
/obj/effect/decal/cleanable/blood/gibs,
/obj/effect/mob_spawn/corpse/human/cook{
mob_name = "Jimothiar Norton"
},
/obj/effect/turf_decal/loading_area{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"iX" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"iY" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 10
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"kN" = (
/obj/item/coffee_cartridge/decaf{
pixel_x = -5;
pixel_y = 10
},
/obj/item/coffee_cartridge/bootleg{
pixel_x = -5;
pixel_y = 15
},
/obj/item/coffee_cartridge/fancy{
pixel_x = 6;
pixel_y = 5
},
/obj/item/coffee_cartridge{
pixel_y = 9;
pixel_x = 6
},
/obj/item/storage/fancy/coffee_condi_display{
pixel_y = -4
},
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"lq" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/tracks{
dir = 9
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"ls" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/blood/tracks,
/obj/item/plate/small{
pixel_y = 1
},
/obj/item/clothing/head/soft/green{
color = "#00a62e";
desc = "It's a baseball hat in a tasteful green colour.";
name = "Jim Norton's Quebecois Coffee cap";
pixel_x = 16
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"lX" = (
/obj/effect/decal/cleanable/blood/gibs,
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/button/door/directional/south,
/obj/effect/decal/cleanable/blood/tracks{
dir = 10
},
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"mk" = (
/obj/machinery/digital_clock,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned)
"ml" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"mT" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/light/warm/directional/south,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"nk" = (
/obj/item/chair/wood{
pixel_y = -6;
dir = 1
},
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/tracks{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/decal/cleanable/blood/tracks{
dir = 6
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"nt" = (
/obj/machinery/griddle,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"oC" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Exterior Window Blast Door"
},
/turf/open/floor/plating,
/area/shuttle/abandoned)
"oP" = (
/obj/effect/decal/cleanable/blood/footprints{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"pD" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned)
"rp" = (
/obj/machinery/smartfridge/food,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"rU" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/bridge)
"sM" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"tL" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bridge)
"tY" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/carpet/green,
/area/shuttle/abandoned/bridge)
"vc" = (
/obj/machinery/oven,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"vO" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Interior Window Blast Door"
},
/turf/open/floor/plating,
/area/shuttle/abandoned)
"vQ" = (
/obj/item/plate{
pixel_y = 2
},
/obj/item/food/poutine{
pixel_y = 3
},
/obj/item/food/poutine{
pixel_y = 6;
pixel_x = 4
},
/obj/item/food/poutine{
pixel_y = 6;
pixel_x = -4
},
/obj/item/food/poutine{
pixel_y = 7
},
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"we" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"wt" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/obj/effect/turf_decal/bot_white,
/obj/machinery/suit_storage_unit/open,
/obj/machinery/light/warm/directional/east,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"ye" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/carpet/green,
/area/shuttle/abandoned/bridge)
"yi" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 6
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"yM" = (
/obj/machinery/power/shuttle_engine/heater{
dir = 8
},
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"Bq" = (
/obj/machinery/holopad/secure,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"Cc" = (
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"Ci" = (
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Interior Window Blast Door"
},
/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"Cy" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/sink/kitchen/directional/south,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"Dm" = (
/obj/item/chair/wood{
pixel_y = -6
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"Dq" = (
/obj/structure/sign/poster/official/jim_nortons,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned)
"DB" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 5
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"DC" = (
/obj/machinery/door/airlock/shuttle{
name = "Cockpit"
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Interior Window Blast Door"
},
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned/bridge)
"DM" = (
/obj/machinery/coffeemaker/impressa{
pixel_y = 4
},
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"Ev" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/decal/cleanable/blood/drip,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"Fe" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
},
/obj/effect/decal/cleanable/blood/hitsplatter{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/door/airlock/hatch{
name = "Maintenance Hatch"
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"FQ" = (
/obj/item/reagent_containers/condiment/sugar{
pixel_y = 4;
pixel_x = -6
},
/obj/item/reagent_containers/condiment/sugar{
pixel_x = -6
},
/obj/item/reagent_containers/condiment/flour{
pixel_x = 6;
pixel_y = 3
},
/obj/item/reagent_containers/condiment/flour{
pixel_x = 6
},
/obj/item/reagent_containers/condiment/flour{
pixel_x = 6;
pixel_y = -3
},
/obj/item/reagent_containers/condiment/flour{
pixel_x = 6;
pixel_y = -6
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"FZ" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/docking_port/mobile{
callTime = 250;
can_move_docking_ports = 1;
shuttle_id = "whiteship";
launch_status = 0;
movement_force = list("KNOCKDOWN"=0,"THROW"=0);
name = "Jim Nortons White Ship"
},
/obj/machinery/door/airlock/external/ruin{
name = "Jim Nortons Delivery Ship"
},
/turf/open/floor/plating,
/area/shuttle/abandoned)
"Ge" = (
/obj/machinery/oven,
/obj/machinery/light/warm/directional/west,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"Gr" = (
/obj/machinery/atmospherics/components/tank/air,
/obj/machinery/light/cold/dim/directional/north,
/obj/machinery/button/door/directional/east{
id = "whiteship_windows";
name = "Blast Door Control"
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"GX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/holopad/secure,
/turf/open/floor/carpet/green,
/area/shuttle/abandoned/bridge)
"Hk" = (
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
},
/obj/effect/decal/cleanable/blood/drip,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"HD" = (
/obj/item/plate/small{
pixel_y = 5;
pixel_x = -7
},
/obj/item/plate/small{
pixel_y = -1
},
/obj/item/plate/small{
pixel_y = 1
},
/obj/item/plate/small{
pixel_y = 3
},
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"IE" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden{
dir = 1
},
/obj/machinery/door/airlock/external/ruin{
name = "Jim Nortons Delivery Ship"
},
/turf/open/floor/plating,
/area/shuttle/abandoned)
"IK" = (
/obj/machinery/power/smes/engineering{
charge = 1e+006
},
/obj/structure/cable,
/obj/machinery/light/cold/dim/directional/south,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"IO" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"Jj" = (
/obj/machinery/power/shuttle_engine/propulsion/right{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"JS" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Interior Window Blast Door"
},
/turf/open/floor/plating,
/area/shuttle/abandoned/bridge)
"Kt" = (
/obj/effect/decal/cleanable/blood/footprints,
/obj/effect/decal/cleanable/blood/footprints{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"Lm" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/door/poddoor{
id = "whiteship_windows";
name = "Exterior Window Blast Door"
},
/obj/effect/decal/cleanable/blood/splatter/over_window,
/turf/open/floor/plating,
/area/shuttle/abandoned)
"Mk" = (
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"MH" = (
/obj/machinery/griddle,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"Na" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"NM" = (
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"Ou" = (
/obj/item/reagent_containers/cup/glass/bottle/juice/cream{
pixel_x = -6;
pixel_y = 6
},
/obj/item/reagent_containers/cup/glass/bottle/juice/cream{
pixel_x = 6;
pixel_y = 6
},
/obj/item/reagent_containers/cup/glass/bottle/juice/cream{
pixel_y = 3
},
/obj/item/reagent_containers/condiment/milk{
pixel_x = 6
},
/obj/item/reagent_containers/condiment/milk{
pixel_x = -6
},
/obj/item/reagent_containers/condiment/milk{
pixel_y = -3
},
/obj/item/reagent_containers/condiment/soymilk{
pixel_y = -6;
pixel_x = 6
},
/obj/item/reagent_containers/condiment/soymilk{
pixel_y = -6;
pixel_x = -6
},
/obj/effect/turf_decal/bot,
/obj/structure/closet/crate/freezer{
name = "milk freezer"
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"PB" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"PV" = (
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/door/airlock/hatch{
name = "Maintenance Hatch"
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"QS" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/effect/decal/cleanable/blood/gibs/old,
/obj/item/clothing/head/soft/green{
color = "#00a62e";
desc = "It's a baseball hat in a tasteful green colour.";
name = "Jim Norton's Quebecois Coffee cap";
pixel_x = 16
},
/obj/effect/mob_spawn/corpse/human/assistant{
name = "Jim Nortons Employee"
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"SC" = (
/obj/machinery/computer/shuttle/white_ship/bridge,
/obj/effect/turf_decal/box/white,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
"SG" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/effect/decal/cleanable/blood/tracks{
dir = 5
},
/obj/effect/decal/cleanable/blood/tracks{
dir = 6
},
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"SH" = (
/obj/structure/table/wood,
/obj/item/plate/small{
pixel_y = 1
},
/turf/open/floor/wood/tile,
/area/shuttle/abandoned)
"Ty" = (
/obj/machinery/power/shuttle_engine/propulsion/left{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/abandoned/engine)
"TG" = (
/obj/machinery/power/port_gen/pacman,
/obj/item/stack/sheet/mineral/plasma/five,
/obj/machinery/power/terminal{
dir = 4
},
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"TW" = (
/obj/item/reagent_containers/cup/glass/mug{
pixel_y = 12
},
/obj/item/reagent_containers/cup/glass/mug{
pixel_y = 7;
pixel_x = -6
},
/obj/item/reagent_containers/cup/glass/mug{
pixel_y = 7;
pixel_x = 4
},
/obj/structure/table/reinforced/titaniumglass,
/turf/open/floor/iron/dark/textured_large,
/area/shuttle/abandoned)
"UO" = (
/mob/living/simple_animal/bot/mulebot,
/obj/effect/decal/cleanable/blood/tracks{
dir = 8
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"WB" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/iron/large,
/area/shuttle/abandoned)
"ZF" = (
/obj/structure/table,
/turf/open/floor/iron/dark/small,
/area/shuttle/abandoned/bridge)
(1,1,1) = {"
ix
Ty
Jj
ix
ix
Ty
Jj
ix
"}
(2,1,1) = {"
ft
sM
sM
Ty
Jj
sM
sM
ft
"}
(3,1,1) = {"
ft
di
UO
iX
yM
Ou
TG
ft
"}
(4,1,1) = {"
ft
Gr
iW
FQ
dN
NM
IK
ft
"}
(5,1,1) = {"
ft
ft
Fe
Ci
Ci
PV
ft
ft
"}
(6,1,1) = {"
ml
pD
Cy
gf
MH
WB
pD
ml
"}
(7,1,1) = {"
Dq
Ge
PB
vQ
nt
iH
bp
Dq
"}
(8,1,1) = {"
pD
vc
DB
IO
Ev
SG
lX
pD
"}
(9,1,1) = {"
oC
DM
Na
Bq
fd
HD
Hk
Lm
"}
(10,1,1) = {"
oC
kN
TW
gf
Cc
rp
bv
oC
"}
(11,1,1) = {"
oC
SH
QS
iY
Kt
nk
yi
oC
"}
(12,1,1) = {"
pD
by
fr
Dm
lq
eW
ls
pD
"}
(13,1,1) = {"
Dq
by
fr
hH
oP
gD
by
Dq
"}
(14,1,1) = {"
ml
mk
bl
fq
mT
pD
vO
pD
"}
(15,1,1) = {"
ix
pD
Mk
we
ea
IE
cx
FZ
"}
(16,1,1) = {"
ix
tL
tL
JS
DC
tL
tL
tL
"}
(17,1,1) = {"
ix
dY
eR
ye
GX
tY
tL
rU
"}
(18,1,1) = {"
ix
dY
SC
ZF
wt
cz
tL
ix
"}
(19,1,1) = {"
ix
tL
dY
dY
tL
tL
rU
ix
"}
_maps/shuttles/zubbers/emergency_vortex.dmm
+2 -2
View File
@@ -3205,8 +3205,8 @@
/obj/item/storage/medkit/regular{
pixel_y = 3
},
/obj/item/clothing/suit/armor/vest/alt/sec/redsec,
/obj/item/clothing/head/helmet/sec/redsec,
/obj/item/clothing/suit/armor/vest/alt/sec,
/obj/item/clothing/head/helmet/sec,
/turf/open/floor/iron/dark,
/area/shuttle/escape/brig)
"LR" = (
_maps/virtual_domains/skyrat_ancientmilsim.dmm
+4 -1
View File
@@ -1413,8 +1413,11 @@
/area/virtual_domain/ancient_milsim/snpc_garage)
"NA" = (
/obj/structure/sign/poster/random/directional/west,
/obj/item/storage/toolbox/maint_kit,
/obj/structure/table/wood,
/obj/item/gun_maintenance_supplies{
pixel_x = 0;
pixel_y = 5
},
/turf/open/floor/carpet/red,
/area/virtual_domain/ancient_milsim/snpc_bar)
"NJ" = (
code/__DEFINES/icon_smoothing.dm
+3
View File
@@ -241,6 +241,9 @@ DEFINE_BITFIELD(smoothing_junction, list(
#define SMOOTH_GROUP_SHUTTERS S_OBJ(88)
#define SMOOTH_GROUP_WATER S_OBJ(89) ///obj/effect/abstract/liquid_turf
#define SMOOTH_GROUP_WIREWEED S_OBJ(90)
#define SMOOTH_GROUP_WIREWEED_WALLS S_OBJ(91)
//SKYRAT EDIT END
/// Performs the work to set smoothing_groups and canSmoothWith.
code/__DEFINES/~skyrat_defines/lewd_defines.dm
+3
View File
@@ -29,6 +29,9 @@
#define BREAST_SIZE_N "N"
#define BREAST_SIZE_O "O"
#define BREAST_SIZE_P "P"
#define BREAST_SIZE_Q "Q"
#define BREAST_SIZE_R "R"
#define BREAST_SIZE_S "S"
#define BREAST_SIZE_BEYOND_MEASUREMENT "beyond measurement"
//ERP Size Areas
code/__DEFINES/~skyrat_defines/signals/signals_fleshmind.dm
+1
View File
@@ -0,0 +1 @@
#define COSMIG_CONTROLLER_SET_TARGET "fleshmind_set_target"
code/__DEFINES/~~bubber_defines/DNA.dm
+2 -1
View File
@@ -78,7 +78,7 @@
#define PENIS_DEFAULT_LENGTH 6 //still a lil long but not insane
#define TESTICLES_MIN_SIZE 0
#define TESTICLES_MAX_SIZE 6
#define TESTICLES_MAX_SIZE 8
#define SHEATH_NONE "None"
#define SHEATH_NORMAL "Sheath"
@@ -138,6 +138,7 @@
#define SPECIES_HEMOPHAGE "hemophage"
#define SPECIES_FELINE_PRIMITIVE "primitive_felinid"
#define SPECIES_PROTEAN "protean"
#define SPECIES_GAS "serpentid"
#define SPECIES_MUTANT "mutant"
#define SPECIES_MUTANT_INFECTIOUS "infectious_mutant"
code/__DEFINES/~~bubber_defines/basic_mobs.dm
+6
View File
@@ -0,0 +1,6 @@
/// Fleshmind
#define BB_MECHIVER_DEAD_TARGET "mechiver_dead_target"
#define BB_MECHIVER_CONTAINED_MOB "mechiver_contained_mob"
#define BB_TREADER_DISPENSE_NANITES "treader_dispense_nanites"
#define BB_TYRANT_LASER "tyrant_shoot_laser"
#define BB_TYRANT_ROCKET "tyrant_shoot_rocket"
code/__DEFINES/~~bubber_defines/gas_clothing_paths.dm
+11
View File
@@ -0,0 +1,11 @@
#define SERPENTID_ACCESSORIES_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/accessories.dmi'
#define SERPENTID_BACK_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/back.dmi'
#define SERPENTID_BELT_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/belt.dmi'
#define SERPENTID_EYES_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/eyes.dmi'
#define SERPENTID_HANDS_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/hands.dmi'
#define SERPENTID_HEAD_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/head.dmi'
#define SERPENTID_MASK_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/mask.dmi'
#define SERPENTID_NECK_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/neck.dmi'
#define SERPENTID_SUIT_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/suit.dmi'
#define SERPENTID_UNIFORM_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/uniform.dmi'
#define SERPENTID_EARS_ICON 'modular_skyrat/master_files/icons/mob/clothing/species/serpentid/ears.dmi'
code/__DEFINES/~~bubber_defines/mobs.dm
+2
View File
@@ -41,3 +41,5 @@
#define AI_HOLOGRAM_BEE "Bee"
#define AI_HOLOGRAM_REDPANDA "Red Panda"
#define AI_HOLOGRAM_FENNEC "Fennec"
#define BODYPART_ICON_GAS 'modular_skyrat/modules/bodyparts/icons/serpentid_parts_greyscale.dmi'
code/__DEFINES/~~bubber_defines/role_preferences.dm
+1
View File
@@ -19,3 +19,4 @@
#define ROLE_MONSTERHUNTER "Monster Hunter"
#define ROLE_VASSAL "Ghoul"
#define ROLE_CHANGELING_ZOMBIE "Changeling Zombie"
#define ROLE_WIRE_PRIEST "Wire Priest"
code/__DEFINES/~~bubber_defines/signals.dm
+17
View File
@@ -54,3 +54,20 @@
#define COMSIG_LIVING_SEARCHED_TRASH_PILE "living_searched_trash_pile"
/// From /datum/component/cleaner/proc/clean - triggered on successful clean. (/datum/component/cleaner/source, mob/living/user)
#define COMSIG_ATOM_POST_CLEAN "atom_post_clean"
// CORRUPTION SIGNALS
/// From /obj/structure/fleshmind/structure/proc/activate_ability() (src)
#define COMSIG_CORRUPTION_STRUCTURE_ABILITY_TRIGGERED "corruption_structure_ability_triggered"
/// From /mob/living/basic/fleshmind/phaser/proc/phase_move_to(atom/target, nearby = FALSE)
#define COMSIG_PHASER_PHASE_MOVE "phaser_phase_move"
/// from /mob/living/basic/fleshmind/phaser/proc/enter_nearby_closet()
#define COMSIG_PHASER_ENTER_CLOSET "phaser_enter_closet"
/// from /obj/structure/fleshmind/structure/core/proc/rally_troops()
#define COMSIG_FLESHMIND_CORE_RALLY "fleshmind_core_rally"
#define COMSIG_MECHIVER_CONVERT "mechiver_convert"
//#define COMSIG_CORE_DEATH "fleshmind_core_death"
code/__HELPERS/~skyrat_helpers/is_helpers.dm
+1
View File
@@ -22,6 +22,7 @@
#define isprotean(A) (is_species(A, /datum/species/protean))
#define iscursekin(A) (is_species(A, /datum/species/human/cursekin))
#define islycan(A) (is_species(A, /datum/species/lycan))
#define isgas(A) (is_species(A, /datum/species/gas))
//Antags
#define ishorrorling(A) (istype(A, /mob/living/simple_animal/hostile/true_changeling))
#define iscorticalborer(A) (istype(A, /mob/living/basic/cortical_borer))
code/datums/components/aggro_emote.dm
+42 -2
View File
@@ -6,6 +6,14 @@
var/living_only
/// List of emotes to play
var/list/emote_list
// BUBBER EDIT - START: FLESHMIND
/// Audiable emotes to play
var/list/audible_emote_list
/// Do we taunt the target?
var/list/speak_list
/// Do we play any sounds?
var/list/sounds
// BUBBER EDIT - END
/// Chance to play an emote
var/emote_chance
/// Chance to subtract every time we play an emote (permanently)
@@ -17,6 +25,9 @@
target_key = BB_BASIC_MOB_CURRENT_TARGET,
living_only = FALSE,
list/emote_list,
list/speak_list, // BUBBER EDIT - ADDITION: FLESHMIND
list/sounds, // BUBBER EDIT - ADDITION: FLESHMIND
list/audible_emote_list, // BUBBER EDIT - ADDITION: FLESHMIND
emote_chance = 30,
minimum_chance = 2,
subtract_chance = 7,
@@ -30,6 +41,9 @@
src.target_key = target_key
src.emote_list = emote_list
src.speak_list = speak_list // BUBBER EDIT - ADDITION: FLESHMIND
src.sounds = sounds // BUBBER EDIT - ADDITION: FLESHMIND
src.audible_emote_list = audible_emote_list // BUBBER EDIT - ADDITION: FLESHMIND
src.emote_chance = emote_chance
src.minimum_chance = minimum_chance
src.subtract_chance = subtract_chance
@@ -46,9 +60,35 @@
/datum/component/aggro_emote/proc/on_target_changed(atom/source)
SIGNAL_HANDLER
var/atom/new_target = source.ai_controller.blackboard[target_key]
// BUBBER EDIT - START: FLESHMIND
var/mob/living/mob = source
/// Used to pick and choose between emotes and audiable sounds
// Grab the number length of each list
var/emotes_length = emote_list?.len
var/audible_emote_length = audible_emote_list?.len
var/speak_emote_length = speak_list?.len
// Add them all together
var/total_choices_length = audible_emote_length + speak_emote_length + emotes_length
//Pick a random number between 1 and the total length of every list
var/random_number_in_range = rand(1, total_choices_length)
var/sound_to_play = length(sounds) > 0 ? pick(sounds) : null
// Calculate the emote chance and determin if you'll run an emote
emote_chance = max(emote_chance - subtract_chance, minimum_chance)
// BUBBER EDIT - END
if (isnull(new_target) || !prob(emote_chance))
return
if (living_only && !isliving(new_target))
return // If we don't want to bark at food items or chairs or windows
emote_chance = max(emote_chance - subtract_chance, minimum_chance)
source.manual_emote("[pick(emote_list)] at [new_target].")
// BUBBER EDIT - START: FLESHMIND
/// Randomly choose between each emote
if(random_number_in_range <= audible_emote_length)
source.manual_emote("[pick(audible_emote_list)]")
playsound(source, sound_to_play, 80, vary = TRUE)
else if(random_number_in_range <= (audible_emote_length + emotes_length))
source.manual_emote("[pick(emote_list)] at [new_target].")
else
INVOKE_ASYNC(mob, TYPE_PROC_REF(/atom/movable, say), pick(speak_list), forced = "AI Controller")
playsound(source, sound_to_play, 80, vary = TRUE)
// BUBBER EDIT - END
code/datums/storage/subtypes/belts.dm
+1
View File
@@ -9,6 +9,7 @@
/obj/item/radio,
/obj/item/melee/sickly_blade/lock,
/obj/item/reagent_containers/cup/soda_cans,
/obj/item/holotool, // BUBBER EDIT ADDITION
))
///Medical belt
code/game/objects/effects/decals/turfdecal/markings.dm
+1 -1
View File
@@ -253,7 +253,7 @@
icon_state = "siding_plain_end"
/obj/effect/turf_decal/siding/red
color = "#486091" //SKYRAT EDIT CHANGE
color = "#DE3A3A"
/obj/effect/turf_decal/siding/red/corner
icon_state = "siding_plain_corner"
code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+2 -2
View File
@@ -83,7 +83,7 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow)
/obj/effect/turf_decal/tile/red
name = "red tile decal"
color = "#486091" // SKYRAT EDIT CHANGE
color = "#DE3A3A"
TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/red)
@@ -275,7 +275,7 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/white)
/// Red trimlines
/obj/effect/turf_decal/trimline/red
color = "#486091" //SKYRAT EDIT CHANGE
color = "#DE3A3A"
TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/red)
code/game/objects/items/storage/garment.dm
+6 -14
View File
@@ -86,8 +86,7 @@
new /obj/item/clothing/suit/armor/vest/hop/hop_formal(src)
new /obj/item/clothing/neck/mantle/hopmantle(src)
/obj/item/storage/bag/garment/hos/PopulateContents()
new /obj/item/clothing/under/rank/security/head_of_security(src)
/obj/item/storage/bag/garment/hos/PopulateContents() /* BUBBER EDIT - OVERWRITTEN IN modular_zubbers\code\modules\security\sec_garment_overrides.dm
new /obj/item/clothing/under/rank/security/head_of_security/skirt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src)
@@ -105,20 +104,12 @@
new /obj/item/clothing/head/hats/hos/cap(src)
new /obj/item/clothing/mask/gas/sechailer/swat(src)
new /obj/item/clothing/neck/cloak/hos(src)
//BUBBER ADDITION BEGIN
new /obj/item/clothing/neck/cloak/hos/redsec(src)
new /obj/item/clothing/under/rank/security/head_of_security/redsec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec(src)
new /obj/item/clothing/shoes/jackboots/sec/redsec(src)
new /obj/item/clothing/head/hos_kepi(src)
new /obj/item/clothing/under/rank/security/peacekeeper/skirt_hos(src)
//BUBBER ADDITION END
//Duplication from Commdrobe
new /obj/item/clothing/head/hats/warden/drill/hos(src)
new /obj/item/clothing/under/rank/security/head_of_security/alt/roselia(src)
new /obj/item/clothing/glasses/hud/security/sunglasses/gars/giga/roselia(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/redsec(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade(src)
new /obj/item/clothing/under/rank/security/head_of_security/parade/female(src)
new /obj/item/clothing/head/hats/hos/elofy(src)
new /obj/item/clothing/suit/armor/hos/elofy(src)
new /obj/item/clothing/gloves/elofy(src)
@@ -127,11 +118,11 @@
new /obj/item/clothing/under/rank/security/head_of_security/bunnysuit(src)
new /obj/item/clothing/suit/armor/hos_tailcoat(src)
new /obj/item/clothing/head/hats/hos/beret/navyhos(src)
new /obj/item/clothing/under/rank/security/head_of_security/peacekeeper(src)
new /obj/item/clothing/suit/jacket/hos/blue(src)
new /obj/item/clothing/neck/mantle/hosmantle(src)
*/
/obj/item/storage/bag/garment/warden/PopulateContents()
/obj/item/storage/bag/garment/warden/PopulateContents() /* BUBBER EDIT - OVERWRITTEN IN modular_zubbers\code\modules\security\sec_garment_overrides.dm
new /obj/item/clothing/suit/armor/vest/warden(src)
new /obj/item/clothing/head/hats/warden(src)
new /obj/item/clothing/head/hats/warden/drill(src)
@@ -144,6 +135,7 @@
new /obj/item/clothing/gloves/kaza_ruk/sec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/mask/gas/sechailer(src)
*/
/obj/item/storage/bag/garment/research_director/PopulateContents()
new /obj/item/clothing/under/rank/rnd/research_director(src)
code/game/objects/items/tools/engineering/painter/paintable_decals.dm
-2
View File
@@ -181,7 +181,6 @@
"Engi Yellow" = /obj/effect/turf_decal/tile/yellow::color,
"Med Blue" = /obj/effect/turf_decal/tile/blue::color,
"R&D Purple" = /obj/effect/turf_decal/tile/purple::color,
"Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/tile/red::color,
"Service Green" = /obj/effect/turf_decal/tile/green::color,
"Custom" = "custom",
@@ -236,7 +235,6 @@
"Engi Yellow" = /obj/effect/turf_decal/siding/yellow::color,
"Med Blue" = /obj/effect/turf_decal/siding/blue::color,
"R&D Purple" = /obj/effect/turf_decal/siding/purple::color,
"Sec Blue" = "#486091", // BUBBER EDIT CHANGE
"Sec Red" = /obj/effect/turf_decal/siding/red::color,
"Service Green" = /obj/effect/turf_decal/siding/green::color,
"Custom" = "custom",
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1
View File
@@ -19,6 +19,7 @@
new /obj/item/storage/photo_album/rd(src)
new /obj/item/storage/box/skillchips/science(src)
new /obj/item/card/id/departmental_budget/sci(src) //SKYRAT EDIT ADDITION
new /obj/item/holotool(src) // BUBBER EDIT ADDITION
/obj/structure/closet/secure_closet/research_director/populate_contents_immediate()
. = ..()
code/game/turfs/open/floor/hull.dm
+3
View File
@@ -12,6 +12,9 @@
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
temperature = T20C
/turf/open/floor/engine/hull/lavaland
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
/turf/open/floor/engine/hull/ceiling
name = "shuttle ceiling plating"
code/modules/admin/sql_ban_system.dm
+1
View File
@@ -436,6 +436,7 @@
ROLE_ASSAULT_OPERATIVE, // SKYRAT EDIT ADDITION
ROLE_BLOODSUCKER,// BUBBER EDIT
ROLE_VASSAL, // BUBBER EDIT
ROLE_WIRE_PRIEST, // BUBBER EDIT
),
"Skyrat Ban Options" = list(
BAN_PACIFICATION,
code/modules/jobs/job_types/security_officer.dm
+1
View File
@@ -242,6 +242,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/helmet/sec
shoes = /obj/item/clothing/shoes/jackboots/sec
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
l_pocket = /obj/item/restraints/handcuffs
r_pocket = /obj/item/assembly/flash/handheld
code/modules/mob/living/carbon/human/human_update_icons.dm
+3 -1
View File
@@ -1123,12 +1123,14 @@ mutant_styles: The mutant style - taur bodytype, STYLE_TESHARI, etc. // SKYRAT E
if (mutant_styles & STYLE_TAUR_ALL)
if (!using_taur_variant)
var/cropping_state = DEFAULT_TAUR_CLIPPING_MASK
var/taur_cache_key = "[t_state]-[file2use]-[female_uniform]-[is_digi]-[type]-[greyscale_colors]-[cropping_state]"
if (ishuman(loc))
var/mob/living/carbon/human/humie = loc
var/obj/item/organ/taur_body/taur = humie.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR)
cropping_state = (taur ? taur.clothing_cropping_state : DEFAULT_TAUR_CLIPPING_MASK)
taur_cache_key = "[t_state]-[file2use]-[female_uniform]-[is_digi]-[type]-[greyscale_colors]-[cropping_state]"
draw_target = wear_taur_version(draw_target.icon_state, draw_target.icon, layer2use, female_uniform, greyscale_colors, cropping_state)
draw_target = wear_taur_version(draw_target.icon_state, draw_target.icon, layer2use, female_uniform, greyscale_colors, cropping_state, taur_cache_key)
else
draw_target.pixel_w -= 16 // it doesnt look right otherwise
// SKYRAT EDIT ADDITION END
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+9 -5
View File
@@ -17,6 +17,7 @@
///The max capacity of modkits the PKA can have installed at once.
var/max_mod_capacity = 100
var/disablemodification = FALSE // Bubber edit, stops removal and addition of mods.
var/disabled_modkits // BUBBER EDIT - ADDITION - Additional var to handle certain modkits being disallwoed on specific PKAs
/obj/item/gun/energy/recharge/kinetic_accelerator/add_bayonet_point()
@@ -344,11 +345,14 @@
if(KA.get_remaining_mod_capacity() >= cost)
if(.)
if(transfer_to_loc && !user.transferItemToLoc(src, KA))
return
to_chat(user, span_notice("You install the modkit."))
playsound(loc, 'sound/items/tools/screwdriver.ogg', 100, TRUE)
KA.modkits |= src
if(!is_type_in_list(src, KA.disabled_modkits)) // BUBBER EDIT - ADDITION - If statement to check if this modkit is disabled on this PKA
if(transfer_to_loc && !user.transferItemToLoc(src, KA))
return
to_chat(user, span_notice("You install the modkit."))
playsound(loc, 'sound/items/tools/screwdriver.ogg', 100, TRUE)
KA.modkits |= src
else
to_chat(user, span_notice("The modkit cannot be installed on this model of kinetic accelerator.")) // BUBBER EDIT - ADDITION - END
else
to_chat(user, span_notice("The modkit you're trying to install would conflict with an already installed modkit. Remove existing modkits first."))
else
code/modules/research/designs/medical_designs.dm
+3 -3
View File
@@ -631,7 +631,7 @@
)
build_path = /obj/item/organ/cyberimp/chest/spine
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_CYBERNETICS
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -701,7 +701,7 @@
)
build_path = /obj/item/organ/cyberimp/chest/reviver
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_CYBERNETICS
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -927,7 +927,7 @@
)
build_path = /obj/item/organ/heart/cybernetic/anomalock
category = list(
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT // BUBBER EDIT - CHANGE - PREVIOUS: RND_CATEGORY_EQUIPMENT
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
code/modules/research/machinery/departmental_protolathe.dm
+1 -1
View File
@@ -43,5 +43,5 @@
name = "department protolathe (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
circuit = /obj/item/circuitboard/machine/protolathe/department/security
stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
stripe_color = "#DE3A3A"
payment_department = ACCOUNT_SEC
code/modules/research/machinery/departmental_techfab.dm
+1 -1
View File
@@ -43,5 +43,5 @@
name = "department techfab (Security)"
allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY
circuit = /obj/item/circuitboard/machine/techfab/department/security
stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A"
stripe_color = "#DE3A3A"
payment_department = ACCOUNT_SEC
code/modules/research/techweb/nodes/cyborg_nodes.dm
+4 -2
View File
@@ -162,8 +162,9 @@
design_ids = list(
"ci-breather",
"ci-nutriment",
"ci-nutrimentplus", // BUBBER EDIT - ADDITION
"ci-thrusters",
"ci-herculean",
//"ci-herculean", // BUBBER EDIT - REMOVAL
"ci-connector",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
@@ -183,6 +184,7 @@
"ci-reviver",
"ci-antidrop",
"ci-antistun",
"ci-herculean", // BUBBER EDIT - ADDITION
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
announce_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_MEDICAL)
@@ -193,7 +195,7 @@
description = "Decades of contraband smuggling by assistants have led to the development of a full toolbox that fits seamlessly into your arm."
prereq_ids = list(TECHWEB_NODE_COMBAT_IMPLANTS, TECHWEB_NODE_EXP_TOOLS)
design_ids = list(
"ci-nutrimentplus",
//"ci-nutrimentplus", // BUBBER EDIT - REMOVAL
"ci-surgery",
"ci-surgery-brain",
"ci-toolset",
code/modules/surgery/organs/internal/eyes/_eyes.dm
+15
View File
@@ -130,6 +130,11 @@
if(CONFIG_GET(flag/native_fov) && native_fov)
affected_human.add_fov_trait(type, native_fov)
// BUBBER EDIT ADDITION - EMISSIVES
if (affected_human.emissive_eyes)
is_emissive = TRUE
// BUBBER EDIT END
if(call_update)
affected_human.update_body()
@@ -164,6 +169,7 @@
organ_owner.update_tint()
organ_owner.update_sight()
is_emissive = FALSE // BUBBER EDIT ADDITION
UnregisterSignal(organ_owner, list(
COMSIG_ATOM_BULLET_ACT,
COMSIG_COMPONENT_CLEAN_FACE_ACT,
@@ -322,6 +328,15 @@
left_scar.color = my_head.draw_color
overlays += left_scar
// BUBBER EDIT START - Customization Emissives
if(is_emissive)
var/mutable_appearance/emissive_left = emissive_appearance_copy(eye_left, owner)
var/mutable_appearance/emissive_right = emissive_appearance_copy(eye_right, owner)
overlays += emissive_left
overlays += emissive_right
// BUBBER EDIT END - Customization Emissives
if(my_head.worn_face_offset)
for (var/mutable_appearance/overlay as anything in overlays)
my_head.worn_face_offset.apply_offset(overlay)
code/modules/unit_tests/_unit_tests.dm
+1
View File
@@ -348,6 +348,7 @@
#include "wizard_loadout.dm"
// SKYRAT EDIT START
#include "~skyrat\automapper.dm"
#include "~skyrat\digitigrade_sprites.dm"
#include "~skyrat\opposing_force.dm"
// SKYRAT EDIT END
// END_INCLUDE
code/modules/unit_tests/screenshots/screenshot_antag_icons_wirepriest.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 657 B

code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_gas.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

code/modules/unit_tests/~skyrat/digitigrade_sprites.dm
+51
View File
@@ -0,0 +1,51 @@
/datum/unit_test/modular_digitigrade_sprites
var/type_to_test = /obj/item/clothing/under
var/list/modular_folders = list(
"modular_skyrat",
"modular_zubbers",
)
/datum/unit_test/modular_digitigrade_sprites/proc/get_folders_of_typepaths()
var/typepath_files = list()
for(var/folder_name in modular_folders)
var/dir = "[folder_name]/"
for(var/file in flist(dir))
var/list/files = find_all_dm_files(dir)
for(var/full_path in files)
var/text = rustg_file_read(full_path)
if(!text)
continue
var/list/matches = parse_typepaths_from_text(text)
if(!length(matches))
continue
typepath_files |= parse_typepaths_from_text(text)
return typepath_files
/datum/unit_test/modular_digitigrade_sprites/proc/parse_typepaths_from_text(text)
var/type_string = "[type_to_test]"
// escape the slashes in the typepath itself to make it valid for regex
type_string = replacetext(type_string, "/", "\\/")
var/regex/matcher = regex(type_string + @"[^s\n]*")
if(!matcher.Find(text))
return list()
return matcher.group
/datum/unit_test/modular_digitigrade_sprites/proc/find_all_dm_files(dir)
var/list/results = list()
for(var/entry in flist(dir))
var/path = "[dir][entry]"
if(copytext(entry, -2) == "dm")
results += path
else if(copytext(entry, -1) == "/")
results += find_all_dm_files(path)
return results
/datum/unit_test/modular_digitigrade_sprites/Run()
var/list/typepath_files = get_folders_of_typepaths()
for(var/obj/item/clothing/under/valid_subtype as anything in subtypesof(/obj/item/clothing/under))
var/subtype_string = "[valid_subtype]"
if(subtype_string in typepath_files)
continue
var/flags = valid_subtype::supports_variations_flags
if(!(flags & CLOTHING_DIGITIGRADE_VARIATION) && !(flags & CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON))
TEST_FAIL("[subtype_string] is missing required digitigrade variation flags.")
config/game_options.txt
+1
View File
@@ -425,6 +425,7 @@ ROUNDSTART_RACES lesser_abductor
ROUNDSTART_RACES zombie
ROUNDSTART_RACES protean
ROUNDSTART_RACES cursekin
ROUNDSTART_RACES serpentid
##-------------------------------------------------------------------------------------------
config/privacy_policy.txt
+86
View File
@@ -0,0 +1,86 @@
1. INTRODUCTION AND SCOPE
This Privacy Policy (the “Policy”) outlines the policies and procedures of Bubberstation (“we,” “us,” “our”) regarding the collection, use, and disclosure of personal information. This Policy applies to all individuals (“you,” “user”) who access or use any of our associated services (collectively, the “Services”).
Our Services include, but are not limited to:
Our game server (“Game”) on the BYOND platform.
Our official website, forums, wiki, and status page (collectively, “Website”).
Our official Discord server (“Discord”).
Our connected Application Programming Interface (API) and any other backend services that connect, track, or link user accounts across these platforms.
By accessing or using any of our Services, you signify your understanding of and agreement to the terms of this Privacy Policy.
2. INFORMATION WE COLLECT
In the course of operating our Services, we may collect a wide range of information, which includes:
Identifiers and Account Information: This includes information you voluntarily provide, such as your BYOND username (CKey), Discord username and User ID, and any other credentials or identifiers used to register for or access our Services.
Device and Hardware Information: We automatically collect data about the device, computer, and software you use to access our Services. This may include, but is not limited to, your IP address, browser type and version, operating system, and unique hardware identifiers (such as a HWID).
Service Usage and Log Data: When you interact with our Services, our servers automatically record information. This data may include connection timestamps, in-game actions, chat logs (from the Game and Discord), IP addresses, and records of your activity on our Website.
Cookies and Tracking Technologies: We use cookies, web beacons, and similar tracking technologies to collect information about your interactions with our Website. This information is used for essential site functionality, session management, and to preserve your preferences. This may include cookies that store your login state for our website or other connected services.
Third-Party Platform Data: When you interact with our Services through third-party platforms such as BYOND, or Discord we may collect information provided to us by those platforms as part of their standard API or service functionality.
Date of Birth: When you initially “Get Vetted” on our Discord, you provide us with your Date of Birth in the form of a heavily censored identification card.
3. BASIS FOR AND PURPOSE OF DATA USE
Our processing of your personal information is for the legitimate interest of operating, maintaining, and moderating our community and Services. We do not use your data for commercial analytics, marketing, or to sell to any third party.
The purposes for which we use your information are:
Provision and Operation of Services: To operate, maintain, and provide the full functionality of the Game, Website, and all connected Services.
Account Management and Integration: To create and maintain your account, and to facilitate the linking of your various accounts (BYOND, Discord, etc.) via our API for integrated community features.
Security, Integrity, and Rule Enforcement: To protect the security and integrity of our Services and community.
Legal Compliance: To comply with any applicable laws, regulations, or legal processes.
Age Verification: To ensure that Bubberstation is free of minors due to the erotic nature of the server.
4. DATA SHARING AND DISCLOSURE
We do not sell, rent, lease, or trade your personal information. Your information is disclosed only in the following limited circumstances:
Third-Party Service Providers: Your information is inherently processed by the third-party platforms you use to access our Services (e.g., BYOND, and Discord) and by our infrastructure providers (e.g., our servers or Website hosts). We do not control the privacy practices of these third parties.
Authorized Volunteer Staff: Our authorized volunteer administrators and moderators may be granted access to your personal information (such as logs, IP addresses, and hardware identifiers) strictly as necessary to perform their moderation and administrative duties in accordance with our internal policies.
Legal Compliance and Protection: We may disclose your information if we believe in good faith that such disclosure is necessary to: (a) comply with a legal obligation, (b) protect and defend our rights or property, (c) act in urgent circumstances to protect the personal safety of users or the public, or (d) protect against legal liability.
5. DATA STORAGE AND SECURITY
We implement reasonable administrative and technical security measures to protect your personal information from unauthorized access, use, or disclosure. We store data on secure servers, primarily located in the United States. However, no method of transmission over the Internet or method of electronic storage is 100% secure. Therefore, we cannot guarantee its absolute security.
6. DATA RETENTION
We retain your personal information for as long as it is necessary to fulfill the purposes for which it was collected and to provide our Services.
Information related to the general use of the Services, such as transient logs, may be retained for a limited period.
Information related to your account profile may be retained for as long as your account is active.
Data related to moderation, sanctions, rule violations, or enforcement actions (including associated identifiers like CKey, IP address, and HWID) may be retained indefinitely.
7. YOUR DATA RIGHTS AND CHOICES
We honor your rights to your data, including those provided under regulations like the GDPR. Subject to applicable law, you may have the right to:
Right of Access: Request a copy of the personal information we hold about you.
Right to Rectification: Request correction of inaccurate personal information.
Right to Erasure (Right to be Forgotten): Request the deletion of your personal information.
How to Make a Request:
To exercise any of these rights, you must contact us via the designated contact email at the bottom of the policy page.
Limitations:
Requesting deletion is irreversible and will result in the permanent removal of your account, game progress, and associated data.
We may decline requests that are excessively repetitive, require disproportionate technical effort, or jeopardize the privacy of others.
We cannot fulfill deletion requests for data that we are legally required to maintain.
We will not delete data related to moderation and ban records.
8. CHILDREN’S PRIVACY
Bubberstation prohibits minors from using its platforms. Bubberstation is forbidden for persons under the age of 18 and the applicable age of majority in the jurisdiction from which Bubberstation is accessed. As indicated throughout this Privacy Notice, some users may be asked to provide some information to us and our service providers for us to make sure that you are over the age of majority required to have access to Bubberstation. We do not knowingly process personal information from minors. If you are the parent or legal guardian of a minor who has provided us with personal information, then please contact us at contact.bubberstation@gmail.com to have that minor’s personal information deleted.
9. CHANGES TO THIS PRIVACY POLICY
We reserve the right to modify this Privacy Policy at any time. Any changes will be posted to this page, and we will notify you of any significant changes by posting a notice on our Website or in our Discord. Your continued use of the Services after such changes constitutes your acceptance of the revised Policy.
10. CONTACT US
If you have any questions about this Privacy Policy or wish to exercise your data rights, please contact us: contact.bubberstation@gmail.com
html/changelogs/AutoChangeLog-bubber-pr-5184.yml
-5
View File
@@ -1,5 +0,0 @@
author: "nikothedude"
delete-after: True
changes:
- bugfix: "SAD can now remove organs, such as a taur body, or breasts"
- rscadd: "A new polymorph mode: Character, which allows you to switch your character at your whim"
html/changelogs/AutoChangeLog-bubber-pr-5226.yml
-5
View File
@@ -1,5 +0,0 @@
author: "ibexgoetia"
delete-after: True
changes:
- rscadd: "Added new folder functionality to the Bureaucratic Goat plush, as well as a revealable tummy."
- image: "Updated the sprite of the Bureaucratic Goat plush."
html/changelogs/AutoChangeLog-bubber-pr-5237.yml
-4
View File
@@ -1,4 +0,0 @@
author: "MajManatee"
delete-after: True
changes:
- qol: "Smoker, Junkie, and Addict now take longer to make you crash out."
html/changelogs/AutoChangeLog-bubber-pr-5245.yml
-4
View File
@@ -1,4 +0,0 @@
author: "nikothedude"
delete-after: True
changes:
- rscdel: "Dirty no longer makes you smell like ass"
html/changelogs/AutoChangeLog-bubber-pr-5294.yml
+5
View File
@@ -0,0 +1,5 @@
author: "LordHookie"
delete-after: True
changes:
- bugfix: "Virtual CIN Soldiers will no longer undergo mitosis upon death."
- bugfix: "Fixed a non-existent item in Milsim."
html/changelogs/bubber_archive/2026-02.yml
+83
View File
@@ -66,3 +66,86 @@
xPokee:
- bugfix: Fixed clown jumpsuits and under clothing not having digitigrade sprites
despite us having their icons.
2026-02-12:
MajManatee:
- qol: Smoker, Junkie, and Addict now take longer to make you crash out.
ibexgoetia:
- rscadd: Added new folder functionality to the Bureaucratic Goat plush, as well
as a revealable tummy.
- image: Updated the sprite of the Bureaucratic Goat plush.
nikothedude:
- rscdel: Dirty no longer makes you smell like ass
- bugfix: SAD can now remove organs, such as a taur body, or breasts
- rscadd: 'A new polymorph mode: Character, which allows you to switch your character
at your whim'
2026-02-13:
KazooBard:
- bugfix: breaching hammers actually DO insulate you now from door shocks, when
you breach with them
xPokee:
- map: Removed the roundstart Plant DNA Manipulators on Box Station and Moon Station.
2026-02-25:
Danielance:
- rscadd: added missing digi leg and teshari sprites for 12 jumpsuit slot items
- rscdel: removed an error clothing item
KateAnbolho:
- rscdel: Removed stasis pods from the game
MajManatee:
- rscadd: New gun available for sec, the NT-USP. A disabler alternative that isn't
lame!
- bugfix: Combat implants are in the combat implant section. Where you would think
they would be.
- bugfix: Holotool has the correct speed and doesnt flash you through a welding
mask.
- rscadd: The RD now has an Experimental Holotool! It starts in their locker.
Nuk5513:
- rscadd: A "new" Haydee snout, as well as loincloth as an option for underwear.
SapphoQueer:
- rscadd: The (alt) sprites for penises now have 3 extra stages of size.
- rscadd: The "pair (alt)" breasts now support Q, R, and S sizes.
- balance: Sets heretic's weight to 0 within the storyteller, disabling it.
- bugfix: Balloon alerts for the murphy now function properly.
- bugfix: Taur legs no longer messes with your clothing's rendering.
Yobrocharlie:
- bugfix: fixes some roundstart atmos differences with lizard gas and the persistence
axietheaxolotl / viro:
- rscdel: blusec
- rscadd: redsec
intense-skies, xPokee:
- rscadd: 'Added new three new teshari emotes: ttrill, tsqueak, and tchirp. These
emotes are also in the emote panel.'
- rscadd: Added two new mohawk hair selections for teshari.
- rscdel: Removed one of the old mohawk ears options from teshari, as it is now
deprecated.
xPokee:
- rscadd: 'Added a new map: Ouroboros!'
- rscadd: 'Added a new reagent: Plushmium! Used to bring plushies to life, it can
also be obtained through hacked LustWish vendors.'
2026-02-26:
BurgerBB:
- rscadd: Adds a new method of removing looping Immovable Rods. You can purchase
it in the contraband section of the Lustwish vendor.. It requires you to interact
with the immovable rod, similar to an RD suplex.
MajManatee:
- balance: rebalanced PKA-Alts
- bugfix: the shockwave PKA can no longer attach AOE kits.
SapphoQueer:
- qol: Oversized players now fit within cryo cells.
YakiAttaki:
- rscadd: The "quad (alt)" breasts now support sizes F-S.
xPokee:
- rscadd: 'Added a new species: Giant Armored Serpentids (GAS)!'
2026-02-27:
Danielance:
- bugfix: ablative trenchcoat digi legs sprite is no longer a missing texture coat
- rscadd: teshari sprites for ablative trenchcoat and hood
kaylexis:
- rscadd: Ported New Seedvault
2026-02-28:
Danielance:
- bugfix: emissive eyes are now emissive again
shayoki:
- map: Some stations are no longer confused whether or not they are still bluesec
or redsec.
- map: Reverts some dark-blue decals outside of the bridge that turned red as a
result.
html/changelogs/bubber_archive/2026-03.yml
+14
View File
@@ -0,0 +1,14 @@
2026-03-01:
Seijan-Etroix:
- rscadd: '6 new drinks for blood-drinkers
5 Alcoholic: Morocco Coffin, Cranberry Cadillac, Jubokko, Venetian Waltz, and
the Bat Outta'' Hell
1 Non-Alcoholic: The Intraverde.'
- rscadd: Eggnog now has its own sprite. No more suspicious glasses of white liquid
during the holidays.
xPokee:
- server: Added a Privacy Policy, be sure to read it.
- bugfix: The privacy policy no longer pops up after you've already accepted it
once.
icons/map_icons/clothing/head/_head.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

icons/map_icons/clothing/head/beret.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+6 -4
View File
@@ -1,6 +1,8 @@
// MODULAR ID TRIM ACCESS OVERRIDES GO HERE!!
//(Most) of Security has inverted IDs, with custom blue-on-black icons. This is to distinguish them from their head, who has a white-on-blue icon
// not anymore
/*
/datum/id_trim/job/head_of_security
subdepartment_color = COLOR_ASSEMBLY_BLACK
@@ -18,7 +20,7 @@
trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
department_color = COLOR_ASSEMBLY_BLACK
subdepartment_color = COLOR_ASSEMBLY_BLACK
*/
/datum/id_trim/job/chief_engineer/New()
. = ..()
@@ -80,10 +82,10 @@
/datum/id_trim/job/corrections_officer
assignment = "Corrections Officer"
trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
trim_icon = 'modular_zubbers/icons/obj/card.dmi' // BUBBER EDIT
trim_state = "trim_corrections_officer"
department_color = COLOR_ASSEMBLY_BLACK
subdepartment_color = COLOR_ASSEMBLY_BLACK
department_color = COLOR_SECURITY_RED // BUBBER EDIT
subdepartment_color = COLOR_SECURITY_RED // BUBBER EDIT
sechud_icon_state = SECHUD_CORRECTIONS_OFFICER
extra_access = list()
minimal_access = list(
modular_skyrat/master_files/code/datums/mood_events/generic_negative_events.dm
+6
View File
@@ -2,3 +2,9 @@
/datum/mood_event/dry_skin
description = "My skin feels awfully dry...\n"
mood_change = -2
// When you get bit by a peculiar plushie
/datum/mood_event/plush_bite
description = span_warning("IT BIT ME!! OW!\n")
mood_change = -3
timeout = 2 MINUTES
modular_skyrat/master_files/code/game/objects/effects/decals/turfdecals/tilecoloring.dm
+2
View File
@@ -1,6 +1,8 @@
/// To make upstream mapping easier we overwrote the color for Red to be not red but blue for our weird bluesec
/// This re-adds a red coloring to be used by mappers in other areas.
// No longer needed, but w/ever
/// Real Red Tiles
/obj/effect/turf_decal/tile/red/real_red
modular_skyrat/master_files/code/game/objects/items/storage/backpack.dm
-21
View File
@@ -100,27 +100,6 @@
icon_state = "messenger_hydroponics"
inhand_icon_state = "messenger_hydroponics"
/obj/item/storage/backpack/messenger/sec
name = "security messenger bag"
desc = "A robust messenger bag for security related needs."
icon_state = "messenger_security_black"
inhand_icon_state = "messenger_security_black"
/obj/item/storage/backpack/messenger/sec/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/sec_messenger)
/datum/atom_skin/sec_messenger
abstract_type = /datum/atom_skin/sec_messenger
/datum/atom_skin/sec_messenger/black
preview_name = "Black Variant"
new_icon_state = "messenger_security_black"
/datum/atom_skin/sec_messenger/white
preview_name = "White Variant"
new_icon_state = "messenger_security_white"
/obj/item/storage/backpack/messenger/explorer
name = "explorer messenger bag"
desc = "A robust messenger bag for stashing your loot, as well as making a remarkably cute accessory for your drakebone armor."
modular_skyrat/master_files/code/modules/clothing/clothing.dm
+2 -2
View File
@@ -53,10 +53,10 @@ GLOBAL_LIST_EMPTY(taur_clothing_icons)
*
* Returns a taur-compatible mutable_appearance!
*/
/proc/wear_taur_version(icon_state, icon/icon_to_process, layer, female_type, greyscale_colors, cropping_state)
/proc/wear_taur_version(icon_state, icon/icon_to_process, layer, female_type, greyscale_colors, cropping_state, cache_key = null)
RETURN_TYPE(/mutable_appearance)
var/index = "[icon_state]-[greyscale_colors]-[female_type]-[cropping_state]"
var/index = cache_key || "[icon_state]-[greyscale_colors]-[female_type]-[cropping_state]"
var/icon/taur_clothing_icon = GLOB.taur_clothing_icons[index]
if(!taur_clothing_icon) //Create standing/laying icons if they don't exist
generate_taur_clothing(index, icon_to_process, icon_state, cropping_state)
modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/under.dm
-8
View File
@@ -200,14 +200,6 @@
/obj/item/clothing/under/changeling
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
/**
* NONE(Squash)
* Clothing that does not have a digitigrade version, and thus will squash legs to fit.
*/
/obj/item/clothing/under/suit/henchmen
supports_variations_flags = NONE
/**
* SUBTYPE WITH NEW ICON
* Clothing that has a digitigrade version, but its parent was set to something else earlier in this file.
modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm
+1 -216
View File
@@ -6,15 +6,7 @@
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
/obj/item/clothing/under/rank/security/head_of_security/skyrat
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
//DEBATE MOVING *ALL* SECURITY STUFF HERE? Even overrides, at least as a like, sub-file?
/*
* SECURITY OFFICER
*/
// syndicate stuff uses this, gotta keep it
/obj/item/clothing/under/rank/security/skyrat/utility
name = "security utility uniform"
@@ -54,213 +46,6 @@
armor_type = /datum/armor/clothing_under/redsec_syndicate
has_sensor = NO_SENSORS
/obj/item/clothing/under/rank/security/peacekeeper/skirt
name = "security battle dress"
desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt."
worn_icon_state = "security_skirt"
icon_state = "security_skirt"
can_adjust = TRUE
alt_covers_chest = FALSE
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
/obj/item/clothing/under/rank/security/peacekeeper/skirt/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_skirt)
/datum/atom_skin/security_peacekeeper_skirt
abstract_type = /datum/atom_skin/security_peacekeeper_skirt
/datum/atom_skin/security_peacekeeper_skirt/blue
preview_name = "Blue Variant"
new_icon_state = "security_skirt"
/datum/atom_skin/security_peacekeeper_skirt/red
preview_name = "Red Variant"
new_icon_state = "security_skirt_red"
/obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec
name = "security battle dress"
desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt. Now in classic security red!"
worn_icon_state = "security_skirt_redsec"
icon_state = "security_skirt_redsec"
can_adjust = TRUE
alt_covers_chest = FALSE
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
/obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec/Initialize(mapload)
. = ..()
var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
qdel(reskin_component)
/obj/item/clothing/under/rank/security/peacekeeper/skirt_hos
name = "head of security battle dress"
desc = "An asymmetrical, unisex uniform with the legs replaced by a utility skirt. This version is specifically designed for the head of the security department!"
worn_icon_state = "security_skirt_hos"
icon_state = "security_skirt_hos"
can_adjust = TRUE
alt_covers_chest = FALSE
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
/obj/item/clothing/under/rank/security/peacekeeper/skirt_hos/Initialize(mapload)
. = ..()
var/list/reskin_components = GetComponents(/datum/component/reskinable_item)
for(var/datum/component/reskinable_item/reskin_component as anything in reskin_components)
qdel(reskin_component)
/obj/item/clothing/under/rank/security/peacekeeper/trousers
name = "security trousers"
desc = "Some Peacekeeper-blue combat trousers. Probably should pair it with a vest for safety."
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
icon_state = "workpants_blue"
body_parts_covered = GROIN|LEGS
can_adjust = FALSE
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS
/obj/item/clothing/under/rank/security/peacekeeper/trousers/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_trousers)
/datum/atom_skin/security_peacekeeper_trousers
abstract_type = /datum/atom_skin/security_peacekeeper_trousers
/datum/atom_skin/security_peacekeeper_trousers/blue
preview_name = "Blue Variant"
new_icon_state = "workpants_blue"
/datum/atom_skin/security_peacekeeper_trousers/white
preview_name = "White Variant"
new_icon_state = "workpants_white"
/datum/atom_skin/security_peacekeeper_trousers/red
preview_name = "Red Variant"
new_icon_state = "workpants_red"
/obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts
name = "security shorts"
desc = "Some Peacekeeper-blue combat shorts. Definitely should pair it with a vest for safety."
icon_state = "workshorts_blue"
/obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_shorts)
/datum/atom_skin/security_peacekeeper_shorts
abstract_type = /datum/atom_skin/security_peacekeeper_shorts
/datum/atom_skin/security_peacekeeper_shorts/blue_short
preview_name = "Blue Variant, Short"
new_icon_state = "workshorts_blue"
/datum/atom_skin/security_peacekeeper_shorts/blue_short_short
preview_name = "Blue Variant, Short Short"
new_icon_state = "workshorts_blue_short"
/datum/atom_skin/security_peacekeeper_shorts/white_short
preview_name = "White Variant, Short"
new_icon_state = "workshorts_white"
/datum/atom_skin/security_peacekeeper_shorts/white_short_short
preview_name = "White Variant, Short Short"
new_icon_state = "workshorts_white_short"
/datum/atom_skin/security_peacekeeper_shorts/red_short
preview_name = "Red Variant, Short"
new_icon_state = "workshorts_red"
/datum/atom_skin/security_peacekeeper_shorts/red_short_short
preview_name = "Red Variant, Short Short"
new_icon_state = "workshorts_red_short"
/obj/item/clothing/under/rank/security/peacekeeper/jumpsuit
name = "security jumpsuit"
desc = "Turtleneck sweater commonly worn by Peacekeepers, attached with pants."
icon_state = "jumpsuit_blue"
can_adjust = TRUE
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
/obj/item/clothing/under/rank/security/peacekeeper/jumpsuit/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_jumpsuit)
/datum/atom_skin/security_peacekeeper_jumpsuit
abstract_type = /datum/atom_skin/security_peacekeeper_jumpsuit
/datum/atom_skin/security_peacekeeper_jumpsuit/blue
preview_name = "Blue Variant"
new_icon_state = "jumpsuit_blue"
/datum/atom_skin/security_peacekeeper_jumpsuit/red
preview_name = "Red Variant"
new_icon_state = "jumpsuit_red"
/obj/item/clothing/under/rank/security/officer/skirt
name = "security jumpskirt"
desc = "Turtleneck sweater commonly worn by Peacekeepers, attached with a skirt."
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
icon_state = "secskirt"
/obj/item/clothing/under/rank/security/peacekeeper/shortskirt
name = "security shortskirt"
desc = "Plainshirted uniform commonly worn by Peacekeepers, attached with a skirt."
icon_state = "shortskirt_blue"
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
gets_cropped_on_taurs = FALSE
/obj/item/clothing/under/rank/security/peacekeeper/shortskirt/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_shortskirt)
/datum/atom_skin/security_peacekeeper_shortskirt
abstract_type = /datum/atom_skin/security_peacekeeper_shortskirt
/datum/atom_skin/security_peacekeeper_shortskirt/blue
preview_name = "Blue Variant"
new_icon_state = "shortskirt_blue"
/datum/atom_skin/security_peacekeeper_shortskirt/black
preview_name = "Black Variant"
new_icon_state = "shortskirt_black"
/obj/item/clothing/under/rank/security/peacekeeper/miniskirt
name = "security miniskirt"
desc = "This miniskirt was originally featured in a gag calendar, but entered official use once they realized its potential for arid climates."
icon_state = "miniskirt"
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
gets_cropped_on_taurs = FALSE
can_adjust = TRUE
body_parts_covered = GROIN | LEGS
/obj/item/clothing/under/rank/security/peacekeeper/miniskirt/Initialize(mapload)
. = ..()
AddComponent(/datum/component/reskinable_item, /datum/atom_skin/security_peacekeeper_miniskirt)
/datum/atom_skin/security_peacekeeper_miniskirt
abstract_type = /datum/atom_skin/security_peacekeeper_miniskirt
/datum/atom_skin/security_peacekeeper_miniskirt/blue
preview_name = "Blue Variant"
new_icon_state = "miniskirt"
/datum/atom_skin/security_peacekeeper_miniskirt/red
preview_name = "Red Variant"
new_icon_state = "miniskirt_red"
/datum/atom_skin/security_peacekeeper_miniskirt/black
preview_name = "Black Variant"
new_icon_state = "miniskirt_black"
/*
* HEAD OF SECURITY
*/
/datum/armor/clothing_under/redsec_syndicate
melee = 10
fire = 50
modular_skyrat/master_files/code/modules/loadout/categories/donator_personal.dm
-18
View File
@@ -325,12 +325,6 @@
item_path = /obj/item/toy/plush/skyrat/tesh
//ckeywhitelist = list("tobjv")
/datum/loadout_item/uniform/redhosneck
name = "Black and Red Turtleneck"
item_path = /obj/item/clothing/under/rank/security/head_of_security/alt/roselia
//ckeywhitelist = list("ultimarifox")
restricted_roles = list(JOB_HEAD_OF_SECURITY)
/datum/loadout_item/toys/plush/roselia_plush
name = "Obscene Sergal Plushie"
item_path = /obj/item/toy/plush/skyrat/roselia
@@ -459,18 +453,6 @@
item_path = /obj/item/toy/plush/skyrat/plushie_elofy
//ckeywhitelist = list("october23") // Asked it to be public.
/datum/loadout_item/suit/elofy
name = "Solar Admiral Coat"
item_path = /obj/item/clothing/suit/armor/hos/elofy
// ckeywhitelist = list("october23")
restricted_roles = list(JOB_HEAD_OF_SECURITY)
/datum/loadout_item/head/elofy
name = "Solar Admiral Hat"
item_path = /obj/item/clothing/head/hats/hos/elofy
ckeywhitelist = list("october23")
restricted_roles = list(JOB_HEAD_OF_SECURITY)
/datum/loadout_item/pocket_items/transponder
name = "Broken Helian Transponder"
item_path = /obj/item/donator/transponder
modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
-25
View File
@@ -428,31 +428,6 @@
* JOB-LOCKED
*/
/datum/loadout_item/head/cowboyhat_sec
name = "Cattleman Hat, Security"
item_path = /obj/item/clothing/head/cowboy/skyrat/cattleman/sec
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/head/cowboyhat_secwide
name = "Wide-Brimmed Cattleman Hat, Security"
item_path = /obj/item/clothing/head/cowboy/skyrat/cattleman/wide/sec
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/head/ushanka/sec
name = "Security Ushanka"
item_path = /obj/item/clothing/head/costume/ushanka/sec
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/head/navyblueofficerberet
name = "Security Officer's Navy Blue beret"
item_path = /obj/item/clothing/head/beret/sec/navyofficer
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
/datum/loadout_item/head/navybluewardenberet
name = "Warden's Navy Blue beret"
item_path = /obj/item/clothing/head/beret/sec/navywarden
restricted_roles = list(JOB_WARDEN)
/datum/loadout_item/head/cybergoggles_civ
name = "Type-34C Forensics Headwear"
item_path = /obj/item/clothing/head/fedora/det_hat/cybergoggles/civilian
modular_skyrat/master_files/code/modules/loadout/categories/suit.dm
-29
View File
@@ -575,35 +575,6 @@
item_path = /obj/item/clothing/suit/hooded/wintercoat/miner
// JACKETS
/datum/loadout_item/suit/navybluejacketofficer
name = "Security Officer's Navy Blue Formal Jacket"
item_path = /obj/item/clothing/suit/jacket/officer/blue
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
/datum/loadout_item/suit/navybluejacketwarden
name = "Warden's Navy Blue Formal Jacket"
item_path = /obj/item/clothing/suit/jacket/warden/blue
restricted_roles = list(JOB_WARDEN)
/datum/loadout_item/suit/navybluejackethos
name = "Head of Security's Navy Blue Formal Jacket"
item_path = /obj/item/clothing/suit/jacket/hos/blue
restricted_roles = list(JOB_HEAD_OF_SECURITY)
/datum/loadout_item/suit/security_jacket
name = "Security Jacket"
item_path = /obj/item/clothing/suit/toggle/jacket/sec
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY) //Not giving this one to COs because it's actually better than the one they spawn with
/datum/loadout_item/suit/brit
name = "High Vis Armored Vest"
item_path = /obj/item/clothing/suit/armor/vest/peacekeeper/brit
restricted_roles = list(JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/suit/british_jacket
name = "Peacekeeper Officer Coat"
item_path = /obj/item/clothing/suit/british_officer
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
/datum/loadout_item/suit/offdep_jacket
name = "Off-Department Jacket"
modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm
-64
View File
@@ -52,65 +52,6 @@
name = "Shoredress Wetsuit"
item_path = /obj/item/clothing/under/akula_wetsuit
/datum/loadout_item/uniform/jumpsuit/security_skirt
name = "Blue Security Battledress"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/skirt
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
/datum/loadout_item/uniform/jumpsuit/security_skirt_redsec
name = "Red Security Battledress"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/skirt_redsec
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
/datum/loadout_item/uniform/jumpsuit/security_skirt_hos
name = "HoS Security Battledress"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/skirt_hos
restricted_roles = list(JOB_HEAD_OF_SECURITY)
/datum/loadout_item/uniform/jumpsuit/security_trousers
name = "Security Trousers"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER
/datum/loadout_item/uniform/jumpsuit/security_shorts
name = "Security Shorts"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/trousers/shorts
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
/datum/loadout_item/uniform/jumpsuit/security_jumpskirt
name = "Security Jumpskirt"
item_path = /obj/item/clothing/under/rank/security/officer/skirt
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
/datum/loadout_item/uniform/jumpsuit/security_shortskirt
name = "Security Shortskirt"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/shortskirt
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
/datum/loadout_item/uniform/jumpsuit/security_miniskirt
name = "Security Miniskirt"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/miniskirt
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
/datum/loadout_item/uniform/jumpsuit/security_jumpsuit
name = "Security Jumpsuit"
item_path = /obj/item/clothing/under/rank/security/peacekeeper/jumpsuit
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC) //BUBBER EDIT: adds JOB_CORRECTIONS_OFFICER and JOB_SECURITY_MEDIC
/datum/loadout_item/uniform/jumpsuit/security_peacekeeper
name = "Security Peacekeeper Uniform"
item_path = /obj/item/clothing/under/rank/security/peacekeeper
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SECURITY_MEDIC)
/datum/loadout_item/uniform/jumpsuit/imperial_police_uniform
name = "Imperial Police Uniform"
item_path = /obj/item/clothing/under/colonial/nri_police
restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC)
/datum/loadout_item/uniform/jumpsuit/disco
name = "Superstar Cop Uniform"
item_path = /obj/item/clothing/under/rank/security/detective/disco
/datum/loadout_item/uniform/jumpsuit/kim
name = "Aerostatic Suit"
item_path = /obj/item/clothing/under/rank/security/detective/kim
@@ -186,11 +127,6 @@
name = "Supply Utility Uniform"
item_path = /obj/item/clothing/under/rank/cargo/tech/skyrat/utility
/datum/loadout_item/uniform/jumpsuit/utility_sec
name = "Security Utility Uniform"
item_path = /obj/item/clothing/under/rank/security/skyrat/utility
restricted_roles = list(JOB_SECURITY_OFFICER, JOB_DETECTIVE, JOB_WARDEN, JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER)
/datum/loadout_item/uniform/jumpsuit/utility_com
name = "Command Utility Uniform"
item_path = /obj/item/clothing/under/rank/captain/skyrat/utility
modular_skyrat/master_files/code/modules/mob/login.dm
+2
View File
@@ -7,4 +7,6 @@
if(SSplayer_ranks.initialized)
SSplayer_ranks.update_prefs_donator_status(client?.prefs)
if(!client.prefs.privacy_policy_acknowledged)
client.show_privacy_policy()
return TRUE
modular_skyrat/master_files/code/modules/mod/mod_theme.dm
-142
View File
@@ -76,148 +76,6 @@
acid = 100
wound = 15
/datum/mod_theme/security // Security Officer
default_skin = "security_blue"
variants = list(
"security" = list(
/obj/item/clothing/head/mod = list(
UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
UNSEALED_COVER = HEADCOVERSMOUTH,
SEALED_COVER = HEADCOVERSEYES|PEPPERPROOF,
UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
),
/obj/item/clothing/suit/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
SEALED_INVISIBILITY = HIDEJUMPSUIT,
UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
),
/obj/item/clothing/gloves/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
),
/obj/item/clothing/shoes/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
),
),
"security_blue" = list(
MOD_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/obj/clothing/modsuit/mod_clothing.dmi',
MOD_WORN_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/mob/clothing/modsuit/mod_clothing.dmi',
/obj/item/clothing/head/mod = list(
UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT,
SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE,
UNSEALED_COVER = HEADCOVERSMOUTH,
SEALED_COVER = HEADCOVERSEYES|PEPPERPROOF,
UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
),
/obj/item/clothing/suit/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
SEALED_INVISIBILITY = HIDEJUMPSUIT,
UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
),
/obj/item/clothing/gloves/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
),
/obj/item/clothing/shoes/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
),
),
)
/datum/mod_theme/safeguard // Head of Security
default_skin = "safeguard_blue"
variants = list(
"safeguard" = list(
/obj/item/clothing/head/mod = list(
UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
),
/obj/item/clothing/suit/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
SEALED_INVISIBILITY = HIDEJUMPSUIT,
UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
),
/obj/item/clothing/gloves/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
),
/obj/item/clothing/shoes/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
),
),
"safeguard_blue" = list(
MOD_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/obj/clothing/modsuit/mod_clothing.dmi',
MOD_WORN_ICON_OVERRIDE = 'modular_skyrat/master_files/icons/mob/clothing/modsuit/mod_clothing.dmi',
/obj/item/clothing/head/mod = list(
UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
),
/obj/item/clothing/suit/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
SEALED_INVISIBILITY = HIDEJUMPSUIT,
UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
),
/obj/item/clothing/gloves/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
),
/obj/item/clothing/shoes/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
CAN_OVERSLOT = TRUE,
UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
),
),
)
/datum/armor/mod_theme_prototype // Charlie Station
melee = 25
bullet = 5
modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 24 KiB

modular_skyrat/master_files/icons/donator/mob/clothing/uniform_teshari.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/accessories.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/back.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/belt.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/ears.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/eyes.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/hands.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/head.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/mask.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/neck.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/suit.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 228 B

modular_skyrat/master_files/icons/mob/clothing/species/serpentid/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 636 B

modular_skyrat/master_files/icons/mob/clothing/species/teshari/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 99 KiB

modular_skyrat/master_files/icons/mob/clothing/under/suits_digi.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 45 KiB

modular_skyrat/master_files/icons/mob/clothing/under/syndicate_digi.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

modular_skyrat/master_files/icons/mob/clothing/uniform_digi.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 91 KiB

modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 30 KiB

modular_skyrat/master_files/icons/mob/sprite_accessory/hair.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 86 KiB

modular_skyrat/modules/GAGS/greyscale_configs.dm
+35
View File
@@ -1502,6 +1502,41 @@ TREK
name = "Teshari Hardsuit"
json_config = 'modular_skyrat/modules/GAGS/json_configs/teshari_fallbacks/hardsuit.json'
/**
* Serpentid fallbacks.
* In case what we have another species with specials Json config file. We use this for our case.
* Check teshari fasllbacks .json config files for more datails.
*/
/datum/greyscale_config/serpentid
name = "Serpentid clothing"
icon_file = 'modular_skyrat/modules/GAGS/icons/serpentid_fallbacks.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/uniform.json'
/datum/greyscale_config/serpentid/cloak
name = "Serpentid Poncho"
json_config = 'modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/neck.json'
/datum/greyscale_config/serpentid/tie
name = "Serpentid Tie"
json_config = 'modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/neck.json'
/datum/greyscale_config/serpentid/scarf
name = "Serpentid Scarf"
json_config = 'modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/neck.json'
/datum/greyscale_config/serpentid/gloves
name = "Serpentid Gloves"
json_config = 'modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/gloves.json'
/datum/greyscale_config/serpentid/eyes
name = "Serpentid Eyes"
json_config = 'modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/eyes.json'
/datum/greyscale_config/serpentid/belt
name = "Serpentid Belt"
json_config = 'modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/belt.json'
/*
* CIN SURPLUS ARMOR
*/
modular_skyrat/modules/GAGS/icons/serpentid_fallbacks.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/belt.json
+10
View File
@@ -0,0 +1,10 @@
{
"": [
{
"type": "icon_state",
"icon_state": "belt",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/eyes.json
+10
View File
@@ -0,0 +1,10 @@
{
"": [
{
"type": "icon_state",
"icon_state": "eyes",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/gloves.json
+10
View File
@@ -0,0 +1,10 @@
{
"": [
{
"type": "icon_state",
"icon_state": "gloves",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/neck.json
+10
View File
@@ -0,0 +1,10 @@
{
"": [
{
"type": "icon_state",
"icon_state": "poncho",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}
modular_skyrat/modules/GAGS/json_configs/serpentid_fallbacks/uniform.json
+10
View File
@@ -0,0 +1,10 @@
{
"": [
{
"type": "icon_state",
"icon_state": "uniform",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}

Some files were not shown because too many files have changed in this diff Show More