diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index b40690f4..e3ee8ee4 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -12,7 +12,7 @@ "bU" = (/obj/effect/turf_decal/stripes/red/line{dir = 9},/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/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"cd" = (/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/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},/obj/item/grenade/chem_grenade/lipoifier_weak{pixel_x = -12},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "cw" = (/obj/machinery/light{dir = 8},/turf/open/floor/wood,/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) @@ -69,7 +69,7 @@ "iv" = (/obj/structure/chair/sofa/corner,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "iN" = (/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment,/obj/machinery/processor,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "iO" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"iW" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/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"},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"iW" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/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"},/obj/machinery/light{dir = 1},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "iX" = (/obj/structure/chair/sofa,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "jh" = (/obj/structure/table,/obj/machinery/disposal/bin{pixel_y = -10},/obj/structure/disposalpipe/trunk{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "jI" = (/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) @@ -114,7 +114,7 @@ "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) "pO" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/meat/bacon,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "qh" = (/obj/machinery/food_cart,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"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) +"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"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/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{dir = 8},/obj/item/flashlight/seclite,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/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) @@ -184,7 +184,7 @@ "yk" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/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"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/obj/machinery/light{light_color = "#cee5d2"},/obj/item/storage/bag/plants,/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) -"zg" = (/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"zg" = (/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "zl" = (/obj/machinery/autolathe/hacked,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "zs" = (/obj/machinery/light/small{dir = 4; light_color = "#d8b1b1"},/turf/open/floor/circuit/red,/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) @@ -271,14 +271,14 @@ "Mi" = (/obj/structure/disposalpipe/segment{dir = 10},/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) -"MW" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"MW" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/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,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Ng" = (/obj/structure/closet/wardrobe/mixed,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Nk" = (/obj/structure/reagent_dispensers/keg/aphro,/obj/effect/turf_decal{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Nt" = (/obj/machinery/light{dir = 1},/obj/structure/table,/obj/machinery/plantgenes{pixel_y = 6},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Nv" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/burger/superbite,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "Nx" = (/obj/structure/sign/poster/contraband/corn_oil,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) -"Nz" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"Nz" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/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},/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) @@ -300,12 +300,13 @@ "Ra" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Rc" = (/obj/machinery/computer/camera_advanced/abductor/feeder,/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 10},/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "Rh" = (/obj/structure/table,/obj/machinery/microwave,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"Rp" = (/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) +"Rp" = (/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"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Rr" = (/obj/structure/table/abductor,/obj/item/abductor/gizmo/feeder,/obj/item/abductor/gizmo/feeder,/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 6},/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "Ru" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_north"},/obj/effect/turf_decal/tile/red,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Rw" = (/obj/machinery/atmospherics/components/unary/outlet_injector/on{dir = 8; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plating/airless,/area/ruin/space/has_grav/feedersden) "Rz" = (/obj/structure/railing{dir = 1},/turf/open/floor/plasteel/stairs/left{dir = 8},/area/ruin/space/has_grav/feedersden) "RC" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8; piping_layer = 3; pixel_x = 5; pixel_y = 5},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"RU" = (/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"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Sh" = (/obj/machinery/telecomms/relay/preset/ruskie{use_power = 0},/obj/item/multitool{pixel_x = 8},/turf/open/floor/circuit/red,/area/ruin/space/has_grav/feedersden) "Sm" = (/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Sp" = (/obj/structure/sign/warning/radiation{pixel_y = -31},/obj/structure/cable,/obj/machinery/power/rtg/advanced/fullupgrade,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) @@ -340,7 +341,7 @@ "WN" = (/obj/structure/rack/shelf,/obj/item/reagent_containers/food/snacks/syndicake,/obj/item/reagent_containers/food/snacks/syndicake,/obj/item/reagent_containers/food/snacks/chips,/obj/item/reagent_containers/food/snacks/chips,/obj/item/reagent_containers/food/snacks/cornchips,/obj/item/reagent_containers/food/snacks/cornchips,/obj/item/reagent_containers/food/snacks/candy,/obj/item/reagent_containers/food/snacks/candy,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "WZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Xa" = (/obj/structure/table/wood,/obj/item/card/id/syndicate{pixel_y = 14},/obj/item/storage/fancy/cigarettes/cigpack_syndicate{pixel_x = -3},/obj/item/lighter{pixel_x = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"Xh" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/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) +"Xh" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/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"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Xo" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/machinery/vending/kink{free = 1; credits = 30},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "Xs" = (/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"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "XF" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) @@ -379,10 +380,10 @@ FEFEFEFEFEBrBrBrBzOwPVOwTOnEBrBrBrfmISBrBrBrBrnrxPoKWHKRKRTHZWDcBrBrBrBrBrqFBrFE FEFEFEFEFEBrBrDcnrnrqCnrDcDcDcDcDcDcDcDcDcDcDcDcwAoKtffCZcoKNvDcDcDcBrBrBrBrDcDcCnDcDcnrnrnrnrDcBrBrFEFEFEFEFE FEFEFEFEBrBrBrnrzLgaQVlRnrrjybrjDcaqEUzyBuDcXoKTExoKoKJxoKoKOcKKphDcBrDcDcDcDcLVPLhgnrcyFfdelRnrBrBrFEFEFEFEFE FEFEFEFEBrBrBrnrLzkxUEEnqDrSsqsqnrQWoFkKJDgUgooKoKfStbvvADAgoKoKoKDcDcDcbUShnrvHJhvHqDsqUEUEOEnrBrBrFEFEFEFEFE -FEFEFEFEBrBrBrnrNAsqsqsqHQKnsqgLnrXakKkKqtgUegoKoKnrgUgUgUnroKOcoKiWRpCuYXzsnruAsTSmHQMVsqsqTlnrBrBrFEFEFEFEFE +FEFEFEFEBrBrBrnrNAsqsqsqHQKnsqgLnrXakKkKqtgUegoKoKnrgUgUgUnroKOcoKiWRUCuYXzsnruAsTSmHQMVsqsqTlnrBrBrFEFEFEFEFE FEebebebqFBrBrnrfMsqelzCnrLMelwnnrSXXFXFwODcwYrWOclQeSiXGFCcoKoKoKNzItgUeZICnrhlbghTnrelZwCHfMnrBrBrFEFEFEFEFE FEFEFEFEFEBrBrDcnrnrnurkDcgUKHzYDcDcgUdHDcDccwoKoKOcoKoKoKvkrWoKoKNzItDcDcDcDcgUYkzYDcftbxnrnrDcBrBrFEFEFEFEFE -FEFEFEFEFEBrBrBrnrtZlltPwyLoJWMqLoKofbMWMWzgcdRpRpqiRpRpRpXhRpRpRpjOkKkKRzKoLusabcQKzwgnLTmmnrBrBrFEFEFEFEFEFE +FEFEFEFEFEBrBrBrnrtZlltPwyLoJWMqLoKofbMWMWzgcdRURUqiRpRpRUXhRURURUjOkKkKRzKoLusabcQKzwgnLTmmnrBrBrFEFEFEFEFEFE FEFEFEFEfmBrBrBrnrZnNBLvAjNRgZKWNRAjNXTGTGTGTGBDTGXWZhZhZhqquOuOuOuOuOrJZOWrndWrsNnArBxJLfZnnrqFebebebFEFEFEFE FEFEFEfmfmBrBrBrDcDcNJNJDcnrnrnrnrnrnrnrnrnrDcWJiONxgUgUgUuXZpTKDcnrnrQFnrnrnrnrnrnrDciuiuDcDcBrFEFEFEFEFEFEFE FEFEBrZCfmISBrBrBrnrMaEqnrikNggqnrWNYEfncnbanrDxvYFDLNdCsRiNvYSsnrZeIoxCkoPgnrridlkCnrfNginrBrBrBrFEFEFEFEFEFE diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 3c83abb4..9e33677a 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -21940,9 +21940,7 @@ /turf/open/floor/plating, /area/maintenance/central) "aLm" = ( -/obj/structure/chair{ - dir = 8 - }, +/obj/structure/scale, /turf/open/floor/plasteel/dark, /area/medical/medbay/central) "aLn" = ( @@ -22802,13 +22800,11 @@ dir = 4; pixel_x = -26 }, -/obj/machinery/camera{ - c_tag = "Medbay Lobby"; - dir = 4; - name = "medical camera"; - network = list("ss13","medical") - }, /obj/structure/disposalpipe/segment, +/obj/machinery/shower{ + dir = 4; + name = "emergency shower" + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/medbay/central) "aMI" = ( @@ -23811,6 +23807,9 @@ name = "Scrubs, MD"; on = 0 }, +/obj/vehicle/ridden/wheelchair, +/obj/vehicle/ridden/wheelchair, +/obj/vehicle/ridden/wheelchair, /turf/open/floor/plasteel/dark, /area/medical/storage) "aOv" = ( @@ -26170,6 +26169,12 @@ /obj/structure/sign/departments/chemistry{ pixel_x = -32 }, +/obj/machinery/camera{ + c_tag = "Medbay Lobby"; + dir = 4; + name = "medical camera"; + network = list("ss13","medical") + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/medbay/central) "aSc" = ( @@ -30460,7 +30465,6 @@ "aYX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, -/obj/structure/punching_bag, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "aYY" = ( @@ -49156,9 +49160,6 @@ name = "command camera" }, /obj/structure/disposalpipe/segment, -/obj/item/toy/plush/lizardplushie{ - gender = "male" - }, /turf/open/floor/plasteel/dark, /area/bridge) "bDD" = ( @@ -56572,6 +56573,9 @@ }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "bPR" = ( @@ -83397,10 +83401,6 @@ /obj/structure/barricade/wooden/crude, /turf/open/floor/plasteel/dark, /area/quartermaster/warehouse) -"oec" = ( -/obj/machinery/vending/cola/random, -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "ofj" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -84590,7 +84590,7 @@ /turf/open/floor/engine, /area/engine/supermatter) "xlT" = ( -/obj/item/conveyor_construct/treadmill, +/obj/structure/punching_bag, /turf/open/floor/wood, /area/crew_quarters/fitness/recreation) "xmU" = ( @@ -101882,7 +101882,7 @@ cFW awD bKD bLb -btv +xlT btr bvz bvx @@ -102139,7 +102139,7 @@ cuB awD bKH bLb -xlT +btv btu bLW bLC @@ -102917,7 +102917,7 @@ bGT bGT bGT bMx -oec +gWo afz adZ ajd diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 1212e2d8..e7bf15e0 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -120,7 +120,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/autosurgeon/testicles = 1, /obj/item/autosurgeon/vagina = 1, /obj/item/autosurgeon/breasts = 1, - /obj/item/autosurgeon/womb = 1, /obj/item/toy/plush/random = 1, /obj/item/grenade/spawnergrenade/clustaur = 1, /obj/effect/spawner/lootdrop/grille_or_trash = 5 diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 2d225f37..537ab2ca 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -915,8 +915,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Vagina Color:
" dat += "    Change
" dat += "Has Womb:[features["has_womb"] == TRUE ? "Yes" : "No"]" - if(features["has_womb"]) - dat += "Can Get Pregnant:[features["can_get_preg"] == TRUE ? "Yes" : "No"]" dat += "" dat += APPEARANCE_CATEGORY_COLUMN dat += "

Breasts

" diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm index 2cc5c554..b75a9184 100644 --- a/code/modules/surgery/organs/autosurgeon.dm +++ b/code/modules/surgery/organs/autosurgeon.dm @@ -122,7 +122,7 @@ uses = 1 starting_organ = /obj/item/organ/genital/breasts -/obj/item/autosurgeon/womb - desc = "A single use autosurgeon that contains a womb. A screwdriver can be used to remove it, but implants can't be placed back in." - uses = 1 - starting_organ = /obj/item/organ/genital/womb \ No newline at end of file +// /obj/item/autosurgeon/womb +// desc = "A single use autosurgeon that contains a womb. A screwdriver can be used to remove it, but implants can't be placed back in." +// uses = 1 +// starting_organ = /obj/item/organ/genital/womb diff --git a/hyperstation/code/obj/pregnancytester.dm b/hyperstation/code/obj/pregnancytester.dm index 974fda3a..08e765e5 100644 --- a/hyperstation/code/obj/pregnancytester.dm +++ b/hyperstation/code/obj/pregnancytester.dm @@ -1,43 +1,43 @@ -/obj/item/pregnancytest - name = "pregnancy test" - desc = "A one time use small device, used to determine whether someone is pregnant or not." - icon = 'hyperstation/icons/obj/pregnancytest.dmi' - throwforce = 0 - icon_state = "ptest" - var/status = 0 - var/results = "null" - w_class = WEIGHT_CLASS_TINY +// /obj/item/pregnancytest +// name = "pregnancy test" +// desc = "A one time use small device, used to determine whether someone is pregnant or not." +// icon = 'hyperstation/icons/obj/pregnancytest.dmi' +// throwforce = 0 +// icon_state = "ptest" +// var/status = 0 +// var/results = "null" +// w_class = WEIGHT_CLASS_TINY -/obj/item/pregnancytest/attack_self(mob/user) - if(QDELETED(src)) - return - if(!isliving(user)) - return - if(isAI(user)) - return - if(user.stat > 0)//unconscious or dead - return - if(status == 1) - return //Already been used once, pregnancy tests only work once. - test(user) +// /obj/item/pregnancytest/attack_self(mob/user) +// if(QDELETED(src)) +// return +// if(!isliving(user)) +// return +// if(isAI(user)) +// return +// if(user.stat > 0)//unconscious or dead +// return +// if(status == 1) +// return //Already been used once, pregnancy tests only work once. +// test(user) -/obj/item/pregnancytest/proc/force(mob/living/user) - //Force it negative - icon_state = "negative" - name = "[results] pregnancy test" - status = 1 - to_chat(user, "You use the pregnancy test, the display reads negative!") +// /obj/item/pregnancytest/proc/force(mob/living/user) +// //Force it negative +// icon_state = "negative" +// name = "[results] pregnancy test" +// status = 1 +// to_chat(user, "You use the pregnancy test, the display reads negative!") -/obj/item/pregnancytest/proc/test(mob/living/user) +// /obj/item/pregnancytest/proc/test(mob/living/user) - var/obj/item/organ/genital/womb/W = user.getorganslot("womb") - if(W.pregnant == 1) - results = "positive" - icon_state = "positive" - name = "[results] pregnancy test" - status = 1 - to_chat(user, "You use the pregnancy test, the display reads positive!") - else - force(user) \ No newline at end of file +// var/obj/item/organ/genital/womb/W = user.getorganslot("womb") +// if(W.pregnant == 1) +// results = "positive" +// icon_state = "positive" +// name = "[results] pregnancy test" +// status = 1 +// to_chat(user, "You use the pregnancy test, the display reads positive!") +// else +// force(user) diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 0fd46471..9e4a9099 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -18,7 +18,6 @@ /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/toxin = 3, /obj/item/reagent_containers/syringe/antiviral = 6, - /obj/item/pregnancytest = 5, /obj/item/storage/hypospraykit/fire = 2, /obj/item/storage/hypospraykit/toxin = 2, /obj/item/storage/hypospraykit/o2 = 2, diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm index dbe34274..6999fefb 100644 --- a/modular_citadel/code/modules/arousal/arousal.dm +++ b/modular_citadel/code/modules/arousal/arousal.dm @@ -452,23 +452,23 @@ to_chat(src, "You feel deep satisfaction with yourself.") //Hyper - impreg - if(impreg) - //Role them odds, only people with the dicks can send the chance to the person with the settings enabled at the momment. - if(prob(L.impregchance)) - var/obj/item/organ/genital/womb/W = L.getorganslot("womb") - if(W) //check if they have a womb. - if (L.breedable == 1 && W.pregnant == 0) //Dont get pregnant again, if you are pregnant. - log_game("Debug: [L] has been impregnated by [src]") - to_chat(L, "You feel your hormones change, and a motherly instinct take over.") //leting them know magic has happened. - W.pregnant = 1 - if (HAS_TRAIT(L, TRAIT_HEAT)) - SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "heat", /datum/mood_event/heat) //well done you perv. - REMOVE_TRAIT(L, TRAIT_HEAT, ROUNDSTART_TRAIT) //take the heat away, you satisfied it! + // if(impreg) + // //Role them odds, only people with the dicks can send the chance to the person with the settings enabled at the momment. + // if(prob(L.impregchance)) + // var/obj/item/organ/genital/womb/W = L.getorganslot("womb") + // if(W) //check if they have a womb. + // if (L.breedable == 1 && W.pregnant == 0) //Dont get pregnant again, if you are pregnant. + // log_game("Debug: [L] has been impregnated by [src]") + // to_chat(L, "You feel your hormones change, and a motherly instinct take over.") //leting them know magic has happened. + // W.pregnant = 1 + // if (HAS_TRAIT(L, TRAIT_HEAT)) + // SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "heat", /datum/mood_event/heat) //well done you perv. + // REMOVE_TRAIT(L, TRAIT_HEAT, ROUNDSTART_TRAIT) //take the heat away, you satisfied it! - //Make breasts produce quicker. - var/obj/item/organ/genital/breasts/B = L.getorganslot("breasts") - if (B.fluid_mult < 0.5 && B) - B.fluid_mult = 0.5 + // //Make breasts produce quicker. + // var/obj/item/organ/genital/breasts/B = L.getorganslot("breasts") + // if (B.fluid_mult < 0.5 && B) + // B.fluid_mult = 0.5 /mob/living/carbon/human/proc/mob_fill_container(obj/item/organ/genital/G, obj/item/reagent_containers/container, mb_time = 30) //For beaker-filling, beware the bartender diff --git a/strings/abductee_objectives.txt b/strings/abductee_objectives.txt index cf1fec86..9c467a71 100644 --- a/strings/abductee_objectives.txt +++ b/strings/abductee_objectives.txt @@ -13,7 +13,6 @@ You're throwing a huge rager. Make it as awesome as possible so the whole crew c The clown is not funny. You can do better! Steal his audience and make the crew laugh! You burn with passion for music. Share your vision. If anyone hates it, beat them on the head with your instrument! Go have a good conversation with the singularity/tesla/supermatter crystal. Bonus points if it responds. -You are pregnant and soon due. Find a safe place to deliver your baby. Expand the station. So much lies undiscovered. Look deeper into the machinations of the universe. Climb the corporate ladder all the way to the top!