diff --git a/GainStation13/code/machinery/feeding_tube.dm b/GainStation13/code/machinery/feeding_tube.dm index d2bf6ab1..293e8f98 100644 --- a/GainStation13/code/machinery/feeding_tube.dm +++ b/GainStation13/code/machinery/feeding_tube.dm @@ -1,6 +1,6 @@ /obj/machinery/iv_drip/feeding_tube name = "\improper Feeding tube" - desc = "something something test." + desc = "Originally meant to automatically feed cattle and farm animals, this model was repurposed for more... personal usage." icon = 'icons/obj/feeding_tube.dmi' icon_state = "feeding_tube" var/static/list/food_containers = typecacheof(list(/obj/item/reagent_containers/food, diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index eef926bf..84683a2a 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -186,7 +186,7 @@ "Hp" = (/obj/structure/reagent_dispensers/keg/mead,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "HQ" = (/obj/structure/sign/poster/contraband/chonk,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "Iq" = (/obj/machinery/chem_master/condimaster{name = "CondiMaster Neo"},/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) -"It" = (/obj/machinery/cryopod{dir = 8},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"It" = (/obj/machinery/cryopod/feederden{dir = 8},/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) "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) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2dc4e4ff..8dd28c93 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -1655,9 +1655,9 @@ "aFS" = (/obj/effect/spawner/lootdrop/maintenance,/obj/structure/rack,/turf/open/floor/plating,/area/maintenance/starboard/fore) "aFT" = (/obj/structure/rack,/turf/open/floor/plating,/area/maintenance/starboard/fore) "aFU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/structure/rack,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/open/floor/plating,/area/maintenance/starboard/fore) -"aFV" = (/obj/machinery/cryopod{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 5},/obj/machinery/power/apc{areastring = "/area/crew_quarters/cryopod"; dir = 8; name = "Cryogenics APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/cryopod) +"aFV" = (/obj/effect/turf_decal/stripes/line{dir = 5},/obj/machinery/power/apc{areastring = "/area/crew_quarters/cryopod"; dir = 8; name = "Cryogenics APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"},/obj/machinery/cryopod/tele,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "aFW" = (/obj/machinery/computer/cryopod{pixel_y = 26},/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel,/area/crew_quarters/cryopod) -"aFX" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/light{dir = 1; pixel_y = 16},/obj/structure/table,/turf/open/floor/plasteel/freezer,/area/crew_quarters/cryopod) +"aFX" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/machinery/light{dir = 1; pixel_y = 16},/obj/structure/table,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "aFY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/structure/sign/poster/random{pixel_x = 32},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "aFZ" = (/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel,/area/crew_quarters/cryopod) "aGa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plasteel,/area/crew_quarters/dorms) @@ -1666,7 +1666,7 @@ "aGd" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/obj/structure/cable{icon_state = "1-2"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet) "aGe" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/camera{c_tag = "Dormitory South"; dir = 8},/turf/open/floor/plasteel,/area/crew_quarters/dorms) "aGf" = (/obj/machinery/shower{pixel_y = 19},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet) -"aGg" = (/obj/machinery/cryopod{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel/freezer,/area/crew_quarters/cryopod) +"aGg" = (/obj/effect/turf_decal/stripes/line{dir = 4},/obj/machinery/cryopod/tele,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "aGh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel/yellowsiding{dir = 1},/area/crew_quarters/fitness/pool) "aGi" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard/fore) "aGj" = (/obj/machinery/light{dir = 1; pixel_y = 16},/turf/open/floor/carpet,/area/crew_quarters/theatre) @@ -3186,9 +3186,9 @@ "bkc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet) "bkd" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/closed/wall,/area/maintenance/starboard/fore) "bke" = (/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green,/obj/structure/table/glass,/obj/item/reagent_containers/glass/bucket{pixel_x = 3; pixel_y = 3},/obj/item/reagent_containers/glass/bucket,/turf/open/floor/plasteel,/area/hydroponics/garden) -"bkf" = (/obj/machinery/cryopod{dir = 4},/obj/effect/turf_decal/stripes/line{dir = 6},/turf/open/floor/plasteel/freezer,/area/crew_quarters/cryopod) +"bkf" = (/obj/effect/turf_decal/stripes/line{dir = 6},/obj/machinery/cryopod/tele,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "bkg" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/obj/machinery/airalarm{dir = 1; pixel_y = -22},/turf/open/floor/plasteel,/area/crew_quarters/cryopod) -"bkh" = (/obj/structure/table,/obj/item/folder/blue,/obj/item/pen/blue,/obj/machinery/camera{c_tag = "Library South"; dir = 10},/obj/effect/turf_decal/stripes/line{dir = 9},/obj/machinery/light{light_color = "#cee5d2"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/cryopod) +"bkh" = (/obj/structure/table,/obj/item/folder/blue,/obj/item/pen/blue,/obj/machinery/camera{c_tag = "Library South"; dir = 10},/obj/effect/turf_decal/stripes/line{dir = 9},/obj/machinery/light{light_color = "#cee5d2"},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "bki" = (/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet) "bkj" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel/freezer,/area/crew_quarters/toilet) "bkk" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard/fore) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index a9cf98ed..8fd3a43e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -42931,17 +42931,20 @@ /turf/open/space/basic, /area/space/nearstation) "bsa" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = -26 }, -/obj/machinery/vr_sleeper, -/obj/effect/turf_decal/box/white, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/turf/open/floor/wood, /area/crew_quarters/locker) "bsb" = ( /obj/effect/landmark/event_spawn, @@ -47291,7 +47294,16 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "bzz" = ( /obj/structure/table/wood, @@ -53034,25 +53046,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bIX" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" }, -/obj/machinery/vr_sleeper, -/obj/effect/turf_decal/box/white, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/sofa/right, +/turf/open/floor/wood, /area/crew_quarters/locker) "bIY" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/vr_sleeper, -/obj/effect/turf_decal/box/white, -/turf/open/floor/plasteel/dark, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/structure/chair/sofa, +/turf/open/floor/wood, /area/crew_quarters/locker) "bIZ" = ( /obj/effect/turf_decal/tile/neutral, @@ -53780,7 +53790,15 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom) "bKj" = ( -/turf/open/floor/plasteel/showroomfloor, +/obj/machinery/cryopod/tele, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "bKk" = ( /obj/machinery/button/door{ @@ -64678,10 +64696,15 @@ /obj/machinery/airalarm{ pixel_y = 22 }, -/obj/machinery/cryopod{ - dir = 8 +/obj/machinery/cryopod/tele, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "cbs" = ( /obj/effect/turf_decal/tile/red{ @@ -77223,18 +77246,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, /area/space/nearstation) -"cxv" = ( -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/crew_quarters/locker) "cxw" = ( /obj/machinery/computer/cryopod{ dir = 1; pixel_y = -26 }, -/turf/open/floor/plasteel/showroomfloor, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "cxy" = ( /obj/structure/girder, @@ -83734,13 +83758,12 @@ /turf/open/floor/wood, /area/maintenance/port/fore) "gxY" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/vr_sleeper, -/obj/effect/turf_decal/box/white, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/sofa/left, +/turf/open/floor/wood, /area/crew_quarters/locker) "gCn" = ( /obj/effect/spawner/structure/window/reinforced, @@ -85348,6 +85371,14 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/wood, /area/maintenance/port/fore) +"sDr" = ( +/obj/machinery/cryopod/tele, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/locker) "sDw" = ( /obj/structure/sign/warning, /turf/closed/wall/rust, @@ -85961,6 +85992,15 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/prison) +"xtz" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/locker) "xwB" = ( /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -108861,7 +108901,7 @@ bwa bxS arj bzy -bKj +xtz cxw bIV ajd @@ -109118,8 +109158,8 @@ bJk cec bIV cbr -cxv -cxv +sDr +bKj bIV afB cou diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index fc35518a..9612a000 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -366,23 +366,23 @@ "ahd" = (/turf/closed/wall,/area/crew_quarters/cryopod) "ahe" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/firedoor,/turf/open/floor/plating,/area/crew_quarters/cryopod) "ahf" = (/turf/closed/wall/mineral/plastitanium,/area/crew_quarters/fitness/pool) -"ahg" = (/obj/machinery/light{dir = 8},/obj/machinery/cryopod,/obj/machinery/light_switch{pixel_x = -26},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"ahh" = (/obj/machinery/cryopod,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"ahi" = (/obj/machinery/cryopod,/obj/machinery/camera{c_tag = "Fitness Room - Fore"},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"ahj" = (/obj/machinery/cryopod,/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahg" = (/obj/machinery/light{dir = 8},/obj/machinery/light_switch{pixel_x = -26},/obj/machinery/cryopod/tele,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahh" = (/obj/machinery/cryopod/tele,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahi" = (/obj/machinery/camera{c_tag = "Fitness Room - Fore"},/obj/machinery/cryopod/tele,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahj" = (/obj/machinery/light{dir = 4},/obj/machinery/cryopod/tele,/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "ahk" = (/obj/structure/lattice,/turf/closed/wall,/area/crew_quarters/cryopod) -"ahl" = (/obj/machinery/computer/cryopod{dir = 4; pixel_x = -26},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahl" = (/obj/machinery/computer/cryopod{dir = 4; pixel_x = -26},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "ahm" = (/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "ahn" = (/obj/structure/cable/yellow{icon_state = "2-4"},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "aho" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"ahp" = (/obj/machinery/power/apc/auto_name/east,/obj/structure/cable/yellow{icon_state = "0-8"},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahp" = (/obj/machinery/power/apc/auto_name/east,/obj/structure/cable/yellow{icon_state = "0-8"},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "ahq" = (/turf/open/space/basic,/area/space/nearstation) "ahr" = (/obj/docking_port/stationary/random{dir = 4; id = "pod_lavaland3"; name = "lavaland"},/turf/open/space,/area/space/nearstation) -"ahs" = (/obj/machinery/firealarm{dir = 4; pixel_x = -24},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"aht" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"ahu" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"ahv" = (/obj/machinery/light,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) -"ahw" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahs" = (/obj/machinery/firealarm{dir = 4; pixel_x = -24},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"aht" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahu" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahv" = (/obj/machinery/light,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) +"ahw" = (/obj/machinery/airalarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "ahx" = (/obj/machinery/door/airlock/external{name = "Escape Pod Two"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/turf/open/floor/plating,/area/security/prison) "ahy" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor,/turf/open/floor/plating,/area/crew_quarters/cryopod) "ahz" = (/obj/machinery/door/airlock{name = "Cryogenics"},/obj/machinery/door/firedoor,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) @@ -8199,6 +8199,7 @@ "sok" = (/obj/structure/sign/carts,/turf/closed/wall,/area/security/vacantoffice) "sKK" = (/obj/machinery/door/airlock/maintenance{dir = 8; req_one_access_txt = "12;25;46"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/starboard) "sQD" = (/obj/structure/window/reinforced,/obj/structure/flora/junglebush/c,/turf/open/floor/grass,/area/crew_quarters/fitness/pool) +"tcA" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/turf/open/floor/plasteel/dark,/area/crew_quarters/cryopod) "tdj" = (/obj/structure/chair/comfy/black{dir = 8},/turf/open/floor/carpet/orange,/area/crew_quarters/locker) "tfC" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/locker) "tmX" = (/obj/structure/sign/nanotrasen,/turf/closed/wall,/area/hallway/secondary/entry) @@ -8298,7 +8299,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaafaaaaakaaaaaaaaaaafaaaaaaaafaaaaaaaaaaaaaaZacAacBacCaaxaaxaaxacDacEacFacGacHacIacJacKacLaaRacMabeabLabeacNacOacRaaxaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaafaaaaaaaafaaacHAaaaaaacHAaaaaaaaaacHAalKacQahdahdahdahdahdahdahdahdaaaalKacQalKalKahfaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaafabvabvabvabvabvaafabRaafabvabvabvabvabvaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafacSacTacTacTacTacTacTacUaafaafaafaafaaZacVacWacXacYacZadaabeadbabeadcabeaddabeabeabeadeabeabeadfabeadgadhadiaaLaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaaacHAaaaaaacHAaaaaaaaaacHAalKwqSahdahgahhahhahiahhahjahdaaaalKadjahaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaabOabPabPabPabPabQabRabSabTabTabTabTabUaafaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaafaaaaafaaaaaaaaaaakaaaaaaaafaaaaaZadmadnadoadpadqadradsaaRadtadcaduadvadwabeadxaaRadyabeadzabeadAadBadCaaxaaaaafaaaaaaaaaadDaaaaaaaaaaafaaaaafaaaaaaaaaaafaaaaaaaaaaaaaafaafaafaafaafcHAcHAcHAcHAcHAalKaonahkahlahmahnahoahoahpahdahqacQadEadFaaaaaaaaaahraaiaagaaiaafaafaaaaaaaaaaaaaaaaaaaaaaaaaagaafaclaclaclaclaclaafabRaafaclaclaclaclaclaafaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaafaaaaafaafaakaafaafaafaafaaZadJadKadLadMadNadradOaaRadPadQadRadSadTabeadUaaRadTabeacfabeadVadWadXaaxaafaafaafaeqaeqaeqaeqaeqaafaafaaaaafadZadZaeaaebaecadZadZaaaaafaaaaaaaafaaaalKalKalKalKalKalKmhiahdahsahtahuahvahmahwahdaaaalKaedahaaaaaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaiaaaaaaaaaaafaaaaaaaaaabRaaaaaaaaaaafaaaaaaaaaaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaaaaaaaaaaaaafaaaaafaafaakaafaafaafaafaaZadJadKadLadMadNadradOaaRadPadQadRadSadTabeadUaaRadTabeacfabeadVadWadXaaxaafaafaafaeqaeqaeqaeqaeqaafaafaaaaafadZadZaeaaebaecadZadZaaaaafaaaaaaaafaaaalKalKalKalKalKalKmhiahdahsahtahuahvtcAahwahdaaaalKaedahaaaaaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaiaaaaaaaaaaafaaaaaaaaaabRaaaaaaaaaaafaaaaaaaaaaajaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaafaafaaaaafaaaaafaeeaefaeeaafaaaaaaaaZaegaehaeiaaxaejaekaelaemabeadcabeaenadcabeaelaeoadcabeahxabeadcaepaelaaxaafaafaeqaeqaesaeraexaeqaeqaafaafadZadZaetaeuaevaewafeadZadZaafajpajpajpajpaeysQDeONrqUalKqsraiuahdaheahyahzahdaheahAahdalKalKaeAalKaeBaeCaeCaeCaeCaeCaeEaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaagaaaabvabvabvabvabvaafaeFaafabvabvabvabvabvaafaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaafaaaaaaaafaafaafaeeaeGaeeaafaafaaaaaZaeHaeIaeJaaxaeKaeLaeMaeNaeOaePaeQaeRaeSaeTaeUaeVaeWaeXaeYaeZafaafbafdafcaafaeqaeqaffafhafgafgafXaeqaeqaafadZafiafjafkaflafmafnafoadZaafajpafpafqafraeyyclqmcalJalKaiyfCealKaftafuafvalKafyafxafyalKafzafAafBafCafDafDafDafDafDafCaafaafaafaafaafaaaaaaaaaaaaaaaaagaafabOabPabPabPabPabQabRabSabTabTabTabTabUaafaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaeeaeeafEaeeaeeaafaafaaZaaZaaZaaZaaxafFafGafHafIafJafKafLafGafMafNafOafPafKafRafGafSafTafUafVafWaafaeqaabafYagbagaagdagcaadaeqaafageagfaggaghagiagjagkaglagmaafaeyagnagoagpaeyaksgNdgNdastahIagralKagtahBahCagvaguagwagxagyagzagzahPafCafDafDafDafDafDafCaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaagaafaclaclaclaclaclaafabRaafaclaclaclaclaclaaaaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index ff2c82cb..1d734e54 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -10913,10 +10913,8 @@ /obj/machinery/computer/cryopod{ pixel_y = 30 }, -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/plasteel, +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) "avm" = ( /turf/open/floor/plasteel, @@ -11978,6 +11976,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "axv" = ( @@ -14675,15 +14677,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /turf/open/floor/plasteel/white/side, /area/crew_quarters/dorms) "aDk" = ( -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 8 - }, +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) "aDl" = ( /obj/structure/cable{ @@ -57896,10 +57897,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/plasteel, +/obj/machinery/cryopod/tele, +/turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) "fIN" = ( /obj/effect/turf_decal/stripes/line{ @@ -62346,6 +62345,16 @@ /obj/machinery/iv_drip, /turf/open/floor/plating, /area/maintenance/department/science) +"qqw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/dorms) "qtA" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -62970,8 +62979,9 @@ /turf/open/floor/wood, /area/maintenance/department/engine) "rTZ" = ( -/obj/machinery/cryopod{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) @@ -105365,13 +105375,13 @@ aaa asj atl aum -avk -awv +rTZ +qqw axu ays azA -avk -avk +rTZ +rTZ aDj aEe aFa @@ -105624,11 +105634,11 @@ apX apX avl fIu -rTZ +aDk aIh azA -rTZ -rTZ +aDk +aDk aDk aEd aFb diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index 014c1470..41a3686d 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -118,7 +118,7 @@ //property_weights = list("story_potential" = 1, "trust" = 1, "chaos" = 1) high_population_requirement = 15 occurances_max = 1 - chaos_min = 3.0 + chaos_min = 4.0 map_blacklist = list("LayeniaStation.dmm") /datum/dynamic_ruleset/event/pirates/ready(forced = FALSE) @@ -143,9 +143,9 @@ requirements = list(101,20,15,10,10,10,10,10,10,10) high_population_requirement = 15 //property_weights = list("chaos" = 1, "valid" = 1) - earliest_start = 40 MINUTES //Skyrat change. + earliest_start = 60 MINUTES //Skyrat change. occurances_max = 2 - chaos_min = 2.0 + chaos_min = 2.5 ////////////////////////////////////////////// // // @@ -164,7 +164,7 @@ high_population_requirement = 15 earliest_start = 60 MINUTES occurances_max = 2 - chaos_min = 2.5 + chaos_min = 3 ////////////////////////////////////////////// // // @@ -194,13 +194,13 @@ cost = 8 required_enemies = list(3,3,3,2,2,2,1,1,0,0) typepath = /datum/round_event/vent_clog/threatening - chaos_min = 1.7 + chaos_min = 2.0 else if(mode.threat_level > 15 && mode.threat > 15 && prob(30)) name = "Clogged Vents: Catastrophic" cost = 15 required_enemies = list(4,4,4,3,3,3,2,1,1,1) typepath = /datum/round_event/vent_clog/catastrophic - chaos_min = 2.0 + chaos_min = 2.5 else cost = 0 name = "Clogged Vents: Normal" @@ -251,7 +251,7 @@ high_population_requirement = 30 //property_weights = list("extended" = -2) occurances_max = 2 - chaos_min = 1.5 + chaos_min = 3.0 map_blacklist = list("LayeniaStation.dmm") /datum/dynamic_ruleset/event/meteor_wave/ready() @@ -260,19 +260,19 @@ cost = 5 typepath = /datum/round_event/meteor_wave/threatening requirements = list(101,101,30,25,20,20,20,20,20,15) - chaos_min = 1.8 + chaos_min = 3.0 else if(world.time-SSticker.round_start_time > 45 MINUTES && mode.threat_level > 50 && mode.threat >= 40 && prob(30)) name = "Meteor Wave: Catastrophic" cost = 10 typepath = /datum/round_event/meteor_wave/catastrophic required_enemies = list(3,3,3,3,3,2,2,2,2,2) requirements = list(101,101,40,30,30,30,30,30,30,30) - chaos_min = 2.0 + chaos_min = 4.0 else name = "Meteor Wave: Normal" cost = 5 typepath = /datum/round_event/meteor_wave - chaos_min = 1.5 + chaos_min = 2.8 required_enemies = list(2,2,2,2,1,1,1,1,0,0) return ..() @@ -313,8 +313,8 @@ high_population_requirement = 10 repeatable = TRUE //property_weights = list("extended" = 1) - occurances_max = 2 - chaos_min = 1.5 + occurances_max = 1 + chaos_min = 2.5 /datum/dynamic_ruleset/event/anomaly_gravitational name = "Anomaly: Gravitational" @@ -345,7 +345,7 @@ repeatable = TRUE //property_weights = list("extended" = 1) occurances_max = 2 - chaos_min = 1.8 + chaos_min = 2.3 /datum/dynamic_ruleset/event/anomaly_vortex name = "Anomaly: Vortex" @@ -376,7 +376,7 @@ typepath = /datum/round_event/ghost_role/operative required_enemies = list(0,0,0,0,0,0,0,0,0,0) weight = 0 //This is changed in nuclearbomb.dm - occurances_max = 3 + occurances_max = 1 requirements = list(10,10,10,10,10,10,10,10,10,10) //SECURE THAT DISK cost = 50 chaos_min = 4 @@ -414,7 +414,7 @@ repeatable = TRUE //property_weights = list("extended" = -1, "chaos" = 1) occurances_max = 1 - chaos_min = 1.8 + chaos_min = 2.2 /datum/dynamic_ruleset/event/carp_migration name = "Carp Migration" @@ -527,7 +527,7 @@ // occurances_max = 2 // chaos_min = 1.0 -// /datum/dynamic_ruleset/event/radiation_storm +// /datum/dynamic_ruleset/event/radiation_storm //commented out by GS13 // name = "Radiation Storm" // //config_tag = "radiation_storm" // typepath = /datum/round_event/radiation_storm @@ -555,7 +555,7 @@ earliest_start = 120 MINUTES //property_weights = list("teamwork" = 1,"chaos" = 1, "extended" = -1) occurances_max = 1 - chaos_min = 1.5 + chaos_min = 3.0 /datum/dynamic_ruleset/event/wormholes @@ -587,7 +587,7 @@ high_population_requirement = 5 //property_weights = list("extended" = -2) occurances_max = 1 - chaos_min = 1.5 + chaos_min = 4.0 map_blacklist = list("LayeniaStation.dmm") /datum/dynamic_ruleset/event/sentient_disease @@ -619,7 +619,7 @@ high_population_requirement = 15 //property_weights = list("story_potential" = -2, "extended" = -1) occurances_max = 1 //Skyrat change. - chaos_min = 2.5 + chaos_min = 3.0 /datum/dynamic_ruleset/event/immovable_rod name = "Immovable Rod" @@ -633,7 +633,7 @@ occurances_max = 2 weight = 3 repeatable_weight_decrease = 2 - chaos_min = 2.5 + chaos_min = 3.0 var/atom/special_target map_blacklist = list("LayeniaStation.dmm") @@ -649,7 +649,7 @@ occurances_max = 2 weight = 3 repeatable_weight_decrease = 2 - chaos_min = 2.0 + chaos_min = 2.5 var/atom/special_target map_whitelist = list("LayeniaStation.dmm") @@ -686,7 +686,7 @@ high_population_requirement = 0 weight = 10 repeatable = TRUE - occurances_max = 6 + occurances_max = 8 /datum/dynamic_ruleset/event/bureaucratic_error name = "Bureaucratic Error" @@ -759,7 +759,7 @@ weight = 10 repeatable_weight_decrease = 3 repeatable = TRUE - occurances_max = 3 + occurances_max = 2 /datum/dynamic_ruleset/event/grey_tide name = "Grey Tide" @@ -767,7 +767,7 @@ enemy_roles = list("Chief Engineer","Station Engineer","Captain","Atmospheric Technician","AI","Cyborg") required_enemies = list(3,2,2,2,2,2,1,1,1,0) requirements = list(101,101,101,5,5,5,5,5,5,5) - high_population_requirement = 0 + high_population_requirement = 30 repeatable = TRUE weight = 4 repeatable_weight_decrease = 3 @@ -801,12 +801,12 @@ required_enemies = list(2,2,2,1,1,1,1,1,1,0) requirements = list(101,101,10,9,8,7,5,5,5,0) cost = 2 - high_population_requirement = 0 + high_population_requirement = 18 weight = 4 repeatable_weight_decrease = 2 earliest_start = 20 MINUTES repeatable = TRUE - occurances_max = 3 + occurances_max = 2 // /datum/dynamic_ruleset/event/spontaneous_appendicitis // name = "Spontaneous Appendicitis" diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 9e5249de..0e3a9415 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -59,10 +59,10 @@ weight = 7 cost = 5 requirements = list(40,30,20,10,10,10,10,10,10,10) - high_population_requirement = 10 + high_population_requirement = 30 repeatable = TRUE flags = TRAITOR_RULESET - chaos_min = 3.0 + chaos_min = 4.0 ////////////////////////////////////////////// // // diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 0ceb409f..dda33e87 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) var/arrivalToggle = TRUE var/newhead = "%PERSON, %DISP_RANK (%RANK), is the department head." var/newheadToggle = TRUE - var/cryostorage = "%PERSON, %RANK, has been moved into cryogenic storage." // this shouldnt be changed + var/cryostorage = "%PERSON, %RANK, has been teleported back to Central Command." // this shouldnt be changed var/greenlight = "Light_Green" var/pinklight = "Light_Pink" diff --git a/icons/obj/Cryogenic2.dmi b/icons/obj/Cryogenic2.dmi index 58d3ac63..4a976128 100644 Binary files a/icons/obj/Cryogenic2.dmi and b/icons/obj/Cryogenic2.dmi differ diff --git a/modular_citadel/code/game/machinery/cryopod.dm b/modular_citadel/code/game/machinery/cryopod.dm index f8e8665e..e70306ee 100644 --- a/modular_citadel/code/game/machinery/cryopod.dm +++ b/modular_citadel/code/game/machinery/cryopod.dm @@ -361,7 +361,7 @@ if(alert(target,"Would you like to enter cryosleep?",,"Yes","No") == "No") return - var/generic_plsnoleave_message = " Please adminhelp before leaving the round, even if there are no administrators online!" + var/generic_plsnoleave_message = "Please make sure you aren't giving other players trouble with your abscence!" if(target == user && world.time - target.client.cryo_warned > 5 * 600)//if we haven't warned them in the last 5 minutes var/caught = FALSE @@ -410,7 +410,7 @@ to_chat(target, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") name = "[name] ([occupant.name])" log_admin("[key_name(target)] entered a stasis pod.") - message_admins("[key_name_admin(target)] entered a stasis pod. (JMP)") + message_admins("[key_name_admin(target)] entered a teleporter pod. (JMP)") add_fingerprint(target) //Attacks/effects. @@ -445,4 +445,40 @@ /obj/machinery/cryopod/syndicate/close_machine(mob/user) ..() - icon_state = "sleeper_s" \ No newline at end of file + icon_state = "sleeper_s" + +//GS13 +/obj/machinery/cryopod/feederden //Pod for Feeder Den - not just for syndies, but for fatsos too + name = "subspace cryogenic sleeper" + desc = "A special mobility sleeper for storing agents in a disclosed location." + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper_s-open" + alert_comms = FALSE + +/obj/machinery/cryopod/feederden/open_machine() + ..() + icon_state = "sleeper_s-open" + +/obj/machinery/cryopod/feederden/close_machine(mob/user) + ..() + icon_state = "sleeper_s" + +/obj/machinery/cryopod/feederden/find_control_computer() //We don't want to store anything + return + + +/obj/machinery/cryopod/tele //lore-friendly cryo thing + name = "Long-range Central Command teleporter" + desc = "A special mobility sleeper for storing agents in a disclosed location." + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "telepod-open" + on_store_message = "has teleported back to Central Command." + on_store_name = "Teleporter Oversight" + +/obj/machinery/cryopod/tele/open_machine() + ..() + icon_state = "telepod-open" + +/obj/machinery/cryopod/tele/close_machine(mob/user) + ..() + icon_state = "telepod" diff --git a/modular_citadel/code/modules/arousal/organs/anus.dm b/modular_citadel/code/modules/arousal/organs/anus.dm index 284e4db6..1228495a 100644 --- a/modular_citadel/code/modules/arousal/organs/anus.dm +++ b/modular_citadel/code/modules/arousal/organs/anus.dm @@ -49,7 +49,7 @@ if(10) size_name = "gargantuan" if(11) - size_name = "gargantuan11" + size_name = "omegagigahyper" // might break something (old name: gargantuan11) if(12) size_name = "gargantuan12" if(13)