diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm index d5386fbf3c..1635f9ead7 100644 --- a/_maps/_basemap.dm +++ b/_maps/_basemap.dm @@ -13,6 +13,7 @@ #include "map_files\BoxStation\BoxStation.dmm" #include "map_files\LambdaStation\lambda.dmm" #include "map_files\SpookyStation\SpookyStation.dmm" + #include "map_files\CogStation\CogStation.dmm" #include "map_files\TauStation\TauStation.dmm" #include "splurt_maps\map_files\Smexistation\Snaxi_Splurt.dmm" diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 85c2f8fe40..0cd907140e 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -55,7 +55,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, -/turf/closed/wall/r_wall/rust, +/turf/closed/wall/r_wall, /area/maintenance/fore) "aaj" = ( /turf/closed/wall/r_wall, @@ -1815,6 +1815,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/science/observatory) "aeD" = ( @@ -2691,6 +2694,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light{ + light_color = "#cee5d2" + }, /turf/open/floor/plasteel/dark, /area/science/observatory) "agN" = ( @@ -4912,8 +4918,17 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "amj" = ( -/turf/closed/wall/rust, -/area/maintenance/port/fore) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel, +/area/security/brig) "amk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6606,9 +6621,6 @@ icon_state = "carpetsymbol" }, /area/service/bar) -"apV" = ( -/turf/closed/wall/rust, -/area/service/chapel/main) "apW" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -6819,8 +6831,10 @@ /turf/open/floor/plating, /area/maintenance/fore) "aqw" = ( -/turf/closed/wall/r_wall/rust, -/area/maintenance/solars/port) +/obj/item/solar_assembly, +/obj/structure/cable, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/starboard/fore) "aqx" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 @@ -7578,9 +7592,6 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"asd" = ( -/turf/closed/wall/rust, -/area/maintenance/starboard/fore) "ase" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -7767,11 +7778,9 @@ /turf/open/pool, /area/commons/fitness/cogpool) "asu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall/rust, -/area/maintenance/disposal) +/obj/machinery/computer/arcade/tetris, +/turf/open/floor/carpet/arcade, +/area/commons/arcade) "asv" = ( /obj/structure/pool/ladder{ dir = 2; @@ -8087,9 +8096,6 @@ }, /turf/open/floor/plasteel/dark, /area/router/service) -"atf" = ( -/turf/closed/wall/r_wall/rust, -/area/maintenance/starboard/central) "atg" = ( /obj/machinery/light{ dir = 1 @@ -8288,9 +8294,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/security/warden) -"atJ" = ( -/turf/closed/wall/rust, -/area/service/theater/clown) "atK" = ( /obj/structure/chair{ dir = 8 @@ -8767,7 +8770,6 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/landmark/start/assistant/override, /turf/open/floor/plasteel, /area/security/office) "auQ" = ( @@ -12306,6 +12308,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plasteel, /area/security/brig) "aCc" = ( @@ -17541,9 +17546,6 @@ icon_state = "carpetsymbol" }, /area/service/bar) -"aMD" = ( -/turf/closed/wall/rust, -/area/maintenance/disposal) "aME" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -18632,12 +18634,6 @@ }, /turf/closed/wall/r_wall, /area/commons/fitness/cogpool) -"aOU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/closed/wall/r_wall/rust, -/area/commons/fitness/cogpool) "aOV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -18693,9 +18689,6 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/service/hydroponics/garden) -"aPe" = ( -/turf/closed/wall/r_wall/rust, -/area/service/hydroponics/garden) "aPf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19000,7 +18993,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/turf/closed/wall/r_wall/rust, +/turf/closed/wall/r_wall, /area/service/hydroponics/garden) "aPO" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on, @@ -19808,9 +19801,6 @@ }, /turf/open/floor/plasteel, /area/tcommsat/computer) -"aRD" = ( -/turf/closed/wall/r_wall/rust, -/area/engineering/gravity_generator) "aRE" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /turf/closed/wall/r_wall, @@ -22691,15 +22681,14 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) "aYh" = ( -/obj/structure/table, /obj/machinery/light{ dir = 4; light_color = "#e8eaff" }, -/obj/item/radio/off, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, +/obj/machinery/vending/wardrobe/bridgeofficer_wardrobe, /turf/open/floor/plasteel, /area/command/bridge) "aYi" = ( @@ -25239,7 +25228,7 @@ icon_state = "1-8" }, /obj/machinery/turretid{ - control_area = "/area/science/server"; + control_area = "/area/science/server/compcore"; icon_state = "control_stun"; name = "Computer Core turret control"; pixel_x = -3; @@ -27991,7 +27980,6 @@ /area/cargo/office) "bjQ" = ( /obj/structure/chair/stool, -/obj/effect/landmark/start/assistant/override, /turf/open/floor/plasteel, /area/cargo/office) "bjR" = ( @@ -28947,11 +28935,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "blP" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 +/obj/effect/landmark/start/assistant, +/obj/structure/chair{ + dir = 8 }, -/turf/closed/wall/rust, -/area/maintenance/department/chapel) +/turf/open/floor/plasteel, +/area/hallway/primary/central) "blQ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northleft{ @@ -29068,7 +29057,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/brown, -/obj/effect/landmark/start/assistant/override, /obj/item/radio/intercom{ name = "Station Intercom (Common)"; pixel_x = 26 @@ -29209,9 +29197,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bmo" = ( -/turf/closed/wall/rust, -/area/maintenance/department/chapel) "bmp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31448,8 +31433,18 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "bqX" = ( -/turf/closed/wall/mineral/titanium/nosmooth, -/area/ai_monitored/turret_protected/ai_upload_foyer) +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/space/basic, +/area/solars/starboard/aft) "bqY" = ( /obj/structure/sign/directions/medical{ pixel_x = -32; @@ -31679,7 +31674,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ - areastring = "/area/engineering/atmos/airaft"; + areastring = "/area/engineering/atmos/aftair"; dir = 8; name = "Aft Air Hookup APC"; pixel_x = -25 @@ -32972,9 +32967,6 @@ }, /turf/open/floor/plating, /area/router) -"but" = ( -/turf/closed/wall/mineral/titanium/nosmooth, -/area/hallway/primary/central) "buu" = ( /obj/structure/table, /turf/open/floor/plating, @@ -33124,7 +33116,7 @@ "buN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/closed/wall/rust, +/turf/closed/wall, /area/service/chapel/main) "buO" = ( /obj/effect/spawner/structure/window/reinforced, @@ -33457,9 +33449,6 @@ /obj/effect/landmark/start/cook, /turf/open/floor/plasteel/freezer, /area/service/kitchen/coldroom) -"bvB" = ( -/turf/closed/wall/r_wall/rust, -/area/router) "bvC" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -35963,8 +35952,18 @@ /turf/closed/wall/r_wall, /area/engineering/main) "bAS" = ( -/turf/closed/wall/r_wall/rust, -/area/maintenance/disposal) +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/security/prison) "bAT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 @@ -36750,12 +36749,15 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"bCL" = ( -/turf/closed/wall/rust, -/area/security/detectives_office) "bCM" = ( -/turf/closed/wall/r_wall/rust, -/area/security/detectives_office) +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" + }, +/obj/structure/table/glass, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "bCN" = ( /obj/structure/filingcabinet, /obj/machinery/light_switch{ @@ -37626,8 +37628,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "bEC" = ( -/obj/structure/table/glass, -/obj/item/storage/fancy/donut_box, +/obj/machinery/computer/shuttle/mining/common, /turf/open/floor/plasteel, /area/hallway/primary/central) "bED" = ( @@ -41588,14 +41589,9 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bMS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/closed/wall/rust, -/area/router) +/obj/machinery/light/floor, +/turf/open/floor/plasteel/dark, +/area/science/observatory) "bMT" = ( /obj/structure/chair/office/light{ dir = 8 @@ -44276,13 +44272,13 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSs" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSt" = ( /obj/machinery/light{ @@ -44291,7 +44287,7 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bSu" = ( /obj/structure/disposalpipe/segment, @@ -45014,9 +45010,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) -"bTY" = ( -/turf/open/floor/mineral/titanium/blue, -/area/hallway/primary/central) "bTZ" = ( /obj/structure/disposalpipe/segment, /obj/structure/lattice, @@ -49593,7 +49586,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/hallway/primary/central) "cdf" = ( /obj/structure/table, @@ -51154,7 +51147,7 @@ /area/engineering/atmos) "cgy" = ( /obj/structure/sign/warning/electricshock, -/turf/closed/wall/rust, +/turf/closed/wall, /area/maintenance/solars/starboard/aft) "cgz" = ( /obj/effect/landmark/event_spawn, @@ -51503,8 +51496,17 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "cho" = ( -/turf/closed/wall/r_wall/rust, -/area/maintenance/department/eva) +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "chp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51602,8 +51604,15 @@ /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "chC" = ( -/turf/closed/wall/r_wall/rust, -/area/space/nearstation) +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "chD" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51639,12 +51648,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel/dark, /area/engineering/teg/coldloop) -"chH" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/turf/closed/wall/r_wall/rust, -/area/maintenance/fore) "chI" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 @@ -52145,12 +52148,13 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/teg/coldloop) -"ciI" = ( -/turf/closed/wall/r_wall/rust, -/area/cargo/warehouse) "ciJ" = ( -/turf/closed/wall/rust, -/area/cargo/warehouse) +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/security/prison) "ciK" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -52433,8 +52437,16 @@ /turf/closed/wall/r_wall, /area/service/theater/mime) "cjq" = ( -/turf/closed/wall/rust, -/area/maintenance/port/central) +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 1" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/structure/fans/tiny, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "cjr" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -53786,11 +53798,26 @@ /turf/open/floor/plasteel, /area/security/checkpoint/supply) "clW" = ( -/turf/closed/wall/rust, -/area/engineering/storage/tech) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/security/brig) "clX" = ( -/turf/closed/wall/rust, -/area/maintenance/starboard/aft) +/obj/structure/lattice, +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/turf/open/space/basic, +/area/solars/starboard/aft) "clY" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/firecloset, @@ -54067,9 +54094,13 @@ /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "cmF" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, -/area/hallway/primary/central) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/table, +/obj/item/radio/off, +/turf/open/floor/plasteel/dark, +/area/command/bridge) "cmG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/disposalpipe/segment{ @@ -55244,6 +55275,9 @@ /obj/machinery/camera{ c_tag = "Central Docking Bay" }, +/obj/structure/chair{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "coR" = ( @@ -55589,10 +55623,6 @@ }, /turf/open/floor/plasteel/white, /area/science/robotics/lab) -"cpx" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/mineral/titanium/blue, -/area/hallway/primary/central) "cpy" = ( /obj/structure/chair{ dir = 1 @@ -55702,8 +55732,13 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "cpJ" = ( -/turf/closed/wall/r_wall/rust, -/area/cargo/office) +/obj/item/solar_assembly, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/starboard/fore) "cpK" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -55894,12 +55929,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/mob/living/simple_animal/hostile/retaliate/goose{ - check_friendly_fire = 1; - desc = "It may not be as wise as an owl, but the Head of Security's pet is far more dangerous."; - faction = list("neutral","silicon","turret","station"); - name = "Officer Snooty" - }, /turf/open/floor/plasteel, /area/security/office) "cqe" = ( @@ -56298,8 +56327,16 @@ /turf/open/floor/plasteel, /area/engineering/teg/coldloop) "cqN" = ( -/turf/closed/wall/rust, -/area/maintenance/department/security) +/obj/machinery/power/solar{ + id = "aftstarboard"; + name = "Aft-Starboard Solar Array" + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/turf/open/floor/plasteel/airless/solarpanel, +/area/solars/starboard/aft) "cqO" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -56552,7 +56589,7 @@ "crk" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/hallway/primary/central) "crl" = ( /obj/structure/rack, @@ -56595,8 +56632,9 @@ /turf/open/floor/plating, /area/medical/chemistry) "cro" = ( -/turf/closed/wall/r_wall/rust, -/area/maintenance/starboard/aft) +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/airless, +/area/solars/starboard/aft) "crp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59593,7 +59631,7 @@ "cwU" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/mineral/titanium/blue, +/turf/open/floor/plasteel, /area/hallway/primary/central) "cwV" = ( /obj/machinery/light{ @@ -61098,7 +61136,7 @@ "czX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/closed/wall/rust, +/turf/closed/wall, /area/maintenance/disposal) "czY" = ( /obj/effect/turf_decal/tile/purple{ @@ -65682,7 +65720,7 @@ /area/medical/genetics) "cHT" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/closed/wall/rust, +/turf/closed/wall, /area/medical/morgue) "cHU" = ( /obj/effect/turf_decal/tile/blue, @@ -68321,8 +68359,12 @@ /turf/open/floor/plating, /area/router/air) "cNo" = ( -/turf/closed/wall/rust, -/area/engineering/workshop) +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/security/prison) "cNp" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red, @@ -70604,6 +70646,9 @@ dir = 1 }, /obj/effect/landmark/start/brigdoc, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/security/brig) "gcF" = ( @@ -70678,9 +70723,6 @@ }, /turf/open/floor/engine/vacuum, /area/engineering/teg/hotloop) -"hwV" = ( -/turf/closed/wall/r_wall/rust, -/area/engineering/teg/hotloop) "hDz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, @@ -70894,7 +70936,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/item/hilbertshotel/ghostdojo, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "mxW" = ( @@ -90298,7 +90339,7 @@ aRe aXS bbb aHF -cQQ +cmF aQW baP bCd @@ -90796,7 +90837,7 @@ awm axc awm ayJ -aqw +abx aGq aJL aUR @@ -91349,7 +91390,7 @@ aaa aaa aaa aaa -aaa +cho aaa aaa aaa @@ -91558,7 +91599,7 @@ ain alt agW aaa -aqw +abx abx aCd aDV @@ -91604,10 +91645,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaU +bdg +cjq +bdg aaU aaU aaU @@ -91861,10 +91902,10 @@ aaa aaa aaa aaU -aaa -aaa -aaa -aaa +aaU +bdg +bjg +bdg aaU aaa aaa @@ -92120,7 +92161,7 @@ aaa aaU bdg bdg -bdg +chC bdg aaU aaa @@ -92377,7 +92418,7 @@ aaa aaU bdg bEC -bgx +beJ bdg aaU aaa @@ -92395,7 +92436,7 @@ aaa aaa aaa aaU -chC +abp abp abp abp @@ -92634,7 +92675,7 @@ bdg bdg bdg beJ -beR +beJ bdg aaU aaa @@ -93661,7 +93702,7 @@ aaa aaa aaU bdg -cmd +bCM beJ bdg aaU @@ -93918,7 +93959,7 @@ aaa aaa aaU bdg -beJ +blP beJ bdg aaU @@ -95934,7 +95975,7 @@ aJt aJN aQg mTf -aew +ciJ ayU aSQ aTg @@ -96191,9 +96232,9 @@ aLf aJO aQi alU -aew +bAS fUg -aSQ +amj aAB aDB asL @@ -96448,9 +96489,9 @@ akv aKa aKw alU -aew +cNo azc -aSQ +clW aAB aDL asL @@ -97240,7 +97281,7 @@ aXG aXR awO aUc -cjq +aQL bcR bcR bcR @@ -98266,10 +98307,10 @@ bcS aQo aXR aQL -cjq aQL aQL -cjq +aQL +aQL aQL aQL aTS @@ -98488,13 +98529,13 @@ ahn ajH ajY alB -amj +aal ape aal ciu aal ape -amj +aal aCM bHd afX @@ -98512,7 +98553,7 @@ csn atc aVZ aXL -cqN +aXM aYq aYt baH @@ -99328,12 +99369,12 @@ aYH bGI bTt bGI -but -but -but -but -but -but +bGI +bGI +bGI +bGI +bGI +bGI bUq bUv bUq @@ -99585,12 +99626,12 @@ cCG cCN coM cpr -cpx -cpx -cpx -cpx -cpx -cpx +bLY +bLY +bLY +bLY +bLY +bLY crV crY crZ @@ -99843,10 +99884,10 @@ bWH bWM bZr cde -cmF +bmL crk -cmF -cmF +bmL +bmL cwU cAT cBA @@ -100099,12 +100140,12 @@ bRy bSA bTw cwW -bTY -bTY -bTY -bTY -bTY -bTY +beJ +beJ +beJ +beJ +beJ +beJ cwX cqY bUE @@ -100356,12 +100397,12 @@ bRB bGI bTt bGI -but -but -but -but -but -but +bGI +bGI +bGI +bGI +bGI +bGI bUq bUv bUq @@ -101122,9 +101163,9 @@ aaa aaa aaa aaU -bqX +aRy bSr -bqX +aRy aaU aaa aaa @@ -101379,9 +101420,9 @@ aaa aaa aaa aaU -bqX +aRy bSs -bqX +aRy aaU aaa aaa @@ -101636,9 +101677,9 @@ aaa aaa aaa aaU -bqX +aRy bSs -bqX +aRy aaU aaa aaa @@ -101893,9 +101934,9 @@ aaa aaa aaa aaU -bqX +aRy bSs -bqX +aRy aaU aaa aaa @@ -102150,9 +102191,9 @@ aaa aaa aaa aaU -bqX +aRy bSs -bqX +aRy aaU aaa aaa @@ -102383,7 +102424,7 @@ aSt aSt bjA aVv -cho +aSt aWq bro bwa @@ -102407,9 +102448,9 @@ awq aOe aQv aaU -bqX +aRy bSt -bqX +aRy aaU bhl biH @@ -102635,7 +102676,7 @@ aFU ayK ayK axQ -aPe +axQ aUh cjM aVv @@ -102650,7 +102691,7 @@ bue aXY bCo aWd -cho +aSt aaU bup ajO @@ -103409,7 +103450,7 @@ ayY axQ aSt aSt -cho +aSt aSt bue bue @@ -103418,7 +103459,7 @@ bCw bue bOC bue -cho +aSt aSt ckI aSt @@ -103615,7 +103656,7 @@ cJv cJv cyX aaa -chH +acb acS aen afi @@ -103866,7 +103907,7 @@ cyX cyX cJv cJv -cJv +bMS cJv cJv cyX @@ -103924,7 +103965,7 @@ aPm aSt aSt aTs -cho +aSt aSt bue bzD @@ -104664,7 +104705,7 @@ bZh abZ adc acA -aci +asu akN ang ang @@ -104908,7 +104949,7 @@ acQ aiD ajq arc -atJ +acQ bmp bGi bZh @@ -104954,12 +104995,12 @@ aQJ aRZ aaU aaa -bvB +btT bzF bCR btT btT -bvB +btT btT btT cjE @@ -105510,7 +105551,7 @@ cuT cuT cuT cMV -cNo +ctG cIz bWO cIX @@ -106229,7 +106270,7 @@ aMa aEZ aof aOl -aOU +aOT aaU aye aaU @@ -106502,7 +106543,7 @@ bEx bMz bSD bVu -bvB +btT aaU aby bsz @@ -107022,7 +107063,7 @@ abH bAA bMK aZp -hwV +cdV cdV cdV cdV @@ -107270,10 +107311,10 @@ buE bwS bBv bFb -bMS +bMB bBv bXM -bvB +btT bvM acY adz @@ -108299,7 +108340,7 @@ btT bBH btT bNl -bvB +btT bXM btT btT @@ -110106,7 +110147,7 @@ aTl cxc aaa aaa -aRD +atF ciT cJD cmu @@ -110855,7 +110896,7 @@ aHA anK anK cAM -bCM +anK anK aaa aaa @@ -111378,7 +111419,7 @@ aaU arE bGJ bFe -atf +arE bxS bzo aMI @@ -111629,7 +111670,7 @@ cAP anK anK arE -atf +arE aKT arE arE @@ -111947,7 +111988,7 @@ bpP bpP bpP bpP -cro +bxw bza bMQ bui @@ -112158,7 +112199,7 @@ bmY ccI bmY anm -asu +bCj anr bHO atF @@ -112396,7 +112437,7 @@ aWx aTr boA cAF -bCL +boA boA anK bqb @@ -112413,7 +112454,7 @@ bmW chv bwW cin -aMD +bwW arp bCk aqk @@ -112734,9 +112775,9 @@ bNK bNS bNU aaa -aaa -aaa -aaa +cqN +bNS +bNU aaa aaa aaa @@ -112860,9 +112901,9 @@ aaU aaa aaa aaa -aaa -aaa -aaa +cpJ +aaO +aqw aaa aaa aao @@ -112948,7 +112989,7 @@ bbN bbN bbN bcb -ciI +bbV bjI bkB bmP @@ -112991,9 +113032,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bYQ +bNU aaa aaa aaa @@ -113117,9 +113158,9 @@ aaU aaa aaa aaa -aaa -aaa -aaa +cpJ +aaP +aqw aaa aaa aao @@ -113182,7 +113223,7 @@ bAk aMI aMI bzn -aMD +bwW ciq bwW ciV @@ -113248,9 +113289,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bYQ +bNU aaa aaa aaa @@ -113374,9 +113415,9 @@ aaU aaa aaa aaa -aaa -aaa -aaa +cpJ +aaP +aqw aaa aaa aao @@ -113467,7 +113508,7 @@ bhk bwi blN bKX -ciI +bbV bfG bbV bgH @@ -113505,9 +113546,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bYQ +bNU aaa aaa aaa @@ -113631,9 +113672,9 @@ aaU aaa aaa aaa -aaa -aaa -aaa +cpJ +aaP +aqw aaa aaa aao @@ -113694,7 +113735,7 @@ bws aNW bxd bBK -bAS +aMI bCq bwW ciq @@ -113762,9 +113803,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bYQ +bNU aaa aaa aaa @@ -113888,9 +113929,9 @@ aaU aaa aaa aaa -aaa -aaa -aaa +cpJ +aaP +aqw aaa aaa aao @@ -113955,7 +113996,7 @@ bmW bBq bwW ciq -aMD +bwW ciV bwW aaU @@ -113987,7 +114028,7 @@ bbV bjf bkh blu -ciI +bbV ccZ cgs cxo @@ -114019,9 +114060,9 @@ aaU avr aaU aaa -aaa -aaa -aaa +aaU +avr +aaU aaa aaa aaa @@ -114145,9 +114186,9 @@ aaU aaa aaa aaa -aaa -aaa -aaa +cpJ +aaP +aqw aaa aaa aaU @@ -114163,7 +114204,7 @@ aaU aaa aaa aaU -asd +aiz ahN aiC alH @@ -114215,7 +114256,7 @@ ciq bwW ciV bwW -aMD +bwW bwW aaa bsT @@ -114231,7 +114272,7 @@ aaU aaa aaa aaa -ciI +bbV bgv bhk bhk @@ -114240,7 +114281,7 @@ bja bLA bbV bfG -ciJ +bgf bUk bUH bVg @@ -114276,9 +114317,9 @@ bNK bNS bNU aaa -aaa -aaa -aaa +cqN +bqX +bNU aaa aaa aaa @@ -114402,9 +114443,9 @@ aaU aaa aaa aaa -aaa -aaa -aaa +aaU +aaT +aaU aaa aaa aao @@ -114517,7 +114558,7 @@ cJi biZ btz bPm -clW +bxH bPM bzd bBg @@ -114533,9 +114574,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bqX +bNU aaa aaa aaa @@ -114790,9 +114831,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bqX +bNU aaa aaa aaa @@ -115047,9 +115088,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bqX +bNU aaa aaa aaa @@ -115228,7 +115269,7 @@ cCB aJd bhi byM -blP +bvs aMA czU czY @@ -115304,9 +115345,9 @@ bNK bYQ bNU aaa -aaa -aaa -aaa +cqN +bqX +bNU aaa aaa aaa @@ -115545,7 +115586,7 @@ cxU cxW cxX cPN -clX +bZt bZu cmM bYn @@ -115562,7 +115603,7 @@ avr aaU aaU aaU -aaU +avr aaU aaU aaa @@ -115799,7 +115840,7 @@ ctv biM bjS bkS -cpJ +biZ btF cxY bZt @@ -115818,10 +115859,10 @@ bNL bNL bOf bOk -bOk +aqA +cro +clX bOq -aaU -aaU aaa aaa aaa @@ -116257,7 +116298,7 @@ buL bhC byS aMn -aMD +bwW bEj bvU cAi @@ -116268,7 +116309,7 @@ aMB bzn bwW bxF -aMD +bwW bEL bAK bjz @@ -116772,7 +116813,7 @@ bhD aOA bvN aMs -bmo +aMs cAa cAk bxy @@ -116780,7 +116821,7 @@ bzi cAy bTU bzn -aMD +bwW bzh bwW cih @@ -117286,7 +117327,7 @@ bfX btr bvP bwc -bmo +aMs bwk bwH bxG @@ -117298,7 +117339,7 @@ bAK ciO bAK ciV -bAS +aMI aaa bJv bMp @@ -117795,7 +117836,7 @@ bdB bgr buU byo -apV +amY bgj buu bvV @@ -117806,7 +117847,7 @@ bCU aMI ceG bAK -bAS +aMI aaa aaU aaa diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 816d08a14d..ac4d395f35 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -367,9 +367,14 @@ SUBSYSTEM_DEF(job) JobDebug("DO, Handling unrejectable unassigned") //Mop up people who can't leave. for(var/mob/dead/new_player/player in unassigned) //Players that wanted to back out but couldn't because they're antags (can you feel the edge case?) - if(!GiveRandomJob(player)) - if(!AssignRole(player, SSjob.overflow_role)) //If everything is already filled, make them an assistant - return FALSE //Living on the edge, the forced antagonist couldn't be assigned to overflow role (bans, client age) - just reroll + if(player.client.prefs.joblessrole == BERANDOMJOB) //Gives the player a random role if their preferences are set to it + if(!GiveRandomJob(player)) + if(!AssignRole(player, SSjob.overflow_role)) //If everything is already filled, make them the overflow role + return FALSE //Living on the edge, the forced antagonist couldn't be assigned to overflow role (bans, client age) - just reroll + else //If the player prefers to return to lobby or be an assistant, give them assistant + if(!AssignRole(player, SSjob.overflow_role)) + if(!GiveRandomJob(player)) //The forced antagonist couldn't be assigned to overflow role (bans, client age) - give a random role + return FALSE //Somehow the forced antagonist couldn't be assigned to the overflow role or the a random role - reroll return validate_required_jobs(required_jobs) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index eaf576510e..7c55f0c4f6 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -295,6 +295,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \ GLOBAL_LIST_INIT(titanium_recipes, list ( \ new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), \ new/datum/stack_recipe("titanic ingot", /obj/item/ingot/titanium, 6, time = 100), \ + new/datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = TRUE, on_floor = TRUE), \ )) /obj/item/stack/sheet/mineral/titanium/get_main_recipes() diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 9d14757897..d5b1e7a244 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -252,6 +252,7 @@ name = "shuttle seat" desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights." icon_state = "shuttle_chair" + buildstacktype = /obj/item/stack/sheet/mineral/titanium /obj/structure/chair/comfy/shuttle/GetArmrest() return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest") diff --git a/config/maps.txt b/config/maps.txt index 0738b1f963..e0bca9ca71 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -64,4 +64,7 @@ map snaxiteststation endmap map taustation -endmap \ No newline at end of file +endmap + +map cogstation +endmap diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml index 40af675307..9e17697842 100644 --- a/html/changelogs/archive/2022-05.yml +++ b/html/changelogs/archive/2022-05.yml @@ -182,3 +182,14 @@ their full path - rscadd: Added a recipe for liquid panty dropper - rscadd: Added a new drink, Mech Rider +2022-05-24: + SandPoot: + - rscadd: You can now make shuttle seats with titanium. +2022-05-27: + BongaTheProto: + - bugfix: fixes extreme and harmful prefs so they're ABLE TO BE SAVED!! FINALLY!!! +2022-05-28: + Anonymous: + - soundadd: Oh no! Our code! It's broken! :( + AshTheDerg: + - bugfix: fixed Cog Map diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index 47c655d4c6..af527a50e5 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -69,8 +69,8 @@ WRITE_FILE(S["noncon_pref"], nonconpref) WRITE_FILE(S["vore_pref"], vorepref) WRITE_FILE(S["unholypref"], unholypref) - WRITE_FILE(S["extremepref"], extremepref) - WRITE_FILE(S["extremeharm"], extremeharm) + WRITE_FILE(S["extreme_pref"], extremepref) + WRITE_FILE(S["extreme_harm"], extremeharm) WRITE_FILE(S["enable_personal_chat_color"], enable_personal_chat_color) WRITE_FILE(S["personal_chat_color"], personal_chat_color) WRITE_FILE(S["alt_titles_preferences"], alt_titles_preferences) diff --git a/modular_splurt/code/game/object/structures/tables_racks.dm b/modular_splurt/code/game/object/structures/tables_racks.dm index 87541fea2d..17dd8207ed 100644 --- a/modular_splurt/code/game/object/structures/tables_racks.dm +++ b/modular_splurt/code/game/object/structures/tables_racks.dm @@ -13,6 +13,12 @@ return . = ..() +/obj/structure/table/glass/table_shatter(mob/living/L) + var/turf/F = get_turf(src) // Because modularized procs ignore original's defined vars. + if(prob(1)) // Took about 33 broken glass tables to play the meme on local testing. + playsound(F, 'modular_splurt/sound/misc/ourtable.ogg', 100, 0) + . = ..() + //Own stuff /obj/structure/table/wood/shadow name = "shadow wood table" diff --git a/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm b/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm index 8a8c9d58c1..b0f21dff26 100644 --- a/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm +++ b/modular_splurt/code/modules/food_and_drinks/recipes/drink_recipes.dm @@ -2,7 +2,7 @@ /datum/chemical_reaction/panty_dropper //https://ifunny.co/video/uyksuxGK8?s=cl name = "Liquid Panty Dropper" id = /datum/reagent/consumable/ethanol/panty_dropper - results = list(/datum/reagent/consumable/ethanol/panty_dropper = 8, /datum/reagent/drug/anaphrodisiacplus = 2) + results = list(/datum/reagent/consumable/ethanol/panty_dropper = 8, /datum/reagent/drug/aphrodisiacplus = 2) required_reagents = list(/datum/reagent/consumable/ethanol/screwdrivercocktail = 1, /datum/reagent/consumable/ethanol/gin = 1, /datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/pineapplejuice = 1, /datum/reagent/consumable/berryjuice = 1) //Can't have the legendary 1:1 ratio or original recipe cuz of recipe clashes :( mix_message = "A very tvvisted combination begins to bubble..." diff --git a/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 6cf437acd6..a047153742 100644 --- a/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/modular_splurt/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -16,7 +16,7 @@ var/anyclothes = FALSE var/items = M.get_contents() for(var/obj/item/W in items) - if(W.body_parts_covered) + if(W.body_parts_covered && ismob(W.loc)) anyclothes = TRUE M.dropItemToGround(W, TRUE) playsound(M.loc, 'sound/items/poster_ripped.ogg', 50, 1) diff --git a/modular_splurt/sound/misc/ourtable.ogg b/modular_splurt/sound/misc/ourtable.ogg new file mode 100644 index 0000000000..d95086e5ca Binary files /dev/null and b/modular_splurt/sound/misc/ourtable.ogg differ