From 966ec0ba238c19b989e2c9d431ff31313332f565 Mon Sep 17 00:00:00 2001 From: evilew Date: Wed, 20 Mar 2024 15:30:45 +0100 Subject: [PATCH] removed racist accents, added pig/cow voice gags - removed italian and asian accents, as they were racist - added pig/cow gag voice modulator: if you put it on, your speech will be turned to animal sounds - placed pig/cow gags into kink vendor and mealdor (contraband) --- GainStation13/code/modules/vending/mealdor.dm | 4 +- GainStation13/code/obj/items/minor_items.dm | 21 +++++ _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 92 +++++++++++-------- _maps/map_files/BoxStation/BoxStation.dmm | 5 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 19 +++- _maps/map_files/gs13/Fast_Food.dmm | 2 +- code/modules/clothing/masks/boxing.dm | 2 +- code/modules/clothing/masks/miscellaneous.dm | 4 +- code/modules/jobs/job_types/cargo_service.dm | 2 +- code/modules/ninja/suit/mask.dm | 2 +- .../code/game/machinery/vending.dm | 8 +- 11 files changed, 109 insertions(+), 52 deletions(-) diff --git a/GainStation13/code/modules/vending/mealdor.dm b/GainStation13/code/modules/vending/mealdor.dm index 3c050243..a355f108 100644 --- a/GainStation13/code/modules/vending/mealdor.dm +++ b/GainStation13/code/modules/vending/mealdor.dm @@ -46,7 +46,9 @@ ) premium = list( /obj/item/reagent_containers/food/drinks/soda_cans/air = 3, - /obj/item/reagent_containers/food/snacks/donut/chaos = 3 + /obj/item/reagent_containers/food/snacks/donut/chaos = 3, + /obj/item/clothing/mask/cowmask/gag = 2, + /obj/item/clothing/mask/pig/gag = 2 ) refill_canister = /obj/item/vending_refill/mealdor diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index a8eda62c..32afc828 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -122,3 +122,24 @@ layer = ABOVE_OPEN_TURF_LAYER pixel_y = -16 pixel_x = -16 + + +//collar voice modulators, based on cow/pig masks + +/obj/item/clothing/mask/pig/gag //this one only lets you say "oink" and similar + name = "Voice modulator - pig" + desc = "A small gag, used to silence people in a rather 'original' way." + icon_state = "ballgag" + item_state = "ballgag" + flags_inv = HIDEFACE + clothing_flags = VOICEBOX_TOGGLABLE + w_class = WEIGHT_CLASS_SMALL + modifies_speech = TRUE + +/obj/item/clothing/mask/cowmask/gag //this one only lets you say "moo" and similar + name = "Voice modulator - cow" + desc = "A small gag, used to silence people in a rather 'original' way." + icon = 'icons/obj/clothing/masks.dmi' + icon_state = "ballgag" + item_state = "ballgag" + flags_inv = HIDEFACE diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index e000bd34..a873a674 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -3,15 +3,15 @@ "aE" = (/obj/structure/rack/shelf,/obj/item/storage/box/donkpockets/donkpockethonk,/obj/item/storage/box/donkpockets/donkpocketpizza{pixel_y = 4},/obj/item/storage/box/donkpockets/donkpocketspicy{pixel_y = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "aM" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/structure/reagent_dispensers/keg/mead,/obj/machinery/light{dir = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "aQ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal{dir = 4},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"ba" = (/obj/structure/rack/shelf,/obj/item/storage/fancy/donut_box{pixel_y = -4},/obj/item/storage/fancy/donut_box,/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/obj/item/autosurgeon/nutripump_turbo,/obj/item/autosurgeon/nutripump_turbo,/obj/item/paper/fluff/ruins/feeder_den/augment_note,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"bo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"ba" = (/obj/structure/rack/shelf,/obj/item/storage/fancy/donut_box{pixel_y = -4},/obj/item/storage/fancy/donut_box,/obj/item/storage/fancy/donut_box{pixel_y = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown,/obj/item/autosurgeon/nutripump_turbo,/obj/item/autosurgeon/nutripump_turbo,/obj/item/paper/fluff/ruins/feeder_den/augment_note,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/pig/gag,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"bo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals8"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "bx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/public/glass{name = "Cell 4"; id_tag = "feederden_cell4"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "bU" = (/obj/structure/chair/sofa/left,/obj/machinery/button/door{name = "Window Shutters North"; id = "feederden_north"; pixel_y = 25},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "bW" = (/obj/structure/closet/secure_closet/freezer/meat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/carpmeat,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/rawbacon,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/item/reagent_containers/food/snacks/meat/slab/bear,/obj/structure/window/reinforced/tinted{dir = 8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "bX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/meter,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "cd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "cn" = (/obj/structure/table,/obj/machinery/recharger,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"cw" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate{pixel_x = -10},/obj/item/clothing/head/helmet/space/syndicate{pixel_x = -10},/obj/item/clothing/mask/gas{pixel_x = -10; pixel_y = 3},/obj/item/clothing/suit/space/syndicate/orange{pixel_x = 8; name = "extra stretchy space suit"},/obj/item/clothing/head/helmet/space/syndicate/orange{pixel_x = 10},/obj/item/clothing/mask/gas{pixel_x = 10; pixel_y = 3},/obj/item/tank/jetpack/carbondioxide/eva,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"cw" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate{pixel_x = -10},/obj/item/clothing/head/helmet/space/syndicate{pixel_x = -10},/obj/item/clothing/mask/gas{pixel_x = -10; pixel_y = 3},/obj/item/clothing/suit/space/syndicate/orange{pixel_x = 8; name = "extra stretchy space suit"},/obj/item/clothing/head/helmet/space/syndicate/orange{pixel_x = 10},/obj/item/clothing/mask/gas{pixel_x = 10; pixel_y = 3},/obj/item/tank/jetpack/carbondioxide/eva,/obj/effect/turf_decal/stripes/white/line{dir = 9},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "cx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "cy" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/food/snacks/store/cake/chocolate,/obj/machinery/light/small{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "cR" = (/obj/machinery/door/airlock/abductor,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) @@ -31,6 +31,7 @@ "eg" = (/obj/effect/mob_spawn/human/feeders_den/fanatic{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "el" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "eE" = (/obj/structure/flora/junglebush/c,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) +"eZ" = (/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "fb" = (/obj/structure/railing{dir = 1},/turf/open/floor/plasteel/stairs/right{dir = 4},/area/ruin/space/has_grav/feedersden) "fh" = (/obj/structure/reagent_dispensers/cooking_oil,/obj/machinery/light/small{brightness = 2; dir = 4},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "fm" = (/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) @@ -46,9 +47,10 @@ "gn" = (/obj/item/trash/can,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "go" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/structure/chair/office/dark{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "gq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"gu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"gu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central6"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "gD" = (/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"; pixel_x = -12; pixel_y = -10},/turf/template_noop,/area/ruin/space/has_grav/feedersden) "gU" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"gZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "hg" = (/obj/structure/sign/poster/contraband/space_cola{pixel_x = -32},/obj/structure/table,/obj/item/reagent_containers/glass/beaker/lipoifier{name = "lipoifier beaker"; pixel_y = -5},/obj/item/reagent_containers/glass/beaker/fizulphite{pixel_x = -8},/obj/item/clothing/glasses/science{pixel_y = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "ie" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/seed_extractor,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "ik" = (/obj/structure/ore_box,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -61,13 +63,14 @@ "jI" = (/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) "jO" = (/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "jS" = (/obj/structure/rack/shelf,/obj/item/electropack/shockcollar,/obj/item/clothing/neck/petcollar,/obj/item/melee/baton/stunsword,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs/cable/zipties,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"ka" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"ka" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "kd" = (/obj/structure/table,/obj/item/kitchen/rollingpin,/obj/item/kitchen/knife/butcher,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "kg" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_south"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "ko" = (/obj/machinery/space_heater,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "kC" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "kK" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "kM" = (/obj/item/bodybag/bluespace,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"ll" = (/obj/item/trash/can,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "ls" = (/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "lR" = (/obj/machinery/iv_drip/feeding_tube,/obj/machinery/light/small{dir = 1},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "ma" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -76,10 +79,11 @@ "mD" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/door/airlock/public/glass{name = "Cell 3"; id_tag = "feederden_cell3"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "mJ" = (/obj/structure/scale/credits,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "mU" = (/obj/structure/sink/kitchen{dir = 8; pixel_x = 11},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"nd" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/store/cake/chocolate{pixel_y = 15},/obj/item/trash/plate{pixel_x = -4; pixel_y = 3},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"nd" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/store/cake/chocolate{pixel_y = 15},/obj/item/trash/plate{pixel_x = -4; pixel_y = 3},/obj/item/clothing/mask/cowmask/gag,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "nr" = (/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "nu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/door/airlock/public/glass{name = "Cell 1"; id_tag = "feederden_cell1"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "nw" = (/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"nA" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "nE" = (/obj/structure/flora/junglebush,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) "nK" = (/obj/machinery/abductor/feeder_console,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "nW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/plantgenes{pixel_y = 6},/obj/structure/table,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -88,6 +92,7 @@ "oS" = (/obj/item/trash/tray{pixel_y = -5; pixel_x = -10},/obj/item/reagent_containers/food/snacks/burger/chicken{pixel_y = -5; pixel_x = -10},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "oY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "pc" = (/turf/open/floor/wood{icon_state = "wood-broken6"},/area/ruin/space/has_grav/feedersden) +"pe" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals3"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals1"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "pf" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/r_wall/syndicate/nodiagonal,/area/ruin/space/has_grav/feedersden) "ph" = (/obj/machinery/vending/gato{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "pl" = (/obj/machinery/porta_turret/fattening,/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -95,38 +100,42 @@ "qi" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "qq" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/light,/obj/structure/disposalpipe/segment{dir = 6},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "qt" = (/obj/effect/mob_spawn/human/feeders_den/fanatic,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"qC" = (/obj/structure/falsewall/plastitanium,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"qC" = (/obj/structure/falsewall/plastitanium,/obj/structure/fans/tiny/invisible,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "qD" = (/obj/machinery/computer/security/telescreen/entertainment,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "qF" = (/obj/structure/lattice,/turf/closed/mineral/random,/area/ruin/unpowered/no_grav) -"qM" = (/obj/structure/closet/crate/secure/weapon,/obj/item/clothing/glasses/hud/health/night,/obj/item/kitchen/knife/combat,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/item/gun/energy/fatoray,/obj/item/book/granter/spell/fattening,/obj/item/gun/energy/laser/alter_ray/gainrate,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"qM" = (/obj/structure/closet/crate/secure/weapon,/obj/item/clothing/glasses/hud/health/night,/obj/item/kitchen/knife/combat,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/item/gun/energy/fatoray,/obj/item/book/granter/spell/fattening,/obj/item/gun/energy/laser/alter_ray/gainrate,/obj/item/ammo_box/c10mm/soporific,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"rf" = (/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "ri" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/components/unary/tank/air,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "rj" = (/obj/structure/reagent_dispensers/keg/milk,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "rk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/public/glass{name = "Cell 1"; id_tag = "feederden_cell1"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "rs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "rt" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"rJ" = (/obj/effect/turf_decal/box/red,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/structure/reagent_dispensers/watertank/high,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"rB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"rJ" = (/obj/effect/turf_decal/box/red,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/structure/reagent_dispensers/watertank/high,/obj/effect/turf_decal/stripes/white/line{dir = 2},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "rS" = (/obj/structure/table/wood,/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{dir = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "rW" = (/obj/structure/table/wood,/obj/item/bdsm_whip/ridingcrop,/obj/item/reagent_containers/pill/butt_enlargement,/obj/item/reagent_containers/pill/butt_enlargement{pixel_x = 3; pixel_y = -3},/obj/item/storage/pill_bottle/breast_enlargement{pixel_y = 5; pixel_x = -5},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) -"sa" = (/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"sa" = (/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "sq" = (/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) -"su" = (/obj/machinery/icecream_vat,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) +"su" = (/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/structure/rack/shelf,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "sC" = (/obj/machinery/vending/hydronutrients,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "sI" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/structure/reagent_dispensers/keg/milk,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) -"sN" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/structure/reagent_dispensers/keg/milk,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"sN" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/structure/reagent_dispensers/keg/milk,/obj/item/reagent_containers/barrel_tank,/obj/item/reagent_containers/barrel_tank,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "sR" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/vending/dinnerware{free = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "sT" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/structure/chair/sofachair,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "tf" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/turf/open/floor/wood{icon_state = "wood-broken7"},/area/ruin/space/has_grav/feedersden) "tj" = (/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "ty" = (/obj/structure/toilet{dir = 4},/obj/machinery/light/small{brightness = 2; dir = 8},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) +"tB" = (/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central7"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_decals4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "tE" = (/obj/structure/filingcabinet,/obj/item/paper/fluff/ruins/feeder_den/report1,/obj/item/paper/fluff/ruins/feeder_den/report2,/obj/item/paper/fluff/ruins/feeder_den/report3,/obj/structure/fluff/paper,/obj/item/paper,/obj/item/paper,/obj/item/paper,/obj/item/paper,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"tH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"tH" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "tI" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "tP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "tV" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/effect/turf_decal{dir = 8},/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "tZ" = (/obj/machinery/vending/mealdor{free = 1},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "uc" = (/obj/structure/rack/shelf,/obj/item/storage/box/donkpockets,/obj/item/storage/box/donkpockets/donkpocketberry{pixel_y = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"uk" = (/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals1"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "uy" = (/obj/machinery/iv_drip/feeding_tube,/obj/machinery/light/small{dir = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) -"uA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"uA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "uF" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high/plus,/obj/structure/cable{icon_state = "1-2"},/obj/item/gps{tracking = 0},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "uO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "uX" = (/obj/machinery/computer/security/telescreen/entertainment,/obj/structure/disposalpipe/segment,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) @@ -139,20 +148,21 @@ "vY" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "wn" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/structure/rack/shelf,/obj/item/storage/box/beakers/bluespace,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "ww" = (/obj/structure/flora/rock,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) -"wy" = (/obj/machinery/button/door{id = "feederden_cell1"; name = "Cell 1 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = -8},/obj/machinery/button/door{id = "feederden_cell2"; name = "Cell 2 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = 8},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"wy" = (/obj/machinery/button/door{id = "feederden_cell1"; name = "Cell 1 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = -8},/obj/machinery/button/door{id = "feederden_cell2"; name = "Cell 2 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = 8},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "wA" = (/obj/structure/table/wood,/obj/item/trash/tray,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "xg" = (/obj/structure/flora/junglebush/large,/obj/item/screwdriver,/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) -"xC" = (/obj/structure/closet/firecloset/full,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"xC" = (/obj/structure/closet/firecloset/full,/obj/effect/turf_decal/stripes/white/line{dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "xG" = (/obj/machinery/iv_drip/feeding_tube,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "xJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "xZ" = (/obj/structure/flora/rock/pile,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) -"yb" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 10},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"yb" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "yg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "yq" = (/obj/structure/ore_box,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/obj/item/stack/sheet/mineral/calorite,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"zc" = (/obj/effect/turf_decal/loading_area{icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "zl" = (/obj/machinery/autolathe/hacked,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "zo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/box/red,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/item/stack/sheet/mineral/uranium,/obj/machinery/power/port_gen/pacman/super,/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "zs" = (/obj/item/twohanded/required/kirbyplants,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"zw" = (/obj/machinery/button/door{id = "feederden_cell4"; name = "Cell 4 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = 8},/obj/machinery/button/door{id = "feederden_cell3"; name = "Cell 3 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = -8},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"zw" = (/obj/machinery/button/door{id = "feederden_cell4"; name = "Cell 4 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = 8},/obj/machinery/button/door{id = "feederden_cell3"; name = "Cell 3 Control"; normaldoorcontrol = 1; specialfunctions = 4; pixel_y = 32; pixel_x = -8},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "zy" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/machinery/light/small{dir = 1},/obj/structure/reagent_dispensers/keg/milk,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "zA" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "zC" = (/obj/item/trash/candy,/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) @@ -162,8 +172,8 @@ "zS" = (/obj/item/reagent_containers/food/snacks/pizzaslice/margherita,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "zY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Aa" = (/obj/structure/fans/tiny,/obj/effect/turf_decal{dir = 4},/obj/effect/turf_decal{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"Ag" = (/obj/structure/closet/emcloset/anchored,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"Aj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Ag" = (/obj/structure/closet/emcloset/anchored,/obj/effect/turf_decal/stripes/white/line{dir = 2},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Aj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "AN" = (/obj/structure/table,/obj/item/reagent_containers/food/snacks/pizza/arnold,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/item/reagent_containers/food/snacks/meat/bacon,/obj/item/reagent_containers/food/condiment/pack/hotsauce,/obj/item/reagent_containers/food/condiment/pack/hotsauce,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Be" = (/obj/item/flashlight/seclite,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Br" = (/turf/closed/mineral/random,/area/ruin/unpowered/no_grav) @@ -201,26 +211,30 @@ "Iq" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "It" = (/obj/machinery/cryopod/feederden{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "IC" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"IG" = (/obj/machinery/vending/clothing{credits = 50},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "IS" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) "Jh" = (/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Jx" = (/obj/item/trash/can,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "JW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Kn" = (/obj/machinery/hydroponics/constructable,/obj/machinery/light{dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"Ko" = (/obj/machinery/light{dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Ko" = (/obj/machinery/light{dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Ku" = (/obj/machinery/vending/mealdor{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "KH" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/door/airlock/public/glass{name = "Cell 2"; id_tag = "feederden_cell2"},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "KK" = (/obj/vehicle/ridden/wheelchair,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "KR" = (/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) -"KW" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"Lf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"KW" = (/obj/machinery/atmospherics/pipe/manifold/supply,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Lf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Lo" = (/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Lu" = (/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Lv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Lz" = (/obj/effect/mob_spawn/human/feeders_den/victim{dir = 4},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "LM" = (/obj/machinery/vending/mealdor{free = 1},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "LN" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/structure/table,/obj/item/reagent_containers/food/condiment/enzyme{layer = 5; pixel_x = -5; pixel_y = 6},/obj/item/reagent_containers/food/condiment/enzyme{layer = 5; pixel_x = 1; pixel_y = 6},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = 3},/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = 9},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"LT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Ma" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -24},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "Md" = (/obj/structure/table,/obj/machinery/microwave,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/button/door{name = "Window Shutters South"; id = "feederden_south"; pixel_y = -25},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Mi" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/closed/wall/r_wall/syndicate/nodiagonal,/area/ruin/space/has_grav/feedersden) -"Mq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Mq" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "MV" = (/obj/item/trash/boritos,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "MY" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/effect/turf_decal/tile/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Ng" = (/obj/structure/closet/wardrobe/mixed,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -229,8 +243,9 @@ "Nx" = (/obj/structure/sign/poster/contraband/corn_oil,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "Nz" = (/obj/structure/window/reinforced/spawner/east,/obj/structure/table/wood,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/item/paper/fluff/ruins/feeder_den/report4,/obj/item/pen/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "NA" = (/obj/structure/sign/poster/contraband/donut_corp{pixel_x = -32},/obj/structure/scale,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) -"NB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"NB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 10},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "NJ" = (/obj/structure/curtain,/obj/effect/turf_decal/tile{dir = 4},/obj/effect/turf_decal/tile{dir = 1},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) +"NR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "NU" = (/obj/machinery/abductor/pad/feeder,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "NX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/railing,/turf/open/floor/plasteel/stairs/left{dir = 4},/area/ruin/space/has_grav/feedersden) "Oc" = (/turf/open/floor/wood{icon_state = "wood-broken"},/area/ruin/space/has_grav/feedersden) @@ -242,7 +257,7 @@ "PL" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "PV" = (/obj/item/paper/fluff/ruins/feeder_den/hidden,/turf/open/floor/plating{icon_state = "panelscorched"},/area/ruin/space/has_grav/feedersden) "QF" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"QK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"QK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "QV" = (/obj/structure/sign/poster/contraband/sun_kist{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "QW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/vending/hydroseeds{slogan_delay = 700},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Ra" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) @@ -266,12 +281,13 @@ "TK" = (/obj/machinery/smartfridge/food,/obj/item/reagent_containers/food/snacks/pastatomato,/obj/item/reagent_containers/food/snacks/sushie_pro,/obj/item/reagent_containers/food/snacks/taco,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "TP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/light{dir = 8},/obj/structure/disposalpipe/segment,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "TU" = (/obj/structure/rack/shelf,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/storage/box/beakers,/obj/item/reagent_containers/food/drinks/soda_cans/tonic,/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko,/obj/item/reagent_containers/food/drinks/soda_cans/starkist,/obj/item/reagent_containers/food/drinks/soda_cans/space_up,/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind,/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,/obj/item/reagent_containers/food/drinks/soda_cans/shamblers,/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy,/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull,/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,/obj/item/reagent_containers/food/drinks/soda_cans/cola,/obj/structure/window/reinforced/tinted{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"TY" = (/obj/structure/rack,/obj/item/storage/bag/ore,/obj/item/t_scanner/adv_mining_scanner/lesser,/obj/item/pickaxe/mini,/obj/item/shovel,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"TY" = (/obj/structure/rack,/obj/item/storage/bag/ore,/obj/item/t_scanner/adv_mining_scanner/lesser,/obj/item/pickaxe/mini,/obj/item/shovel,/obj/effect/turf_decal/stripes/white/line{dir = 10},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "UE" = (/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "UZ" = (/obj/structure/disposaloutlet{dir = 4},/obj/structure/disposalpipe/trunk{dir = 8},/turf/open/floor/plating/airless,/area/ruin/space/has_grav/feedersden) "Ve" = (/obj/structure/flora/junglebush,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) "Vx" = (/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "VF" = (/obj/structure/rack,/obj/effect/spawner/lootdrop/bedsheet,/obj/effect/spawner/lootdrop/bedsheet,/obj/effect/spawner/lootdrop/bedsheet,/obj/effect/spawner/lootdrop/bedsheet,/obj/item/toy/plush/random,/obj/item/toy/plush/random,/obj/item/toy/plush/random,/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"VW" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Wr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/junction/flip,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Ws" = (/obj/machinery/light{dir = 1},/obj/effect/turf_decal{dir = 4},/obj/machinery/airalarm/syndicate{pixel_y = 32},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Wt" = (/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"; pixel_x = 12; pixel_y = -10},/turf/template_noop,/area/ruin/space/has_grav/feedersden) @@ -282,18 +298,20 @@ "XL" = (/turf/closed/mineral/random,/area/ruin/space/has_grav/feedersden) "XP" = (/obj/structure/rack,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/circuitboard/machine/hydroponics,/obj/item/storage/box/disks_plantgene,/obj/item/storage/box/disks_plantgene,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "XW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/light,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"Yh" = (/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals4"},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"Yk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Yp" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"YA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"YA" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "YE" = (/obj/structure/rack,/obj/item/storage/toolbox/syndicate,/obj/item/multitool,/obj/item/clothing/head/welding,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/structure/sign/poster/contraband/syndicate_pistol{pixel_y = 32},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "YN" = (/obj/item/trash/fatoray_scrap1,/obj/structure/sign/warning/securearea{pixel_y = 32},/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) "YU" = (/obj/structure/table,/obj/item/reagent_containers/food/snacks/burger/cheese,/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "YX" = (/obj/structure/rack/shelf,/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/rods/twentyfive,/obj/item/stock_parts/cell/high/plus,/obj/item/stock_parts/cell/high/plus,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"},/obj/item/storage/box/stockparts/deluxe,/obj/item/storage/box/stockparts/deluxe,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Ze" = (/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"Zn" = (/obj/machinery/vending/kink{free = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"Zn" = (/obj/machinery/vending/kink{free = 1; credits = 30},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Zp" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Zw" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "ZC" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) -"ZO" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/turf_decal/box/red,/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"ZO" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/turf_decal/box/red,/obj/structure/medkit_cabinet{pixel_y = 27},/obj/effect/turf_decal/stripes/white/line{dir = 9},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) (1,1,1) = {" FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFE @@ -310,16 +328,16 @@ FEFEFEFEFEFEBrBrBrnrLzUEUEEnqDuysTuynrBrBrBrBrDcnrDcEkfCzSKRoSphKuDcnrDcBrBrBrBr FEFEFEFEFEFEBrBrBrnrNAsqsqsqHQHisqaqnrBrBrDcnrDcsIaMrWndNvKRKRTHpcCuItDcnrDcBrBrnrhgJhGZHQMVsqsqTlnrBrBrFEFEFE FEFEFEebebebqFBrBrnrfMsqelzCnrLMelwnnrBrDcnrgoNzdHExwAvvtfOcrSSpDMoKiWDUbUnrDcBrnrSmrttInrelZwCHfMnrBrBrFEFEFE FEFEFEFEFEFEFEBrBrDcnrnrnurkDcgUKHzYDcnrDctEegvkQFdHoKoKoKoKJxoKKKiWPLkKkKzsDcnrDcgUmDzYDcftbxnrnrDcBrBrFEFEFE -FEFEFEFEFEFEFEBrBrBrnrtZgntPwysaJWMqsaKofbkKkKkKZeRpRpqiRpRpRpXhRpRpjOkKkKkKRzKosasaJWQKzwgntPmmnrBrBrFEFEFEFE -FEFEFEFEFEFEfmBrBrBrnrZnNBLvAjAjuAKWAjAjNXYAYAYAYABDTGXWTGTGTGqquOuOkakakaybDsAjAjAjuAKWAjxJLfZnnrqFebebebFEFE +FEFEFEFEFEFEFEBrBrBrnrtZlltPwyLoJWMqLoKofbkKkKkKZeRpRpqiRpRpRpXhRpRpjOkKkKkKRzKoLusaJWQKzwgnLTmmnrBrBrFEFEFEFE +FEFEFEFEFEFEfmBrBrBrnrZnNBLvAjNRgZKWNRAjNXTGTGTGTGBDTGXWTGTGTGqquOuOkakakaybDsrBYkrBuAnArBxJLfZnnrqFebebebFEFE FEFEFEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrDcWJiONxgUgUgUuXZpTKDcnrnrgqnrnrnrnrnrnrDciuiuDcDcBrFEFEFEFEFE -FEFEFEFEBrZCfmISBrBrBrnrMaEqnrxGNgqtnrWNYEfncnbanrDxvYFDLNdCsRiNvYSsnrrJZOWrkoPgnrridlkCnrfNginrBrBrBrFEFEFEFE -FEFEFEFEBrBrfmfmBrBrBrnrtyEqnrikJhBeWsDOlslslslsvtDxvYSyvYvYvYvwvYmUnrcWmaICrscxtVbXJhkMnrfNdAnrBrBrBrFEFEFEFE +FEFEFEFEBrZCfmISBrBrBrnrMaEqnrikNgqtnrWNYEfncnbanrDxvYFDLNdCsRiNvYSsnrrJZOWrkoPgnrridlkCnrfNginrBrBrBrFEFEFEFE +FEFEFEFEBrBrfmfmBrBrBrnrtyEqnrIGJhBeWsDOlsuklslsvtDxvYSyvYvYvYvwvYmUnrcWmaICrscxtVbXJhkMnrfNdAnrBrBrBrFEFEFEFE FEFEFEFEFEBrwwfmeEBrBrDcnrnrDcnrxGHpNkDOtHguboygaQoYvYvYvYvYvYvwvYkdnrxCTYFHYpDBnrzlJhXPnrnrnrDcBrBrBrFEFEFEFE FEFEFEFEFEBrxZfmfmBrBrBrBrBrDcDcnrnrDcsNlsucaEBPnrvYaDMYMdRhDKjhANYUnrnrnrTPJhYXnrnrRanrnrBrEWYNfmBrBrBrFEFEFE -FEFEFEFEFEFEfmfmBrBrBrBrBrBrnrnKEfWKnrqhlslslsVFDczAnrnrnrkgnrnrnrnrDcAgcwddRCuFnrKnlsdvnrISVefmxZfxBrBrFEFEFE -FEFEFEFEFEFEFEfmBrBrBrBrBrBrnrNUcVcVcRDOlslslsdzPItjfhnroHoHoHdrVxnwAalslsfKJhvHRalslssCkgeEfmFEFEebFEFEFEFEFE -FEFEFEFEFEFEFEFEBrBrBrBrBrBrnrRccVRrnrqMyqzJjSTUbWTxsunroHoHoHdrBVBVAalslscdzoFmEsienWQWEsRwfmFEFEebFEFEFEFEFE +FEFEFEFEFEFEfmfmBrBrBrBrBrBrnrnKEfWKnrqhlslszcVFDczAnrnrnrkgnrnrnrnrDcAgcwddRCuFnrKnVWdvnrISVefmxZfxBrBrFEFEFE +FEFEFEFEFEFEFEfmBrBrBrBrBrBrnrNUcVcVcRDOrfrfYhdzPItjfhnroHoHoHdrVxnwAaYAtBfKJhvHRaukeZsCkgeEfmFEFEebFEFEFEFEFE +FEFEFEFEFEFEFEFEBrBrBrBrBrBrnrRccVRrnrqMyqzJjSTUbWTxsunroHoHoHdrBVBVAaYApecdzoFmEsienWQWEsRwfmFEFEebFEFEFEFEFE FEFEFEFEFEFEFEFEFEBrBrBrBrBrDcnrnrnrDcnrnrnrnrnrnrnrnrpfgDoHWtpfnrnrnrnrnrzEvLvLMivLvLvLMiUZFEFEFEebFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEBrBrBrBrBrBrBrBrBrBrBrBrBrBrXLBrqFebebebebebqFXLBrBrBrBrBrBrBrBrBrBrBrqFebebqFqFFEFEFEFEFE FEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEFEBrBrBrBrBrplfmFEFEFEFEFEFExZEWISfmeEfmBrBrBrBrBrBrBrFEFEFEBrBrFEFEFEFEFE diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2de263ec..7354afdd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -876,7 +876,7 @@ "aqR" = (/obj/structure/table,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/turf/open/floor/plating,/area/maintenance/starboard/fore) "aqS" = (/obj/structure/table,/obj/item/pen,/turf/open/floor/plating,/area/maintenance/starboard/fore) "aqT" = (/obj/structure/chair/stool{pixel_y = 8},/turf/open/floor/plating,/area/maintenance/starboard/fore) -"aqU" = (/obj/item/coin/gold,/obj/item/coin/iron,/turf/open/floor/plating,/area/maintenance/starboard/fore) +"aqU" = (/obj/item/coin/gold,/obj/item/coin/iron,/obj/item/clothing/mask/cowmask/gag,/turf/open/floor/plating,/area/maintenance/starboard/fore) "aqV" = (/obj/structure/closet,/obj/item/coin/iron,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating,/area/maintenance/starboard/fore) "aqW" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/construction/mining/aux_base) "aqX" = (/obj/structure/rack,/obj/item/electronics/airlock,/obj/item/electronics/airlock,/obj/item/electronics/airlock,/obj/item/electronics/airlock,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/wallframe/camera,/obj/item/wallframe/camera,/obj/item/wallframe/camera,/obj/item/wallframe/camera,/obj/item/assault_pod/mining,/obj/machinery/computer/security/telescreen/auxbase{dir = 8; pixel_x = 30},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel,/area/construction/mining/aux_base) @@ -7311,6 +7311,7 @@ "mSV" = (/obj/item/trash/tray,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/grimy,/area/maintenance/starboard/aft) "naR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/flora/ausbushes/reedbush,/turf/open/water,/area/security/courtroom) "ndA" = (/obj/structure/table/wood,/turf/open/floor/carpet,/area/hallway/secondary/entry) +"neL" = (/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/cowmask/gag,/turf/open/floor/plating,/area/maintenance/bar) "nsm" = (/obj/structure/chair/sofa/left{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/grimy,/area/maintenance/starboard/aft) "nzp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/airalarm{pixel_y = 23},/turf/open/floor/wood,/area/security/vacantoffice) "nGb" = (/obj/machinery/door/airlock/grunge,/turf/open/floor/wood,/area/security/vacantoffice) @@ -7560,7 +7561,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaadaaaaadaaaacfaaaaadaaaaadaaaaaQaadaadbObcoUcoVbTLcoWbTLbTLbTLbTLbXRbObcoXcoYcoZkJiclPcjlcpacpbcjlbShbXTcilcpccpdcmUcmUcmUcpecpfcpgcphcpicpjcpkcimbObbObcplcpmcpncmacmacpocppcpqcprcprcprcprcjFbZucpscptcpucpvcpwcpxcpycpzclacgDcpAcjOclccnucpBcpCcpCcaBaadcccbLAciHbOhbOhcpDbKtbOhcpEcpFbOhbOhcpGbOhbOhcpFcpHbSXcpIbODbPWbPWbPWcpJcpKcePclrbYzcgRcpLcgTcgTcgUbODcmzcmzcpMcmzcmzcltcnJcnJcpNcpOcjfcnLcnLcpPcnLcnLcjfcggbXEbXEbXEccDbXEaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaacpQcpRcpSaaacpQcpRcpSaaacpQcpRcpSaaaaaQaaaaaabObcpTbTLcpUbObbObcpVbObbObbObbObckAcpWckAckAcjlclQclQcjlcjlbShbXTcilclScpXcpYcjqcpZclSclSckJcqackMcqbcqccqdcqecqfcqgcqhcqicqjcqkcqlcqmcqntDkcqpcqqcqrcqscqtcqucqvceucqwcqxcgycqycgCcexchCcqzcdtcorcqAcqBcqCcqDcaBaadbOhbOhciHcqEcqFcpDcqGbOhcpEcqHbYucqIcqJcqKbYucqLcqMbXGcqNbODbVYbVYbVYbVYchQcqOcfUcqPchQbVYbVYbVYbVYbODcltcltcltcltcltcltcqQcqQcqRcqScjfcjfcjfcjfcjfcjfcjfcggbXEcqTgWmccDbXEaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaadcpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaadaadaaaaaabObcqWbTLbTLbObcfibTLcqYccNcgjbObcqZcracrbckAcrccmOcmOcmRcjlbWFbXTcilcjqcrdcrecjqcrfcrgcjqckJcrhcricrjcrkcrlcrmcrncrocrpcrqcrrcrscrtcrucrvcrwcrxcppcofcqscrzbZucpscgycrAcrBcrCcrDcrEbZtcrFcrGceCcntcnucrHcpCcpCcaBaadbOhbLAcrIcrJcrKcrLbYmbOhcrMcrNcrOcqMbOCcqMcpHcrPcrQbXGcrRbODciNcgTcgTcrSciPbYzcrTcePcrUcrVbPWbPWbPWbODcrWbZWcrXcrYcrYcltcrZcrZcqRcmDcltcnMcsacoScsbcscbXEcggbXEcsbcsbccDbXEbXEbXEaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaacpQcqVcpSaadcpQcqVcpSaadcpQcqVcpSaaaaadaadaadbObaVjcqXcsdbObcsechfcsfcsgcfjbObcshcracsickAcrccmOcsjcmRcskbWFbXTcilcjqcslcsmcsncsocspcjqcsqcsrcsscstcsucimcsvcswcsxcsycszcsAcsBcsCcsDcpqcsEcsFcsGcqocsIcsJbZucpscsKcsLbZubZucsKcsKcsKchCcsMcsNcorcoscaBcaBcaBcaBaadbOhcovcsOcsPcsQcsRcsSbOhbOhcsTcsUcsVbOCcsWcsXbOhbOhbXGcrRbODckabPWbPWcsYckcbYzcfUbYzcfVcsZbPWbPWcfXbODcsbctactbctcctdcltctectecqRcmDcltctfctgcthctictjctkctlcmIcmIcmIctmctnctoctpaaeaaeaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaacpQcqVcpSaadcpQcqVcpSaadcpQcqVcpSaaaaadaadaadbObaVjcqXcsdbObcsechfcsfcsgcfjbObcshneLcsickAcrccmOcsjcmRcskbWFbXTcilcjqcslcsmcsncsocspcjqcsqcsrcsscstcsucimcsvcswcsxcsycszcsAcsBcsCcsDcpqcsEcsFcsGcqocsIcsJbZucpscsKcsLbZubZucsKcsKcsKchCcsMcsNcorcoscaBcaBcaBcaBaadbOhcovcsOcsPcsQcsRcsSbOhbOhcsTcsUcsVbOCcsWcsXbOhbOhbXGcrRbODckabPWbPWcsYckcbYzcfUbYzcfVcsZbPWbPWcfXbODcsbctactbctcctdcltctectecqRcmDcltctfctgcthctictjctkctlcmIcmIcmIctmctnctoctpaaeaaeaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadcpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaadaadaaaaaabObctqctrctsbObcttctubObctvbObbObctwctxctyckAcjlcpbcpbcjlctzbWFbXTcilcilcilcilcilcilcilcilcimcimcimcimcimcimbObctAbObbObctBctBctBctCctDctEctBctFctGctHcqsbZucdpctIcsKcpwcesbZucaychwcsKchCcsKbYdctJctKcjPaadaadaadaadctLctMctNctOctPctQctQctQctRctSctTcsVctUcsVcsVbOhctVbXGcrRbODbPWbPWbSZctWctXcePctYbYzcgRctZcgTcgTcgUbODbXEcuacubbXEbXEcltcltcltcuccudcltcuecsbcufccDcugbXEcoRbXEbXEcuhbXEbXEbXEbXEaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaQaaQaadaaacpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaaaaadaaaaaacuicujcujcujcujbObbObcukculbObbObbObbObbObbObbXSbXSbXSbXSbObcumcuncgmcuocupcuqcuqcuqcuqcuqcuqcuqcuqcuqcuqcuqcuqcurbTLcttctBcuscutcuucuvcuwctBcuxcuycuzcqscuAcuBcezcuCcuDcuEcuFcuCcuFcuCcuGcsKbYdcuHcuIcuJcuKcuLcuMctMcuNcuOcuPcuQcuRcuScuTctQcuUbLAcuVcuWcuXcuYcuZbXobXocvacvbbODbODbODbODbODbODbODcvcbODbODbODbODbODbODbODcvdcvecvfcvfcvgctkcvhcvicvjcvkbXEbXEbXEbXEcvlbXEbXEcvmbXEcvncvocsbbXEaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaaaaaacvpaaaaaaaaacvpaaaaaaaaacvpaaaaaaaadcuicuicuicvqcvrcvscvtcvubTLcvvcvwcvxchfchfchfchfchfchfchfchfchfchfchfcvychlcvzcvAcqscqscqscqscqscqscqscqscqscqscqscqscqscqscqsctBctBcvBcvCcvDcvEcvFcvGcvHcvIcqscuAcvJcvKcvLcvMcvNcvOcvPbZucvQcvRcvScvTcvUcvVcvWcvXcvYcvZcwacwbcwccwdcwecwfcwgcwhctQbLAbLAcsVcsVbKtcsVcwibLAbLAbXGcwjbZYaaaaaaaaaaaaaaabZYcwkbZYaaaaaaaaaaaaaaabZYcwlcwmcwncwocwpcwqcwrcwrcwscwtcwucwvcwwcwxcwycwzcwAcwBbXEcqUcsbcwCbXEaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e2569e3d..bdc5d08d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -62323,6 +62323,10 @@ /obj/structure/closet/crate, /turf/open/floor/plating, /area/maintenance/department/cargo) +"pMn" = ( +/obj/item/clothing/mask/cowmask/gag, +/turf/open/floor/plating, +/area/maintenance/department/engine) "pMG" = ( /obj/structure/sink{ dir = 8; @@ -63881,6 +63885,10 @@ /obj/structure/sign/warning/docking, /turf/open/floor/plating, /area/hallway/secondary/entry) +"tPP" = ( +/obj/item/clothing/mask/pig/gag, +/turf/open/floor/plating, +/area/maintenance/department/science) "tRc" = ( /obj/structure/ore_box, /turf/open/floor/plating{ @@ -64972,6 +64980,10 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"wEG" = ( +/obj/item/clothing/mask/cowmask/gag, +/turf/open/floor/plating, +/area/maintenance/department/security/brig) "wFT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -65017,6 +65029,7 @@ /obj/effect/spawner/lootdrop/three_course_meal, /obj/effect/spawner/lootdrop/three_course_meal, /obj/structure/closet/crate, +/obj/item/clothing/mask/cowmask/gag, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -82457,7 +82470,7 @@ aaa aaa aiu aiX -ajD +wEG aks aiu ait @@ -87685,7 +87698,7 @@ aQW aRr bWZ bDi -bDi +pMn aSt aQW aht @@ -111577,7 +111590,7 @@ izF bwm qnT lJr -lWy +tPP maW bwm aht diff --git a/_maps/map_files/gs13/Fast_Food.dmm b/_maps/map_files/gs13/Fast_Food.dmm index b082f67f..5e3aaecb 100644 --- a/_maps/map_files/gs13/Fast_Food.dmm +++ b/_maps/map_files/gs13/Fast_Food.dmm @@ -472,7 +472,7 @@ "SK" = (/obj/structure/table/plaswood,/obj/item/trash/tray,/obj/item/reagent_containers/food/snacks/burger/bigbite,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "SM" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "Te" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/sink/kitchen{dir = 4; pixel_x = -11; pixel_y = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) -"Tm" = (/obj/structure/double_bed,/obj/item/restraints/handcuffs/cable/zipties{pixel_y = 6},/obj/item/clothing/mask/muzzle/ballgag{pixel_x = -5; pixel_y = -5},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) +"Tm" = (/obj/structure/double_bed,/obj/item/restraints/handcuffs/cable/zipties{pixel_y = 6},/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/cowmask/gag,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "Tv" = (/obj/machinery/chem_dispenser/drinks/fullupgrade{dir = 8},/obj/item/reagent_containers/glass/beaker/lipoifier{pixel_x = -12; pixel_y = 5},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "TA" = (/obj/machinery/conveyor{dir = 2; id = "fastfood_trash"},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "TC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/item/trash/sosjerky,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_main) diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 3960bdad..06c730ef 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -20,7 +20,7 @@ flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR w_class = WEIGHT_CLASS_SMALL mutantrace_variation = MUTANTRACE_VARIATION - modifies_speech = TRUE + // modifies_speech = TRUE //bad! /obj/item/clothing/mask/luchador/handle_speech(datum/source, list/speech_args) var/message = speech_args[SPEECH_MESSAGE] diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 9f403cdf..f7724bba 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -60,7 +60,7 @@ /obj/item/clothing/mask/fakemoustache/italian name = "italian moustache" desc = "Made from authentic Italian moustache hairs. Gives the wearer an irresistable urge to gesticulate wildly." - modifies_speech = TRUE + // modifies_speech = TRUE //bad! /obj/item/clothing/mask/fakemoustache/italian/handle_speech(datum/source, list/speech_args) var/message = speech_args[SPEECH_MESSAGE] @@ -121,7 +121,7 @@ flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR w_class = WEIGHT_CLASS_SMALL clothing_flags = VOICEBOX_TOGGLABLE - modifies_speech = TRUE + //modifies_speech = TRUE /obj/item/clothing/mask/frog/handle_speech(datum/source, list/speech_args) //whenever you speak if(!CHECK_BITFIELD(clothing_flags, VOICEBOX_DISABLED)) diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index 05b2ba44..43c75071 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -215,7 +215,7 @@ Cook uniform = /obj/item/clothing/under/rank/chef suit = /obj/item/clothing/suit/toggle/chef head = /obj/item/clothing/head/chefhat - mask = /obj/item/clothing/mask/fakemoustache/italian + // mask = /obj/item/clothing/mask/fakemoustache/italian //bad! backpack_contents = list(/obj/item/sharpener = 1) /datum/outfit/job/cook/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index e97e3964..a5bb56c5 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -17,7 +17,7 @@ Contents: item_state = "s-ninja_mask" strip_delay = 120 resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF - modifies_speech = TRUE + //modifies_speech = TRUE //bad! /obj/item/clothing/mask/gas/space_ninja/handle_speech(datum/source, list/speech_args) var/message = speech_args[SPEECH_MESSAGE] diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 67288e4d..0fd46471 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -42,6 +42,8 @@ product_slogans = "Kinky!;Sexy!;Check me out, big boy!" vend_reply = "Have fun, you shameless pervert!" products = list( + /obj/item/clothing/mask/pig/gag = 3, + /obj/item/clothing/mask/cowmask/gag = 3, /obj/item/condom = 10, /obj/item/sounding = 5, /obj/item/clothing/head/maidband = 5, @@ -49,9 +51,9 @@ /obj/item/clothing/under/stripper_pink = 5, /obj/item/clothing/under/stripper_green = 5, /obj/item/dildo/custom = 5, - /obj/item/reagent_containers/pill/penis_enlargement = 3, - /obj/item/reagent_containers/pill/breast_enlargement = 3, - /obj/item/reagent_containers/pill/butt_enlargement = 3, + /obj/item/reagent_containers/pill/penis_enlargement = 5, + /obj/item/reagent_containers/pill/breast_enlargement = 5, + /obj/item/reagent_containers/pill/butt_enlargement = 5, /obj/item/clothing/gloves/latexsleeves = 3, /obj/item/clothing/shoes/highheels = 3, /obj/item/clothing/neck/stole = 2,