diff --git a/_maps/RandomRuins/SpaceRuins/skelter.dmm b/_maps/RandomRuins/SpaceRuins/skelter.dmm
index f6e6584f10..f6e56a6348 100644
--- a/_maps/RandomRuins/SpaceRuins/skelter.dmm
+++ b/_maps/RandomRuins/SpaceRuins/skelter.dmm
@@ -1529,6 +1529,7 @@
icon_state = "warningline";
dir = 1
},
+/obj/item/paper/fluff/ruins/skelter/cloner,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/skelter/med)
"dJ" = (
@@ -2485,10 +2486,13 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"fR" = (
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
-/obj/item/ammo_casing/c45,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/item/kitchen/knife/combat,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"fS" = (
@@ -2826,10 +2830,12 @@
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"gI" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/turf/open/floor/plasteel/dark,
-/area/ruin/space/has_grav/skelter/sec)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/item/ammo_casing/c10mm,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/skelter/engine/powerstorage)
"gJ" = (
/obj/machinery/power/terminal{
dir = 1
@@ -3285,17 +3291,10 @@
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"hJ" = (
-/obj/effect/turf_decal/trimline/blue/line,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/obj/item/ammo_casing/c45,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/skelter/comms)
+/obj/structure/rack,
+/obj/item/ammo_box/magazine/m10mm,
+/turf/open/floor/plasteel/dark,
+/area/ruin/space/has_grav/skelter/sec)
"hK" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
icon_state = "trimline_fill";
@@ -3843,19 +3842,10 @@
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"iP" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/turf/open/floor/plasteel/showroomfloor,
-/area/ruin/space/has_grav/skelter/comms)
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/pistol,
+/turf/open/floor/plasteel/dark,
+/area/ruin/space/has_grav/skelter/sec)
"iQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/mineral/titanium,
@@ -3934,17 +3924,15 @@
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"iX" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/trimline/blue/line,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/item/ammo_casing/c45,
+/obj/item/ammo_casing/c10mm,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"iY" = (
@@ -4149,16 +4137,39 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/skelter/admin)
"jv" = (
-/obj/structure/rack,
-/obj/item/ammo_box/magazine/m45,
-/turf/open/floor/plasteel/dark,
-/area/ruin/space/has_grav/skelter/sec)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/item/gun/ballistic/automatic/pistol/no_mag,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/space/has_grav/skelter/comms)
"jw" = (
/turf/open/space/basic,
/area/space/nearstation)
"jx" = (
/turf/open/space/basic,
/area/template_noop)
+"jy" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/item/ammo_casing/c10mm,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/space/has_grav/skelter/comms)
(1,1,1) = {"
ah
@@ -4479,7 +4490,7 @@ eW
cF
fN
gj
-jv
+hJ
gl
hw
hU
@@ -4539,7 +4550,7 @@ eX
fx
fN
gj
-gI
+iP
gl
hx
hx
@@ -4657,7 +4668,7 @@ dI
bI
fc
fA
-fR
+gI
go
gL
iC
@@ -4715,7 +4726,7 @@ bI
bI
bI
eA
-fd
+fR
fA
fA
fA
@@ -4991,10 +5002,10 @@ ju
gw
dO
hk
-hJ
+iX
ij
iF
-iP
+jv
iW
jh
jl
@@ -5025,7 +5036,7 @@ hK
ii
jm
jn
-iX
+jy
ii
jl
ah
diff --git a/_maps/map_files/LambdaStation/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm
index e5003965ed..a38d2b9e1d 100644
--- a/_maps/map_files/LambdaStation/dorms.dmm
+++ b/_maps/map_files/LambdaStation/dorms.dmm
@@ -25,6 +25,9 @@
/obj/structure/closet,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
+"ae" = (
+/turf/open/floor/wood,
+/area/hydroponics/garden/monastery)
"af" = (
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
@@ -216,9 +219,6 @@
},
/turf/open/floor/plasteel,
/area/gateway)
-"ay" = (
-/turf/closed/wall/r_wall,
-/area/construction/mining/aux_base)
"az" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
@@ -386,16 +386,6 @@
"aT" = (
/turf/closed/wall/r_wall,
/area/chapel/main)
-"aU" = (
-/obj/effect/turf_decal/trimline/neutral/filled/line,
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
"aV" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -577,6 +567,13 @@
},
/turf/open/floor/plating,
/area/hydroponics/garden/abandoned)
+"br" = (
+/obj/structure/table,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"bu" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -600,6 +597,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"bv" = (
+/obj/structure/railing,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"bw" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -775,6 +776,15 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
+"bN" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/turf/open/floor/plating{
+ icon_state = "platingdmg2"
+ },
+/area/maintenance/central)
"bO" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -804,6 +814,15 @@
/obj/machinery/light,
/turf/open/floor/carpet,
/area/chapel/main)
+"bT" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hydroponics/garden/monastery)
"bU" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -926,6 +945,21 @@
/obj/item/clothing/mask/horsehead,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
+"cp" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness/recreation)
"cq" = (
/turf/open/space,
/area/space)
@@ -1006,6 +1040,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"cC" = (
@@ -1090,14 +1125,14 @@
icon_state = "L6";
layer = 2.04
},
-/mob/living/simple_animal/bot/medbot{
- auto_patrol = 1;
- name = "Dr. Heals"
- },
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=dorms9";
location = "dorms8"
},
+/mob/living/simple_animal/bot/medbot{
+ auto_patrol = 1;
+ name = "Dr. Heals"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"cN" = (
@@ -1116,6 +1151,14 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"cO" = (
+/turf/closed/mineral{
+ baseturfs = /turf/open/floor/plating/asteroid;
+ initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ name = "asteroid";
+ turf_type = /turf/open/floor/plating/asteroid
+ },
+/area/space)
"cP" = (
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel,
@@ -1197,6 +1240,14 @@
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
+"db" = (
+/obj/effect/turf_decal/trimline/neutral/filled/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/bot,
+/obj/machinery/holopad,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness/pool)
"dc" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
@@ -1226,10 +1277,6 @@
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"di" = (
-/obj/docking_port/stationary/public_mining_dock,
-/turf/open/floor/plating,
-/area/construction/mining/aux_base)
"dk" = (
/obj/machinery/door/airlock/public/glass{
name = "Public Minning Access"
@@ -1303,6 +1350,12 @@
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
+"ds" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"dt" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -1362,6 +1415,10 @@
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
+"dB" = (
+/obj/structure/railing,
+/turf/open/floor/plating,
+/area/maintenance/central)
"dC" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -1426,13 +1483,6 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
-"dK" = (
-/obj/machinery/door/airlock/external{
- name = "Construction Zone"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plating,
-/area/construction/mining/aux_base)
"dM" = (
/obj/machinery/vending/autodrobe,
/turf/open/floor/wood,
@@ -1522,6 +1572,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"ea" = (
+/obj/machinery/light/floor,
+/turf/open/floor/wood,
+/area/hydroponics/garden/monastery)
"eb" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1954,12 +2008,6 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/carpet,
/area/chapel/office)
-"fn" = (
-/obj/machinery/computer/camera_advanced/base_construction{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"fo" = (
/obj/effect/turf_decal/vg_decals/department/sec,
/obj/effect/turf_decal/tile/neutral,
@@ -2178,10 +2226,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
-"fR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"fS" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
@@ -2378,6 +2422,14 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
+"go" = (
+/obj/machinery/camera/autoname,
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 8
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"gp" = (
/obj/effect/turf_decal/vg_decals/department/sci,
/obj/effect/turf_decal/tile/neutral,
@@ -2427,6 +2479,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
dir = 4
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/hydroponics/garden/monastery)
"gw" = (
@@ -2486,6 +2541,11 @@
"gI" = (
/turf/open/floor/plating,
/area/maintenance/bar)
+"gJ" = (
+/obj/structure/closet,
+/obj/structure/railing/corner,
+/turf/open/floor/plating,
+/area/maintenance/central)
"gK" = (
/obj/structure/table,
/obj/machinery/camera{
@@ -2509,6 +2569,14 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"gO" = (
+/obj/machinery/space_heater,
+/obj/structure/railing/corner{
+ icon_state = "railing_corner";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/central)
"gP" = (
/obj/machinery/light/small{
dir = 8;
@@ -2560,14 +2628,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/crew_quarters/bar)
-"gV" = (
-/obj/structure/table,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/pipe_dispenser,
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"gX" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -2754,6 +2814,16 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"hv" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Aux Base Maintenance";
+ req_access_txt = "48"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/maintenance/central)
"hw" = (
/obj/structure/chair/stool,
/obj/structure/cable{
@@ -2937,13 +3007,6 @@
icon_state = "wood-broken6"
},
/area/maintenance/bar)
-"hW" = (
-/obj/machinery/computer/shuttle/mining{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"hX" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/bot,
@@ -2976,13 +3039,6 @@
/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
-"ic" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"id" = (
/obj/structure/chair/sofa/corp/corner{
dir = 4
@@ -2996,35 +3052,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/cafeteria)
-"if" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
- dir = 4
- },
-/obj/machinery/button/door{
- id = "aux_base_shutters";
- name = "Public Shutters Control";
- pixel_y = -24;
- req_one_access_txt = "32;47;48"
- },
-/obj/machinery/camera{
- c_tag = "Auxillary Base Construction";
- dir = 10
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
-"ig" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"ih" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/airlock/external{
@@ -3091,30 +3118,10 @@
},
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
-"iq" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for the Auxillary Mining Base.";
- dir = 1;
- name = "Auxillary Base Monitor";
- network = list("auxbase");
- pixel_y = -28
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"ir" = (
/obj/item/coin/silver,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
-"is" = (
-/obj/machinery/light,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"it" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/structure/cable{
@@ -3218,17 +3225,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
-"iH" = (
-/obj/machinery/power/apc{
- areastring = "/area/construction/mining/aux_base";
- name = "Auxillary Base Construction APC";
- pixel_y = -24
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"iI" = (
/obj/structure/table,
/obj/item/stack/sheet/plasteel{
@@ -3733,6 +3729,13 @@
},
/turf/open/floor/carpet,
/area/chapel/office)
+"jO" = (
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_x = 5
+ },
+/turf/open/floor/plating,
+/area/maintenance/central)
"jP" = (
/obj/item/storage/bag/plants/portaseeder,
/obj/item/storage/bag/plants/portaseeder,
@@ -3860,14 +3863,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
-"kc" = (
-/obj/machinery/door/poddoor/shutters{
- id = "aux_base_shutters";
- name = "Auxillary Base Shutters"
- },
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"kd" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -3982,21 +3977,6 @@
/obj/item/organ/heart,
/turf/open/floor/carpet,
/area/chapel/office)
-"kp" = (
-/obj/machinery/door/airlock/engineering{
- name = "Auxillary Base Construction";
- req_one_access_txt = "32;47;48"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"kq" = (
/obj/effect/turf_decal/bot_white/left,
/obj/effect/turf_decal/tile/neutral{
@@ -4099,24 +4079,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/central)
-"kC" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/button/door{
- id = "aux_base_shutters";
- name = "Public Shutters Control";
- pixel_y = 24;
- req_one_access_txt = "32;47;48"
- },
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 6
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
"kD" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -4141,24 +4103,6 @@
/obj/machinery/vending/snack/random,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
-"kK" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
"kL" = (
/obj/structure/table,
/obj/item/extinguisher/mini,
@@ -4444,27 +4388,6 @@
},
/turf/open/floor/plasteel,
/area/hydroponics/garden/monastery)
-"lu" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3,
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/hallway/primary/central)
"lv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
@@ -4558,6 +4481,14 @@
icon_state = "wood-broken3"
},
/area/maintenance/bar)
+"lJ" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/maintenance/central)
"lK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
@@ -4843,6 +4774,12 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"ms" = (
+/turf/open/floor/plating,
+/turf/open/floor/plating{
+ icon_state = "platingdmg2"
+ },
+/area/maintenance/central)
"mt" = (
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
@@ -4858,6 +4795,13 @@
},
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
+"mv" = (
+/obj/machinery/computer/shuttle/mining,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"mw" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/cable_coil,
@@ -4925,6 +4869,10 @@
/obj/item/toy/cards/deck,
/turf/open/floor/wood,
/area/maintenance/bar)
+"mI" = (
+/obj/machinery/light/small,
+/turf/open/floor/plating,
+/area/maintenance/central)
"mK" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -5349,10 +5297,6 @@
},
/turf/open/floor/carpet,
/area/chapel/office)
-"nH" = (
-/obj/machinery/camera/autoname,
-/turf/open/floor/plasteel,
-/area/hydroponics/garden/monastery)
"nI" = (
/obj/machinery/door/airlock/maintenance{
req_one_access_txt = "12;5;39;6"
@@ -5648,6 +5592,13 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
+"oy" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/central)
"oA" = (
/obj/structure/bodycontainer/morgue{
dir = 1
@@ -6183,6 +6134,13 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"pS" = (
+/obj/effect/spawner/lootdrop/glowstick,
+/turf/open/floor/plating,
+/turf/open/floor/plating{
+ icon_state = "platingdmg2"
+ },
+/area/maintenance/central)
"pT" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -6579,6 +6537,9 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
+"qO" = (
+/turf/open/transparent/openspace,
+/area/maintenance/central)
"qP" = (
/obj/effect/spawner/lootdrop/glowstick,
/turf/open/floor/plating,
@@ -6786,6 +6747,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
+"rC" = (
+/obj/machinery/biogenerator,
+/turf/open/floor/wood,
+/area/hydroponics/garden/monastery)
"rD" = (
/obj/structure/lattice,
/turf/open/space/basic,
@@ -6815,6 +6780,9 @@
dir = 4;
layer = 3.2
},
+/obj/structure/curtain{
+ icon_state = "closed"
+ },
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
"rH" = (
@@ -7088,6 +7056,13 @@
},
/turf/open/floor/plasteel,
/area/hydroponics)
+"sn" = (
+/obj/structure/railing/corner{
+ icon_state = "railing_corner";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/central)
"so" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -7103,6 +7078,16 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/cafeteria)
+"sq" = (
+/turf/closed/wall,
+/area/asteroid/nearstation)
+"sr" = (
+/obj/structure/railing/corner{
+ icon_state = "railing_corner";
+ dir = 4
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"ss" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 1
@@ -7556,6 +7541,14 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
+"tw" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/maintenance/central)
"tx" = (
/obj/effect/turf_decal/plaque{
icon_state = "L13";
@@ -7807,13 +7800,6 @@
/obj/structure/pool/Lboard,
/turf/open/pool,
/area/crew_quarters/fitness/pool)
-"ui" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hydroponics/garden/monastery)
"uj" = (
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
@@ -7974,6 +7960,10 @@
icon_state = "panelscorched"
},
/area/maintenance/department/crew_quarters/dorms)
+"uH" = (
+/obj/structure/railing/corner,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"uI" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating,
@@ -7985,6 +7975,9 @@
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/hydroponics/garden/monastery)
"uK" = (
@@ -8680,6 +8673,9 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
+"ww" = (
+/turf/closed/wall,
+/area/construction/mining/aux_base)
"wx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sink{
@@ -9100,6 +9096,10 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
+"xN" = (
+/obj/machinery/seed_extractor,
+/turf/open/floor/wood,
+/area/hydroponics/garden/monastery)
"xO" = (
/obj/machinery/door/airlock/external{
name = "Solar Maintenance";
@@ -9862,9 +9862,6 @@
},
/turf/open/floor/plating,
/area/maintenance/central)
-"zG" = (
-/turf/closed/wall/r_wall,
-/area/asteroid/nearstation)
"zH" = (
/obj/machinery/vending/wallmed{
pixel_x = -28
@@ -10126,6 +10123,14 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"An" = (
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"Ao" = (
/turf/closed/wall,
/area/tcommsat/chamber)
@@ -10172,6 +10177,13 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"Ax" = (
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
+ },
+/turf/open/floor/wood,
+/area/hydroponics/garden/monastery)
"Ay" = (
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
@@ -10406,10 +10418,6 @@
"Be" = (
/turf/closed/wall,
/area/storage/tools)
-"Bf" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/hydroponics/garden/monastery)
"Bg" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -10593,9 +10601,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
-"BB" = (
-/turf/closed/wall/r_wall,
-/area/crew_quarters/dorms)
"BC" = (
/obj/structure/chair{
dir = 4
@@ -10606,6 +10611,9 @@
/obj/structure/dresser,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
+"BE" = (
+/turf/open/transparent/openspace,
+/area/construction/mining/aux_base)
"BF" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel,
@@ -10798,6 +10806,14 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
+"Ci" = (
+/obj/structure/closet/toolcloset,
+/obj/machinery/light/small{
+ dir = 8;
+ pixel_x = 5
+ },
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"Ck" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/trimline/blue/filled/line{
@@ -11099,15 +11115,15 @@
/area/crew_quarters/kitchen)
"Da" = (
/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/lizard{
- name = "Wags-His-Tail";
- real_name = "Wags-His-Tail"
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
+/mob/living/simple_animal/hostile/lizard{
+ name = "Wags-His-Tail";
+ real_name = "Wags-His-Tail"
+ },
/turf/open/floor/plating,
/area/janitor)
"Dc" = (
@@ -11256,6 +11272,10 @@
/obj/machinery/light,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/cafeteria)
+"Dz" = (
+/obj/structure/railing/corner,
+/turf/open/floor/plating,
+/area/maintenance/central)
"DB" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -12018,6 +12038,14 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main)
+"Fi" = (
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"Fk" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -12100,6 +12128,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"Fw" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/central)
"Fx" = (
/obj/structure/girder,
/obj/structure/grille,
@@ -12236,6 +12271,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"FP" = (
+/obj/machinery/computer/camera_advanced/base_construction,
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"FQ" = (
/obj/item/storage/box/bodybags{
pixel_y = 5
@@ -13156,6 +13195,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"Il" = (
@@ -13614,6 +13654,16 @@
},
/turf/open/floor/plasteel,
/area/janitor)
+"IY" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"IZ" = (
/obj/machinery/light{
dir = 4;
@@ -13705,6 +13755,11 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
+"Jn" = (
+/obj/structure/flora/tree/jungle/small,
+/obj/structure/railing,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"Jo" = (
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
@@ -13764,7 +13819,6 @@
/turf/open/floor/carpet,
/area/chapel/main)
"Jz" = (
-/obj/structure/curtain,
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
"JA" = (
@@ -13947,6 +14001,13 @@
/obj/item/hand_labeler,
/turf/open/floor/plasteel,
/area/vacant_room/commissary)
+"JT" = (
+/obj/docking_port/stationary/public_mining_dock{
+ icon_state = "pinonfar";
+ dir = 2
+ },
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
"JU" = (
/obj/structure/chair/office/dark,
/turf/open/floor/carpet/blue,
@@ -14136,6 +14197,12 @@
},
/turf/open/floor/plating,
/area/maintenance/central)
+"Ky" = (
+/obj/machinery/door/airlock/external{
+ name = "Construction Zone"
+ },
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
"KB" = (
/obj/machinery/door/airlock/maintenance{
name = "Janitor Maintenance";
@@ -14353,6 +14420,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/open/floor/plasteel/white,
/area/crew_quarters/kitchen)
+"KX" = (
+/obj/structure/railing/corner{
+ icon_state = "railing_corner";
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"KZ" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -14392,6 +14466,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"Le" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 5
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"Lf" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
dir = 8
@@ -14409,6 +14490,25 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"Lg" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 8
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/secondary/construction";
+ dir = 1;
+ name = "Auxiliary Construction Zone APC";
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"Lh" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/seed_extractor,
@@ -14775,6 +14875,10 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
+"Mb" = (
+/obj/structure/flora/grass/jungle,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"Mc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -15371,6 +15475,17 @@
},
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
+"NG" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 9
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
+"NH" = (
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plating,
+/area/maintenance/solars/starboard/fore)
"NI" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
dir = 4
@@ -15937,6 +16052,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plasteel/chapel,
/area/chapel/main)
+"Pl" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/service)
"Pm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 6
@@ -16238,6 +16358,9 @@
dir = 8;
layer = 3.2
},
+/obj/structure/curtain{
+ icon_state = "closed"
+ },
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
"PY" = (
@@ -16328,6 +16451,15 @@
},
/turf/open/floor/plasteel/dark,
/area/gateway)
+"Qj" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/maintenance/central)
"Ql" = (
/obj/machinery/light/small/built,
/turf/open/floor/plating,
@@ -16389,11 +16521,6 @@
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel/dark,
/area/chapel/main)
-"Qw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/hallway/secondary/construction)
"Qx" = (
/obj/structure/table,
/obj/item/reagent_containers/food/condiment/peppermill{
@@ -16457,9 +16584,6 @@
},
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
-"QE" = (
-/turf/closed/wall/r_wall,
-/area/hydroponics/garden/monastery)
"QH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/effect/turf_decal/tile/neutral,
@@ -16596,6 +16720,13 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"QT" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 8
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"QU" = (
/turf/open/floor/wood,
/area/crew_quarters/bar)
@@ -16754,10 +16885,21 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
+"Rv" = (
+/obj/structure/flora/grass/jungle/b,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"Rw" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/gateway)
+"Rx" = (
+/obj/structure/railing/corner{
+ icon_state = "railing_corner";
+ dir = 8
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"Ry" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -16784,6 +16926,13 @@
},
/turf/open/floor/plasteel,
/area/gateway)
+"RA" = (
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 4
+ },
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
"RB" = (
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
@@ -17002,6 +17151,12 @@
/obj/machinery/camera/autoname,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
+"Sa" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"Sc" = (
/obj/machinery/cryopod{
dir = 8
@@ -17367,6 +17522,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
+"Tc" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/holopad,
+/turf/open/floor/plasteel,
+/area/hydroponics/garden/monastery)
"Td" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -17825,7 +17985,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/obj/effect/turf_decal/vg_decals/numbers/two,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"Ui" = (
@@ -17900,6 +18059,14 @@
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
+"Up" = (
+/obj/structure/table,
+/obj/item/pipe_dispenser,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/construction/mining/aux_base)
"Ur" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/obj/effect/turf_decal/tile/neutral,
@@ -18195,6 +18362,17 @@
/obj/structure/kitchenspike,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/kitchen)
+"Vd" = (
+/obj/machinery/hydroponics/soil,
+/turf/open/floor/grass,
+/area/hydroponics/garden/monastery)
+"Vf" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/light/small,
+/turf/open/floor/plating,
+/area/maintenance/central)
"Vg" = (
/mob/living/simple_animal/hostile/retaliate/goat{
name = "Pete"
@@ -18408,6 +18586,15 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
+"VA" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/turf/open/floor/plating{
+ icon_state = "platingdmg2"
+ },
+/area/maintenance/central)
"VB" = (
/obj/structure/window/reinforced{
dir = 4
@@ -18458,8 +18645,8 @@
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"VH" = (
-/mob/living/simple_animal/crab/Coffee,
/obj/machinery/camera/autoname,
+/mob/living/simple_animal/crab/Coffee,
/turf/open/floor/plating/beach/sand,
/area/crew_quarters/fitness/pool)
"VI" = (
@@ -18521,6 +18708,7 @@
pixel_y = 32
},
/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"VR" = (
@@ -18608,10 +18796,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
-"Wa" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel,
-/area/construction/mining/aux_base)
"Wb" = (
/obj/effect/landmark/start/mime,
/turf/open/floor/carpet,
@@ -19007,9 +19191,6 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard)
-"Xc" = (
-/turf/open/floor/plating/airless,
-/area/asteroid/nearstation)
"Xd" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/wood,
@@ -45997,7 +46178,7 @@ qo
qo
qo
qo
-qo
+sq
qo
qo
qo
@@ -46797,7 +46978,7 @@ Xh
qo
qo
qo
-qo
+sq
qo
qo
qo
@@ -47577,7 +47758,7 @@ qo
qo
qo
qo
-qo
+sq
UX
UX
UX
@@ -47817,7 +47998,7 @@ Xh
Xh
Xh
Xh
-qo
+sq
qo
qo
qo
@@ -48066,7 +48247,7 @@ qo
qo
qo
qo
-qo
+sq
qo
qo
qo
@@ -48609,7 +48790,7 @@ qo
qo
qo
qo
-qo
+sq
Xh
Xh
Xh
@@ -50186,7 +50367,7 @@ lO
Fo
Fo
pW
-qo
+sq
Xh
Xh
Xh
@@ -51709,7 +51890,7 @@ qo
FN
FN
qo
-qo
+sq
UX
UX
UX
@@ -53186,7 +53367,7 @@ fl
fl
fl
fl
-KN
+fl
Xx
Xx
Xx
@@ -53256,7 +53437,7 @@ qo
qo
qo
Xh
-Xc
+sq
qo
qo
qo
@@ -53443,7 +53624,7 @@ Gy
BU
gk
aM
-KN
+fl
Xx
Xx
Xx
@@ -53513,7 +53694,7 @@ qo
qo
qo
qo
-gx
+qo
qo
qo
qo
@@ -53700,7 +53881,7 @@ qS
ZG
Bs
Bs
-KN
+fl
Xx
Xx
Xx
@@ -53957,7 +54138,7 @@ ln
SA
Bs
Bs
-KN
+fl
Xx
Xx
Xx
@@ -54214,42 +54395,42 @@ PO
PO
PO
Bs
-KN
+fl
Xx
Xx
Xx
+cn
JV
JV
JV
JV
+cn
JV
JV
JV
JV
+cn
+JV
+JV
+JV
+cn
+JV
+JV
+cn
+JV
+JV
+JV
+cn
JV
JV
JV
JV
+cn
JV
JV
JV
JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
-JV
+cn
Xx
Xx
Xx
@@ -54471,11 +54652,11 @@ fl
fl
fl
rl
-KN
-KN
-KN
-KN
-QE
+fl
+fl
+fl
+fl
+cn
Iz
Iz
OR
@@ -54504,7 +54685,7 @@ Iz
Iz
OR
Iz
-Iz
+Rv
Iz
JV
Xx
@@ -54734,11 +54915,11 @@ Bs
PW
cn
Iz
+Mb
Iz
-Iz
-Iz
-Iz
-Iz
+Vd
+ae
+Vd
Iz
Iz
Iz
@@ -54748,6 +54929,7 @@ uM
Iz
Iz
Iz
+Mb
Iz
Iz
Iz
@@ -54755,11 +54937,10 @@ Iz
Iz
Iz
Iz
+uM
Iz
-Iz
-Iz
-Iz
-Iz
+Mb
+Rv
Iz
Iz
Iz
@@ -54989,20 +55170,20 @@ pK
pK
pK
Bs
-cn
+fN
PE
uM
Iz
+Vd
+ae
+Vd
+Iz
+Sd
Iz
Iz
Iz
Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
+Mb
Iz
Iz
Iz
@@ -55016,7 +55197,7 @@ Iz
Iz
Iz
Iz
-Iz
+Mb
Iz
uM
Yz
@@ -55250,12 +55431,9 @@ cn
Iz
Iz
Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Sd
+Vd
+ae
+Vd
Iz
Iz
Iz
@@ -55271,6 +55449,9 @@ Iz
Iz
Iz
Iz
+Rv
+Iz
+Iz
Iz
Iz
Sd
@@ -55282,9 +55463,9 @@ Xx
Xx
Xx
Xx
-BB
-BB
-BB
+Sz
+Sz
+Sz
sC
sC
AE
@@ -55504,25 +55685,26 @@ Bh
pK
Bs
cn
+rC
+ae
Iz
+Vd
+ae
+Vd
Iz
-Iz
-Iz
-Iz
-Iz
+cn
qn
Iz
Iz
Iz
Iz
Iz
-Iz
-Iz
Sd
Iz
Iz
Iz
Iz
+Mb
Iz
Iz
Iz
@@ -55533,13 +55715,12 @@ Iz
Iz
Iz
Iz
-Iz
-JV
+cn
Xx
Xx
Xx
Xx
-BB
+Sz
jf
rG
WM
@@ -55761,16 +55942,16 @@ lG
pK
Bs
cn
+xN
+ae
Iz
-Iz
-Iz
-Sd
-Iz
-Iz
+Vd
+ae
+Vd
Iz
pq
Iz
-Iz
+uM
Iz
Iz
pq
@@ -55796,7 +55977,7 @@ Xx
Xx
Xx
Xx
-BB
+Sz
KS
Jz
WM
@@ -55806,7 +55987,7 @@ eJ
qM
FA
FA
-FA
+db
FA
FA
FA
@@ -56018,14 +56199,11 @@ lZ
pK
Bs
cn
-PE
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
+Ax
+ae
+Iz
+Iz
+ae
Iz
Iz
Iz
@@ -56033,6 +56211,9 @@ Iz
Iz
Iz
Iz
+ae
+ae
+ae
Iz
Iz
uM
@@ -56051,9 +56232,9 @@ Sd
JV
Xx
Xx
-BB
-BB
-BB
+Sz
+Sz
+Sz
ke
Sz
WM
@@ -56275,40 +56456,40 @@ FC
pK
Bs
cn
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-uM
-Iz
-Iz
-Iz
-Iz
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
Sd
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
aE
JV
Xx
Xx
-BB
+Sz
IQ
zj
zj
@@ -56544,13 +56725,13 @@ Iz
Iz
Iz
Iz
+ae
+ae
+ae
Iz
Iz
-Iz
-Iz
-Iz
-Iz
-Iz
+ae
+ae
Iz
Iz
Iz
@@ -56562,10 +56743,10 @@ Iz
Iz
Iz
Iz
-JV
+cn
Xx
Xx
-BB
+Sz
fP
FM
yg
@@ -56798,6 +56979,7 @@ Iz
Iz
Iz
Iz
+Mb
Iz
Iz
Iz
@@ -56805,11 +56987,10 @@ Iz
Iz
Iz
Iz
-Iz
-Iz
-Iz
+ae
+ae
Sd
-Iz
+Rv
Iz
Iz
Iz
@@ -56822,7 +57003,7 @@ Yz
JV
Xx
Xx
-BB
+Sz
SX
zj
lo
@@ -57053,7 +57234,7 @@ Iz
Iz
Iz
Iz
-Iz
+Mb
Iz
Iz
Iz
@@ -57063,8 +57244,8 @@ uM
Iz
Iz
Iz
-pq
-Iz
+ea
+ae
Iz
Iz
Iz
@@ -57074,12 +57255,12 @@ Iz
Iz
Iz
Iz
-Iz
-Iz
+Mb
+Rv
JV
Xx
Xx
-BB
+Sz
kh
zj
lo
@@ -57318,13 +57499,13 @@ uM
Iz
Iz
Iz
+Mb
Iz
+ae
+ae
Iz
-Iz
-Iz
-Iz
-Iz
-Iz
+Mb
+Rv
Iz
Iz
Iz
@@ -57336,7 +57517,7 @@ Iz
JV
Xx
Xx
-BB
+Sz
zj
JZ
DJ
@@ -57562,12 +57743,23 @@ ZX
cn
Iz
Iz
-DN
+Fi
Iz
Iz
Iz
Iz
-DN
+An
+RA
+sr
+Iz
+Iz
+ga
+Iz
+Iz
+Iz
+Iz
+ae
+ae
Iz
Iz
Iz
@@ -57576,24 +57768,13 @@ ga
Iz
Iz
Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-ga
-Iz
-Iz
-Iz
-Iz
+Mb
Iz
Iz
JV
Xx
Xx
-BB
+Sz
BD
lc
Kt
@@ -57816,41 +57997,41 @@ pK
ra
OA
OA
-Vh
-Vh
-Vh
-Vh
-Vh
-Vh
+OA
+Tl
+Tl
+Tl
+Tl
+Tl
OA
OA
OA
dV
-Iz
-Iz
-Iz
-Bf
+Le
+RA
+RA
+cn
Iz
Iz
Iz
Iz
+ae
+ae
Iz
Iz
Iz
Iz
-Iz
-Iz
-Bf
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-JV
+cn
+RA
+RA
+RA
+RA
+RA
+RA
+cn
wq
wq
-BB
+Sz
Sz
Sz
nt
@@ -58083,25 +58264,25 @@ vf
PH
mK
wf
-ui
+mj
mj
mj
uJ
mj
lt
-ui
+mj
mj
CY
mj
mj
-ui
+mj
mj
mj
gv
mj
mj
mj
-ui
+mj
mj
iy
eB
@@ -58349,9 +58530,9 @@ gT
eE
eE
Ud
-Yh
-iV
eE
+iV
+Yh
eE
eE
gT
@@ -58600,18 +58781,18 @@ zB
zB
zB
hL
-zB
+bT
zB
zB
zB
zB
kN
-oe
+zB
hL
+oe
zB
zB
-zB
-zB
+bT
zB
zB
zB
@@ -58853,32 +59034,32 @@ PD
Ej
aA
OA
-qn
+go
+QT
+QT
+QT
+cn
Iz
Iz
Iz
Iz
Iz
-Iz
-Iz
-Yd
pq
+Yd
fK
Iz
Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-JV
+cn
+QT
+QT
+QT
+QT
+QT
+QT
+cn
wq
wq
-BB
+Sz
Sz
Sz
te
@@ -59114,6 +59295,8 @@ Iz
Iz
Iz
Iz
+OR
+Iz
Iz
Iz
Iz
@@ -59123,9 +59306,7 @@ Yd
fK
Iz
Iz
-Iz
-Iz
-Iz
+OR
Iz
Iz
Iz
@@ -59135,7 +59316,7 @@ Iz
JV
Xx
Xx
-BB
+Sz
BD
JB
Ab
@@ -59374,14 +59555,14 @@ Iz
pq
Iz
Iz
+Sd
+Rv
Iz
Yd
Yd
fK
Iz
Iz
-Iz
-Iz
pq
Iz
Sd
@@ -59392,7 +59573,7 @@ Iz
JV
Xx
Xx
-BB
+Sz
zj
FM
Lb
@@ -59630,26 +59811,26 @@ Iz
Iz
Iz
Iz
-Sd
+Iz
+Iz
+Iz
Iz
Yd
OX
jJ
Iz
-Iz
-Iz
Sd
Iz
Iz
Iz
Iz
-Iz
-Iz
+Rv
+Mb
Iz
JV
Xx
Xx
-BB
+Sz
SX
zj
DP
@@ -59885,10 +60066,12 @@ Iz
Iz
Iz
Iz
-Iz
-Iz
-Iz
-Iz
+Rv
+uH
+RA
+RA
+RA
+sr
Yd
Yd
Yd
@@ -59900,13 +60083,11 @@ Iz
Iz
Iz
Iz
-Iz
-Iz
Yz
JV
Xx
Xx
-BB
+Sz
kh
JZ
oC
@@ -60140,15 +60321,17 @@ vP
Tl
Iz
Iz
+Mb
Iz
Iz
-Iz
-Iz
-Iz
-Iz
-Yd
+bv
+aZ
+aZ
+aZ
+Le
pq
Yd
+Yd
Iz
Iz
Iz
@@ -60158,12 +60341,10 @@ Iz
Iz
Iz
Iz
-Iz
-Iz
-JV
+cn
Xx
Xx
-BB
+Sz
fP
zj
zj
@@ -60397,22 +60578,22 @@ vP
Tl
Iz
Iz
-Iz
+Mb
Iz
pq
-Iz
-Iz
-Bf
-Yd
+bv
+aZ
+aZ
+aZ
aZ
Yd
-Iz
-Iz
+Yd
+Yd
Iz
Iz
oF
Iz
-Iz
+Mb
Iz
Iz
uM
@@ -60420,7 +60601,7 @@ Iz
JV
Xx
Xx
-BB
+Sz
IQ
zj
zj
@@ -60657,14 +60838,14 @@ Iz
Iz
Iz
Iz
-Iz
-Yz
-Bf
-nH
+bv
+aZ
+aZ
+aZ
aZ
Yd
-Iz
-Iz
+Tc
+Yd
Iz
Iz
Sd
@@ -60677,8 +60858,8 @@ aE
JV
Xx
Xx
-BB
-BB
+Sz
+Sz
ke
Sz
Sz
@@ -60700,7 +60881,7 @@ Dk
VI
VI
VI
-VI
+cp
uC
VI
VI
@@ -60896,7 +61077,7 @@ KG
RN
YL
Rf
-oQ
+CA
yo
yo
Rk
@@ -60914,14 +61095,14 @@ Iz
Iz
Iz
Iz
-uM
-Iz
-Bf
-Yd
+Jn
+aZ
+aZ
+aZ
aZ
Yd
-Iz
-Iz
+Yd
+Yd
Iz
Iz
Iz
@@ -60935,7 +61116,7 @@ JV
Xx
Xx
Xx
-BB
+Sz
KS
Jz
Sz
@@ -61171,14 +61352,14 @@ Iz
Iz
Sd
Iz
-Iz
-Iz
-Iz
-Yd
+bv
+aZ
+aZ
+aZ
+NG
pq
Yd
-Iz
-Iz
+Yd
Iz
Iz
Iz
@@ -61188,11 +61369,11 @@ Iz
Iz
Iz
Iz
-JV
+cn
Xx
Xx
Xx
-BB
+Sz
yv
PX
Sz
@@ -61428,33 +61609,33 @@ Iz
Iz
Iz
Iz
+Rx
+QT
+QT
+QT
+KX
+Iz
+Iz
+Iz
+Rv
Iz
Iz
Iz
Iz
Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
-Iz
+Mb
Iz
Yz
JV
Xx
Xx
Xx
-BB
-BB
-BB
-BB
-zG
-BB
+Sz
+Sz
+Sz
+Sz
+sq
+Sz
Sz
Sz
kY
@@ -61693,7 +61874,7 @@ Sd
Iz
Iz
Iz
-Iz
+Rv
Iz
Iz
Iz
@@ -61709,9 +61890,9 @@ Xx
qo
qo
qo
-zG
+sq
uX
-BB
+Sz
yL
lE
lE
@@ -61966,7 +62147,7 @@ pW
pW
pW
qo
-zG
+sq
uX
Vi
fp
@@ -62197,7 +62378,7 @@ OA
Iz
Iz
Iz
-Iz
+Mb
DN
Pa
Iz
@@ -62223,7 +62404,7 @@ iT
xe
pW
qo
-zG
+sq
uX
Vi
It
@@ -62453,34 +62634,34 @@ vP
OA
fN
cn
-QE
-JV
-JV
-JV
-JV
+cn
JV
JV
JV
JV
+cn
JV
JV
JV
JV
+cn
JV
JV
JV
JV
+cn
JV
JV
JV
JV
+cn
Xx
pW
ir
po
pW
pW
-dw
+pW
uX
Vi
YC
@@ -62710,7 +62891,7 @@ Wj
OA
Pu
Bs
-KN
+fl
Xx
Xx
Xx
@@ -62737,9 +62918,9 @@ pY
Fo
YP
Fo
-dw
+pW
uX
-BB
+Sz
Sc
Sc
Sc
@@ -62966,10 +63147,10 @@ mg
bD
Go
TJ
-Bs
-KN
-Xx
-Xx
+gJ
+fl
+fl
+fl
Xx
Xx
Xx
@@ -62994,9 +63175,9 @@ pW
pW
pW
Fo
-dw
-dw
-BB
+pW
+pW
+Sz
Sz
Sz
Sz
@@ -63185,7 +63366,7 @@ qo
qo
qo
qo
-qo
+fl
fl
Bs
OA
@@ -63223,10 +63404,10 @@ hd
vP
OA
Yt
-ZX
-KN
-Xx
-Xx
+dB
+qO
+ms
+fl
Xx
Xx
Xx
@@ -63442,10 +63623,10 @@ qo
qo
qo
qo
-qo
fl
Bs
Bs
+mI
OA
oR
lk
@@ -63479,11 +63660,11 @@ He
hd
vP
OA
-Yt
+tw
+sn
+Fw
Bs
-KN
-Xx
-Xx
+fl
Xx
Xx
Xx
@@ -63696,12 +63877,12 @@ qo
FN
qo
qo
-qo
fl
fl
fl
fl
Bs
+Bs
tP
OA
PD
@@ -63737,10 +63918,10 @@ uc
vP
OA
Yt
-nN
-KN
-Xx
-Xx
+Dz
+oy
+Bs
+fl
Xx
Xx
Xx
@@ -63953,12 +64134,12 @@ qo
FN
FN
qo
-qo
fl
CH
JX
fl
Bs
+fl
OA
OA
Qr
@@ -63994,10 +64175,10 @@ hd
Fa
OA
Yt
-Bs
-KN
-Xx
-Xx
+dB
+qO
+fl
+fl
Xx
Xx
Xx
@@ -64210,13 +64391,13 @@ qo
FN
FN
qo
-qo
fl
fv
Li
rl
BW
-OA
+dB
+Wq
Wq
gp
jx
@@ -64251,9 +64432,9 @@ jH
vP
OA
Yt
-Bs
-KN
-Xx
+dB
+qO
+fl
Xx
Xx
Xx
@@ -64281,7 +64462,7 @@ qo
qo
qo
qo
-dw
+pW
Uk
rV
pW
@@ -64467,13 +64648,13 @@ qo
qo
FN
qo
-qo
fl
kL
DQ
fl
Bs
-OA
+dB
+Wq
Wq
fo
RR
@@ -64508,10 +64689,10 @@ MO
vP
OA
Yt
-cx
-KN
-KN
-KN
+gO
+fl
+fl
+fl
qo
qo
qo
@@ -64724,13 +64905,13 @@ FN
qo
FN
qo
-qo
fl
fl
fl
fl
Bs
-OA
+dB
+Wq
Wq
OG
mA
@@ -64981,12 +65162,12 @@ qo
FN
FN
qo
-qo
fl
um
um
fl
Bs
+fl
OA
OA
Bu
@@ -65027,7 +65208,7 @@ PI
PI
PI
PI
-PI
+lJ
PI
Of
oP
@@ -65238,13 +65419,13 @@ FN
FN
FN
qo
-qo
fl
Bs
kA
rl
BW
Bs
+Bs
OA
PD
lk
@@ -65495,12 +65676,12 @@ qo
qo
qo
qo
-qo
fl
fl
fl
fl
PW
+PW
Bs
OA
PD
@@ -65755,7 +65936,7 @@ qo
qo
qo
qo
-qo
+fl
fl
ZX
kA
@@ -66012,7 +66193,7 @@ qo
qo
qo
qo
-qo
+fl
fl
PW
Bs
@@ -66058,7 +66239,7 @@ Um
Rz
yr
gf
-Yt
+bN
fl
qo
qo
@@ -66260,19 +66441,19 @@ FN
qo
qo
qo
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
+FN
+qo
+qo
+qo
+qo
+FN
+qo
+qo
+qo
+fl
+Bs
+Bs
+fl
OA
oR
lk
@@ -66517,19 +66698,19 @@ FN
qo
qo
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-fn
-hW
+FN
+qo
+qo
+qo
+qo
+FN
+qo
+qo
+qo
+fl
+Bs
+Bs
+fl
OA
cJ
ij
@@ -66773,21 +66954,21 @@ FN
qo
qo
qo
+FN
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-fO
-Wa
-kc
+qo
+qo
+qo
+qo
+FN
+qo
+qo
+qo
+fl
+Bs
+Bs
+fl
+OA
PG
MJ
pg
@@ -67031,21 +67212,21 @@ qo
qo
qo
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-fO
-ic
-kc
-aU
+qo
+FN
+FN
+qo
+FN
+qo
+qo
+qo
+qo
+fl
+Bs
+Bs
+fl
+OA
+PD
lk
pg
Gx
@@ -67287,22 +67468,22 @@ FN
qo
qo
qo
+FN
+FN
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-LK
-if
+FN
+FN
+qo
+qo
+qo
+qo
+qo
+fl
+PW
+Bs
+fl
OA
-kC
+PD
lk
pg
rN
@@ -67544,23 +67725,23 @@ FN
qo
qo
qo
+FN
qo
-ay
-bb
-bb
-bb
-bb
-bF
-bb
-bb
-bb
-di
-dK
-fR
-ig
-kp
-kK
-lu
+qo
+qo
+qo
+FN
+qo
+qo
+qo
+qo
+fl
+Bs
+Bs
+fl
+OA
+PD
+Fd
pg
ID
OA
@@ -67801,22 +67982,22 @@ FN
FN
qo
qo
+FN
+FN
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-fO
-iq
+qo
+qo
+FN
+qo
+qo
+qo
+qo
+fl
+fl
+Bs
+fl
OA
-mq
+PD
Fd
pg
ew
@@ -68058,20 +68239,20 @@ FN
qo
qo
qo
+FN
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-gi
-is
+qo
+qo
+qo
+qo
+qo
+qo
+qo
+qo
+fl
+Bs
+mI
+fl
OA
ml
Fd
@@ -68105,7 +68286,7 @@ PD
MW
vP
OA
-qP
+pS
Bs
Bs
Bs
@@ -68314,21 +68495,21 @@ qo
qo
FN
qo
+FN
qo
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-gj
-iH
+qo
+FN
+qo
+qo
+qo
+qo
+qo
+qo
+fl
+Bs
+PW
+fl
OA
PD
wh
@@ -68573,19 +68754,19 @@ FN
qo
qo
qo
-ay
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-bb
-dt
-gV
-iI
+qo
+qo
+FN
+FN
+qo
+FN
+qo
+qo
+qo
+fl
+Bs
+Bs
+fl
OA
TW
XN
@@ -68604,7 +68785,7 @@ Je
YX
uw
Tl
-Av
+Pl
Ik
OA
OA
@@ -68830,19 +69011,19 @@ qo
qo
qo
qo
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
-ay
+qo
+ct
+ct
+ct
+ct
+ct
+ct
+ct
+ct
+ct
+Bs
+Bs
+fl
OA
PD
Fd
@@ -68881,7 +69062,7 @@ fl
er
JX
rl
-BW
+VA
fl
qo
qo
@@ -69096,7 +69277,7 @@ fD
mh
Cu
bA
-fl
+ct
oE
tT
fq
@@ -69610,7 +69791,7 @@ Ew
du
vl
lA
-fl
+ct
Yt
fl
qo
@@ -69864,10 +70045,10 @@ hX
HB
HB
wc
-Qw
+HB
vl
YT
-fl
+ct
Yt
fl
qo
@@ -70381,7 +70562,7 @@ CO
FJ
ur
fg
-fl
+ct
Yt
fl
qo
@@ -70887,7 +71068,7 @@ YV
IB
PI
Fr
-oP
+Vf
fl
jS
fl
@@ -71153,8 +71334,8 @@ fl
fl
fl
fl
-fl
-fl
+Bs
+Bs
Yt
gw
gw
@@ -71394,7 +71575,7 @@ yM
zh
Dv
GQ
-Jg
+NH
Sx
UV
PI
@@ -71409,9 +71590,9 @@ gH
fl
qo
qo
-qo
-qo
fl
+fl
+Bs
jk
PI
oP
@@ -71667,13 +71848,13 @@ fl
qo
qo
qo
-qo
+fl
fl
Fz
-fl
+Bs
Yt
fl
-qo
+fl
fl
Yt
fl
@@ -71929,9 +72110,9 @@ fl
fl
fl
Yt
-fl
-fl
-fl
+Bs
+jO
+Bs
Yt
fl
fl
@@ -72188,7 +72369,7 @@ fl
fC
PI
PI
-PI
+Qj
gH
fl
qo
@@ -72445,7 +72626,7 @@ fl
fl
fl
fl
-fl
+Yt
fl
fl
qo
@@ -72700,10 +72881,10 @@ qo
qo
qo
qo
-qo
-qo
-qo
-qo
+fl
+Bs
+Yt
+fl
qo
qo
qo
@@ -72957,10 +73138,10 @@ qo
qo
qo
qo
-qo
-qo
-qo
-qo
+fl
+Bs
+Yt
+fl
qo
qo
qo
@@ -73214,9 +73395,9 @@ FN
qo
qo
qo
-qo
-qo
-qo
+fl
+Bs
+Yt
qo
qo
qo
@@ -73472,9 +73653,9 @@ FN
qo
FN
qo
-qo
-FN
-FN
+Bs
+Yt
+fl
qo
qo
qo
@@ -73729,9 +73910,9 @@ FN
FN
qo
FN
-qo
-FN
-FN
+Bs
+Yt
+fl
FN
qo
qo
@@ -73985,10 +74166,10 @@ qo
FN
qo
qo
-FN
qo
-FN
-FN
+Bs
+Yt
+fl
FN
qo
qo
@@ -74242,10 +74423,10 @@ FN
FN
qo
FN
-FN
-FN
-FN
qo
+Bs
+Yt
+fl
qo
qo
qo
@@ -74500,9 +74681,9 @@ qo
qo
qo
qo
-qo
-FN
-qo
+Bs
+Yt
+fl
qo
qo
qo
@@ -74756,9 +74937,9 @@ qo
FN
qo
FN
-qo
-qo
-qo
+fl
+Bs
+Yt
qo
FN
qo
@@ -75013,10 +75194,10 @@ qo
qo
qo
qo
-FN
-qo
-FN
-qo
+fl
+Bs
+Yt
+fl
FN
qo
FN
@@ -75270,10 +75451,10 @@ qo
FN
qo
qo
-FN
-qo
-qo
-qo
+fl
+Bs
+Yt
+fl
qo
qo
qo
@@ -75284,7 +75465,7 @@ qo
FN
qo
qo
-Xh
+cO
KN
DZ
KN
@@ -75525,23 +75706,23 @@ FN
qo
FN
qo
-qo
-qo
-FN
-FN
-FN
-qo
-FN
-qo
-qo
-qo
-qo
-FN
-qo
-FN
-qo
-qo
-Xh
+ww
+ww
+ww
+ww
+hv
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
UX
LU
UX
@@ -75782,23 +75963,23 @@ qo
FN
qo
FN
-FN
-qo
-qo
-qo
-FN
-FN
-FN
-qo
-qo
-qo
-qo
-qo
-qo
-FN
-qo
-Xh
-Xh
+ww
+BE
+BE
+BE
+ds
+Ci
+dt
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
Xh
LU
Xh
@@ -76039,25 +76220,25 @@ qo
qo
FN
FN
-qo
-qo
-qo
-FN
-qo
-qo
-qo
-qo
-qo
-FN
-qo
-qo
-FN
-qo
-qo
-Xh
-Xh
-Xh
+ww
+Lg
+IY
+IY
+Sa
+LK
+dt
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
Xh
+LU
Xh
Xh
qo
@@ -76296,25 +76477,25 @@ FN
qo
qo
qo
-qo
-qo
-qo
-qo
-qo
-qo
-FN
-qo
-qo
-qo
-qo
-FN
-qo
-qo
-qo
-Xh
-Xh
-Xh
+ww
+ww
+ww
+gj
+fO
+fO
+dt
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
Xh
+LU
Xh
Xh
qo
@@ -76555,23 +76736,23 @@ FN
qo
FN
qo
-FN
-qo
-qo
-qo
-qo
-qo
-FN
-qo
-qo
-qo
-FN
-qo
-qo
-Xh
-Xh
-Xh
+ww
+FP
+fO
+fO
+dt
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
Xh
+LU
Xh
Xh
qo
@@ -76812,23 +76993,23 @@ qo
qo
qo
FN
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-Xh
-Xh
-Xh
+ww
+mv
+fO
+fO
+Ky
+JT
+bb
+bb
+bb
+bF
+bb
+bb
+bb
+bb
+ww
Xh
+LU
Xh
Xh
qo
@@ -77069,23 +77250,23 @@ qo
qo
qo
FN
-FN
-qo
-FN
-qo
-FN
-qo
-qo
-qo
-FN
-FN
-qo
-qo
-qo
-Xh
-Xh
-Xh
+ww
+gi
+fO
+fO
+dt
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
Xh
+LU
Xh
Xh
qo
@@ -77326,26 +77507,26 @@ qo
qo
FN
qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-Xh
-Xh
-Xh
-Xh
-Xh
-Xh
-qo
+ww
+fO
+fO
+fO
+dt
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
+UX
+LU
+UX
+UX
+ww
qo
qo
qo
@@ -77583,23 +77764,23 @@ qo
qo
qo
qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-Xh
-Xh
-Xh
+ww
+br
+Up
+iI
+dt
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
Xh
+LU
Xh
Xh
qo
@@ -77840,21 +78021,21 @@ Xh
qo
qo
qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-qo
-Xh
-Xh
+ww
+ww
+ww
+ww
+ww
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+bb
+ww
Xh
Xh
Xh
@@ -78101,17 +78282,17 @@ Xh
Xh
Xh
Xh
-Xh
-Xh
-Xh
-Xh
-Xh
-Xh
-Xh
-Xh
-Xh
-Xh
-Xh
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
+ww
Xh
Xh
Xh
diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
index fdcc0fa7c1..a0d54edb91 100644
--- a/_maps/map_files/LambdaStation/lambda.dmm
+++ b/_maps/map_files/LambdaStation/lambda.dmm
@@ -11825,8 +11825,8 @@
dir = 8
},
/obj/effect/turf_decal/tile/neutral,
-/mob/living/simple_animal/hostile/retaliate/bat/secbat,
/obj/effect/turf_decal/loading_area/red,
+/mob/living/simple_animal/hostile/retaliate/bat/secbat,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"avX" = (
@@ -21222,9 +21222,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
-"aMg" = (
-/turf/closed/wall/r_wall,
-/area/quartermaster/miningoffice)
"aMh" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/captain/private)
@@ -23448,11 +23445,14 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aQy" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Mining Maintenance";
- req_access_txt = "48"
+/obj/machinery/door/airlock/engineering{
+ name = "Auxillary Base Construction";
+ req_one_access_txt = "32;47;48"
},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"aQz" = (
/turf/closed/wall,
@@ -23735,12 +23735,6 @@
"aRj" = (
/turf/open/floor/plating,
/area/maintenance/department/cargo)
-"aRk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
"aRl" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -23752,10 +23746,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
-"aRm" = (
-/obj/structure/sign/warning/vacuum/external,
-/turf/closed/wall/r_wall,
-/area/maintenance/department/cargo)
"aRn" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -24108,12 +24098,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
-"aSm" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
"aSn" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -24128,15 +24112,6 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/plating,
/area/maintenance/fore)
-"aSo" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
"aSp" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -27268,6 +27243,9 @@
name = "Bridge";
req_access_txt = "19"
},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/command)
"baa" = (
@@ -37337,6 +37315,9 @@
req_access_txt = "19"
},
/obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bAH" = (
@@ -37882,6 +37863,9 @@
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/command)
"bCA" = (
@@ -37896,6 +37880,9 @@
name = "Command Hallway";
req_access_txt = "19"
},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/hallway/secondary/command)
"bCB" = (
@@ -46902,10 +46889,6 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
-"cat" = (
-/obj/item/storage/toolbox/mechanical,
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
"cau" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -49432,15 +49415,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
-"chE" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance{
- lootcount = 3;
- name = "3maintenance loot spawner"
- },
-/obj/item/storage/toolbox/emergency,
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
"chG" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -55016,8 +54990,9 @@
"cxw" = (
/obj/machinery/power/apc{
areastring = "/area/construction";
+ dir = 1;
name = "Construction Area APC";
- pixel_y = -24
+ pixel_y = 24
},
/obj/structure/cable{
icon_state = "0-4"
@@ -59865,6 +59840,9 @@
/area/medical/abandoned)
"cMq" = (
/obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/maintenance/central/secondary)
"cMr" = (
@@ -63507,13 +63485,6 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
-"dRD" = (
-/obj/machinery/status_display/ai{
- pixel_y = 32
- },
-/obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"dRM" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -64284,6 +64255,9 @@
},
/turf/open/floor/plasteel,
/area/engine/break_room)
+"eYV" = (
+/turf/open/floor/plasteel,
+/area/maintenance/department/cargo)
"eZq" = (
/obj/machinery/gravity_generator/main/station,
/obj/effect/turf_decal/bot_white,
@@ -64413,10 +64387,6 @@
/obj/structure/chair,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
-"fqq" = (
-/obj/machinery/door/firedoor,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"fqL" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -64948,6 +64918,10 @@
},
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
+"gbW" = (
+/obj/structure/stairs/south,
+/turf/open/floor/plasteel,
+/area/maintenance/department/cargo)
"gcM" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -65849,11 +65823,9 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"hDs" = (
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plating,
+/area/maintenance/department/medical)
"hEj" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -65961,12 +65933,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
-"hTm" = (
-/obj/structure/chair/comfy/brown{
- dir = 4
- },
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"hVb" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
@@ -66553,6 +66519,10 @@
},
/turf/open/space/basic,
/area/space/nearstation)
+"jjQ" = (
+/obj/effect/spawner/lootdrop/crate_spawner,
+/turf/open/floor/plating,
+/area/maintenance/department/medical)
"jld" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -67036,12 +67006,16 @@
/turf/open/floor/plating/airless,
/area/engine/atmos)
"kgv" = (
-/obj/structure/table,
-/obj/item/flashlight/lamp/green{
- pixel_y = 3
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 4
},
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 8
+ },
+/turf/open/floor/plasteel/stairs/old,
+/area/maintenance/department/medical)
"khi" = (
/obj/machinery/light{
dir = 4;
@@ -67431,10 +67405,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"leD" = (
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/carpet,
-/area/hallway/primary/aft)
"lfg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -68436,15 +68406,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
/turf/closed/wall,
/area/maintenance/disposal/incinerator)
-"nab" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- req_access_txt = "13"
- },
-/turf/open/floor/plating,
-/area/maintenance/department/cargo)
"nek" = (
/obj/docking_port/stationary{
dir = 8;
@@ -69505,6 +69466,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plating,
/area/maintenance/aft)
+"peD" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/maintenance/department/cargo)
"pgc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -69944,13 +69911,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
-"pXR" = (
-/obj/machinery/status_display/evac{
- pixel_y = 32
- },
-/obj/machinery/vending/coffee,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"pXT" = (
/obj/machinery/light{
dir = 4
@@ -70170,8 +70130,11 @@
},
/area/maintenance/department/electrical)
"qIN" = (
-/turf/open/floor/carpet,
-/area/hallway/primary/aft)
+/turf/open/floor/plating,
+/turf/open/floor/plating{
+ icon_state = "platingdmg2"
+ },
+/area/maintenance/department/medical)
"qLB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/closed/wall/r_wall,
@@ -70312,6 +70275,17 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
+"rcP" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating{
+ icon_state = "platingdmg1"
+ },
+/area/maintenance/department/medical)
"rcU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -70668,6 +70642,13 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/foyer)
+"rMw" = (
+/obj/machinery/door/airlock/external,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/central/secondary)
"rNH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/general/visible{
@@ -70949,10 +70930,12 @@
/turf/closed/wall,
/area/maintenance/starboard/aft)
"sHs" = (
-/obj/machinery/vending/snack/random,
-/obj/machinery/camera/autoname,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 2;
+ name = "2maintenance loot spawner"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/medical)
"sJs" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -71043,14 +71026,6 @@
},
/turf/open/space,
/area/solar/starboard/aft)
-"sYf" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"sYO" = (
/obj/structure/window/reinforced/spawner/north,
/obj/machinery/atmospherics/components/trinary/filter/atmos/n2o{
@@ -71125,12 +71100,17 @@
/turf/open/floor/carpet,
/area/hallway/secondary/entry)
"tcW" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/light{
+/obj/structure/stairs/west,
+/obj/structure/railing{
+ icon_state = "railing";
+ dir = 4
+ },
+/obj/structure/railing{
+ icon_state = "railing";
dir = 8
},
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
+/turf/open/floor/plating,
+/area/maintenance/department/medical)
"tdt" = (
/obj/machinery/power/port_gen/pacman,
/turf/open/floor/plating,
@@ -71621,11 +71601,6 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
-"uaS" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/snacks/chips,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"ubl" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -71756,10 +71731,6 @@
/obj/item/flashlight/lamp,
/turf/open/floor/carpet/orange,
/area/crew_quarters/heads/chief/private)
-"uqr" = (
-/obj/machinery/holopad,
-/turf/open/floor/carpet,
-/area/hallway/primary/aft)
"urx" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/rock/jungle,
@@ -71781,9 +71752,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
-"usZ" = (
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"utp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
@@ -71826,6 +71794,13 @@
},
/turf/open/floor/plasteel,
/area/engine/break_room)
+"uyX" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Aux Base Maintenance";
+ req_access_txt = "48"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/cargo)
"uBL" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -73132,6 +73107,9 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"xbr" = (
+/turf/closed/wall/r_wall,
+/area/space/nearstation)
"xfQ" = (
/obj/machinery/atmospherics/pipe/manifold/green/visible{
dir = 4
@@ -73527,10 +73505,6 @@
"ycq" = (
/turf/open/floor/engine/plasma,
/area/engine/atmos)
-"yeB" = (
-/obj/structure/table,
-/turf/open/floor/plasteel/grimy,
-/area/hallway/primary/aft)
"yfq" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -105141,7 +105115,7 @@ bpg
cDz
aSt
biL
-cMq
+rMw
biL
biL
biL
@@ -115949,7 +115923,7 @@ cVr
cVr
cVr
cVr
-cVt
+rcP
bDx
bDx
bDx
@@ -116464,12 +116438,12 @@ ctY
cxq
cza
cBF
-boU
-boU
-boU
-boU
-boU
-boU
+bDx
+bDx
+aaA
+bDx
+aaA
+aaA
boU
bZM
ccx
@@ -116721,13 +116695,13 @@ cuc
cxC
cVr
cBI
-boU
+bpw
+kgv
kgv
-hTm
tcW
-hTm
-yeB
-bIL
+bDx
+aaA
+boU
bZT
ccB
cgC
@@ -116978,13 +116952,13 @@ cud
cxD
cVr
cVt
+bqa
+bpw
+bpw
+bRI
+bDx
+aaA
boU
-pXR
-qIN
-qIN
-qIN
-usZ
-bIL
luG
cdM
hST
@@ -117235,13 +117209,13 @@ cue
cxE
cVr
cVt
-boU
+bpw
sHs
qIN
-uqr
-leD
-usZ
-fqq
+aaA
+aaA
+aaA
+boU
cgY
cWO
cAj
@@ -117492,13 +117466,13 @@ cVr
cVr
cVr
cVt
+bpw
+bpw
+bpw
+jjQ
+aaA
+aaA
boU
-dRD
-qIN
-qIN
-qIN
-usZ
-fqq
cgY
cWO
sNh
@@ -117749,13 +117723,13 @@ cuS
cxS
cVr
cBK
+bhg
+biZ
+hDs
+bDx
+aaA
+aaA
boU
-yeB
-hDs
-sYf
-hDs
-uaS
-bIL
mdh
cWO
cgK
@@ -118006,12 +117980,12 @@ cud
cxT
cVr
cVt
-boU
-boU
-boU
-boU
-boU
-boU
+bpw
+bDx
+bDx
+aaA
+aaA
+aaA
boU
bZX
cWO
@@ -118263,7 +118237,7 @@ cuc
cxC
cVr
cVt
-aaA
+bpw
aaA
aaA
aaA
@@ -118520,7 +118494,7 @@ ctY
cxU
cza
cBF
-aaA
+bpw
aaA
aaA
aaA
@@ -118779,7 +118753,7 @@ cVr
cVt
bDx
aaA
-aco
+aaA
aaA
aaA
boU
@@ -128253,7 +128227,7 @@ aOD
aPv
aPF
aMe
-cat
+aRj
aRj
aRj
aRj
@@ -128510,7 +128484,7 @@ aNX
aNa
aPG
aMe
-cQS
+aRj
aRj
aQz
aQz
@@ -128767,23 +128741,23 @@ aOa
aNa
aPH
aMe
-aRj
aQz
+uyX
aQz
aaA
-aaR
-aaR
-aaR
-aaR
-aaA
-aaA
-aaA
-aaA
-aaA
-aco
aaA
aaA
aaA
+aac
+aaa
+aaa
+aaa
+aaa
+aac
+aaa
+aaa
+aaa
+aaa
aab
bjw
bkJ
@@ -129024,25 +128998,25 @@ aNZ
aNa
cLS
aMe
-aRj
-lQP
+eYV
+eYV
+aQz
+aQz
+aQz
aQz
-aaR
-aaR
-aaR
-aaR
-aaR
aaA
-aaA
-aco
-aaA
-aaA
-aaA
-aaA
-cce
-aaA
-aaa
-aaa
+xbr
+aac
+aac
+aac
+aac
+xbr
+aac
+aac
+aac
+aac
+xbr
+aac
aac
aaa
aab
@@ -129281,24 +129255,24 @@ aNZ
aOO
aQp
aQy
-aRk
-aRj
+eYV
+eYV
+peD
+eYV
+gbW
aQz
-aaR
-aaR
-aaR
aaA
-aaR
-aaA
-aaA
-aaA
-aaA
-aab
-aab
-aab
aac
+aaa
+aaa
+aaa
+aab
+aab
+aab
+aab
aab
aaa
+aac
aaa
aac
aaa
@@ -129538,24 +129512,24 @@ aPy
aNa
aQq
aMe
-bIH
-aRj
aQz
-aaR
+aQz
+aQz
+aQz
+aQz
+aQz
aaA
-aaA
-aaA
-aaA
-aaA
-aaA
-aab
-aab
-aaa
-aaa
-aaa
aac
-aaa
-aaa
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aac
aaa
aac
aaa
@@ -129795,25 +129769,25 @@ aOb
aNa
aQq
aMe
-bIH
-aRj
-aQz
-aaR
-aaA
-aco
aaA
aaA
aaA
aaA
-aaa
-aaa
-aaa
-aaa
-aaa
+aaA
+aaA
+aaA
aac
aaa
aaa
aaa
+aab
+aab
+aab
+aab
+aab
+aaa
+aac
+aaa
aac
aaa
aab
@@ -130046,31 +130020,31 @@ aMd
aMd
aMd
aMd
-aMg
+aMe
aLo
aOE
aPw
aQr
aMe
-aRj
-cQS
-aQz
-aaR
aaA
aaA
aaA
aaA
+aaA
+aaA
+aaA
+aac
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aac
aab
-aab
-aaa
-aaa
-aaa
-aab
-aaa
-aac
-aac
-aac
-aac
aac
aac
aav
@@ -130303,31 +130277,31 @@ aav
aab
aab
aab
-aMg
-aMg
-aMg
-aMg
-aMg
-aMg
-aRj
-aRj
-aQA
-aaR
+aMe
+aMe
+aMe
+aMe
+aMe
+aMe
aaA
aaA
aaA
aaA
+aaA
+aaA
+aaA
+xbr
aaa
aaa
aaa
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+xbr
+aac
aac
aab
aab
@@ -130565,15 +130539,15 @@ aaA
aaA
aaA
aaA
-aQA
-chE
-aSm
-aQA
+aaA
+aaA
+aaA
+aaA
aaA
aaA
aab
aab
-aab
+aac
aaa
aaa
aaa
@@ -130582,8 +130556,8 @@ aab
aab
aab
aab
-aab
-aab
+aaa
+aac
aaa
aac
aaa
@@ -130822,25 +130796,25 @@ aab
aaA
aaA
aaA
-aQA
-aRm
-aSo
-aQA
+aaA
+aaA
+aaA
+aaA
aaA
aab
aaa
aaa
+aac
aaa
aaa
aaa
+aab
+aab
+aab
+aab
+aab
aaa
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
aaa
aac
aaa
@@ -131080,24 +131054,24 @@ aab
aab
aaA
aaA
-aQA
-aRj
-aQA
+aaA
+aaA
+aaA
aaA
aaa
aaa
aaa
+aac
aaa
aaa
aaa
aaa
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aaa
+aaa
+aaa
+aaa
+aaa
+aac
aaa
aac
aaa
@@ -131335,12 +131309,16 @@ aaa
aaa
aaa
aaa
+aaa
+aaa
+aaa
+aaa
+aaa
aab
-aab
-aQA
-aRj
-aQA
-aab
+aaa
+aaa
+aaa
+aac
aaa
aaa
aaa
@@ -131348,13 +131326,9 @@ aaa
aaa
aaa
aaa
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aaa
+aaa
+aac
aaa
aac
aac
@@ -131593,10 +131567,6 @@ aaa
aaa
aaa
aaa
-aab
-aQA
-nab
-aQA
aaa
aaa
aaa
@@ -131605,14 +131575,18 @@ aaa
aaa
aaa
aaa
-aab
-aab
-aab
-aab
-aab
-aaa
-aaa
-aaa
+xbr
+aac
+aac
+aac
+aac
+xbr
+aac
+aac
+aac
+aac
+xbr
+aac
aac
aaa
aaa
@@ -131847,13 +131821,13 @@ aaa
aaa
aaa
aab
-aab
-aab
-aab
aaa
-aav
-acv
-aac
+aaa
+aaa
+aaa
+aab
+aab
+aab
aaa
aaa
aaa
@@ -132109,7 +132083,7 @@ aab
aab
aab
aaa
-aSp
+aaa
aaa
aab
aab
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
index a3e5423753..1d47549685 100644
--- a/code/__DEFINES/antagonists.dm
+++ b/code/__DEFINES/antagonists.dm
@@ -63,6 +63,10 @@
#define CONTRACT_UPLINK_PAGE_CONTRACTS "CONTRACTS"
#define CONTRACT_UPLINK_PAGE_HUB "HUB"
+//Lingblood stuff
+#define LINGBLOOD_DETECTION_THRESHOLD 1
+#define LINGBLOOD_EXPLOSION_MULT 2
+#define LINGBLOOD_EXPLOSION_THRESHOLD (LINGBLOOD_DETECTION_THRESHOLD * LINGBLOOD_EXPLOSION_MULT) //Hey, important to note here: the explosion threshold is explicitly more than, rather than more than or equal to. This stops a single loud ability from triggering the explosion threshold.
///Heretics --
#define IS_HERETIC(mob) (mob.mind?.has_antag_datum(/datum/antagonist/heretic))
diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index 0bdf27452b..923355b340 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -106,5 +106,11 @@
//belly sound pref things
#define NORMIE_HEARCHECK 4
+//icon states for the default eyes and for a state for no eye
+#define DEFAULT_EYES_TYPE "normal"
+#define DEFAULT_LEFT_EYE_STATE "normal_left_eye"
+#define DEFAULT_RIGHT_EYE_STATE "normal_right_eye"
+#define DEFAULT_NO_EYE_STATE "no_eye"
+
//special species definitions
#define MINIMUM_MUTANT_COLOR "#202020" //this is how dark players mutant parts and skin can be
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 4723577fad..90864cf359 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -1186,6 +1186,8 @@ GLOBAL_DATUM_INIT(dummySave, /savefile, new("tmp/dummySave.sav")) //Cache of ico
SSassets.transport.register_asset(key, I)
for (var/thing2 in targets)
SSassets.transport.send_assets(thing2, key)
+ if(sourceonly)
+ return SSassets.transport.get_asset_url(key)
return ", The current vote system is not supported by statpanel rendering. Please vote manually by opening the vote popup using the action button or chat link."
- return
- global_data += "Time Left:, [round(SSvote.end_time - world.time)] seconds"
-
- global_data += "Choices:"
- for(var/i in 1 to SSvote.choice_statclicks.len)
- var/choice = SSvote.choice_statclicks[i]
- var/ivotedforthis = FALSE
- if(usr.ckey)
- switch(SSvote.vote_system)
- if(APPROVAL_VOTING)
- ivotedforthis = SSvote.voted[usr.ckey] && (i in SSvote.voted[usr.ckey])
- if(PLURALITY_VOTING)
- ivotedforthis = SSvote.voted[usr.ckey] == i
-
- global_data += (ivotedforthis? "\[X\]" : "\[ \]", SSvote.choice_statclicks[choice])
-*/
encoded_global_data = url_encode(json_encode(global_data))
src.currentrun = GLOB.clients.Copy()
@@ -63,6 +41,31 @@ SUBSYSTEM_DEF(statpanels)
var/ping_str = url_encode("Ping: [round(target.lastping, 1)]ms (Average: [round(target.avgping, 1)]ms)")
var/other_str = url_encode(json_encode(target.mob.get_status_tab_items()))
target << output("[encoded_global_data];[ping_str];[other_str]", "statbrowser:update")
+ if(SSvote.mode)
+ var/list/vote_arry = list(
+ list("Vote active!", "There is currently a vote running. Question: [SSvote.question]")
+ ) //see the MC on how this works.
+ if(!(SSvote.vote_system in list(PLURALITY_VOTING, APPROVAL_VOTING)))
+ vote_arry[++vote_arry.len] += list("STATPANEL VOTING DISABLED!", "The current vote system is not supported by statpanel rendering. Please vote manually by opening the vote popup using the action button or chat link.", "disabled")
+ //does not return.
+ else
+ vote_arry[++vote_arry.len] += list("Time Left:", " [round(SSvote.end_time - world.time)] seconds")
+ vote_arry[++vote_arry.len] += list("Choices:", "")
+ for(var/choice in SSvote.choice_statclicks)
+ var/choice_id = SSvote.choice_statclicks[choice]
+ var/ivotedforthis = FALSE
+ if(target.ckey)
+ switch(SSvote.vote_system)
+ if(APPROVAL_VOTING)
+ ivotedforthis = SSvote.voted[target.ckey] && (text2num(choice_id) in SSvote.voted[usr.ckey])
+ if(PLURALITY_VOTING)
+ ivotedforthis = (SSvote.voted[target.ckey] == text2num(choice_id))
+ vote_arry[++vote_arry.len] += list(ivotedforthis ? "\[X\]" : "\[ \]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1")
+ var/vote_str = url_encode(json_encode(vote_arry))
+ target << output("[vote_str]", "statbrowser:update_voting")
+ else
+ var/null_bullet = url_encode(json_encode(list(list(null))))
+ target << output("[null_bullet]", "statbrowser:update_voting")
if(!target.holder)
target << output("", "statbrowser:remove_admin_tabs")
else
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index a93aff7d2b..06b76718c1 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -16,6 +16,7 @@ SUBSYSTEM_DEF(vote)
var/question = null
var/list/choices = list()
/// List of choice = object for statclick objects for statpanel voting
+ /// statclick rework? 2: list("name"="id")
var/list/choice_statclicks = list()
var/list/scores = list()
var/list/choice_descs = list() // optional descriptions
@@ -49,34 +50,6 @@ SUBSYSTEM_DEF(vote)
client_popup.open(0)
next_pop = world.time+VOTE_COOLDOWN
-/**
- * Renders a statpanel. Directly uses statpanel/stat calls since this is called from base of mob/Stat().
- */
-/datum/controller/subsystem/vote/proc/render_statpanel(mob/M)
- if(!mode) // check if vote is running
- return
- if(!statpanel("Status")) // don't bother if they're not focused on this panel
- return
- var/static/list/supported = list(PLURALITY_VOTING, APPROVAL_VOTING)
- stat("Vote active!", "There is currently a vote running. Question: [question]")
- if(!(vote_system in supported))
- stat("", "The current vote system is not supported by statpanel rendering. Please vote manually by opening the vote popup using the action button or chat link.")
- return
- stat("Time Left:", "[round(end_time - world.time)] seconds")
- stat(null, null)
- stat("Choices:", null)
- stat(null, null)
- for(var/i in 1 to choice_statclicks.len)
- var/choice = choice_statclicks[i]
- var/ivotedforthis = FALSE
- switch(vote_system)
- if(APPROVAL_VOTING)
- ivotedforthis = voted[usr.ckey] && (i in voted[usr.ckey])
- if(PLURALITY_VOTING)
- ivotedforthis = voted[usr.ckey] == i
- stat(ivotedforthis? "\[X\]" : "\[ \]", choice_statclicks[choice])
- stat(null, null)
-
/datum/controller/subsystem/vote/proc/reset()
initiator = null
end_time = 0
@@ -87,26 +60,10 @@ SUBSYSTEM_DEF(vote)
voted.Cut()
voting.Cut()
scores.Cut()
- cleanup_statclicks()
+ choice_statclicks = list()
display_votes = initial(display_votes) //CIT CHANGE - obfuscated votes
remove_action_buttons()
-/datum/controller/subsystem/vote/proc/cleanup_statclicks()
- for(var/choice in choice_statclicks)
- qdel(choice_statclicks[choice])
- choice_statclicks = list()
-
-/obj/effect/statclick/vote
- name = "ERROR"
- var/choice
-
-/obj/effect/statclick/vote/Click()
- SSvote.submit_vote(choice)
-
-/obj/effect/statclick/vote/New(loc, choice, name)
- src.choice = choice
- src.name = name
-
/datum/controller/subsystem/vote/proc/get_result()
//get the highest number of votes
var/greatest_votes = 0
@@ -582,10 +539,10 @@ SUBSYSTEM_DEF(vote)
to_chat(world, "\n[text] \nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote.An explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) has occured at ([get_area(epicenter)]) ", turf_target = get_turf(epicenter))
var/x0 = epicenter.x
var/y0 = epicenter.y
diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm
index 1b1fa949a2..da82b0afc7 100644
--- a/code/game/machinery/announcement_system.dm
+++ b/code/game/machinery/announcement_system.dm
@@ -18,9 +18,10 @@ GLOBAL_LIST_EMPTY(announcement_systems)
var/obj/item/radio/headset/radio
var/arrival = "%PERSON has signed up as %RANK"
- var/arrivalToggle = 1
+ var/arrivalToggle = TRUE
var/newhead = "%PERSON, %RANK, is the department head."
- var/newheadToggle = 1
+ var/newheadToggle = TRUE
+ var/cryostorage = "%PERSON, %RANK, has been moved into cryogenic storage." // this shouldnt be changed
var/greenlight = "Light_Green"
var/pinklight = "Light_Pink"
@@ -84,6 +85,8 @@ GLOBAL_LIST_EMPTY(announcement_systems)
message = CompileText(arrival, user, rank)
else if(message_type == "NEWHEAD" && newheadToggle)
message = CompileText(newhead, user, rank)
+ else if(message_type == "CRYOSTORAGE")
+ message = CompileText(cryostorage, user, rank)
else if(message_type == "ARRIVALS_BROKEN")
message = "The arrivals shuttle has been damaged. Docking for repairs..."
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index 235fbf6a9f..c467cbd4e8 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -10,6 +10,7 @@
if(log)
message_admins("EMP with power [power], max distance [max_distance] in area [epicenter.loc.name] ")
log_game("EMP with power [power], max distance [max_distance] in area [epicenter.loc.name] ")
+ deadchat_broadcast("EMP with power ([power]), max distance ([max_distance]) in [epicenter.loc.name] ", turf_target = epicenter)
if(power > 100)
new /obj/effect/temp_visual/emp/pulse(epicenter)
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index e7cf8defc9..e2e0779b53 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -165,6 +165,30 @@
throwforce = 15
bayonet = TRUE
+/obj/item/kitchen/knife/combat/survival/knuckledagger
+ name = "survival dagger"
+ icon_state = "glaive-dagger"
+ desc = "An enhanced hunting grade survival dagger, with a bright light and a handguard that makes it better for efficient butchery."
+ actions_types = list(/datum/action/item_action/toggle_light)
+ var/light_on = FALSE
+ var/brightness_on = 7
+
+/obj/item/kitchen/knife/combat/survival/knuckledagger/Initialize()
+ . = ..()
+ AddComponent(/datum/component/butchering, 50, 120, 5) // it's good for butchering stuff
+
+/obj/item/kitchen/knife/combat/survival/knuckledagger/ui_action_click(mob/user, actiontype)
+ light_on = !light_on
+ playsound(user, 'sound/weapons/empty.ogg', 100, TRUE)
+ update_brightness(user)
+ update_icon()
+
+/obj/item/kitchen/knife/combat/survival/knuckledagger/proc/update_brightness(mob/user = null)
+ if(light_on)
+ set_light(brightness_on)
+ else
+ set_light(0)
+
/obj/item/kitchen/knife/combat/bone
name = "bone dagger"
item_state = "bone_dagger"
@@ -222,10 +246,10 @@
/* Trays moved to /obj/item/storage/bag */
/obj/item/kitchen/knife/scimitar
- name = "Scimitar knife"
+ name = "scimitar knife"
desc = "A knife used to cleanly butcher. Its razor-sharp edge has been honed for butchering, but has been poorly maintained over the years."
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-/obj/item/kitchen/knife/scimiar/Initialize()
+/obj/item/kitchen/knife/scimitar/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 90 - force, 100, force - 60) //bonus chance increases depending on force
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 91ffae9cb1..0f338383c0 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -214,7 +214,7 @@
/obj/item/stack/tile/carpet/arcade
name = "arcade carpet"
icon_state = "tile-carpet-arcade"
- turf_type = /turf/open/floor
+ turf_type = /turf/open/floor/carpet/arcade
tableVariant = null
/obj/item/stack/tile/carpet/blackred
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 1e278a9f88..d996f86df7 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -98,6 +98,10 @@
/obj/structure/holosign/barrier/firelock/BlockSuperconductivity()
return TRUE
+/obj/structure/holosign/barrier/firelock/Initialize()
+ . = ..()
+ air_update_turf(TRUE)
+
/obj/structure/holosign/barrier/combifan
name = "holo combifan"
desc = "A holographic barrier resembling a blue-accented tiny fan. Though it does not prevent solid objects from passing through, gas and temperature changes are kept out."
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 2745c2dc70..5fc105781d 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////Panels
/datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list)
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Show Player Panel"
set desc="Edit player (respawn, ban, heal, etc)"
@@ -219,7 +219,7 @@
/datum/admins/proc/access_news_network() //MARKER
- set category = "Fun"
+ set category = "Admin.Events"
set name = "Access Newscaster Network"
set desc = "Allows you to view, add and edit news feeds."
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index 7e5c104d90..52be445120 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -6,7 +6,7 @@
/client/proc/investigate_show()
set name = "Investigate"
- set category = "Admin"
+ set category = "Admin.Game"
if(!holder)
return
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index c0a29f0854..bbb35c4650 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -349,7 +349,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
/client/proc/admin_ghost()
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Aghost"
if(!holder)
return FALSE
@@ -380,7 +380,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
/client/proc/invisimin()
set name = "Invisimin"
- set category = "Admin"
+ set category = "Admin.Game"
set desc = "Toggles ghost-like invisibility (Don't abuse this)"
if(holder && mob)
if(mob.invisibility == INVISIBILITY_OBSERVER)
@@ -392,7 +392,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
/client/proc/check_antagonists()
set name = "Check Antagonists"
- set category = "Admin"
+ set category = "Admin.Game"
if(holder)
holder.check_antagonists()
log_admin("[key_name(usr)] checked antagonists.") //for tsar~
@@ -412,14 +412,14 @@ GLOBAL_PROTECT(admin_verbs_hideable)
/client/proc/game_panel()
set name = "Game Panel"
- set category = "Admin"
+ set category = "Admin.Game"
if(holder)
holder.Game()
SSblackbox.record_feedback("tally", "admin_verb", 1, "Game Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/secrets()
set name = "Secrets"
- set category = "Admin"
+ set category = "Admin.Game"
if (holder)
holder.Secrets()
SSblackbox.record_feedback("tally", "admin_verb", 1, "Secrets Panel") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -473,7 +473,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/drop_bomb()
- set category = "Special Verbs"
+ set category = "Admin.Fun"
set name = "Drop Bomb"
set desc = "Cause an explosion of varying strength at your location."
@@ -515,7 +515,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/drop_dynex_bomb()
- set category = "Special Verbs"
+ set category = "Admin.Fun"
set name = "Drop DynEx Bomb"
set desc = "Cause an explosion of varying strength at your location."
@@ -562,7 +562,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
message_admins("[key_name_admin(usr)] has modified Dynamic Explosion Scale: [ex_scale]")
/client/proc/give_spell(mob/T in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Give Spell"
set desc = "Gives a spell to a mob."
@@ -586,7 +586,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
message_admins("Spells given to mindless mobs will not be transferred in mindswap or cloning! ")
/client/proc/remove_spell(mob/T in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Remove Spell"
set desc = "Remove a spell from the selected mob."
@@ -599,7 +599,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Remove Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/give_disease(mob/living/T in GLOB.mob_living_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Give Disease"
set desc = "Gives a Disease to a mob."
if(!istype(T))
@@ -614,7 +614,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
message_admins("[key_name_admin(usr)] gave [key_name(T)] the disease [D]. ")
/client/proc/object_say(obj/O in world)
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "OSay"
set desc = "Makes an object say something."
var/message = input(usr, "What do you want the message to be?", "Make Sound") as text | null
@@ -626,7 +626,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/togglebuildmodeself()
set name = "Toggle Build Mode Self"
- set category = "Special Verbs"
+ set category = "Admin.Events"
if (!(holder.rank.rights & R_BUILDMODE))
return
if(src.mob)
@@ -635,7 +635,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
/client/proc/check_ai_laws()
set name = "Check AI Laws"
- set category = "Admin"
+ set category = "Admin.Game"
if(holder)
src.holder.output_ai_laws()
@@ -718,7 +718,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
/client/proc/toggle_AI_interact()
set name = "Toggle Admin AI Interact"
- set category = "Admin"
+ set category = "Admin.Game"
set desc = "Allows you to interact with most machines as an AI would as a ghost"
AI_Interact = !AI_Interact
diff --git a/code/modules/admin/adminmenu.dm b/code/modules/admin/adminmenu.dm
index 64ce5987cf..b7d85ccff5 100644
--- a/code/modules/admin/adminmenu.dm
+++ b/code/modules/admin/adminmenu.dm
@@ -5,7 +5,7 @@
/datum/verbs/menu/Admin/verb/playerpanel()
set name = "Player Panel"
set desc = "Player Panel"
- set category = "Admin"
+ set category = "Admin.Game"
if(usr.client.holder)
usr.client.holder.player_panel_new()
SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 257c1d275a..ef56b4cd2a 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -1,7 +1,7 @@
/client/proc/jumptoarea(area/A in GLOB.sortedAreas)
set name = "Jump to Area"
set desc = "Area to jump to"
- set category = "Admin"
+ set category = "Admin.Game"
if(!src.holder)
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
return
@@ -28,7 +28,7 @@
/client/proc/jumptoturf(turf/T in world)
set name = "Jump to Turf"
- set category = "Admin"
+ set category = "Admin.Game"
if(!src.holder)
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
return
@@ -40,7 +40,7 @@
return
/client/proc/jumptomob(mob/M in GLOB.mob_list)
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Jump to Mob"
if(!src.holder)
@@ -59,7 +59,7 @@
to_chat(A, "This mob is not located in the game world.", confidential = TRUE)
/client/proc/jumptocoord(tx as num, ty as num, tz as num)
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Jump to Coordinate"
if (!holder)
@@ -74,7 +74,7 @@
message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]")
/client/proc/jumptokey()
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Jump to Key"
if(!src.holder)
@@ -97,7 +97,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/Getmob(mob/M in GLOB.mob_list - GLOB.dummy_mob_list)
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Get Mob"
set desc = "Mob to teleport"
if(!src.holder)
@@ -113,7 +113,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Mob") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/Getkey()
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Get Key"
set desc = "Key to teleport"
@@ -141,7 +141,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Get Key") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/sendmob(mob/M in sortmobs())
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Send Mob"
if(!src.holder)
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm
index be22c889f0..4b60ecc0ff 100644
--- a/code/modules/admin/verbs/borgpanel.dm
+++ b/code/modules/admin/verbs/borgpanel.dm
@@ -1,5 +1,5 @@
/datum/admins/proc/open_borgopanel(borgo in GLOB.silicon_mobs)
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Show Borg Panel"
set desc = "Show borg panel"
diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm
index 9b27a8d8e9..123e9877f7 100644
--- a/code/modules/admin/verbs/cinematic.dm
+++ b/code/modules/admin/verbs/cinematic.dm
@@ -1,6 +1,6 @@
/client/proc/cinematic()
set name = "cinematic"
- set category = "Fun"
+ set category = "Admin.Fun"
set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
set hidden = 1
if(!SSticker)
diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm
index 66acc0f667..e3937e19b6 100644
--- a/code/modules/admin/verbs/deadsay.dm
+++ b/code/modules/admin/verbs/deadsay.dm
@@ -1,5 +1,5 @@
/client/proc/dsay(msg as text)
- set category = "Special Verbs"
+ set category = "Admin.Game"
set name = "Dsay"
set hidden = 1
if(!holder)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 5bb8c4ff15..f73ecf10d4 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -27,7 +27,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Air Status In Location") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Make Robot"
if(!SSticker.HasRoundStarted())
@@ -43,7 +43,7 @@
alert("Invalid mob")
/client/proc/cmd_admin_blobize(mob/M in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Make Blob"
if(!SSticker.HasRoundStarted())
@@ -58,7 +58,7 @@
/client/proc/cmd_admin_animalize(mob/M in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Make Simple Animal"
if(!SSticker.HasRoundStarted())
@@ -79,7 +79,7 @@
/client/proc/makepAI(turf/T in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Make pAI"
set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI"
@@ -106,7 +106,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Make pAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_alienize(mob/M in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Make Alien"
if(!SSticker.HasRoundStarted())
@@ -121,7 +121,7 @@
alert("Invalid mob")
/client/proc/cmd_admin_slimeize(mob/M in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Make slime"
if(!SSticker.HasRoundStarted())
@@ -211,7 +211,7 @@
message_admins("[key_name_admin(usr)] has granted [M.key] full access. ")
/client/proc/cmd_assume_direct_control(mob/M in GLOB.mob_list)
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Assume direct control"
set desc = "Direct intervention"
@@ -229,6 +229,33 @@
qdel(adminmob)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/cmd_give_direct_control(mob/M in GLOB.mob_list)
+ set category = "Admin.Game"
+ set name = "Give direct control"
+
+ if(!M)
+ return
+ if(M.ckey)
+ if(alert("This mob is being controlled by [M.key]. Are you sure you wish to give someone else control of it? [M.key] will be made a ghost.",,"Yes","No") != "Yes")
+ return
+ var/client/newkey = input(src, "Pick the player to put in control.", "New player") as null|anything in sortList(GLOB.clients)
+ var/mob/oldmob = newkey.mob
+ var/delmob = FALSE
+ if((isobserver(oldmob) || alert("Do you want to delete [newkey]'s old mob?","Delete?","Yes","No") != "No"))
+ delmob = TRUE
+ if(!M || QDELETED(M))
+ to_chat(usr, "The target mob no longer exists, aborting. ")
+ return
+ if(M.ckey)
+ M.ghostize(FALSE)
+ M.ckey = newkey.key
+ M.client?.init_verbs()
+ if(delmob)
+ qdel(oldmob)
+ message_admins("[key_name_admin(usr)] gave away direct control of [M] to [newkey]. ")
+ log_admin("[key_name(usr)] gave away direct control of [M] to [newkey].")
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
/client/proc/cmd_admin_test_atmos_controllers()
set category = "Mapping"
set name = "Test Atmos Monitoring Consoles"
@@ -455,7 +482,7 @@
cmd_admin_areatest(FALSE)
/client/proc/cmd_admin_dress(mob/M in GLOB.mob_list)
- set category = "Fun"
+ set category = "Admin.Events"
set name = "Select equipment"
if(!(ishuman(M) || isobserver(M)))
alert("Invalid mob")
diff --git a/code/modules/admin/verbs/dice.dm b/code/modules/admin/verbs/dice.dm
index 5b0a15257e..f033351f96 100644
--- a/code/modules/admin/verbs/dice.dm
+++ b/code/modules/admin/verbs/dice.dm
@@ -1,5 +1,5 @@
/client/proc/roll_dices()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Roll Dice"
if(!check_rights(R_FUN))
return
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 7675f858ee..2379ee22bc 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -1,7 +1,7 @@
/client/proc/one_click_antag()
set name = "Create Antagonist"
set desc = "Auto-create an antagonist of your choice"
- set category = "Admin"
+ set category = "Admin.Events"
if(holder)
holder.one_click_antag()
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index fc2ba55f54..6e188a6c7a 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -1,5 +1,5 @@
/client/proc/play_sound(S as sound)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Play Global Sound"
if(!check_rights(R_SOUNDS))
return
@@ -42,7 +42,7 @@
/client/proc/play_local_sound(S as sound)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Play Local Sound"
if(!check_rights(R_SOUNDS))
return
@@ -53,7 +53,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Local Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/play_web_sound()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Play Internet Sound"
if(!check_rights(R_SOUNDS))
return
@@ -136,7 +136,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Internet Sound")
/client/proc/manual_play_web_sound()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Manual Play Internet Sound"
if(!check_rights(R_SOUNDS))
return
@@ -182,7 +182,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Manual Play Internet Sound")
/client/proc/set_round_end_sound(S as sound)
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Set Round End Sound"
if(!check_rights(R_SOUNDS))
return
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index bd12070981..2b8e963f4e 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -20,7 +20,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Everything") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_subtle_message(mob/M in GLOB.mob_list)
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Subtle Message"
if(!ismob(M))
@@ -46,7 +46,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Subtle Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list)
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Headset Message"
admin_headset_message(M)
@@ -128,7 +128,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Modify Antagonist Reputation") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_world_narrate()
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Global Narrate"
if(!check_rights(R_ADMIN))
@@ -144,7 +144,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Global Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_direct_narrate(mob/M)
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Direct Narrate"
if(!check_rights(R_ADMIN))
@@ -169,7 +169,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Direct Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_local_narrate(atom/A)
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Local Narrate"
if(!check_rights(R_ADMIN))
@@ -190,7 +190,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list)
- set category = "Special Verbs"
+ set category = "Admin.Game"
set name = "Godmode"
if(!check_rights(R_ADMIN))
return
@@ -335,7 +335,7 @@ Works kind of like entering the game with a new character. Character receives a
Traitors and the like can also be revived with the previous role mostly intact.
/N */
/client/proc/respawn_character()
- set category = "Special Verbs"
+ set category = "Admin.Game"
set name = "Respawn Character"
set desc = "Respawn a person that has been gibbed/dusted/killed. They must be a ghost for this to work and preferably should not have a body to go back into."
if(!check_rights(R_ADMIN))
@@ -503,7 +503,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return new_character
/client/proc/cmd_admin_add_freeform_ai_law()
- set category = "Fun"
+ set category = "Admin.Events"
set name = "Add Custom AI law"
if(!check_rights(R_ADMIN))
@@ -546,7 +546,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "Rejuvinate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_create_centcom_report()
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Create Command Report"
if(!check_rights(R_ADMIN))
@@ -572,7 +572,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_change_command_name()
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Change Command Name"
if(!check_rights(R_ADMIN))
@@ -595,7 +595,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
admin_delete(A)
/client/proc/cmd_admin_list_open_jobs()
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Manage Job Slots"
if(!check_rights(R_ADMIN))
@@ -604,7 +604,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Job Slots") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world)
- set category = "Special Verbs"
+ set category = "Admin.Fun"
set name = "Explosion"
if(!check_rights(R_ADMIN))
@@ -640,7 +640,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
/client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world)
- set category = "Special Verbs"
+ set category = "Admin.Fun"
set name = "EM Pulse"
if(!check_rights(R_ADMIN))
@@ -656,7 +656,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_gib(mob/M in GLOB.mob_list)
- set category = "Special Verbs"
+ set category = "Admin.Fun"
set name = "Gib"
if(!check_rights(R_ADMIN))
@@ -683,7 +683,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_gib_self()
set name = "Gibself"
- set category = "Fun"
+ set category = "Admin.Fun"
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm == "Yes")
@@ -702,7 +702,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Contents") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/toggle_view_range()
- set category = "Special Verbs"
+ set category = "Admin.Game"
set name = "Change View Range"
set desc = "switches between 1x and custom views"
@@ -717,8 +717,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Change View Range", "[view]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/admin_call_shuttle()
-
- set category = "Admin"
+ set category = "Admin.Events"
set name = "Call Shuttle"
if(EMERGENCY_AT_LEAST_DOCKED)
@@ -738,7 +737,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
/client/proc/admin_cancel_shuttle()
- set category = "Admin"
+ set category = "Admin.Events"
set name = "Cancel Shuttle"
if(!check_rights(0))
return
@@ -754,9 +753,51 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle. ")
return
+/*
+/client/proc/admin_disable_shuttle()
+ set category = "Admin.Events"
+ set name = "Disable Shuttle"
+ if(!check_rights(R_ADMIN))
+ return
+ if(SSshuttle.emergency.mode == SHUTTLE_DISABLED)
+ to_chat(usr, "Error, shuttle is already disabled. ")
+ return
+ if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes")
+ return
+ message_admins("[key_name_admin(usr)] disabled the shuttle. ")
+ SSshuttle.lastMode = SSshuttle.emergency.mode
+ SSshuttle.lastCallTime = SSshuttle.emergency.timeLeft(1)
+ SSshuttle.adminEmergencyNoRecall = TRUE
+ SSshuttle.emergency.setTimer(0)
+ SSshuttle.emergency.mode = SHUTTLE_DISABLED
+ priority_announce("Warning: Emergency Shuttle uplink failure, shuttle disabled until further notice.", "Emergency Shuttle Uplink Alert", 'sound/misc/announce_dig.ogg')
+
+/client/proc/admin_enable_shuttle()
+ set category = "Admin - Events"
+ set category = "Admin.Events"
+ set name = "Enable Shuttle"
+
+ if(!check_rights(R_ADMIN))
+ return
+ if(SSshuttle.emergency.mode != SHUTTLE_DISABLED)
+ to_chat(usr, "Error, shuttle not disabled. ")
+ return
+ if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes")
+ return
+ message_admins("[key_name_admin(usr)] enabled the emergency shuttle. ")
+ SSshuttle.adminEmergencyNoRecall = FALSE
+ SSshuttle.emergencyNoRecall = FALSE
+ if(SSshuttle.lastMode == SHUTTLE_DISABLED) //If everything goes to shit, fix it.
+ SSshuttle.lastMode = SHUTTLE_IDLE
+ SSshuttle.emergency.mode = SSshuttle.lastMode
+ if(SSshuttle.lastCallTime < 10 SECONDS && SSshuttle.lastMode != SHUTTLE_IDLE)
+ SSshuttle.lastCallTime = 10 SECONDS //Make sure no insta departures.
+ SSshuttle.emergency.setTimer(SSshuttle.lastCallTime)
+ priority_announce("Warning: Emergency Shuttle uplink reestablished, shuttle enabled.", "Emergency Shuttle Uplink Alert", 'sound/misc/announce_dig.ogg')
+*/
/client/proc/everyone_random()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Make Everyone Random"
set desc = "Make everyone have a random appearance. You can only use this before rounds!"
@@ -817,7 +858,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle nuke disk stationary admin logging", "[current_state ? "Enabled" : "Disabled"]"))
/client/proc/admin_change_sec_level()
- set category = "Special Verbs"
+ set category = "Admin.Events"
set name = "Set Security Level"
set desc = "Changes the security level. Announcement only, i.e. setting to Delta won't activate nuke"
@@ -834,7 +875,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list)
set name = "Toggle Nuke"
- set category = "Fun"
+ set category = "Admin.Events"
set popup_menu = 0
if(!check_rights(R_DEBUG))
return
@@ -1029,7 +1070,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
usr << browse(dat, "window=dressup;size=550x600")
/client/proc/toggle_combo_hud()
- set category = "Admin"
+ set category = "Admin.Game"
set name = "Toggle Combo HUD"
set desc = "Toggles the Admin Combo HUD (antag, sci, med, eng)"
@@ -1064,7 +1105,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
/client/proc/run_weather()
- set category = "Fun"
+ set category = "Admin.Events"
set name = "Run Weather"
set desc = "Triggers a weather on the z-level you choose."
@@ -1088,7 +1129,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
SSblackbox.record_feedback("tally", "admin_verb", 1, "Run Weather")
/client/proc/mass_zombie_infection()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Mass Zombie Infection"
set desc = "Infects all humans with a latent organ that will zombify \
them on death."
@@ -1108,7 +1149,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Infection")
/client/proc/mass_zombie_cure()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Mass Zombie Cure"
set desc = "Removes the zombie infection from all humans, returning them to normal."
if(!check_rights(R_ADMIN))
@@ -1126,7 +1167,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Cure")
/client/proc/polymorph_all()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Polymorph All"
set desc = "Applies the effects of the bolt of change to every single mob."
@@ -1216,7 +1257,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggled Hub Visibility", "[GLOB.hub_visibility ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_toggle_fov()
- set category = "Fun"
+ set category = "Admin.Fun"
set name = "Enable/Disable Field of Vision"
var/static/busy_toggling_fov = FALSE
@@ -1269,7 +1310,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
/client/proc/smite(mob/living/carbon/human/target as mob)
set name = "Smite"
- set category = "Fun"
+ set category = "Admin.Fun"
if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
return
diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm
index a80eafae02..7552936136 100644
--- a/code/modules/admin/verbs/shuttlepanel.dm
+++ b/code/modules/admin/verbs/shuttlepanel.dm
@@ -1,5 +1,5 @@
/datum/admins/proc/open_shuttlepanel()
- set category = "Admin"
+ set category = "Admin.Events"
set name = "Shuttle Manipulator"
set desc = "Opens the shuttle manipulator UI."
diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm
index 7742d6ea66..fc4270dd1b 100644
--- a/code/modules/admin/verbs/tripAI.dm
+++ b/code/modules/admin/verbs/tripAI.dm
@@ -1,5 +1,5 @@
/client/proc/triple_ai()
- set category = "Fun"
+ set category = "Admin.Events"
set name = "Create AI Triumvirate"
if(SSticker.current_state > GAME_STATE_PREGAME)
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index 242538a1e5..8f4e7ef3d6 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -38,8 +38,9 @@
var/mimicing = ""
var/canrespec = 0
var/changeling_speak = 0
- var/loudfactor = 0 //Used for blood tests. At 4, blood tests will succeed. At 10, blood tests will result in an explosion.
- var/bloodtestwarnings = 0 //Used to track if the ling has been notified that they will pass blood tests.
+ var/loudfactor = 0 //Used for blood tests. This is is the average loudness of the ling's abilities calculated with the below two vars
+ var/loudtotal = 0 //Used to keep track of the sum of the ling's loudness
+ var/totalpurchases = 0 //Used to keep track of how many purchases the ling's made after free abilities have been added
var/datum/dna/chosen_dna
var/obj/effect/proc_holder/changeling/sting/chosen_sting
var/datum/cellular_emporium/cellular_emporium
@@ -139,8 +140,6 @@
/datum/antagonist/changeling/proc/reset_powers()
if(purchasedpowers)
remove_changeling_powers()
- loudfactor = 0
- bloodtestwarnings = 0
//Repurchase free powers.
for(var/path in all_powers)
var/obj/effect/proc_holder/changeling/S = new path()
@@ -148,6 +147,9 @@
if(!has_sting(S))
purchasedpowers += S
S.on_purchase(owner.current,TRUE)
+ loudfactor = 0
+ loudtotal = 0
+ totalpurchases = 0
/datum/antagonist/changeling/proc/has_sting(obj/effect/proc_holder/changeling/power)
for(var/obj/effect/proc_holder/changeling/P in purchasedpowers)
@@ -192,13 +194,18 @@
geneticpoints -= thepower.dna_cost
purchasedpowers += thepower
thepower.on_purchase(owner.current)
- loudfactor += thepower.loudness
- if(loudfactor >= 4 && !bloodtestwarnings)
- to_chat(owner.current, "Our blood is growing flammable. Our blood will react violently to heat. ")
- bloodtestwarnings = 1
- if(loudfactor >= 10 && bloodtestwarnings < 2)
- to_chat(owner.current, "Our blood has grown extremely flammable. Our blood will react explosively to heat. ")
- bloodtestwarnings = 2
+ loudtotal += thepower.loudness
+ totalpurchases++
+ var/oldloudness = loudfactor
+ loudfactor = loudtotal/max(totalpurchases,1)
+ if(loudfactor >= LINGBLOOD_DETECTION_THRESHOLD && oldloudness < LINGBLOOD_DETECTION_THRESHOLD)
+ to_chat(owner.current, "Our blood has grown flammable. Our blood will now react violently to heat. ")
+ else if(loudfactor < LINGBLOOD_DETECTION_THRESHOLD && oldloudness >= LINGBLOOD_DETECTION_THRESHOLD)
+ to_chat(owner.current, "Our blood has stabilized, and will no longer react violently to heat. ")
+ if(loudfactor > LINGBLOOD_EXPLOSION_THRESHOLD && oldloudness <= LINGBLOOD_EXPLOSION_THRESHOLD)
+ to_chat(owner.current, "Our blood has grown extremely flammable. Our blood will now react explosively to heat. ")
+ else if(loudfactor <= LINGBLOOD_EXPLOSION_THRESHOLD && oldloudness > LINGBLOOD_EXPLOSION_THRESHOLD)
+ to_chat(owner.current, "Our blood has slightly stabilized, and will no longer explode when exposed to heat. ")
/datum/antagonist/changeling/proc/readapt()
if(!ishuman(owner.current))
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index b7eac1e591..354df5f592 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -12,7 +12,7 @@
/client/proc/centcom_podlauncher() //Creates a verb for admins to open up the ui
set name = "Config/Launch Supplypod"
set desc = "Configure and launch a CentCom supplypod full of whatever your heart desires!"
- set category = "Admin"
+ set category = "Admin.Events"
var/datum/centcom_podlauncher/plaunch = new(usr)//create the datum
plaunch.ui_interact(usr)//datum has a tgui component, here we open the window
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index acff128f2b..e537b82835 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -112,6 +112,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/use_custom_skin_tone = FALSE
var/left_eye_color = "000000" //Eye color
var/right_eye_color = "000000"
+ var/eye_type = DEFAULT_EYES_TYPE //Eye type
var/split_eye_colors = FALSE
var/datum/species/pref_species = new /datum/species/human() //Mutant race
var/list/features = list("mcolor" = "FFFFFF",
@@ -301,7 +302,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
/datum/preferences/proc/ShowChoices(mob/user)
if(!user || !user.client)
return
- update_preview_icon(current_tab != 2)
+ update_preview_icon(current_tab)
var/list/dat = list("")
dat += "Character Settings "
@@ -506,21 +507,28 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if (CONFIG_GET(number/body_size_min) != CONFIG_GET(number/body_size_max))
dat += "Sprite Size: [features["body_size"]*100]% Heterochromia "
- dat += "[split_eye_colors ? "Enabled" : "Disabled"] "
- if(!split_eye_colors)
- dat += "Eye Color "
- dat += " Change "
- else
- dat += "Left Eye Color "
- dat += " Change "
- dat += "Right Eye Color "
- dat += " Change Eye Type "
+ dat += "[eye_type] Heterochromia "
+ dat += "[split_eye_colors ? "Enabled" : "Disabled"] "
+ if(!split_eye_colors)
+ dat += "Eye Color "
+ dat += " Change "
+ dat += ""
+ else
+ dat += "Left Eye Color "
+ dat += " Change "
+ dat += "Right Eye Color "
+ dat += " Change Speech preferences "
dat += "Custom Speech Verb: [src] cackles, \"You'll nae get rid a me that easily!\" ")
playsound(loc, 'sound/spookoween/ahaha.ogg', 100, 0.25)
+ fully_heal(FALSE)
health = 25
poof()
@@ -81,9 +84,9 @@
say("Hello there [gender_check(M)]!")
return ..()
if(!ckey)
- busy_chatting = FALSE
+ stopmove()
chit_chat(M)
- busy_chatting = TRUE
+ canmove()
..()
/mob/living/simple_animal/jacq/attack_paw(mob/living/carbon/monkey/M)
@@ -91,11 +94,28 @@
say("Hello there [gender_check(M)]!")
return ..()
if(!ckey)
- busy_chatting = FALSE
+ stopmove()
chit_chat(M)
- busy_chatting = TRUE
+ canmove()
..()
+/mob/living/simple_animal/jacq/proc/canmove()
+ busy = FALSE
+ update_mobility()
+
+/mob/living/simple_animal/jacq/proc/stopmove()
+ if(ckey) //if someone is in her, don't disable her movement!
+ canmove()
+ return
+ busy = TRUE
+ update_mobility()
+
+/mob/living/simple_animal/jacq/proc/jacqrunes(message, mob/living/carbon/C) //Displays speechtext over Jacq for the user only.
+ var/atom/hearer = C
+ var/list/spans = list("spooky")
+ new /datum/chatmessage(message, src, hearer, spans)
+
+
/mob/living/simple_animal/jacq/proc/poof()
last_poof = world.realtime
var/datum/reagents/R = new/datum/reagents(100)//Hey, just in case.
@@ -104,7 +124,7 @@
s.set_up(R, 0, loc)
s.start()
visible_message("[src] disappears in a puff of smoke!")
- busy_chatting = TRUE
+ canmove()
health = 25
//Try to go to populated areas
@@ -120,7 +140,7 @@
continue
targets += H
- if(!targets)
+ if(!targets.len)
targets = GLOB.generic_event_spawns
for(var/i in 1 to 6) //Attempts a jump up to 6 times.
@@ -151,14 +171,16 @@
if(!progression["[C.real_name]"] || !(progression["[C.real_name]"] & JACQ_HELLO))
visible_message("[src] smiles ominously at [C], \"Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.\" ")
+ jacqrunes("Well halo there [gender]! Ah'm Jacqueline, tae great Pumpqueen, great tae meet ye.", C)
sleep(20)
visible_message("[src] continues, \"Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead. \" giving [C] a wide grin.")
+ jacqrunes("Ah'm sure yae well stunned, but ah've got nae taem fer that. Ah'm after the candies around this station. If yae get mae enoof o the wee buggers, Ah'll give ye a treat, or if yae feeling bold, Ah ken trick ye instead.", C)
if(!progression["[C.real_name]"])
progression["[C.real_name]"] = NONE //TO MAKE SURE THAT THE LIST ENTRY EXISTS.
progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HELLO
- var/choices = list("Trick", "Treat", "How do I get candies?")
+ var/choices = list("Trick", "Treat", "How do I get candies?", "Do I know you from somewhere?")
var/choice = input(C, "Trick or Treat?", "Trick or Treat?") in choices
switch(choice)
if("Trick")
@@ -168,14 +190,20 @@
if(check_candies(C))
treat(C, gender)
else
- visible_message("[src] raises an eyebrow, \"You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.\" ")
+ visible_message("[src] raises aneyebrow, \"You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.\" ")
+ jacqrunes("You've nae got any candies Ah want! They're the orange round ones, now bugger off an go get em first.", C)
return
if("How do I get candies?")
visible_message("[src] says, \"Gae find my familiar; Bartholomew. Ee's tendin the cauldron which ken bring oot t' magic energy in items scattered aroond. Knowing him, ee's probably gone tae somewhere with books.\" ")
+ jacqrunes("Gae find my familiar; Bartholomew. Ee's tendin the cauldron which ken bring oot t' magic energy in items scattered aroond. Knowing him, ee's probably gone tae somewhere with books.", C)
return
+ if("Do I know you from somewhere?")
+ visible_message("[src] says, \"Aye ye micht dae, ah was kicking aboot round 'ere aboot a year ago when ah had a wee... altercation wit the witch academy n' ran oot here tae crash oan me sis's floor. Course she pushed me tae git it a' sorted oot lik', bit nae before ah hud a wee bit o' fun oan this station. Or maybe ye jest recognise me ma's prized pumpkin atop me nonce.\" ")
+ jacqrunes("Aye ye micht dae, ah was kicking aboot round 'ere aboot a year ago when ah had a wee... altercation wit the witch academy n' ran oot here tae crash oan me sis's floor. Course she pushed me tae git it a' sorted oot lik', bit nae before ah hud a wee bit o' fun oan this station. Or maybe ye jest recognise me ma's prized pumpkin atop me nonce.", C)
/mob/living/simple_animal/jacq/proc/treat(mob/living/carbon/C, gender)
visible_message("[src] gives off a glowing smile, \"What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.\" ")
+ jacqrunes("What ken Ah offer ye? I can magic up an object, a potion or a plushie fer ye.", C)
var/choices_reward = list("Object - 3 candies", "Potion - 2 candies", "Jacqueline Tracker - 2 candies", "Plushie - 1 candy", "Can I get to know you instead?", "Become a pumpkinhead dullahan (perma) - 4 candies")
var/choice_reward = input(usr, "Trick or Treat?", "Trick or Treat?") in choices_reward
@@ -184,8 +212,10 @@
if("Become a pumpkinhead dullahan (perma) - 4 candies")
if(!take_candies(C, 4))
visible_message("[src] raises an eyebrown, \"It's 4 candies for that [gender]! Thems the rules!\" ")
+ jacqrunes("It's 4 candies for that [gender]! Thems the rules!", C)
return
visible_message("[src] waves their arms around, \"Off comes your head, a pumpkin taking it's stead!\" ")
+ jacqrunes("Off comes your head, a pumpkin taking it's stead!", C)
C.reagents.add_reagent(/datum/reagent/mutationtoxin/pumpkinhead, 5)
sleep(20)
poof()
@@ -194,6 +224,7 @@
if("Object - 3 candies")
if(!take_candies(C, 3))
visible_message("[src] raises an eyebrown, \"It's 3 candies per trinket [gender]! Thems the rules!\" ")
+ jacqrunes("It's 3 candies per trinket [gender]! Thems the rules!", C)
return
var/new_obj = pick(subtypesof(/obj))
@@ -203,36 +234,43 @@
var/reward = new new_obj(C.loc)
C.put_in_hands(reward)
visible_message("[src] waves her hands, magicking up a [reward] from thin air, \"There ye are [gender], enjoy! \" ")
+ jacqrunes("There ye are [gender], enjoy!", C)
sleep(20)
poof()
return
if("Potion - 2 candies")
if(!take_candies(C, 2))
visible_message("[src] raises an eyebrow, \"It's 2 candies per potion [gender]! Thems the rules!\" ")
+ jacqrunes("It's 2 candies per potion [gender]! Thems the rules!", C)
return
var/reward = new /obj/item/reagent_containers/potion_container(C.loc)
C.put_in_hands(reward)
visible_message("[src] waves her hands, magicking up a [reward] from thin air, \"There ye are [gender], enjoy! \" ")
+ jacqrunes("There ye are [gender], enjoy!", C)
sleep(20)
poof()
return
if("Plushie - 1 candy")
if(!take_candies(C, 1))
visible_message("[src] raises an eyebrow, \"It's 1 candy per plushie [gender]! Thems the rules!\" ")
+ jacqrunes("It's 1 candy per plushie [gender]! Thems the rules!", C)
return
new /obj/item/toy/plush/random(C.loc)
visible_message("[src] waves her hands, magicking up a plushie from thin air, \"There ye are [gender], enjoy! \" ")
+ jacqrunes("There ye are [gender], enjoy!", C)
sleep(20)
poof()
return
if("Jacqueline Tracker - 2 candies")
if(!take_candies(C, 2))
visible_message("[src] raises an eyebrow, \"It's 1 candy per plushie [gender]! Thems the rules!\" ")
+ jacqrunes("It's 1 candy per plushie [gender]! Thems the rules!", C)
return
new /obj/item/pinpointer/jacq(C.loc)
visible_message("[src] waves her hands, magicking up a tracker from thin air, \"Feels weird to magic up a tracker fer meself but, here ye are [gender], enjoy! \" ")
+ jacqrunes("Feels weird to magic up a tracker fer meself but, here ye are [gender], enjoy!", C)
sleep(20)
poof()
return
@@ -252,7 +290,7 @@
choices += "What is that on your head?"
if(!(progression["[C.real_name]"] & JACQ_EXPELL))
if(progression["[C.real_name]"] & JACQ_WITCH)
- choices += "So you got ex-spell-ed?"
+ choices += "What is it like being a witch?"
else
choices += "Are you a witch?"
@@ -270,47 +308,79 @@
//If you've nothing to ask
if(!LAZYLEN(choices))
visible_message("[src] sighs, \"Ah'm all questioned oot fer noo, [gender].\" ")
+ jacqrunes("Ah'm all questioned oot fer noo, [gender]", C)
return
//Otherwise, lets go!
visible_message("[src] says, \"A question? Sure, it'll cost you a candy though!\" ")
+ jacqrunes("A question? Sure, it'll cost you a candy though!", C)
choices += "Nevermind"
//Candies for chitchats
var/choice = input(C, "What do you want to ask?", "What do you want to ask?") in choices
if(!take_candies(C, 1))
visible_message("[src] raises an eyebrow, \"It's a candy per question [gender]! Thems the rules!\" ")
+ jacqrunes("It's a candy per question [gender]! Thems the rules!", C)
return
//Talking
switch(choice)
if("Why do you want the candies?")
visible_message("[src] says, \"Ave ye tried them? They're full of all sorts of reagents. Ah'm after them so ah ken magic em up an hopefully find rare stuff fer me brews. Honestly it's a lot easier magicking up tatt fer ye lot than runnin aroond on me own like. I'd ask me familiars but most a my familiars are funny fellows 'n constantly bugger off on adventures when given simple objectives like; Go grab me a tea cake or watch over me cauldron. Ah mean, ye might run into Bartholomew my cat. Ee's supposed tae be tending my cauldron, but I've nae idea where ee's got tae.\" ")
+ jacqrunes("Ave ye tried them? They're full of all sorts of reagents. Ah'm after them so ah ken magic em up an hopefully find rare stuff fer me brews. Honestly it's a lot easier magicking up tatt fer ye lot than runnin aroond on me own like. I'd ask me familiars but most a my familiars are funny fellows 'n constantly bugger off on adventures when given simple objectives like; Go grab me a tea cake or watch over me cauldron. Ah mean, ye might run into Bartholomew my cat. Ee's supposed tae be tending my cauldron, but I've nae idea where ee's got tae.", C)
progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_CANDIES
sleep(30)
if("You really came all this way for candy?")
- visible_message("[src] l ooks tae the side sheepishly, \"Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead!\" [src] scowls, \"She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts moles in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!\" [src] sighs, \"But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.\" ")
+ visible_message("[src] looks to the side sheepishly, \"Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead!\" [src] scowls, \"She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts moles in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!\" [src] sighs, \"But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.\" ")
+ jacqrunes("Aye, well, tae be honest, Ah'm here tae see me sis, but dunnae let her knew that. She's an alchemist too like, but she dunnae use a caldron like mae, she buggered off like tae her posh ivory tower tae learn bloody chemistry instead", C)
progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_FAR
- sleep(30)
+ sleep(10)
+ jacqrunes("She's tae black sheep o' the family too, so we dunnae see eye tae eye sometimes on alchemy. Ah mean, she puts moles in her brews! Ye dunnae put moles in yer brews! Yae threw your brews at tae wee bastards an blew em up!", C)
+ sleep(10)
+ jacqrunes("But she's a heart o gold so.. Ah wanted tae see her an check up oon her, make sure she's okay.", C)
+ sleep(10)
if("What is that on your head?")
- visible_message("[src] pats the pumpkin atop her head, \"This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly it felt like she loved this thing more than any of us, which Ah knew ain't true an it's not like she was hartless or anything but.. well, we had a falling oot when Ah got back home with all me stuff in tow. An all she had done is sent me owl after owl over t' last year aboot this bloody pumpkin and ah had enough. So ah took it, an put it on me head. You know, as ye do. Ah am the great Pumpqueen after all, Ah deserve this.\" ")
+ visible_message("[src] pats the pumpkin atop her head, \"This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly I got bloody sick o'er harpin' on aboot it, all she had done is sent me owl after owl over aboot this bloody pumpkin since i left the nest and ah had enough after a ... mild altercation like. So I nabbed it last halloween. Caught bloody hell fer it ah did, course me sis talked to me ma and, well, simmered her doon. We've all but made up noo, but seein' as ah'm the great Pumpqueen after all, I cannae be seen withoot it like.\" ")
+ jacqrunes("This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly I got bloody sick o'er harpin' on aboot it, all she had done is sent me owl after owl over aboot this bloody pumpkin since i left the nest and ah had enough after a ... mild altercation like. So I nabbed it last halloween. Caught bloody hell fer it ah did, course me sis talked to me ma and, well, simmered her doon. We've all but made up noo, but seein' as ah'm the great Pumpqueen after all, I cannae be seen withoot it like.", C)
progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_HEAD
sleep(30)
+ //Year 1 answer: for anyone who is interested!
+ /*This thing? This ain't nae ordinary pumpkin! Me Ma grew this monster ooer a year o love, dedication an hard work. Honestly it felt like she loved this thing more than any of us, which Ah knew ain't true an it's not like she was hartless or anything but.. well, we had a falling oot when Ah got back home with all me stuff in tow. An all she had done is sent me owl after owl over t' last year aboot this bloody pumpkin and ah had enough. So ah took it, an put it on me head. You know, as ye do. Ah am the great Pumpqueen after all, Ah deserve this.*/
+
if("Are you a witch?")
- visible_message("[src] grumbles, \"If ye must know, Ah got kicked oot of the witch academy fer being too much of a \"loose cannon\". A bloody loose cannon? Nae they were just pissed off Ah had the brass tae proclaim myself as the Pumpqueen! And also maybe the time Ah went and blew up one of the towers by trying tae make a huge batch of astrogen might've had something tae do with it. Ah mean it would've worked fine if the cauldrons weren't so shite and were actually upgraded by the faculty. So technically no, I'm not a witch.\" ")
+ visible_message("[src] smirks, \"Weel, after getting kicked oot over a very minor explosion last year, ah wis able tae git back in 'n' finish me witching degree thanks tae me sis! 'twas bloody brutal finishing th' degree though, ah will tell ye, ye take a peek o'er at t' other witches all prim 'n' proper like 'n' it gets in yer heid, ye'r nae as guid. But ah bloody well ended up summoning Nar'Sie last year for the lot o' yous. Aye a'm a loose cannon - but ah get results.\" thumping her chest with pride as she finishes speaking.")
+ jacqrunes("Weel, after getting kicked oot over a very minor explosion last year, ah wis able tae git back in 'n' finish me witching degree thanks tae me sis! 'twas bloody brutal finishing th' degree though, ah will tell ye, ye take a peek o'er at t' other witches all prim 'n' proper like 'n' it gets in yer heid, ye'r nae as guid. But ah bloody well ended up summoning Nar'Sie last year for the lot o' yous. Aye a'm a loose cannon - but ah get results." , C)
progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_WITCH
sleep(30)
- if("So you got ex-spell-ed?")
- visible_message("[src] Gives you a blank look at the pun, before continuing, \"Not quite, Ah know Ah ken get back into the academy, it's only an explosion, they happen all the time, but, tae be fair it's my fault that things came tae their explosive climax. You don't know what it's like when you're after a witch doctorate, everyone else is doing well, everyone's making new spells and the like, and I'm just good at making explosions really, or fireworks. So, Ah did something Ah knew was dangerous, because Ah had tae do something tae stand oot, but Ah know this life ain't fer me, Ah don't want tae be locked up in dusty towers, grinding reagent after reagent together, trying tae find new reactions, some of the wizards in there haven't left fer years. Ah want tae live, Ah want tae fly around on a broom, turn people into cats fer a day and disappear cackling! That's what got me into witchcraft!\" she throws her arms up in the arm, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, giving oot a soft sigh, \"Ah know my mother's obsession with this dumb thing on my head is just her trying tae fill the void of me and my sis moving oot, and it really shouldn't be on my head. And Ah know that I'm really here tae get help from my sis.. She's the sensible one, and she gives good hugs.\" ")
- sleep(30)
+ //Year 1 answer for anyone who is interested:
+ /* Are you a witch?
+ If ye must know, Ah got kicked oot of the witch academy fer being too much of a \"loose cannon\". A bloody loose cannon? Nae they were just pissed off Ah had the brass tae proclaim myself as the Pumpqueen! And also maybe the time Ah went and blew up one of the towers by trying tae make a huge batch of astrogen might've had something tae do with it. Ah mean it would've worked fine if the cauldrons weren't so shite and were actually upgraded by the faculty. So technically no, I'm not a witch.*/
+
+ if("What is it like being a witch?") //What is it like being a witch?
+
+ visible_message("[src] says, \"Tae be honest, ah dunnae. Ah mean ah have a piece o’ paper that implies that a’m, ‘n’ a few folk who seem keen in shoving me back in their magic tower, but I don’t know if that’s fer me really.\" she gives the back of her pumpkin a quick scratch as she continues \"What draws me tae witchcraft is the chaos, ah live tae see th’ utter madness that comes fae the spells ah cast ‘n’ th’ like, ‘n’ ah know you do tae, it’s why you’re ‘ere, aye? Ah kin conjure some utterly chaotic things, and ah love tae do it, just tae see what I’ll git! It’s why visiting here is so fun, ye wee lot scurrying about, getting me candies, hoping I’ll conjure up something utterly chaotic!\" she throws her arms up in the arm with a laugh, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, \"But o’ course life ain’t that easy, ye can’t just go around being a pure agent o’ chaos, ‘n’ ah feel like the reality o’ the world be trying tae dull me, to shove me in a boring dusty auld room where ah spend t’ rest o’ me days researching some boggin’ magic till ah die. Ah want tae bloody well change t’ world, ah want to do something that leaves an impact, but ah dunnae want t’ kill people doing it.\" she gives out a soft sigh, \"Who knows, maybe I’ll bugger off ‘n’ make some pumkinmobiles or something daft like that.\" ")
+ jacqrunes("Tae be honest, ah dunnae. Ah mean ah have a piece o’ paper that implies that a’m, ‘n’ a few folk who seem keen in shoving me back in their magic tower, but I don’t know if that’s fer me really." , C)
+ sleep(10)
+ jacqrunes("What draws me tae witchcraft is the chaos, ah live tae see th’ utter madness that comes fae the spells ah cast ‘n’ th’ like, ‘n’ ah know you do tae, it’s why you’re ‘ere, aye? Ah kin conjure some utterly chaotic things, and ah love tae do it, just tae see what I’ll git! It’s why visiting here is so fun, ye wee lot scurrying about, getting me candies, hoping I’ll conjure up something utterly chaotic!" , C)
+ sleep(10)
+ jacqrunes("But o’ course life ain’t that easy, ye can’t just go around being a pure agent o’ chaos, ‘n’ ah feel like the reality o’ the world be trying tae dull me, to shove me in a boring dusty auld room where ah spend t’ rest o’ me days researching some boggin’ magic till ah die. Ah want tae bloody well change t’ world, ah want to do something that leaves an impact, but ah dunnae want t’ kill people doing it.", C)
+ sleep(10)
+ jacqrunes("Who knows, maybe I’ll bugger off ‘n’ make some pumkinmobiles or something daft like that.", C)
+ sleep(25)
visible_message("[src] says, \"Thanks [C], Ah guess Ah didn't realise Ah needed someone tae talk tae but, I'm glad ye spent all your candies talking tae me. Funny how things seem much worse in yer head.\" ")
+ jacqrunes("Thanks [C], Ah guess Ah didn't realise Ah needed someone tae talk tae but, I'm glad ye spent all your candies talking tae me. Funny how things seem much worse in yer head." , C)
progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_EXPELL
sleep(30)
+ //Year 1 answer for anyone who is interested:
+ /*"So you got ex-spell-ed?"
+ Gives you a blank look at the pun, before continuing, \"Not quite, Ah know Ah ken get back into the academy, it's only an explosion, they happen all the time, but, tae be fair it's my fault that things came tae their explosive climax. You don't know what it's like when you're after a witch doctorate, everyone else is doing well, everyone's making new spells and the like, and I'm just good at making explosions really, or fireworks. So, Ah did something Ah knew was dangerous, because Ah had tae do something tae stand oot, but Ah know this life ain't fer me, Ah don't want tae be locked up in dusty towers, grinding reagent after reagent together, trying tae find new reactions, some of the wizards in there haven't left fer years. Ah want tae live, Ah want tae fly around on a broom, turn people into cats fer a day and disappear cackling! That's what got me into witchcraft!\" she throws her arms up in the arm, spinning the pumpkin upon her head slightly. She carefully spins it back to face you, giving oot a soft sigh, \"Ah know my mother's obsession with this dumb thing on my head is just her trying tae fill the void of me and my sis moving oot, and it really shouldn't be on my head. And Ah know that I'm really here tae get help from my sis.. She's the sensible one, and she gives good hugs.
+ */
+
if("Can I take you out on a date?")
visible_message("[src] blushes, \"...You want tae ask me oot on a date? Me? After all that nonsense Ah just said? It seems a waste of a candy honestly.\" ")
- //progression["[C.real_name]"] = progression["[C.real_name]"] | JACQ_DATE
+ jacqrunes("...You want tae ask me oot on a date? Me? After all that nonsense Ah just said? It seems a waste of a candy honestly." , C)
visible_message("[src] looks to the side, deep in thought. ")
dating_start(C, gender)
@@ -328,15 +398,18 @@
switch(option)
if(1)
visible_message("[src] waves their arms around, \"Hocus pocus, making friends is now your focus!\" ")
+ jacqrunes("Hocus pocus, making friends is now your focus!", C)
var/message = pick("make a tasty sandwich for", "compose a poem for", "aquire a nice outfit to give to", "strike up a conversation about pumpkins with", "write a letter and deliver it to", "give a nice hat to")
var/mob/living/L2 = pick(GLOB.player_list)
message += " [L2.name]."
to_chat(C, " You feel an overwhelming desire to [message]")
if(2)
visible_message("[src] waves their arms around, \"If only you had a better upbringing, your ears are now full of my singing!\" ")
- C.client.tgui_panel?.play_music("https://puu.sh/ExBbv.mp4")
+ jacqrunes("If only you had a better upbringing, your ears are now full of my singing!", C)
+ C.client.tgui_panel?.play_music("https://katlin.dog/v/spooky.mp4")
if(3)
visible_message("[src] waves their arms around, \"You're cute little bumpkin, On your head is a pumpkin!\" ")
+ jacqrunes("You're cute little bumpkin, On your head is a pumpkin!", C)
if(C.head)
var/obj/item/W = C.head
C.dropItemToGround(W, TRUE)
@@ -344,12 +417,15 @@
C.equip_to_slot(jaqc_latern, SLOT_HEAD, 1, 1)
if(4)
visible_message("[src] waves their arms around, \"In your body there's something amiss, you'll find it's a chem made by my sis!\" ")
+ jacqrunes("In your body there's something amiss, you'll find it's a chem made by my sis!", C)
C.reagents.add_reagent(/datum/reagent/fermi/eigenstate, 30)
if(5)
visible_message("[src] waves their arms around, \"A new familiar for me, and you'll see it's thee!\" ")
- C.reagents.add_reagent("secretcatchem", 30)
+ jacqrunes("A new familiar for me, and you'll see it's thee!", C)
+ C.reagents.add_reagent(/datum/reagent/fermi/secretcatchem, 30)
if(6)
visible_message("[src] waves their arms around, \"While you may not be a ghost, for this sheet you'll always be it's host.\" ")
+ jacqrunes("While you may not be a ghost, for this sheet you'll always be it's host.", C)
var/mob/living/carbon/human/H = C
if(H.wear_suit)
var/obj/item/W = H.wear_suit
@@ -370,22 +446,30 @@
message_admins("[C2]/[C2.key] has agreed to go on a date with [C] as Jacqueline.")
log_game("HALLOWEEN: [C2]/[C2.key] has agreed to go on a date with [C] as Jacqueline")
to_chat(src, "You are Jacqueline the great pumpqueen, witch Extraordinaire! You're a very Scottish lass with a kind heart, but also a little crazy. You also blew up the wizarding school and you're suspended for a while, so you visited the station before heading home. On your head lies the prize pumpkin of your Mother's pumpkin patch. You're currently on a date with [C] and well, I didn't think anyone would get this far. Please be good so I can do events like this in the future. ")
- return
+ canmove()
+ return TRUE
else
candies =- C2
visible_message("[src] looks to the side, \"Look, Ah like ye but, Ah don't think Ah can right now. If ye can't tell, the stations covered in volatile candies, I've a few other laddies and lassies running after me treats, and tae top it all off, I've the gods breathing down me neck, watching every treat Ah make fer the lot of yous.\" she sighs, \"But that's not a no, right? That's.. just a nae right noo.\" ")
+ jacqrunes("Look, Ah like ye but, Ah don't think Ah can right now. If ye can't tell, the stations covered in volatile candies, I've a few other laddies and lassies running after me treats, and tae top it all off, I've the gods breathing down me neck, watching every treat Ah make fer the lot of yous.", C)
sleep(20)
+ jacqrunes("But that's not a no, right? That's.. just a nae right noo.", C)
visible_message("[src] takes off the pumpkin on her head, a rich blush on her cheeks. She leans over planting a kiss upon your forehead quickly befere popping the pumpkin back on her head.")
- sleep(10)
+ sleep(20)
visible_message("[src] waves their arms around, \"There, that aught tae be worth a candy.\" ")
+ jacqrunes("There, that aught tae be worth a candy.", C)
sleep(20)
poof()
/mob/living/simple_animal/jacq/update_mobility()
. = ..()
- if(busy_chatting)
+ if(busy)
DISABLE_BITFIELD(., MOBILITY_MOVE)
- mobility_flags = .
+ else
+ ENABLE_BITFIELD(., MOBILITY_MOVE)
+ mobility_flags = .
+
+
/obj/item/clothing/head/hardhat/pumpkinhead/jaqc
name = "Jacq o' latern"
diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm
index e6fd991169..51e94afb3c 100644
--- a/code/modules/hydroponics/grown/grass_carpet.dm
+++ b/code/modules/hydroponics/grown/grass_carpet.dm
@@ -50,7 +50,7 @@
plantname = "Fairygrass"
product = /obj/item/reagent_containers/food/snacks/grown/grass/fairy
icon_grow = "fairygrass-grow"
- icon_dead = "fairygrass-dead"
+ icon_dead = "grass-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/blue)
mutatelist = list (/obj/item/seeds/grass/carpet)
reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/hydrogen = 0.05, /datum/reagent/drug/space_drugs = 0.15)
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 80ba6b7375..e6d2484632 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -193,6 +193,8 @@
growthstages = 3
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism)
growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
+ icon_grow = "chanter-grow"
+ icon_dead = "chanter-dead"
reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
mutatelist = list(/obj/item/seeds/chanterelle/jupitercup)
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index d6022c1345..aa8a7b60c2 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -285,7 +285,7 @@
else
plant_overlay.icon_state = myseed.icon_harvest
else
- var/t_growthstate = min(round((age / myseed.maturation) * myseed.growthstages), myseed.growthstages)
+ var/t_growthstate = clamp(round((age / myseed.maturation) * myseed.growthstages), 1, myseed.growthstages)
plant_overlay.icon_state = "[myseed.icon_grow][t_growthstate]"
add_overlay(plant_overlay)
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index c69e990033..30a933db39 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -11,8 +11,8 @@
/obj/item/survivalcapsule
name = "bluespace shelter capsule"
desc = "An emergency shelter stored within a pocket of bluespace."
- icon_state = "capsule"
icon = 'icons/obj/mining.dmi'
+ icon_state = "capsule"
w_class = WEIGHT_CLASS_TINY
var/template_id = "shelter_alpha"
var/datum/map_template/shelter/template
@@ -72,9 +72,10 @@
/obj/item/survivalcapsule/luxury
name = "luxury bluespace shelter capsule"
desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace."
+ icon_state = "capsule-lux"
template_id = "shelter_beta"
-/obj/item/survivalcapsule/luxuryelite
+/obj/item/survivalcapsule/luxury/elitebar
name = "luxury elite bar capsule"
desc = "A luxury bar in a capsule. Bartender required and not included."
template_id = "shelter_charlie"
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index b368313400..101b7adafc 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -42,7 +42,7 @@
new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000),
new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000),
- new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1000),
+ new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining/conscript, 1000),
new /datum/data/mining_equipment("1000 Point Transfer Card", /obj/item/card/mining_point_card/mp1000, 1000),
new /datum/data/mining_equipment("1500 Point Transfer Card", /obj/item/card/mining_point_card/mp1500, 1500),
new /datum/data/mining_equipment("2000 Point Transfer Card", /obj/item/card/mining_point_card/mp2000, 2000),
@@ -55,7 +55,7 @@
new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
new /datum/data/mining_equipment("Ice hiking boots", /obj/item/clothing/shoes/winterboots/ice_boots, 2500),
new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
- new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000),
+ new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxury/elitebar, 10000),
new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800),
new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400),
new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400),
@@ -70,9 +70,10 @@
new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000),
new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000),
new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000),
- new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining_cloned, 3000),
+ new /datum/data/mining_equipment("Miner Full Replacement", /obj/item/storage/backpack/duffelbag/mining/cloned, 3000),
new /datum/data/mining_equipment("Premium Accelerator", /obj/item/gun/energy/kinetic_accelerator/premiumka, 8000),
- new /datum/data/mining_equipment("Kinetic Glaive", /obj/item/kinetic_crusher/glaive, 2250),
+ new /datum/data/mining_equipment("Kinetic Glaive Kit", /obj/item/storage/backpack/duffelbag/mining/glaivekit, 2250),
+ new /datum/data/mining_equipment("Survival Dagger", /obj/item/kitchen/knife/combat/survival/knuckledagger, 550),
new /datum/data/mining_equipment("Kinetic Destroyer", /obj/item/kinetic_crusher/premiumcrusher, 12000), //boop
)
@@ -223,7 +224,7 @@
new /obj/item/extinguisher/mini(drop_location)
new /obj/item/kinetic_crusher(drop_location)
if("Mining Conscription Kit")
- new /obj/item/storage/backpack/duffelbag/mining_conscript(drop_location)
+ new /obj/item/storage/backpack/duffelbag/mining/conscript(drop_location)
SSblackbox.record_feedback("tally", "mining_voucher_redeemed", 1, selection)
qdel(voucher)
@@ -329,11 +330,11 @@
to_chat(user, "You upgrade [I] with mining access.")
qdel(src)
-/obj/item/storage/backpack/duffelbag/mining_conscript
+/obj/item/storage/backpack/duffelbag/mining/conscript
name = "mining conscription kit"
desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
-/obj/item/storage/backpack/duffelbag/mining_conscript/PopulateContents()
+/obj/item/storage/backpack/duffelbag/mining/conscript/PopulateContents()
new /obj/item/pickaxe/mini(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
@@ -348,11 +349,11 @@
//CITADEL ADDITIONS BELOW
-/obj/item/storage/backpack/duffelbag/mining_cloned
+/obj/item/storage/backpack/duffelbag/mining/cloned
name = "mining replacement kit"
- desc = "A large bag that has advance tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even has a new ID!"
+ desc = "A large bag that has advanced tools and a spare jumpsuit, boots, and gloves for a newly cloned miner to get back in the field. Even has a new ID!"
-/obj/item/storage/backpack/duffelbag/mining_cloned/PopulateContents()
+/obj/item/storage/backpack/duffelbag/mining/cloned/PopulateContents()
new /obj/item/pickaxe/mini(src)
new /obj/item/clothing/under/rank/cargo/miner/lavaland(src)
new /obj/item/clothing/shoes/workboots/mining(src)
@@ -370,6 +371,12 @@
new /obj/item/storage/bag/ore(src)
new /obj/item/clothing/glasses/meson/prescription(src)
+/obj/item/storage/backpack/duffelbag/mining/glaivekit
+
+/obj/item/storage/backpack/duffelbag/mining/glaivekit/PopulateContents()
+ new /obj/item/kinetic_crusher/glaive(src)
+ new /obj/item/kitchen/knife/combat/survival/knuckledagger(src)
+
/obj/machinery/mineral/equipment_vendor/proc/RedeemSVoucher(obj/item/suit_voucher/voucher, mob/redeemer)
var/items = list( "Exo-suit" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "exo"),
"SEVA suit" = image(icon = 'icons/obj/clothing/suits.dmi', icon_state = "seva"))
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index c3c0787aa8..2e1ffe718f 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -26,7 +26,8 @@
features = random_features(pref_species?.id, gender)
age = rand(AGE_MIN,AGE_MAX)
-/datum/preferences/proc/update_preview_icon(equip_job = TRUE)
+/datum/preferences/proc/update_preview_icon(current_tab)
+ var/equip_job = (current_tab != 2)
// Determine what job is marked as 'High' priority, and dress them up as such.
var/datum/job/previewJob = get_highest_job()
@@ -45,9 +46,13 @@
mannequin.add_overlay(mutable_appearance('modular_citadel/icons/ui/backgrounds.dmi', bgstate, layer = SPACE_LAYER))
copy_to(mannequin, initial_spawn = TRUE)
- if(previewJob && equip_job)
- mannequin.job = previewJob.title
- previewJob.equip(mannequin, TRUE, preference_source = parent)
+ if(current_tab == 3)
+ //give it its loadout if not on the appearance tab
+ SSjob.equip_loadout(parent.mob, mannequin, FALSE, bypass_prereqs = TRUE, can_drop = FALSE)
+ else
+ if(previewJob && equip_job)
+ mannequin.job = previewJob.title
+ previewJob.equip(mannequin, TRUE, preference_source = parent)
COMPILE_OVERLAYS(mannequin)
parent.show_character_previews(new /mutable_appearance(mannequin))
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm
index a07fdaa5d3..23b1f87bd2 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_face.dm
@@ -2,7 +2,7 @@
// Facial Hair Definitions //
/////////////////////////////
/datum/sprite_accessory/facial_hair
- icon = 'icons/mob/human_face.dmi'
+ icon = 'icons/mob/hair.dmi'
gender = MALE // barf (unless you're a dorf, dorfs dig chix w/ beards :P)
// please make sure they're sorted alphabetically and categorized
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
index 8e4e6ad617..55ab18c20c 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
@@ -2,7 +2,7 @@
// Hair Definitions //
//////////////////////
/datum/sprite_accessory/hair
- icon = 'icons/mob/human_face.dmi' // default icon for all hairs
+ icon = 'icons/mob/hair.dmi' // default icon for all hairs
// please make sure they're sorted alphabetically and, where needed, categorized
// try to capitalize the names please~
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index cbf2099cfa..b06a586041 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -128,6 +128,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/datum/action/innate/flight/fly //the actual flying ability given to flying species
var/wings_icon = "Angel" //the icon used for the wings
+ //the type of eyes this species has
+ var/eye_type = "normal"
///////////
// PROCS //
@@ -542,7 +544,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/mutable_appearance/hair_overlay = mutable_appearance(layer = -HAIR_LAYER)
if(!hair_hidden && !H.getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain
if(!(NOBLOOD in species_traits))
- hair_overlay.icon = 'icons/mob/human_face.dmi'
+ hair_overlay.icon = 'icons/mob/hair.dmi'
hair_overlay.icon_state = "debrained"
else if(H.hair_style && (HAIR in species_traits))
@@ -601,7 +603,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(HD && !(HAS_TRAIT(H, TRAIT_HUSK)))
// lipstick
if(H.lip_style && (LIPS in species_traits))
- var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[H.lip_style]", -BODY_LAYER)
+ var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/lips.dmi', "lips_[H.lip_style]", -BODY_LAYER)
lip_overlay.color = H.lip_color
if(OFFSET_LIPS in H.dna.species.offset_features)
@@ -614,10 +616,17 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(!(NOEYES in species_traits))
var/has_eyes = H.getorganslot(ORGAN_SLOT_EYES)
if(!has_eyes)
- standing += mutable_appearance('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER)
+ standing += mutable_appearance('icons/mob/eyes.dmi', "eyes_missing", -BODY_LAYER)
else
- var/mutable_appearance/left_eye = mutable_appearance('icons/mob/human_face.dmi', "left_eye", -BODY_LAYER)
- var/mutable_appearance/right_eye = mutable_appearance('icons/mob/human_face.dmi', "right_eye", -BODY_LAYER)
+ var/left_state = DEFAULT_LEFT_EYE_STATE
+ var/right_state = DEFAULT_RIGHT_EYE_STATE
+ message_admins("okay so our eye type is [eye_type] and we can index it to know [GLOB.eye_types[eye_type]]")
+ if(eye_type in GLOB.eye_types)
+ message_admins("to know that it's in!")
+ left_state = eye_type + "_left_eye"
+ right_state = eye_type + "_right_eye"
+ var/mutable_appearance/left_eye = mutable_appearance('icons/mob/eyes.dmi', left_state, -BODY_LAYER)
+ var/mutable_appearance/right_eye = mutable_appearance('icons/mob/eyes.dmi', right_state, -BODY_LAYER)
if((EYECOLOR in species_traits) && has_eyes)
left_eye.color = "#" + H.left_eye_color
right_eye.color = "#" + H.right_eye_color
diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
index 7e51653a66..a40693c7e9 100644
--- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
@@ -22,3 +22,5 @@
species_type = "insect"
allowed_limb_ids = list("insect","apid","moth","moth_not_greyscale")
+
+ eye_type = "insect"
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 6e0fdf7c9c..8c3419ffe0 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -951,7 +951,7 @@ use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if
if(HD && !(HAS_TRAIT(src, TRAIT_HUSK)))
// lipstick
if(lip_style && (LIPS in dna.species.species_traits))
- var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/human_face.dmi', "lips_[lip_style]", -BODY_LAYER)
+ var/mutable_appearance/lip_overlay = mutable_appearance('icons/mob/lips.dmi', "lips_[lip_style]", -BODY_LAYER)
lip_overlay.color = lip_color
if(OFFSET_LIPS in dna.species.offset_features)
lip_overlay.pixel_x += dna.species.offset_features[OFFSET_LIPS][1]
@@ -962,10 +962,17 @@ use_mob_overlay_icon: if FALSE, it will always use the default_icon_file even if
if(!(NOEYES in dna.species.species_traits))
var/has_eyes = getorganslot(ORGAN_SLOT_EYES)
if(!has_eyes)
- add_overlay(mutable_appearance('icons/mob/human_face.dmi', "eyes_missing", -BODY_LAYER))
+ add_overlay(mutable_appearance('icons/mob/eyes.dmi', "eyes_missing", -BODY_LAYER))
else
- var/mutable_appearance/left_eye = mutable_appearance('icons/mob/human_face.dmi', "left_eye", -BODY_LAYER)
- var/mutable_appearance/right_eye = mutable_appearance('icons/mob/human_face.dmi', "right_eye", -BODY_LAYER)
+ var/left_state = DEFAULT_LEFT_EYE_STATE
+ var/right_state = DEFAULT_RIGHT_EYE_STATE
+ if(dna.species)
+ var/eye_type = dna.species.eye_type
+ if(GLOB.eye_types[eye_type])
+ left_state = eye_type + "_left_eye"
+ right_state = eye_type + "_right_eye"
+ var/mutable_appearance/left_eye = mutable_appearance('icons/mob/eyes.dmi', left_state, -BODY_LAYER)
+ var/mutable_appearance/right_eye = mutable_appearance('icons/mob/eyes.dmi', right_state, -BODY_LAYER)
if((EYECOLOR in dna.species.species_traits) && has_eyes)
left_eye.color = "#" + left_eye_color
right_eye.color = "#" + right_eye_color
diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm
index 1e00815f24..bfe04c8622 100644
--- a/code/modules/mob/living/carbon/monkey/update_icons.dm
+++ b/code/modules/mob/living/carbon/monkey/update_icons.dm
@@ -34,7 +34,7 @@
hair_hidden = 1
if(!hair_hidden)
if(!getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain
- overlays_standing[HAIR_LAYER] = mutable_appearance('icons/mob/human_face.dmi', "debrained", -HAIR_LAYER)
+ overlays_standing[HAIR_LAYER] = mutable_appearance('icons/mob/human_parts.dmi', "debrained", -HAIR_LAYER)
apply_overlay(HAIR_LAYER)
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 954e968bd7..ae045dbd26 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -22,7 +22,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
icon_state = "magicbase"
icon_living = "magicbase"
icon_dead = "magicbase"
- speed = 0
+ speed = -0.5
blood_volume = 0
a_intent = INTENT_HARM
stop_automated_movement = 1
@@ -511,7 +511,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
var/used_message = "All the cards seem to be blank now. "
var/failure_message = "..And draw a card! It's...blank? Maybe you should try again later. "
var/ling_failure = "The deck refuses to respond to a souless creature such as you. "
- var/list/possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
+ var/list/possible_guardians = list("Assassin", "Chaos", "Gravitokinetic", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
var/random = TRUE
var/allowmultiple = FALSE
var/allowling = TRUE
@@ -559,6 +559,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
if("Chaos")
pickedtype = /mob/living/simple_animal/hostile/guardian/fire
+ if("Gravitokinetic")
+ pickedtype = /mob/living/simple_animal/hostile/guardian/gravitokinetic
+
if("Standard")
pickedtype = /mob/living/simple_animal/hostile/guardian/punch
@@ -615,10 +618,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
random = FALSE
/obj/item/guardiancreator/choose/dextrous
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
+ possible_guardians = list("Assassin", "Chaos", "Gravitokinetic", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
/obj/item/guardiancreator/choose/wizard
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard")
+ possible_guardians = list("Assassin", "Chaos", "Gravitokinetic", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard")
allowmultiple = TRUE
/obj/item/guardiancreator/tech
@@ -634,7 +637,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
ling_failure = "The holoparasites recoil in horror. They want nothing to do with a creature like you. "
/obj/item/guardiancreator/tech/choose/traitor
- possible_guardians = list("Assassin", "Chaos", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
+ possible_guardians = list("Assassin", "Chaos", "Gravitokinetic", "Charger", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
allowling = FALSE
/obj/item/guardiancreator/tech/choose/traitor/check_uplink_validity()
@@ -644,10 +647,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
random = FALSE
/obj/item/guardiancreator/tech/choose/dextrous
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
+ possible_guardians = list("Assassin", "Chaos", "Gravitokinetic", "Charger", "Dextrous", "Explosive", "Lightning", "Protector", "Ranged", "Standard", "Support")
/obj/item/guardiancreator/tech/choose/nukie // lacks support and protector as encouraging nukies to play turtle isnt fun and dextrous is epic
- possible_guardians = list("Assassin", "Chaos", "Charger", "Dextrous", "Explosive", "Lightning", "Ranged", "Standard")
+ possible_guardians = list("Assassin", "Chaos", "Gravitokinetic", "Charger", "Dextrous", "Explosive", "Lightning", "Ranged", "Standard")
/obj/item/guardiancreator/tech/choose/nukie/check_uplink_validity()
return !used
@@ -666,6 +669,8 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
Explosive : High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.Gravitokinetic : Attacks will apply crushing gravity to the target. Can target the ground as well to slow targets advancing on you, but this will affect the user.Lightning : Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.Protector : Causes you to teleport to it when out of range, unlike other parasites. Has two modes; Combat, where it does and takes medium damage, and Protection, where it does and takes almost no damage but moves slightly slower.Explosive : High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.Gravitokinetic : Attacks will apply crushing gravity to the target. Can target the ground as well to slow targets advancing on you, but this will affect the user.Lightning : Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.Protector : Causes you to teleport to it when out of range, unlike other parasites. Has two modes; Combat, where it does and takes medium damage, and Protection, where it does and takes almost no damage but moves slightly slower.Explosive : High damage resist and medium power attack that may explosively teleport targets. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay.Gravitokinetic : Attacks will apply crushing gravity to the target. Can target the ground as well to slow targets advancing on you, but this will affect the user.Lightning : Attacks apply lightning chains to targets. Has a lightning chain to the user. Lightning chains shock everything near them, doing constant damage.Ranged : Has two modes. Ranged; which fires a constant stream of weak, armor-ignoring projectiles. Scout; Cannot attack, but can move through walls and is quite hard to see. Can lay surveillance snares, which alert it when crossed, in either mode.As a charger type you do medium damage, take half damage, have near immunity to brute damage, move very fast, and can charge at a location, damaging any target hit and forcing them to drop any items they are holding. "
magic_fluff_string = "..And draw the Hunter, an alien master of rapid assault. "
diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
index b9037ff4a4..39a7bfaebd 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
@@ -1,5 +1,7 @@
//Bomb
/mob/living/simple_animal/hostile/guardian/bomb
+ melee_damage_lower = 15
+ melee_damage_upper = 15
damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 0.6, CLONE = 0.6, STAMINA = 0, OXY = 0.6)
playstyle_string = "As an explosive type, you have moderate close combat abilities, take half damage, may explosively teleport targets on attack, and are capable of converting nearby items and objects into disguised bombs via alt click. "
magic_fluff_string = "..And draw the Scientist, master of explosive death. "
diff --git a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
new file mode 100644
index 0000000000..34948d3e0c
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
@@ -0,0 +1,73 @@
+//gravitokinetic
+/mob/living/simple_animal/hostile/guardian/gravitokinetic
+ melee_damage_lower = 15
+ melee_damage_upper = 15
+ damage_coeff = list(BRUTE = 0.75, BURN = 0.75, TOX = 0.75, CLONE = 0.75, STAMINA = 0, OXY = 0.75)
+ playstyle_string = "As a gravitokinetic type, you can alt click to make the gravity on the ground stronger, and punching applies this effect to a target. "
+ magic_fluff_string = "..And draw the Singularity, an anomalous force of terror. "
+ tech_fluff_string = "Boot sequence complete. Gravitokinetic modules loaded. Holoparasite swarm online. "
+ carp_fluff_string = "CARP CARP CARP! Caught one! It's a gravitokinetic carp! Now do you understand the gravity of the situation? "
+ var/list/gravito_targets = list()
+ var/gravity_power_range = 10 //how close the stand must stay to the target to keep the heavy gravity
+
+///Removes gravity from affected mobs upon guardian death to prevent permanent effects
+/mob/living/simple_animal/hostile/guardian/gravitokinetic/death()
+ . = ..()
+ for(var/i in gravito_targets)
+ remove_gravity(i)
+
+/mob/living/simple_animal/hostile/guardian/gravitokinetic/AttackingTarget()
+ . = ..()
+ if(isliving(target) && target != src && target != summoner)
+ to_chat(src, "Your punch has applied heavy gravity to [target]! Everything feels really heavy! ")
+
+/mob/living/simple_animal/hostile/guardian/gravitokinetic/AltClickOn(atom/A)
+ if(isopenturf(A) && is_deployed() && stat != DEAD && in_range(src, A) && !incapacitated())
+ var/turf/T = A
+ if(isspaceturf(T))
+ to_chat(src, "You cannot add gravity to space! ")
+ return
+ visible_message("[src] slams their fist into the [T]! ", "You modify the gravity of the [T]. ")
+ do_attack_animation(T)
+ add_gravity(T, 3)
+ return
+ return ..()
+
+/mob/living/simple_animal/hostile/guardian/gravitokinetic/Recall(forced)
+ . = ..()
+ to_chat(src, "You have released your gravitokinetic powers! As a protector type you cause your summoner to leash to you instead of you leashing to them and have two modes; Combat Mode, where you do and take medium damage, and Protection Mode, where you do and take almost no damage, but move slightly slower. "
@@ -31,9 +33,10 @@
cooldown = world.time + 10
if(toggle)
cut_overlays()
- melee_damage_lower = 15
- melee_damage_upper = 15
- speed = 0
+ add_overlay(cooloverlay) //readd the guardian's colors
+ melee_damage_lower = initial(melee_damage_lower)
+ melee_damage_upper = initial(melee_damage_upper)
+ speed = initial(speed)
damage_coeff = list(BRUTE = 0.4, BURN = 0.4, TOX = 0.4, CLONE = 0.4, STAMINA = 0, OXY = 0.4)
to_chat(src, "You switch to combat mode. As a support type, you have 30% damage reduction and may toggle your basic attacks to a healing mode. In addition, Alt-Clicking on an adjacent object or mob will warp them to your bluespace beacon after a short delay. "
magic_fluff_string = "..And draw the CMO, a potent force of life... and death. "
carp_fluff_string = "CARP CARP CARP! You caught a support carp. It's a kleptocarp! "
@@ -43,15 +45,15 @@
if(src.loc == summoner)
if(toggle)
a_intent = INTENT_HARM
- speed = 0
+ speed = initial(speed)
damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 0.7, CLONE = 0.7, STAMINA = 0, OXY = 0.7)
- melee_damage_lower = 15
- melee_damage_upper = 15
+ melee_damage_lower = initial(melee_damage_lower)
+ melee_damage_upper = initial(melee_damage_upper)
to_chat(src, "You switch to combat mode. You can't do that so fast, slow down. ")
return
- var/list/choices
+ DelayNextAction(CLICK_CD_MELEE, flush = TRUE)
+
+ var/list/lickable = list()
for(var/mob/living/L in view(1))
if(L != src && (!L.ckey || L.client?.prefs.vore_flags & LICKABLE) && Adjacent(L))
- LAZYADD(choices, L)
+ LAZYADD(lickable, L)
+ for(var/mob/living/listed in lickable)
+ lickable[listed] = new /mutable_appearance(listed)
- if(!choices)
+ if(!lickable)
return
- var/mob/living/tasted = input(src, "Who would you like to lick? (Excluding yourself and those with the preference disabled)", "Licking") as null|anything in choices
+ var/mob/living/tasted = show_radial_menu(src, src, lickable, radius = 40, require_near = TRUE)
if(QDELETED(tasted) || (tasted.ckey && !(tasted.client?.prefs.vore_flags & LICKABLE)) || !Adjacent(tasted) || incapacitated(ignore_restraints = TRUE))
return
- DelayNextAction(CLICK_CD_MELEE)
-
visible_message("[src] licks [tasted]! ","You lick [tasted]. They taste rather like [tasted.get_taste_message()]. ","Slurp! ")
/mob/living/proc/get_taste_message(allow_generic = TRUE, datum/species/mrace)
diff --git a/code/modules/vore/eating/vorepanel.dm b/code/modules/vore/eating/vorepanel.dm
index 9cb46d011d..6e3951e60a 100644
--- a/code/modules/vore/eating/vorepanel.dm
+++ b/code/modules/vore/eating/vorepanel.dm
@@ -661,7 +661,7 @@
if(href_list["saveprefs"])
if(!(user.client?.prefs))
return FALSE
- if(!user.client.prefs.save_character())
+ if(!user.copy_to_prefs_vr() || !user.client.prefs.save_character())
to_chat(user, "Belly Preferences not saved! ")
log_admin("Could not save vore prefs on USER: [user].")
else
diff --git a/html/changelogs/AutoChangeLog-pr-13252.yml b/html/changelogs/AutoChangeLog-pr-13252.yml
new file mode 100644
index 0000000000..5de40bb80b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13252.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - tweak: "looking at loadout equips loadout items on your preview image instead of job items"
diff --git a/html/changelogs/AutoChangeLog-pr-13496.yml b/html/changelogs/AutoChangeLog-pr-13496.yml
new file mode 100644
index 0000000000..30308efaff
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13496.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes:
+ - rscadd: "explosions now get broadcasted to deadchat."
diff --git a/html/changelogs/AutoChangeLog-pr-13498.yml b/html/changelogs/AutoChangeLog-pr-13498.yml
new file mode 100644
index 0000000000..f956ee4b07
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13498.yml
@@ -0,0 +1,5 @@
+author: "Bhijn"
+delete-after: True
+changes:
+ - tweak: "Changeling loudness is now determined as an average of all their abilities, rather than the sum"
+ - tweak: "To compensate for this, blood tests now require a loudness value of 1 or higher to detect ling blood. Additionally, blood test explosions are now triggered only when the loudness value is higher than 2."
diff --git a/html/changelogs/AutoChangeLog-pr-13500.yml b/html/changelogs/AutoChangeLog-pr-13500.yml
new file mode 100644
index 0000000000..7ba1eb64f3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13500.yml
@@ -0,0 +1,5 @@
+author: "LetterN"
+delete-after: True
+changes:
+ - rscadd: "2 more ways to get up from z1"
+ - tweak: "tweaked the z2 garden to be less blank"
diff --git a/html/changelogs/AutoChangeLog-pr-13501.yml b/html/changelogs/AutoChangeLog-pr-13501.yml
new file mode 100644
index 0000000000..dcdd868e37
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13501.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Holofirelocks work now."
diff --git a/html/changelogs/AutoChangeLog-pr-13503.yml b/html/changelogs/AutoChangeLog-pr-13503.yml
new file mode 100644
index 0000000000..c68eaf44f0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13503.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: "Survival daggers! A slightly more expensive survival knife that comes with a brighter flashlight. On the blade."
+ - tweak: "Luxury pod capsules look different from normal capsules."
diff --git a/html/changelogs/AutoChangeLog-pr-13504.yml b/html/changelogs/AutoChangeLog-pr-13504.yml
new file mode 100644
index 0000000000..7f59b120b6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13504.yml
@@ -0,0 +1,6 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - rscadd: "gravitokinetic stands from tg"
+ - balance: "buffs stands overall"
+ - bugfix: "protector stands no longer become tposing invisible apes sometimes"
diff --git a/html/changelogs/AutoChangeLog-pr-13509.yml b/html/changelogs/AutoChangeLog-pr-13509.yml
new file mode 100644
index 0000000000..e666a6b2a4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13509.yml
@@ -0,0 +1,6 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - balance: "The \"Skelter ruin\" now has stechkins as opposed to M1911s"
+ - tweak: "Skelter's decorative bullet casings replaced to factor in the change in caliber"
+ - rscadd: "Skelter now has a combat knife and fluff note"
diff --git a/html/changelogs/AutoChangeLog-pr-13511.yml b/html/changelogs/AutoChangeLog-pr-13511.yml
new file mode 100644
index 0000000000..e819d8752d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13511.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - imageadd: "The Syndicate appear to be issuing new revolver variants."
diff --git a/html/changelogs/AutoChangeLog-pr-13512.yml b/html/changelogs/AutoChangeLog-pr-13512.yml
new file mode 100644
index 0000000000..f96f13a156
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13512.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - bugfix: "Cryogenics now screams on common again when your fuckbuddy heads out."
diff --git a/html/changelogs/AutoChangeLog-pr-13513.yml b/html/changelogs/AutoChangeLog-pr-13513.yml
new file mode 100644
index 0000000000..0cff979e8c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13513.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "you can now pick your eye sprites from customization"
diff --git a/html/changelogs/AutoChangeLog-pr-13514.yml b/html/changelogs/AutoChangeLog-pr-13514.yml
new file mode 100644
index 0000000000..bd1605fb96
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13514.yml
@@ -0,0 +1,4 @@
+author: "Thalpy"
+delete-after: True
+changes:
+ - bugfix: "fixes some bugs in jacqs code from edits to the codebase"
diff --git a/html/changelogs/AutoChangeLog-pr-13516.yml b/html/changelogs/AutoChangeLog-pr-13516.yml
new file mode 100644
index 0000000000..30e22f4f48
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13516.yml
@@ -0,0 +1,4 @@
+author: "yorii"
+delete-after: True
+changes:
+ - bugfix: "fixed botany rounding error that caused grass and other plants to misbehave"
diff --git a/html/changelogs/AutoChangeLog-pr-13518.yml b/html/changelogs/AutoChangeLog-pr-13518.yml
new file mode 100644
index 0000000000..565754f48b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13518.yml
@@ -0,0 +1,4 @@
+author: "TheObserver-sys"
+delete-after: True
+changes:
+ - bugfix: "Drake? Where's the dead fairygrass sprite?"
diff --git a/html/changelogs/AutoChangeLog-pr-13519.yml b/html/changelogs/AutoChangeLog-pr-13519.yml
new file mode 100644
index 0000000000..0c4978a7d8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13519.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes:
+ - rscadd: "Lick radial"
diff --git a/html/changelogs/AutoChangeLog-pr-13523.yml b/html/changelogs/AutoChangeLog-pr-13523.yml
new file mode 100644
index 0000000000..ac2019bb88
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13523.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes:
+ - bugfix: "arcade carpets now actually work"
diff --git a/html/changelogs/AutoChangeLog-pr-13526.yml b/html/changelogs/AutoChangeLog-pr-13526.yml
new file mode 100644
index 0000000000..104b76bd94
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13526.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "vore prefs save now"
diff --git a/html/statbrowser.html b/html/statbrowser.html
index fbdbb61449..0920081fd2 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -7,149 +7,172 @@