___
Dear Sir or Madam,
We extend our deepest apologies for any inconvenience caused by the current location of your office. Your feedback is invaluable, and we are committed to addressing your concerns promptly.
In response to your request for a more suitable workplace, we are actively working on relocating your office to a more convenient setting. The necessary arrangements will be implemented during the upcoming shift.
Thank you for your understanding and continued support.
Best regards,
-NT Official
"; + name = "Deepest apoligies"; + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/paper/fluff{ + default_raw_text = "___
Dear Sir or Madam,
We acknowledge receipt of your recent emails emphasizing the urgency of expediting the transfer process. Regrettably, we must address the matter with utmost consideration, given the choice words employed in your communications.Apon careful review, we have revisited the proposal to relocate your office to the security department. However, owing to the recent renovation in the security facilities; you will find the northern access point is now in closer proximity to your current office location. Consequently, the feasibility of relocating your office based on financial considerations has been reassessed, and it is not deemed necessary at this time.
We appreciate your understanding and cooperation in this matter. If you have any further inquiries or would like to discuss alternative solutions, please feel free to reach out to your onboard representative.
Thank you for your continued cooperation.
Best regards,
-NT Official
"; + name = "re:Deepest apoligies"; + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/paper/fluff{ + default_raw_text = "___
Dear Sir or madam,
We sincerely apologize for the delay in our response and appreciate your loyal, dedicated work during these times.
In our commitment to improving working conditions, we have successfully moved your office closer to the western access point. However, we regret to inform you that due to the financial burden of this relocation, a deduction of 5,000 credits will be made indefinably from your future pay cheques to cover the renovation expenses. Please enjoy the complementary high quality whisky for your continued effort
We value your understanding and cooperation throughout this transition. If you have any further concerns or inquiries, please feel free to contact your onboard representative.
Best regards,
-NT official"; + name = "re:re:Deepest apoligies"; + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/carpet/green, +/area/security/detectives_office) "fpe" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -21019,18 +20853,6 @@ burnt = 1 }, /area/crew_quarters/locker) -"ftA" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -1; - pixel_y = 9 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/opposingcorners, -/turf/open/floor/iron, -/area/construction) "ftG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -22240,6 +22062,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/science/robotics/lab) +"fIp" = ( +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. This one used to hold many secrets..." + }, +/turf/open/floor/cult, +/area/chapel/office) "fIq" = ( /obj/structure/railing{ dir = 1 @@ -22454,6 +22282,35 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/quartermaster/storage) +"fLf" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/airalarm/directional/north{ + pixel_y = 22 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe{ + pixel_x = 1; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/apothecary) "fLr" = ( /obj/effect/turf_decal/tile/green/fourcorners/contrasted, /turf/open/floor/iron, @@ -23172,38 +23029,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) -"fTU" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 28 - }, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_y = -28 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "fTX" = ( /turf/open/floor/iron/white, /area/medical/medbay/central) @@ -23570,6 +23395,29 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) +"fYC" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "emmd"; + name = "Emergency Medical Lockdown Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/green/fourcorners/contrasted, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron/dark, +/area/medical/medbay/lobby) "fYR" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -23752,6 +23600,15 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"gbd" = ( +/obj/item/reagent_containers/cup/glass/bottle/wine, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/cup/glass/trophy{ + pixel_x = 9; + pixel_y = 8 + }, +/turf/open/floor/carpet/grimy, +/area/chapel/main) "gbx" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable/yellow{ @@ -24032,30 +23889,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_smes) -"geN" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Secure Creature Pen Shield Holder"; - obj_integrity = 300; - req_one_access_txt = "55" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "gfc" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/chair/fancy/comfy{ @@ -24434,6 +24267,28 @@ dir = 4 }, /area/quartermaster/office) +"gjN" = ( +/obj/structure/table, +/obj/item/kitchen/fork, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/effect/spawner/lootdrop/three_course_meal, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/cafeteria) "gkd" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -24730,22 +24585,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) -"gnN" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 1; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "aicoredoor"; - name = "AI Core Shutter" - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "gnX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -25560,28 +25399,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/library/lounge) -"gzm" = ( -/obj/machinery/shieldwallgen/xenobiologyaccess, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 4; - icon_state = "leftsecure"; - name = "Secure Creature Pen Shield Holder"; - obj_integrity = 300; - req_access_txt = "55" - }, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 - }, -/obj/structure/window/reinforced, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/plating, -/area/science/xenobiology) "gzo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -25877,16 +25694,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/central) -"gCw" = ( -/obj/structure/table, -/obj/item/storage/bag/plants/portaseeder, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/cup/bucket, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, -/obj/item/seeds/wheat, -/turf/open/floor/grass, -/area/hydroponics/garden) "gCA" = ( /obj/item/food/canned/beans{ pixel_x = -5; @@ -26221,6 +26028,17 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"gHI" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/glass/mug/cocoa{ + pixel_x = 6 + }, +/turf/open/floor/iron/sepia, +/area/engine/break_room) "gHS" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/table, @@ -26380,19 +26198,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"gJI" = ( -/obj/item/reagent_containers/cup/bucket, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "gJJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -26531,6 +26336,29 @@ }, /turf/open/floor/iron/dark/side, /area/engine/atmos) +"gLr" = ( +/obj/item/food/canned/peaches{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/food/canned/peaches{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/food/canned/beans{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/waterbottle{ + pixel_x = -8; + pixel_y = -5 + }, +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/open/floor/iron/techmaint, +/area/security/prison/shielded) "gLs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27146,6 +26974,31 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"gSV" = ( +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/item/storage/box/papersack{ + icon_state = "paperbag_NanotrasenStandard_closed" + }, +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "gSY" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/turf_decal/stripes/closeup, @@ -27712,6 +27565,12 @@ /obj/item/food/chips, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"haU" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/oven, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "hbb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27852,40 +27711,6 @@ "hds" = ( /turf/closed/wall/rust, /area/maintenance/port) -"hdx" = ( -/obj/structure/closet/crate{ - name = "food crate" - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = -2 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 5 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/waterbottle/large{ - pixel_x = 8; - pixel_y = -3 - }, -/obj/machinery/status_display/ai{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/turf/open/floor/engine, -/area/security/nuke_storage) "hdy" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/circuit/green{ @@ -28138,21 +27963,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"hih" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "aicoredoor"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window{ - base_state = "rightsecure"; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "hij" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -28775,32 +28585,6 @@ /obj/item/dice/d1, /turf/open/floor/iron/dark, /area/library/lounge) -"hqs" = ( -/obj/structure/table/wood, -/obj/item/paper/fluff{ - default_raw_text = "
___
Dear Sir or Madam,
We extend our deepest apologies for any inconvenience caused by the current location of your office. Your feedback is invaluable, and we are committed to addressing your concerns promptly.
In response to your request for a more suitable workplace, we are actively working on relocating your office to a more convenient setting. The necessary arrangements will be implemented during the upcoming shift.
Thank you for your understanding and continued support.
Best regards,
-NT Official
"; - name = "Deepest apoligies"; - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/paper/fluff{ - default_raw_text = "___
Dear Sir or Madam,
We acknowledge receipt of your recent emails emphasizing the urgency of expediting the transfer process. Regrettably, we must address the matter with utmost consideration, given the choice words employed in your communications.Apon careful review, we have revisited the proposal to relocate your office to the security department. However, owing to the recent renovation in the security facilities; you will find the northern access point is now in closer proximity to your current office location. Consequently, the feasibility of relocating your office based on financial considerations has been reassessed, and it is not deemed necessary at this time.
We appreciate your understanding and cooperation in this matter. If you have any further inquiries or would like to discuss alternative solutions, please feel free to reach out to your onboard representative.
Thank you for your continued cooperation.
Best regards,
-NT Official
"; - name = "re:Deepest apoligies"; - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/paper/fluff{ - default_raw_text = "___
Dear Sir or madam,
We sincerely apologize for the delay in our response and appreciate your loyal, dedicated work during these times.
In our commitment to improving working conditions, we have successfully moved your office closer to the western access point. However, we regret to inform you that due to the financial burden of this relocation, a deduction of 5,000 credits will be made indefinably from your future pay cheques to cover the renovation expenses. Please enjoy the complementary high quality whisky for your continued effort
We value your understanding and cooperation throughout this transition. If you have any further concerns or inquiries, please feel free to contact your onboard representative.
Best regards,
-NT official"; - name = "re:re:Deepest apoligies"; - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/carpet/green, -/area/security/detectives_office) "hqF" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -29006,23 +28790,36 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/maintenance/department/science) -"hus" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -29 +"hux" = ( +/obj/structure/table/reinforced, +/obj/item/seeds/soya, +/obj/item/seeds/cabbage, +/obj/item/seeds/corn, +/obj/item/seeds/onion, +/obj/item/seeds/potato, +/obj/item/seeds/wheat, +/obj/item/seeds/carrot, +/obj/item/storage/bag/plants/portaseeder{ + pixel_x = 1; + pixel_y = 3 }, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ - pixel_x = 3 +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 8; + pixel_y = -1 }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/clothing/mask/cigarette/cigar/havana{ - pixel_x = -3 +/obj/item/cultivator{ + pixel_x = 1; + pixel_y = -1 }, -/obj/machinery/light/small, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "huM" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -29623,6 +29420,29 @@ }, /turf/open/floor/iron, /area/security/checkpoint/escape) +"hDD" = ( +/obj/structure/table, +/obj/item/food/mint{ + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 2 + }, +/obj/structure/noticeboard{ + dir = 8; + pixel_x = 26 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/machinery/newscaster{ + pixel_y = -28 + }, +/turf/open/floor/iron/cafeteria, +/area/vacant_room/commissary/commissaryFood) "hDG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -30104,29 +29924,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/bridge) -"hKB" = ( -/obj/item/food/canned/peaches{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/food/canned/peaches{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/food/canned/beans{ - pixel_x = 4; - pixel_y = -1 - }, -/obj/item/reagent_containers/cup/waterbottle{ - pixel_x = -8; - pixel_y = -5 - }, -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small, -/turf/open/floor/iron/techmaint, -/area/security/prison/shielded) "hKD" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall, @@ -31197,16 +30994,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"hYl" = ( -/obj/structure/table/wood, -/obj/item/razor{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/reagent_containers/cup/glass/flask/gold, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) "hYU" = ( /obj/structure/table/wood/fancy, /obj/item/flashlight/lantern, @@ -31418,19 +31205,6 @@ broken = 1 }, /area/maintenance/central) -"ial" = ( -/obj/machinery/newscaster{ - pixel_y = 31 - }, -/obj/structure/janitorialcart, -/obj/item/reagent_containers/cup/bucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/item/mop, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/janitor) "ian" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -31845,17 +31619,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"ifl" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/northleft{ - dir = 8; - name = "Animal Pen" - }, -/obj/item/cultivator, -/obj/item/reagent_containers/cup/bucket, -/obj/item/seeds/tower, -/turf/open/floor/plating, -/area/hydroponics/garden) "ifn" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/machinery/vending/hydronutrients, @@ -32063,41 +31826,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"iiZ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/dropper, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "chemisttop"; - name = "Chemistry Shutter Control"; - pixel_x = 7; - pixel_y = -24; - req_access_txt = "33" - }, -/obj/machinery/button/door{ - id = "chemistbot"; - name = "Chemistry Shutter Control"; - pixel_x = -6; - pixel_y = -24; - req_access_txt = "33" - }, -/obj/item/storage/pill_bottle, -/obj/item/reagent_containers/medspray{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/apothecary) "ijh" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -32139,38 +31867,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hydroponics) -"iki" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_y = 24 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_y = -28 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 28 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "ikr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/cable/yellow{ @@ -32694,20 +32390,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) -"irn" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/mortar, -/obj/item/pestle, -/obj/item/clothing/glasses/hud/health{ - pixel_x = 4; - pixel_y = -1 - }, -/turf/open/floor/iron/grid, -/area/medical/virology) "irr" = ( /obj/machinery/camera/directional/south{ c_tag = "Atmospherics - Plasma Cell" @@ -33614,6 +33296,15 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/techmaint, /area/security/prison) +"iBZ" = ( +/obj/structure/table, +/obj/effect/turf_decal/bot, +/obj/machinery/light, +/obj/machinery/reagentgrinder, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "iCg" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -33752,12 +33443,6 @@ /obj/effect/turf_decal/siding/wideplating_new/dark, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"iDU" = ( -/obj/structure/table/wood, -/obj/item/storage/lockbox/medal, -/obj/item/reagent_containers/cup/glass/shaker, -/turf/open/floor/iron/dark, -/area/crew_quarters/heads/captain) "iDW" = ( /obj/machinery/light{ dir = 8 @@ -34851,27 +34536,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/hallway/primary/central) -"iRk" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/obj/effect/turf_decal/trimline/red/corner{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 10; - pixel_y = 9 - }, -/obj/item/food/donut/berry{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/genpop_interface{ - pixel_y = 32 - }, -/turf/open/floor/iron/dark, -/area/security/prison) "iRo" = ( /obj/structure/sign/warning/docking, /turf/closed/wall/r_wall, @@ -35304,6 +34968,15 @@ }, /turf/open/floor/iron/techmaint, /area/ai_monitored/storage/eva) +"iXG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/structure/railing, +/turf/open/floor/iron/techmaint, +/area/science/misc_lab) "iYf" = ( /obj/structure/cable{ icon_state = "0-2" @@ -36550,6 +36223,22 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/hop) +"jpj" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 1; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "aicoredoor"; + name = "AI Core Shutter" + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "jpl" = ( /obj/effect/decal/cleanable/greenglow, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -36755,27 +36444,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/port) -"jsw" = ( -/obj/structure/bonfire, -/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ - desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; - name = "Carton of Estus" - }, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/item/melee/baseball_bat{ - desc = "Don't tell anyone you put any points into dex, though."; - icon_state = "swordon"; - item_state = "swordon"; - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; - name = "moonlight greatsword"; - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - }, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/port) "jsN" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -36824,23 +36492,6 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/fitness/recreation) -"jti" = ( -/obj/structure/rack, -/obj/item/book/manual/wiki/robotics_cyborgs{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/storage/belt/utility, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/delivery, -/obj/machinery/requests_console{ - department = "Robotics Lab"; - name = "Robotics RC"; - pixel_y = 30; - receive_ore_updates = 1 - }, -/turf/open/floor/iron/grid/steel, -/area/science/robotics/lab) "jtj" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -37512,6 +37163,27 @@ /obj/structure/chair/wood/normal, /turf/open/floor/iron/dark, /area/security/courtroom) +"jDR" = ( +/obj/structure/bonfire, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ + desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; + name = "Carton of Estus" + }, +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/item/melee/baseball_bat{ + desc = "Don't tell anyone you put any points into dex, though."; + icon_state = "swordon"; + item_state = "swordon"; + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; + name = "moonlight greatsword"; + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + }, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/maintenance/port) "jEa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37634,6 +37306,19 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) +"jFK" = ( +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/sink/kitchen{ + desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; + dir = 4; + name = "old sink"; + pixel_x = -11 + }, +/obj/structure/mopbucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/turf/open/floor/iron/dark, +/area/security/main) "jFT" = ( /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/rack, @@ -39733,12 +39418,6 @@ }, /turf/open/floor/iron/dark, /area/security/main) -"keX" = ( -/obj/structure/rack, -/obj/item/reagent_containers/cup/glass/bottle/whiskey, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/central/secondary) "kfb" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/grid/steel, @@ -39817,6 +39496,21 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"kgy" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "aicoredoor"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window{ + base_state = "rightsecure"; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "kgB" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -40280,6 +39974,11 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) +"kmD" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/turf/open/floor/carpet/grimy, +/area/hallway/primary/port) "kmL" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41140,6 +40839,88 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"kxf" = ( +/obj/structure/closet/crate/medical, +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/item/circuitboard/machine/chem_heater, +/turf/open/floor/iron/techmaint, +/area/medical/virology) "kxg" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -41171,6 +40952,16 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"kyc" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "kyh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/kirbyplants/random, @@ -41750,6 +41541,28 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) +"kGy" = ( +/obj/machinery/shieldwallgen/xenobiologyaccess, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 4; + icon_state = "leftsecure"; + name = "Secure Creature Pen Shield Holder"; + atom_integrity = 300; + req_access_txt = "55" + }, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/window/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/plating, +/area/science/xenobiology) "kGA" = ( /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -44131,6 +43944,34 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/grid/steel, /area/hallway/secondary/exit/departure_lounge) +"lil" = ( +/obj/structure/table, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 3 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3 + }, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/apothecary) "lim" = ( /turf/open/floor/iron/dark/corner{ dir = 1 @@ -45239,6 +45080,19 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/medical) +"lvi" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/dest_tagger, +/obj/machinery/computer/security/telescreen/rd{ + pixel_y = 30 + }, +/turf/open/floor/iron/dark, +/area/bridge) "lvk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -45639,6 +45493,20 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) +"lAL" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/dropper, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/turf/open/floor/iron/dark, +/area/science/lab) "lAV" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -46210,12 +46078,6 @@ /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, /area/security/prison) -"lJu" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/oven, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "lJz" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -47874,6 +47736,38 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/sepia, /area/engine/engineering) +"mif" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 28 + }, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_y = 24 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_y = -28 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 8; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "mii" = ( /obj/effect/turf_decal/trimline/red/arrow_cw{ dir = 4 @@ -48401,6 +48295,40 @@ "mqi" = ( /turf/open/floor/iron, /area/hallway/primary/starboard) +"mqw" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + dir = 1; + name = "Virology Desk Window"; + req_access_txt = "20" + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/storage/box/masks{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/effect/turf_decal/stripes/closeup, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/machinery/door/window/northleft{ + dir = 2; + name = "Virology Desk Window" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "mqx" = ( /obj/effect/turf_decal/stripes/full, /obj/machinery/power/smes{ @@ -50351,6 +50279,19 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/dorms) +"mQj" = ( +/obj/item/reagent_containers/cup/bucket, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/tile/green/opposingcorners, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics) "mQl" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -50703,6 +50644,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/central) +"mUs" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/northleft{ + dir = 8; + name = "Animal Pen" + }, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/bucket, +/obj/item/seeds/tower, +/turf/open/floor/plating, +/area/hydroponics/garden) "mUv" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -50906,6 +50858,27 @@ }, /turf/closed/wall/r_wall, /area/engine/supermatter) +"mYp" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/effect/turf_decal/trimline/red/corner{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 10; + pixel_y = 9 + }, +/obj/item/food/donut/berry{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/genpop_interface{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/security/prison) "mYB" = ( /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, @@ -51243,17 +51216,6 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/genetics) -"ndu" = ( -/obj/structure/table/wood/fancy, -/obj/item/soulstone/anybody/chaplain, -/obj/item/organ/heart{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/item/book/granter/spell/smoke/lesser, -/turf/open/floor/cult, -/area/chapel/office) "ndM" = ( /obj/effect/turf_decal/guideline/guideline_in/red{ dir = 4 @@ -51730,15 +51692,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) -"njG" = ( -/obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/machinery/light, -/obj/machinery/reagentgrinder, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "njM" = ( /obj/effect/turf_decal/bot, /obj/machinery/shieldwallgen, @@ -52643,23 +52596,6 @@ }, /turf/open/floor/plating, /area/science/mixing) -"nwP" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/reagent_containers/cup/rag, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/obj/item/book/manual/wiki/barman_recipes{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/structure/noticeboard{ - dir = 4; - pixel_x = -27 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "nwT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -54007,6 +53943,20 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/storage/tech) +"nPp" = ( +/obj/item/folder, +/obj/item/clipboard, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/obj/structure/table/wood, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/radio/intercom{ + pixel_y = 24 + }, +/turf/open/floor/iron/dark, +/area/science/breakroom) "nPL" = ( /obj/item/stack/cable_coil/cut/yellow, /obj/structure/cable/yellow{ @@ -55609,6 +55559,38 @@ /obj/machinery/light/small, /turf/open/floor/engine, /area/engine/supermatter) +"onm" = ( +/obj/structure/table/reinforced, +/obj/item/book/granter/crafting_recipe/cooking_sweets_101{ + pixel_x = 6; + pixel_y = 16 + }, +/obj/item/book/manual/chef_recipes{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -4; + pixel_y = 17 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/iron/techmaint, +/area/security/prison) "ono" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Server Room"; @@ -55815,6 +55797,11 @@ }, /turf/open/floor/iron/dark, /area/science/shuttle) +"opu" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/maintenance/department/security/brig) "opD" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -55862,15 +55849,6 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/fore) -"oqj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/obj/structure/railing, -/turf/open/floor/iron/techmaint, -/area/science/misc_lab) "oqm" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -57883,6 +57861,22 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/central) +"oUy" = ( +/obj/structure/rack, +/obj/item/stack/cable_coil/random/five, +/obj/item/screwdriver, +/obj/item/wrench, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/condiment/enzyme, +/obj/item/knife/kitchen, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/turf/open/floor/iron/dark, +/area/vacant_room/commissary/commissaryFood) "oUA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59581,6 +59575,42 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/hydroponics) +"ptv" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/closet/secure_closet/injection, +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/facid{ + name = "fluorosulfuric acid bottle"; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe{ + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/iron/techmaint, +/area/security/execution/education) "ptH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -60222,15 +60252,6 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/heads/hor) -"pBN" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/techmaint, -/area/security/prison) "pBR" = ( /obj/docking_port/stationary{ dir = 2; @@ -60298,6 +60319,12 @@ }, /turf/open/floor/iron/techmaint, /area/science/xenobiology) +"pCA" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/turf/open/floor/iron/techmaint, +/area/science/research) "pCN" = ( /obj/effect/spawner/room/fivexfour, /turf/open/floor/plating, @@ -60343,6 +60370,26 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"pDz" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/machinery/door/poddoor/shutters{ + id = "kitchencounter"; + name = "Kitchen Bar Counter Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron/techmaint, +/area/crew_quarters/kitchen) "pDL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -61749,6 +61796,19 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"pXS" = ( +/obj/machinery/newscaster{ + pixel_y = 31 + }, +/obj/structure/janitorialcart, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/item/mop, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/janitor) "pYk" = ( /obj/structure/window/reinforced{ dir = 8 @@ -61888,36 +61948,28 @@ /obj/machinery/light, /turf/open/floor/wood, /area/library/lounge) -"pZt" = ( -/obj/structure/table/reinforced, -/obj/item/seeds/soya, -/obj/item/seeds/cabbage, -/obj/item/seeds/corn, -/obj/item/seeds/onion, -/obj/item/seeds/potato, -/obj/item/seeds/wheat, -/obj/item/seeds/carrot, -/obj/item/storage/bag/plants/portaseeder{ - pixel_x = 1; - pixel_y = 3 +"pZF" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = 4; + pixel_y = 4 }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 8; - pixel_y = -1 +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -3; + pixel_y = 15 }, -/obj/item/cultivator{ - pixel_x = 1; - pixel_y = -1 +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 3 }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 }, -/turf/open/floor/iron/techmaint, -/area/security/prison) +/turf/open/floor/carpet, +/area/chapel/office) "pZM" = ( /obj/structure/chair/fancy/sofa/old{ color = "#742925"; @@ -63147,12 +63199,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"qpL" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/turf/open/floor/iron/techmaint, -/area/science/research) "qpP" = ( /obj/structure/noticeboard{ pixel_y = 26 @@ -63509,38 +63555,6 @@ }, /turf/open/floor/iron/dark, /area/engine/gravity_generator) -"qtM" = ( -/obj/structure/table/reinforced, -/obj/item/book/granter/crafting_recipe/cooking_sweets_101{ - pixel_x = 6; - pixel_y = 16 - }, -/obj/item/book/manual/chef_recipes{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/item/reagent_containers/condiment/sugar{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = -4; - pixel_y = 17 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/iron/techmaint, -/area/security/prison) "qtS" = ( /obj/effect/turf_decal/trimline/blue/warning{ dir = 8 @@ -63822,21 +63836,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"qxm" = ( -/obj/structure/table, -/obj/item/food/spaghetti/raw, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/condiment/peppermill, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 6 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "qxp" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 8 @@ -63996,22 +63995,6 @@ }, /turf/open/floor/iron/checker, /area/quartermaster/storage) -"qzO" = ( -/obj/structure/rack, -/obj/item/stack/cable_coil/random/five, -/obj/item/screwdriver, -/obj/item/wrench, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/condiment/enzyme, -/obj/item/knife/kitchen, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/turf/open/floor/iron/dark, -/area/vacant_room/commissary/commissaryFood) "qAh" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -64577,6 +64560,40 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/techmaint, /area/hallway/secondary/entry) +"qGZ" = ( +/obj/structure/closet/crate{ + name = "food crate" + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = -2 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 5 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/waterbottle/large{ + pixel_x = 8; + pixel_y = -3 + }, +/obj/machinery/status_display/ai{ + pixel_x = -32 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/engine, +/area/security/nuke_storage) "qHa" = ( /obj/machinery/photocopier, /turf/open/floor/wood, @@ -65610,6 +65627,15 @@ }, /turf/open/floor/iron, /area/maintenance/disposal) +"qTl" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/food/tofu/prison, +/turf/open/floor/iron/dark, +/area/vacant_room/commissary/commissaryFood) "qTo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -66681,20 +66707,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/department/medical) -"rkq" = ( -/obj/item/folder, -/obj/item/clipboard, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/obj/structure/table/wood, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/radio/intercom{ - pixel_y = 24 - }, -/turf/open/floor/iron/dark, -/area/science/breakroom) "rkv" = ( /obj/structure/table/wood, /turf/open/floor/carpet, @@ -68445,21 +68457,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/atmos) -"rGZ" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/structure/table, -/obj/item/toy/batong{ - pixel_x = 1; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/iron/techmaint, -/area/security/prison) "rHd" = ( /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, @@ -70998,11 +70995,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/iron/white, /area/science/xenobiology) -"smb" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/plating, -/area/maintenance/department/security/brig) "sme" = ( /obj/structure/sign/departments/security, /turf/closed/wall/r_wall, @@ -71232,17 +71224,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"soC" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/glass/mug/cocoa{ - pixel_x = 6 - }, -/turf/open/floor/iron/sepia, -/area/engine/break_room) "soH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -73905,22 +73886,6 @@ /obj/structure/closet/toolcloset, /turf/open/floor/iron/techmaint, /area/maintenance/solars/port) -"sYd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table/reinforced, -/obj/item/food/popcorn, -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/structure/railing, -/turf/open/floor/iron/techmaint, -/area/science/misc_lab) "sYg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -74807,6 +74772,21 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"tkK" = ( +/obj/structure/table, +/obj/item/food/spaghetti/raw, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 6 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "tkM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -75432,6 +75412,12 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/dark, /area/engine/storage) +"ttm" = ( +/obj/structure/table/wood, +/obj/item/storage/lockbox/medal, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/iron/dark, +/area/crew_quarters/heads/captain) "ttn" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -75581,6 +75567,24 @@ /obj/machinery/light, /turf/open/floor/grass/no_border, /area/hallway/primary/port) +"tuO" = ( +/obj/structure/table/reinforced, +/obj/item/folder/white, +/obj/item/stack/sheet/mineral/plasma{ + amount = 5 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker, +/obj/item/reagent_containers/dropper, +/obj/machinery/camera/directional/north{ + c_tag = "Xenobiology - Research Area"; + name = "xenobiology camera" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "tuT" = ( /obj/structure/lattice, /turf/open/space, @@ -75600,26 +75604,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/bar/atrium) -"tvw" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/machinery/door/poddoor/shutters{ - id = "kitchencounter"; - name = "Kitchen Bar Counter Shutters" - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/turf/open/floor/iron/techmaint, -/area/crew_quarters/kitchen) "tvz" = ( /obj/item/soap/nanotrasen, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -77059,29 +77043,6 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, /area/teleporter) -"tPo" = ( -/obj/structure/table, -/obj/item/food/mint{ - pixel_y = 9 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 2 - }, -/obj/structure/noticeboard{ - dir = 8; - pixel_x = 26 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_y = -28 - }, -/turf/open/floor/iron/cafeteria, -/area/vacant_room/commissary/commissaryFood) "tPD" = ( /obj/machinery/light_switch{ pixel_x = -24; @@ -77709,6 +77670,40 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/vacant_room/commissary/commissary2) +"tXb" = ( +/obj/effect/turf_decal/bot, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/machinery/firealarm/directional/west, +/obj/machinery/vending/wallmed{ + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); + name = "Upgraded NanoMed"; + pixel_x = -1; + pixel_y = -32; + premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "tXc" = ( /obj/structure/window/reinforced{ dir = 4 @@ -79160,6 +79155,29 @@ }, /turf/open/floor/iron/dark, /area/security/checkpoint) +"uqM" = ( +/obj/machinery/newscaster{ + pixel_x = -28; + pixel_y = 1 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/dropper, +/obj/item/radio/headset/headset_med, +/obj/item/flashlight/pen{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/genetics) "uqQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/side{ @@ -80982,22 +81000,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"uNi" = ( -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/grey_bull{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/machinery/camera/directional/east, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "uNj" = ( /turf/open/floor/iron/dark, /area/science/robotics/mechbay) @@ -81190,34 +81192,6 @@ }, /turf/open/floor/iron/techmaint, /area/science/shuttle) -"uPL" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/science{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/glasses/science, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 3 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/medical/apothecary) "uPN" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, @@ -82383,16 +82357,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/chapel/main) -"vdJ" = ( -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/turf_decal/tile/bar/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics) "vdU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -82704,6 +82668,23 @@ }, /turf/open/floor/iron/sepia, /area/engine/break_room) +"viq" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/machinery/computer/security/telescreen/minisat{ + dir = 1; + pixel_y = -29 + }, +/obj/item/clothing/mask/cigarette/cigar/cohiba{ + pixel_x = 3 + }, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/clothing/mask/cigarette/cigar/havana{ + pixel_x = -3 + }, +/obj/machinery/light/small, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain) "vit" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -83625,6 +83606,17 @@ }, /turf/open/floor/circuit/telecomms, /area/science/xenobiology) +"vsd" = ( +/obj/structure/table/wood/fancy, +/obj/item/soulstone/anybody/chaplain, +/obj/item/organ/heart{ + pixel_x = 8; + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/item/book/granter/spell/smoke/lesser, +/turf/open/floor/cult, +/area/chapel/office) "vsi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -83695,6 +83687,35 @@ broken = 1 }, /area/maintenance/port) +"vsI" = ( +/obj/structure/table/wood, +/obj/item/folder/blue{ + pixel_x = 8 + }, +/obj/item/stamp/captain{ + pixel_x = 8 + }, +/obj/structure/desk_bell/speed_demon{ + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; + name = "Bottle of Tears"; + pixel_x = 8; + pixel_y = 20 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "vsR" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -84371,15 +84392,6 @@ /obj/structure/closet/secure_closet/medical1, /turf/open/floor/iron/grid/steel, /area/medical/virology) -"vye" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/closet/secure_closet/freezer/kitchen/maintenance, -/obj/item/reagent_containers/condiment/sugar, -/obj/item/food/tofu/prison, -/turf/open/floor/iron/dark, -/area/vacant_room/commissary/commissaryFood) "vym" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 @@ -85440,6 +85452,22 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"vLO" = ( +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/grey_bull{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "vMl" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -86159,6 +86187,18 @@ }, /turf/open/floor/wood, /area/library) +"vSU" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/opposingcorners, +/turf/open/floor/iron, +/area/construction) "vTc" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/closeup{ @@ -87117,6 +87157,20 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/apothecary) +"wge" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/mortar, +/obj/item/pestle, +/obj/item/clothing/glasses/hud/health{ + pixel_x = 4; + pixel_y = -1 + }, +/turf/open/floor/iron/grid, +/area/medical/virology) "wgl" = ( /obj/machinery/light, /turf/open/floor/iron, @@ -87531,6 +87585,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engine/break_room) +"wmv" = ( +/obj/structure/table/wood, +/obj/item/razor{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/reagent_containers/cup/glass/flask/gold, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "wmy" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -87729,35 +87793,6 @@ }, /turf/open/floor/iron/techmaint, /area/maintenance/port) -"wok" = ( -/obj/structure/table/wood, -/obj/item/folder/blue{ - pixel_x = 8 - }, -/obj/item/stamp/captain{ - pixel_x = 8 - }, -/obj/structure/desk_bell/speed_demon{ - pixel_x = -8 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; - name = "Bottle of Tears"; - pixel_x = 8; - pixel_y = 20 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "woq" = ( /turf/closed/wall, /area/chapel/main) @@ -87815,6 +87850,14 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"wpp" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/table, +/obj/item/food/dough, +/obj/item/reagent_containers/cup/bowl, +/obj/item/food/grown/tomato, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "wpw" = ( /obj/structure/sign/warning/pods{ pixel_x = -32 @@ -88348,42 +88391,6 @@ }, /turf/open/floor/iron/dark, /area/science/lobby) -"wvS" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/closet/secure_closet/injection, -/obj/item/reagent_containers/cup/bottle/toxin{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/facid{ - name = "fluorosulfuric acid bottle"; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/syringe{ - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/chloralhydrate, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/iron/techmaint, -/area/security/execution/education) "wwl" = ( /turf/open/floor/plating{ burnt = 1 @@ -88608,6 +88615,41 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"wzo" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/dropper, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "chemisttop"; + name = "Chemistry Shutter Control"; + pixel_x = 7; + pixel_y = -24; + req_access_txt = "33" + }, +/obj/machinery/button/door{ + id = "chemistbot"; + name = "Chemistry Shutter Control"; + pixel_x = -6; + pixel_y = -24; + req_access_txt = "33" + }, +/obj/item/storage/pill_bottle, +/obj/item/reagent_containers/medspray{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/apothecary) "wzw" = ( /obj/structure/sign/directions/science{ dir = 1; @@ -89304,6 +89346,38 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/entry) +"wIW" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_y = 24 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_y = -28 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 28 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 8; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "wIX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -89387,35 +89461,6 @@ /obj/machinery/vending/modularpc, /turf/open/floor/iron/white, /area/science/lobby) -"wKu" = ( -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/machinery/airalarm/directional/north{ - pixel_y = 22 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/syringe{ - pixel_x = 1; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/apothecary) "wKB" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -89640,6 +89685,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"wNm" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/aft) "wNp" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -89998,40 +90049,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"wSr" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "Virology Desk Window"; - req_access_txt = "20" - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/storage/box/masks{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/effect/turf_decal/stripes/closeup, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "Isolation Shutters" - }, -/obj/structure/desk_bell{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/machinery/door/window/northleft{ - dir = 2; - name = "Virology Desk Window" - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "wSw" = ( /obj/effect/landmark/start/atmospheric_technician, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -92913,6 +92930,14 @@ }, /turf/open/floor/iron/techmaint, /area/crew_quarters/dorms) +"xvy" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "xvL" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -93047,6 +93072,23 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"xxe" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag, +/obj/structure/sign/plaques/deempisi{ + pixel_y = 28 + }, +/obj/item/book/manual/wiki/barman_recipes{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/structure/noticeboard{ + dir = 4; + pixel_x = -27 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "xxf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -93386,20 +93428,6 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) -"xAu" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/pen, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = -6; - pixel_y = 1 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "xAA" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ @@ -95044,20 +95072,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/catwalk_floor, /area/bridge) -"xPy" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/dropper, -/obj/item/hand_labeler, -/obj/item/stack/package_wrap, -/turf/open/floor/iron/dark, -/area/science/lab) "xPz" = ( /obj/effect/turf_decal/stripes/closeup, /obj/effect/spawner/structure/window/plasma/reinforced, @@ -95220,6 +95234,12 @@ }, /turf/open/floor/iron/stairs/left, /area/hallway/primary/central) +"xRu" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/bottle/whiskey, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/port/fore) "xRw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -95440,11 +95460,6 @@ dir = 8 }, /area/crew_quarters/fitness/recreation) -"xTR" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/turf/open/floor/carpet/grimy, -/area/hallway/primary/port) "xUa" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -95709,29 +95724,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/hallway/primary/starboard) -"xXA" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/syringe, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "emmd"; - name = "Emergency Medical Lockdown Shutters" - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/green/fourcorners/contrasted, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/turf/open/floor/iron/dark, -/area/medical/medbay/lobby) "xXH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -95939,28 +95931,36 @@ "xZW" = ( /turf/open/floor/iron, /area/quartermaster/storage) -"yaa" = ( -/obj/structure/table, -/obj/item/kitchen/fork, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 +"yab" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/patron{ + pixel_x = -5; + pixel_y = 16 }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 5; - pixel_y = 6 +/obj/item/reagent_containers/cup/glass/bottle/grappa{ + pixel_x = 10; + pixel_y = 15 }, -/obj/effect/spawner/lootdrop/three_course_meal, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/light/small{ - dir = 4 +/obj/item/reagent_containers/cup/glass/bottle/absinthe{ + pixel_x = -5; + pixel_y = 4 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/item/reagent_containers/cup/glass/bottle/kahlua{ + pixel_x = 9; + pixel_y = 7 }, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/cafeteria) +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = 24 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "yag" = ( /obj/effect/turf_decal/guideline/guideline_in/red, /turf/open/floor/iron/dark/corner{ @@ -111748,7 +111748,7 @@ bXv vQG wpn wxd -jsw +jDR wxd kHH kHH @@ -113492,7 +113492,7 @@ leT leT leT eFZ -cgB +xRu wXp eFZ leT @@ -114301,7 +114301,7 @@ ovf ocT cZb qar -vye +qTl sha xDh wxd @@ -114803,7 +114803,7 @@ cXA cXA cXA dCU -ifl +mUs dCU dCU cXA @@ -115586,7 +115586,7 @@ rNo tjo sha led -qzO +oUy sha wuE amH @@ -115840,7 +115840,7 @@ cqq cXA foJ mxb -tPo +hDD sha sha sha @@ -116051,8 +116051,8 @@ abN abN kHH yjW -ePp -ndu +fIp +vsd yjW aMO byH @@ -116093,7 +116093,7 @@ jbB mbf tNe tNe -gCw +cVU cXA sha sha @@ -116615,7 +116615,7 @@ lsd tkV xfm rxd -nwP +xxe wOu gci nnV @@ -116872,7 +116872,7 @@ ahM rxd rxd rxd -emH +yab qqr hkQ vlF @@ -116920,7 +116920,7 @@ abm msj wUY uQX -ftA +vSU jpl sGf ygc @@ -117338,7 +117338,7 @@ abN bau blm cAg -cIH +pZF mvI dQg beY @@ -118119,7 +118119,7 @@ fgq woq hQe hQe -exT +gbd erC swI swI @@ -118150,7 +118150,7 @@ arZ arZ arZ arZ -gJI +mQj oje rxd oSW @@ -118407,7 +118407,7 @@ mbT mEz txf tdp -vdJ +kyc hin rxd aib @@ -119191,7 +119191,7 @@ eqe vqH vqH sRp -tvw +pDz sRp sxz vqH @@ -119705,10 +119705,10 @@ ttS roM fhD mib -dam +gSV czD mib -lJu +haU wRF hvk vmw @@ -119963,9 +119963,9 @@ mib mib rfs sis -fiV +wpp mib -njG +iBZ jOJ oZr bwH @@ -120217,7 +120217,7 @@ mWm xNi iLg pYP -qxm +tkK mib mLj czD @@ -121525,7 +121525,7 @@ xTG cnU uOq avq -xTR +kmD lPp piR xPG @@ -122248,7 +122248,7 @@ ygM hZS pgb tNV -aLS +uqM gms xJa ifW @@ -122258,7 +122258,7 @@ cxE hMo dgU aWV -cSw +abi oRE xvj wqJ @@ -122539,7 +122539,7 @@ qQj qQj hUT xNh -ial +pXS qlN eJK qKp @@ -123567,7 +123567,7 @@ qQj sXP hUT qQj -smb +opu pji qjc nfx @@ -123772,7 +123772,7 @@ cWr bIL ddX jGv -eWR +tXb aeJ rqd aya @@ -124057,7 +124057,7 @@ mhb esg fTN jId -xAu +bkf fdE uYN wqJ @@ -124287,7 +124287,7 @@ cpH atK nWX bkU -wSr +mqw ozj uuW aQZ @@ -124543,7 +124543,7 @@ rGy hfy eBn nbL -irn +wge aPd vqt uuW @@ -125852,7 +125852,7 @@ lvn tNk dkR iLD -xXA +fYC kXx vhU gwS @@ -126592,7 +126592,7 @@ crQ asn aeJ fqS -aGl +kxf aeJ fXx hxg @@ -126626,7 +126626,7 @@ vhU vhU vhU vhU -wKu +fLf heB kVj vhU @@ -127396,7 +127396,7 @@ pyX iyB heB ocm -uPL +lil uho lMx nDy @@ -127656,7 +127656,7 @@ lMx lMx lPU lMx -iiZ +wzo vhU shm xCx @@ -127944,8 +127944,8 @@ cSo snr hUT iSJ -ayM -hqs +bSN +fpa cmy wPJ oRk @@ -128435,7 +128435,7 @@ wrM vUR wdH rGl -bgd +jFK vUR szG hUW @@ -129505,7 +129505,7 @@ cnM cnM oVz rAx -keX +bqg isS vDc qbd @@ -129768,7 +129768,7 @@ mMf qbd gtO yfq -jti +dsX kAx fIf xJr @@ -130300,7 +130300,7 @@ oth tAi eUq ehQ -rkq +nPp kDo akh xip @@ -130829,13 +130829,13 @@ eNp ozc oYg dlC -geN +dOQ rxv lis tCO lis ide -gzm +kGy siW qTo bmB @@ -131079,7 +131079,7 @@ kJm eUi iHz aZB -dBq +tuO iQp swU rcR @@ -131286,7 +131286,7 @@ uGP nHb gjj pXI -iRk +mYp fUO ssT ybT @@ -131876,7 +131876,7 @@ sMR qTc tBr qTc -uNi +vLO haP ozc nnx @@ -132557,7 +132557,7 @@ xIV wyg kkX nVS -wvS +ptv iyg iOw nVS @@ -133343,7 +133343,7 @@ nWr mCC cuR tJu -pZt +hux bcg qOM mju @@ -133659,7 +133659,7 @@ ere kFN lkl eLS -sYd +bhK mHj abN nnx @@ -133842,7 +133842,7 @@ wOG wzW wyg wYw -rGZ +ejc kjg nBj dOq @@ -133857,9 +133857,9 @@ oEf oEf tWe rDR -qtM +onm tLe -pBN +fmn eRO uxl oYl @@ -134173,7 +134173,7 @@ sTZ eeu mKd iIX -oqj +iXG mHj abN abN @@ -134624,7 +134624,7 @@ fsb hcE mPD aJK -hKB +gLr fsb ehr cNy @@ -135941,7 +135941,7 @@ xrc gEs wBR cTl -qpL +pCA xSV uAE myi @@ -136194,7 +136194,7 @@ rlX gad wLT wZg -xPy +lAL gEs abA wiV @@ -141266,7 +141266,7 @@ hFK hFi nFb wfA -iDU +ttm gwI ivi dVN @@ -141324,7 +141324,7 @@ cBt tXM oPn qyd -soC +gHI pFP ykQ gfk @@ -141521,14 +141521,14 @@ hrQ wfA hip hGf -hYl +wmv wfA uzu gwI ivG gUi jvr -hus +viq yiC mqi aTF @@ -141770,7 +141770,7 @@ csJ nnx nnx yeb -dMN +lvi osY flj tPT @@ -142811,7 +142811,7 @@ wfA puK tvl tvl -wok +vsI hcD oFa yiC @@ -143935,7 +143935,7 @@ ylJ ylJ kEC vXB -dqI +wNm ylJ ylJ uBK @@ -144092,7 +144092,7 @@ ydm xVC fvs gCA -hdx +qGZ hKK qIr ydm @@ -150815,7 +150815,7 @@ wZD xyd qjE yic -yaa +gjN qjE wCr anQ @@ -152100,7 +152100,7 @@ wZR ptW wDO vPF -eDM +xvy wDI vjo ycc @@ -153342,9 +153342,9 @@ flv gLC eYA bti -gnN +jpj fLF -hih +kgy bti ifi rPA @@ -154625,13 +154625,13 @@ aYu aYu kOu kOu -fTU +mif kOu goB gQS hnr kOu -iki +wIW kOu kOu aYu diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e0c8ee46563a1..f3a2253a807ac 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1688,6 +1688,38 @@ /obj/structure/fans/tiny/invisible, /turf/open/space/basic, /area/space) +"agN" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = -10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = -27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = -10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + pixel_x = 4; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "agP" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -3352,26 +3384,6 @@ }, /turf/open/floor/iron, /area/bridge) -"aqK" = ( -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = 3; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/glass/bottle/rum{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain) "aqQ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8942,6 +8954,35 @@ }, /turf/open/floor/engine, /area/science/mixing/chamber) +"bbG" = ( +/obj/item/book/manual/wiki/medicine, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/cable/yellow, +/obj/machinery/power/apc{ + areastring = "/area/medical/cryo"; + dir = 4; + name = "Cryogenics APC"; + pixel_x = 24 + }, +/obj/item/wrench/medical, +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe, +/turf/open/floor/iron/showroomfloor, +/area/medical/cryo) "bbI" = ( /obj/machinery/doppler_array/research/science{ dir = 4 @@ -10342,39 +10383,6 @@ "bkP" = ( /turf/closed/wall/rust, /area/quartermaster/sorting) -"bkU" = ( -/obj/structure/table/wood, -/obj/item/storage/box/seccarts{ - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; - name = "Bottle of Tears"; - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_y = 2 - }, -/obj/machinery/keycard_auth{ - pixel_x = -6; - pixel_y = -24 - }, -/obj/machinery/button/door{ - id = "hosspace"; - name = "Space Blast door Toggle"; - pixel_x = 7; - pixel_y = -24 - }, -/obj/effect/turf_decal/siding/wood/end{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/hos) "bkW" = ( /obj/machinery/door/poddoor/shutters{ id = "teleshutter"; @@ -10680,27 +10688,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/miningoffice) -"bmS" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen_2"; - name = "Hallway Hatch" - }, -/obj/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) "bmZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -10879,27 +10866,6 @@ }, /turf/open/floor/grass, /area/hydroponics) -"bnL" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "Serving Hatch" - }, -/obj/item/toy/figure/chef, -/turf/open/floor/plating, -/area/crew_quarters/kitchen) "bnP" = ( /obj/structure/window/reinforced{ dir = 1 @@ -11113,18 +11079,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/kitchen) -"boy" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/candle/infinite{ - pixel_x = -4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/central) "boB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -11313,6 +11267,28 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/office) +"bpR" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/paicard{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "bpV" = ( /obj/structure/sign/departments/botany, /turf/closed/wall, @@ -11603,31 +11579,6 @@ burnt = 1 }, /area/engine/engineering) -"brB" = ( -/obj/structure/table, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/noticeboard{ - dir = 4; - pixel_x = -27 - }, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 4; - pixel_y = 4 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) "brD" = ( /turf/closed/wall, /area/crew_quarters/toilet/restrooms) @@ -11813,18 +11764,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) -"bta" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/item/clothing/suit/hooded/chaplain_hoodie, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/item/soulstone/anybody/chaplain, -/obj/item/organ/heart, -/obj/item/book/granter/spell/smoke/lesser, -/turf/open/floor/iron/dark, -/area/chapel/office) "btb" = ( /obj/machinery/mass_driver{ dir = 1; @@ -11902,29 +11841,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/chapel/office) -"btq" = ( -/obj/structure/table/wood/fancy, -/obj/effect/turf_decal/stripes/corner, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/whiskey{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/pen, -/obj/machinery/requests_console{ - department = "Chapel"; - departmentType = 2; - name = "Chapel RC"; - pixel_y = -30 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood, -/area/chapel/office) "btw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner{ @@ -14525,6 +14441,27 @@ /obj/structure/cable/yellow, /turf/open/floor/iron/dark, /area/quartermaster/sorting) +"bHy" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ + desc = "An emerald flask, from the Keeper's soul. High in vitamins!"; + name = "estus flask"; + pixel_x = 4; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "bHB" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -15195,38 +15132,6 @@ }, /turf/open/floor/plating, /area/quartermaster/office) -"bLM" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = 10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Tertiary AI Core Access"; - obj_integrity = 300; - pixel_x = -3; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "bLS" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -15533,13 +15438,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"bNT" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "bNU" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -17180,6 +17078,17 @@ }, /turf/open/floor/engine/vacuum, /area/engine/atmos) +"caP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/quartermaster/warehouse) "caT" = ( /obj/structure/lattice, /obj/structure/grille, @@ -17772,28 +17681,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"cdW" = ( -/obj/machinery/turretid{ - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = 3; - pixel_y = 28 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "cdX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18247,26 +18134,6 @@ /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"cfK" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AI Core shutters"; - name = "AI Core Shutter" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/light_switch{ - pixel_x = 6; - pixel_y = 24 - }, -/turf/open/floor/engine, -/area/ai_monitored/turret_protected/ai) "cfL" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 5 @@ -24540,6 +24407,23 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/iron/dark, /area/hallway/secondary/entry) +"cKw" = ( +/obj/structure/table, +/obj/item/food/mint, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/beaker, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/kitchen) "cKx" = ( /obj/effect/turf_decal/stripes/corner, /turf/closed/wall/r_wall, @@ -26261,28 +26145,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"cYd" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/paicard{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) "cYh" = ( /obj/structure/chair/office/light{ dir = 4 @@ -26898,6 +26760,10 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"dhi" = ( +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/turf/open/floor/plating, +/area/quartermaster/warehouse) "dhx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ @@ -27345,46 +27211,6 @@ broken = 1 }, /area/maintenance/port/fore) -"dpR" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -7 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -7 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 7 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/chemistry) -"dpY" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/table/wood, -/obj/item/cultivator{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 9; - pixel_y = 5 - }, -/turf/open/floor/grass, -/area/security/prison) "dqg" = ( /obj/structure/chair/fancy/sofa/old/left{ color = "#742925" @@ -27516,6 +27342,23 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/theatre) +"drK" = ( +/obj/structure/table, +/obj/item/clipboard, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 6 + }, +/obj/item/clothing/glasses/science, +/obj/item/clothing/glasses/science, +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/science/lab) "drL" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green/anticorner/contrasted, @@ -28039,38 +27882,6 @@ }, /turf/open/floor/iron/dark, /area/science/aft) -"dAW" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = -10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = -27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - pixel_x = 4; - req_access_txt = "16" - }, -/turf/open/floor/circuit/red, -/area/ai_monitored/turret_protected/ai) "dBa" = ( /obj/machinery/light{ dir = 4 @@ -28850,6 +28661,35 @@ broken = 1 }, /area/maintenance/starboard) +"dOp" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/item/radio/intercom{ + pixel_y = 27 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/bottle/vodka{ + pixel_x = -8; + pixel_y = 7 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/aft) "dOw" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/engineering, @@ -29511,6 +29351,38 @@ }, /turf/open/floor/iron, /area/bridge) +"dZB" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = 10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Tertiary AI Core Access"; + atom_integrity = 300; + pixel_x = -3; + req_access_txt = "16" + }, +/turf/open/floor/circuit/red, +/area/ai_monitored/turret_protected/ai) "dZN" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/corner{ @@ -30238,16 +30110,6 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) -"eja" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/kitchen/rollingpin, -/obj/item/clothing/head/utility/chefhat, -/turf/open/floor/iron/techmaint, -/area/security/prison) "ejj" = ( /obj/structure/table, /obj/item/storage/box/donkpockets{ @@ -30864,6 +30726,23 @@ burnt = 1 }, /area/maintenance/central) +"etq" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/table/wood, +/obj/item/cultivator{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 9; + pixel_y = 5 + }, +/turf/open/floor/grass, +/area/security/prison) "etx" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -31176,6 +31055,27 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/quartermaster/storage) +"exI" = ( +/obj/structure/bonfire, +/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ + desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; + name = "Carton of Estus" + }, +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb, +/obj/item/melee/baseball_bat{ + desc = "Don't tell anyone you put any points into dex, though."; + icon_state = "swordon"; + item_state = "swordon"; + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; + name = "moonlight greatsword"; + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + }, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/maintenance/starboard/fore) "eym" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -32489,25 +32389,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/lab) -"eWx" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; - list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30); - name = "Kilo-Kocktail"; - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/carpet/green, -/area/lawoffice) "eWy" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -35790,6 +35671,28 @@ /obj/effect/spawner/mail/maintloot, /turf/open/floor/plating, /area/maintenance/port/aft) +"gbr" = ( +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 3; + pixel_y = 28 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "gbw" = ( /obj/effect/landmark/start/scientist, /obj/structure/cable/yellow{ @@ -36153,16 +36056,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/maintenance/central) -"giB" = ( -/obj/structure/mopbucket, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/structure/sign/warning/securearea{ - pixel_x = -32 - }, -/turf/open/floor/iron/dark, -/area/security/brig) "gjd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/structure/cable/yellow{ @@ -37174,6 +37067,25 @@ burnt = 1 }, /area/maintenance/starboard/fore) +"gEQ" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -3; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + desc = "A station exclusive. Consumption may result in seizures, blindness, drunkenness, or even death."; + list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko=30); + name = "Kilo-Kocktail"; + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/carpet/green, +/area/lawoffice) "gFe" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/engine/vacuum, @@ -38261,6 +38173,39 @@ }, /turf/open/floor/iron/dark, /area/science/xenobiology) +"gYn" = ( +/obj/structure/table/wood, +/obj/item/storage/box/seccarts{ + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + desc = "A bottle of whiskey. There's a label that reads 'tears' taped to the front."; + name = "Bottle of Tears"; + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_y = 2 + }, +/obj/machinery/keycard_auth{ + pixel_x = -6; + pixel_y = -24 + }, +/obj/machinery/button/door{ + id = "hosspace"; + name = "Space Blast door Toggle"; + pixel_x = 7; + pixel_y = -24 + }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/hos) "gYq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ @@ -38339,6 +38284,18 @@ }, /turf/open/floor/wood, /area/crew_quarters/locker) +"gZV" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/candle/infinite{ + pixel_x = -4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/central) "hak" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -38529,27 +38486,6 @@ }, /turf/open/floor/engine, /area/engine/engineering) -"hec" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_y = 22 - }, -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/glasses/science{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/glasses/science, -/obj/effect/turf_decal/bot, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -6 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/chemistry) "hef" = ( /obj/machinery/light_switch{ pixel_x = 1; @@ -39290,6 +39226,29 @@ }, /turf/open/floor/iron, /area/quartermaster/miningoffice) +"hqf" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 7 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/chemistry) "hqi" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -39547,13 +39506,6 @@ }, /turf/open/floor/iron, /area/bridge) -"htk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/quartermaster/warehouse) "htu" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -28 @@ -40444,6 +40396,31 @@ broken = 1 }, /area/maintenance/starboard/fore) +"hGj" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -3; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 24 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/chapel/office) "hGq" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -42400,6 +42377,24 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) +"iod" = ( +/obj/structure/table/wood, +/obj/item/clipboard, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/toy/figure/bartender{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/rag, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "iok" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -42892,19 +42887,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/science/aft) -"izu" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/pwr_game{ - pixel_x = 6; - pixel_y = 7; - list_reagents = list(/datum/reagent/consumable/pwr_game = 5) - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 1 - }, -/turf/open/floor/wood, -/area/security/prison) "izz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42995,24 +42977,36 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/bar) -"iAH" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -2; - pixel_y = 2 +"iAJ" = ( +/obj/structure/table/glass, +/obj/item/paper_bin{ + pixel_x = -9; + pixel_y = 3 }, -/obj/item/toy/figure/bartender{ - pixel_x = 8; - pixel_y = 2 +/obj/item/pen{ + pixel_x = -8; + pixel_y = 3 }, -/obj/item/reagent_containers/cup/rag, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/storage/box/syringes{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = -7 + }, +/obj/machinery/light{ + bulb_colour = "#22bfa2"; + bulb_vacuum_colour = "#22bfa2"; + dir = 4; + nightshift_light_color = "#22bfa2" }, -/obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, -/area/crew_quarters/bar) +/area/medical/virology) "iAR" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -44719,10 +44713,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/security/execution/transfer) -"jcF" = ( -/obj/item/reagent_containers/cup/soda_cans/dr_gibb, -/turf/open/floor/plating, -/area/quartermaster/warehouse) "jcT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -45985,95 +45975,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"juC" = ( -/obj/item/restraints/handcuffs{ - pixel_y = 4 - }, -/obj/item/circuitboard/machine/chem_heater, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/structure/closet/crate/secure/plasma{ - name = "virology crate"; - req_access_txt = "39" - }, -/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, -/turf/open/floor/iron/showroomfloor, -/area/medical/virology) "juE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -47412,27 +47313,6 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/docking/arrival) -"jQD" = ( -/obj/machinery/airalarm/directional/south{ - pixel_y = -22 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/disposal) "jQL" = ( /obj/effect/turf_decal/plaque{ icon_state = "L2" @@ -50400,35 +50280,6 @@ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, /area/quartermaster/exploration_dock) -"kRc" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/item/radio/intercom{ - pixel_y = 27 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup, -/obj/item/reagent_containers/cup/glass/bottle/vodka{ - pixel_x = -8; - pixel_y = 7 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/aft) "kRl" = ( /obj/structure/girder, /turf/open/floor/plating{ @@ -52716,6 +52567,48 @@ }, /turf/open/floor/iron, /area/teleporter) +"lAa" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + color = "#439C1E" + }, +/obj/structure/closet/crate/secure/plasma{ + name = "virology crate"; + req_access_txt = "39" + }, +/obj/item/book/manual/wiki/infections, +/obj/item/book/manual/wiki/infections, +/obj/item/extrapolator, +/obj/item/storage/box/beakers{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/syringes{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/virology) "lAi" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -53225,6 +53118,27 @@ }, /turf/open/floor/iron/showroomfloor, /area/quartermaster/exploration_prep) +"lJJ" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Serving Hatch" + }, +/obj/item/toy/figure/chef, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "lJO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -54083,24 +53997,6 @@ burnt = 1 }, /area/maintenance/port/aft) -"lXx" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/crowbar/red, -/obj/item/cultivator, -/obj/item/wirecutters, -/obj/item/reagent_containers/cup/bucket, -/obj/item/circuitboard/machine/biogenerator, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/quartermaster/warehouse) "lXA" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -54164,6 +54060,26 @@ broken = 1 }, /area/maintenance/port) +"lZd" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AI Core shutters"; + name = "AI Core Shutter" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/light_switch{ + pixel_x = 6; + pixel_y = 24 + }, +/turf/open/floor/engine, +/area/ai_monitored/turret_protected/ai) "lZf" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -54203,27 +54119,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/bar) -"lZo" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ - desc = "An emerald flask, from the Keeper's soul. High in vitamins!"; - name = "estus flask"; - pixel_x = 4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar/atrium) "lZN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -55614,6 +55509,34 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/hydroponics) +"mBH" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "Isolation Shutters" + }, +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + name = "Virology Desk"; + req_access_txt = "39"; + dir = 4 + }, +/obj/item/storage/box/masks, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/medical/virology) "mBL" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -57517,21 +57440,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/prison, /area/security/prison) -"nkq" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/reagent_containers/cup/bucket, -/obj/item/radio/intercom{ - pixel_y = 22 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/janitor) "nkU" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 8; @@ -57756,6 +57664,15 @@ burnt = 1 }, /area/maintenance/port/aft) +"npf" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bowl, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "npg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -58449,6 +58366,12 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/xenobiology) +"nDC" = ( +/obj/structure/flora/ausbushes/leafybush, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/grass, +/area/security/prison) "nDT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -58937,6 +58860,19 @@ }, /turf/open/floor/iron, /area/security/brig/aft) +"nKS" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ + pixel_x = 6; + pixel_y = 7; + list_reagents = list(/datum/reagent/consumable/pwr_game = 5) + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 1 + }, +/turf/open/floor/wood, +/area/security/prison) "nKU" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -59019,27 +58955,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"nLF" = ( -/obj/effect/turf_decal/bot, -/obj/structure/closet/crate/hydroponics, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/crowbar/red, -/obj/item/cultivator, -/obj/item/wirecutters, -/obj/item/reagent_containers/cup/bucket, -/obj/item/circuitboard/machine/biogenerator, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "nLN" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -59261,23 +59176,6 @@ broken = 1 }, /area/maintenance/starboard) -"nPI" = ( -/obj/structure/table, -/obj/item/food/mint, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/reagent_containers/condiment/sugar{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/beaker, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/kitchen) "nPL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -59872,31 +59770,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/security/main) -"nZh" = ( -/obj/structure/table, -/obj/item/reagent_containers/condiment/peppermill{ - desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; - pixel_x = -8; - pixel_y = 2 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - desc = "Salt. From space oceans, presumably. A staple of modern medicine."; - pixel_x = -8; - pixel_y = 12 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/item/storage/box/donkpockets{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/kitchen) "nZk" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable/yellow{ @@ -60022,6 +59895,24 @@ broken = 1 }, /area/maintenance/starboard) +"oau" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/item/cultivator, +/obj/item/wirecutters, +/obj/item/reagent_containers/cup/bucket, +/obj/item/circuitboard/machine/biogenerator, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/quartermaster/warehouse) "oaH" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -60474,6 +60365,20 @@ broken = 1 }, /area/maintenance/aft) +"ohR" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark, +/area/chapel/main) "ohU" = ( /obj/machinery/power/solar{ id = "aftstarboard"; @@ -61255,6 +61160,27 @@ burnt = 1 }, /area/maintenance/port/fore) +"ouh" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = 22 + }, +/obj/structure/table/glass, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/glasses/science{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/science, +/obj/effect/turf_decal/bot, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -6 + }, +/turf/open/floor/iron/showroomfloor, +/area/medical/chemistry) "ouu" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating{ @@ -62321,34 +62247,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hop) -"oMW" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "Isolation Shutters" - }, -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - name = "Virology Desk"; - req_access_txt = "39"; - dir = 4 - }, -/obj/item/storage/box/masks, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -9; - pixel_y = 5 - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/medical/virology) "oNj" = ( /obj/machinery/airalarm/directional/south{ pixel_y = -22 @@ -62365,6 +62263,18 @@ broken = 1 }, /area/engine/engineering) +"oNw" = ( +/obj/structure/table/wood/fancy, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/clothing/suit/hooded/chaplain_hoodie, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/item/soulstone/anybody/chaplain, +/obj/item/organ/heart, +/obj/item/book/granter/spell/smoke/lesser, +/turf/open/floor/iron/dark, +/area/chapel/office) "oNy" = ( /obj/machinery/light, /obj/machinery/light_switch{ @@ -63063,6 +62973,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/science/research) +"oYX" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/delivery, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "oZd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, @@ -63918,27 +63837,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/security/execution/education) -"pmx" = ( -/obj/structure/bonfire, -/obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice{ - desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; - name = "Carton of Estus" - }, -/obj/effect/decal/remains/human, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/item/melee/baseball_bat{ - desc = "Don't tell anyone you put any points into dex, though."; - icon_state = "swordon"; - item_state = "swordon"; - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'; - name = "moonlight greatsword"; - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - }, -/turf/open/floor/plating{ - burnt = 1 - }, -/area/maintenance/starboard/fore) "pmM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -64119,6 +64017,27 @@ /obj/item/clothing/accessory/maidapron, /turf/open/floor/iron/dark, /area/security/brig) +"ppB" = ( +/obj/effect/turf_decal/bot, +/obj/structure/closet/crate/hydroponics, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/item/cultivator, +/obj/item/wirecutters, +/obj/item/reagent_containers/cup/bucket, +/obj/item/circuitboard/machine/biogenerator, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "ppJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -64794,6 +64713,31 @@ }, /turf/open/floor/iron/dark, /area/maintenance/fore) +"pzi" = ( +/obj/structure/table, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/noticeboard{ + dir = 4; + pixel_x = -27 + }, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar/atrium) "pzm" = ( /obj/machinery/conveyor{ dir = 5; @@ -65687,6 +65631,21 @@ /obj/effect/mapping_helpers/dead_body_placer/medbay_morgue, /turf/open/floor/iron/dark, /area/medical/morgue) +"pPm" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/item/reagent_containers/cup/bucket, +/obj/item/radio/intercom{ + pixel_y = 22 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/janitor) "pPG" = ( /obj/machinery/light/small{ dir = 4 @@ -66691,6 +66650,19 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, /area/teleporter) +"qgk" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "qgm" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/personal, @@ -67366,35 +67338,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/quartermaster/warehouse) -"qti" = ( -/obj/item/book/manual/wiki/medicine, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/structure/cable/yellow, -/obj/machinery/power/apc{ - areastring = "/area/medical/cryo"; - dir = 4; - name = "Cryogenics APC"; - pixel_x = 24 - }, -/obj/item/wrench/medical, -/obj/structure/table/glass, -/obj/item/reagent_containers/syringe, -/turf/open/floor/iron/showroomfloor, -/area/medical/cryo) "qtn" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -67556,6 +67499,26 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/port/aft) +"qvp" = ( +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain) "qvr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -67958,15 +67921,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/engine/atmos) -"qCD" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bowl, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/turf/open/floor/iron/techmaint, -/area/security/prison) "qCI" = ( /obj/structure/girder/displaced, /turf/open/floor/plating, @@ -68128,6 +68082,31 @@ burnt = 1 }, /area/maintenance/starboard/fore) +"qFg" = ( +/obj/structure/table, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/kitchen) "qFB" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -69026,17 +69005,6 @@ }, /turf/open/floor/noslip/white, /area/security/main) -"qVe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/quartermaster/warehouse) "qVl" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -69185,25 +69153,6 @@ }, /turf/open/floor/iron/dark, /area/hydroponics) -"qXR" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11; - pixel_y = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/loading_area, -/obj/machinery/door/window/southright{ - name = "Trash Chute"; - req_one_access_txt = "26" - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron, -/area/janitor) "qXV" = ( /obj/effect/spawner/randomvend/cola, /obj/effect/turf_decal/bot, @@ -69728,6 +69677,16 @@ /obj/structure/sign/warning/docking, /turf/closed/wall, /area/science/shuttledock) +"rft" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + broken = 1 + }, +/area/maintenance/central) "rfv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -69805,6 +69764,21 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/storage) +"rgL" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/chapel/main) "rgZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash, @@ -70437,29 +70411,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"rpF" = ( -/obj/structure/table, -/obj/item/folder, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -4 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 4 - }, -/obj/item/reagent_containers/dropper, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/science/xenobiology) "rqo" = ( /obj/effect/turf_decal/box, /obj/machinery/power/solar{ @@ -71172,6 +71123,46 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"rEb" = ( +/obj/structure/sign/directions/evac{ + dir = 8; + pixel_y = 32 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/starkist{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/shamblers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ + pixel_x = -4; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 6; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_y = 20 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, +/area/science/aft) "rFb" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -74134,16 +74125,6 @@ broken = 1 }, /area/maintenance/aft) -"sHz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating{ - broken = 1 - }, -/area/maintenance/central) "sId" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -74420,31 +74401,6 @@ /obj/item/soap/nanotrasen, /turf/open/floor/noslip/white, /area/security/prison) -"sMK" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -3; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/bottle/holywater{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/chapel/office) "sMT" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/binary/pump{ @@ -76614,36 +76570,6 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/fore) -"tyw" = ( -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -9; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/item/storage/box/syringes{ - pixel_x = 6; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = -7 - }, -/obj/machinery/light{ - bulb_colour = "#22bfa2"; - bulb_vacuum_colour = "#22bfa2"; - dir = 4; - nightshift_light_color = "#22bfa2" - }, -/turf/open/floor/iron/dark, -/area/medical/virology) "tyN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -77832,15 +77758,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/science/research) -"tXJ" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/delivery, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "tXU" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -77879,23 +77796,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/quartermaster/office) -"tZQ" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 6 - }, -/obj/item/clothing/glasses/science, -/obj/item/clothing/glasses/science, -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/science/lab) "uad" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -78810,6 +78710,95 @@ /obj/machinery/fax/cargo, /turf/open/floor/iron, /area/quartermaster/storage) +"upK" = ( +/obj/item/restraints/handcuffs{ + pixel_y = 4 + }, +/obj/item/circuitboard/machine/chem_heater, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/structure/closet/crate/secure/plasma{ + name = "virology crate"; + req_access_txt = "39" + }, +/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, +/turf/open/floor/iron/showroomfloor, +/area/medical/virology) "upL" = ( /obj/machinery/door/poddoor/preopen{ id = "Prisongate"; @@ -79192,6 +79181,27 @@ }, /turf/open/floor/plating, /area/quartermaster/warehouse) +"uuH" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + desc = "Often used to flavor food or make people sneeze. Fashionably moved to the left side of the table."; + pixel_x = -8; + pixel_y = 2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + desc = "Salt. From space oceans, presumably. A staple of modern medicine."; + pixel_x = -8; + pixel_y = 12 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen_2"; + name = "Hallway Hatch" + }, +/obj/structure/window/reinforced, +/turf/open/floor/plating, +/area/crew_quarters/kitchen) "uuY" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -79903,19 +79913,6 @@ broken = 1 }, /area/maintenance/starboard) -"uGS" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/delivery, -/obj/machinery/light/small, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "uHp" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -80021,6 +80018,29 @@ burnt = 1 }, /area/bridge) +"uKa" = ( +/obj/structure/table/wood/fancy, +/obj/effect/turf_decal/stripes/corner, +/obj/item/paper_bin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/pen, +/obj/machinery/requests_console{ + department = "Chapel"; + departmentType = 2; + name = "Chapel RC"; + pixel_y = -30 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/chapel/office) "uKd" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 1 @@ -80195,6 +80215,29 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/science/mixing) +"uLP" = ( +/obj/structure/table, +/obj/item/folder, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 4 + }, +/obj/item/reagent_containers/dropper, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/science/xenobiology) "uMj" = ( /obj/structure/chair{ dir = 4 @@ -80463,12 +80506,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) -"uQT" = ( -/obj/structure/flora/ausbushes/leafybush, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/grass, -/area/security/prison) "uRb" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/corner{ @@ -83726,19 +83763,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/medical/medbay/central) -"vSy" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hydroponics) "vSA" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -84362,20 +84386,6 @@ "waD" = ( /turf/open/floor/plating/asteroid/airless, /area/quartermaster/warehouse) -"waM" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron/dark, -/area/chapel/main) "waU" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -85011,48 +85021,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"wkJ" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - color = "#439C1E" - }, -/obj/structure/closet/crate/secure/plasma{ - name = "virology crate"; - req_access_txt = "39" - }, -/obj/item/book/manual/wiki/infections, -/obj/item/book/manual/wiki/infections, -/obj/item/extrapolator, -/obj/item/storage/box/beakers{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/syringes{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/medical/virology) "wkP" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -85142,24 +85110,6 @@ /obj/effect/loot_jobscale/medical/medkits, /turf/open/floor/iron/showroomfloor, /area/medical/storage) -"wms" = ( -/obj/structure/rack, -/obj/effect/turf_decal/bot, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/multitool, -/obj/item/storage/toolbox/electrical, -/obj/item/multitool{ - pixel_x = 4 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "wmQ" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/corner{ @@ -85346,6 +85296,25 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"wps" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11; + pixel_y = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/loading_area, +/obj/machinery/door/window/southright{ + name = "Trash Chute"; + req_one_access_txt = "26" + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/effect/turf_decal/tile/blue, +/turf/open/floor/iron, +/area/janitor) "wpt" = ( /obj/structure/closet/secure_closet/RD, /obj/effect/turf_decal/delivery, @@ -86643,6 +86612,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"wIv" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/small, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "wIP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/tile/purple{ @@ -87650,6 +87632,27 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"wXc" = ( +/obj/machinery/airalarm/directional/south{ + pixel_y = -22 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/maintenance/disposal) "wXg" = ( /obj/effect/turf_decal/bot, /obj/structure/cable/yellow{ @@ -87686,6 +87689,13 @@ name = "mainframe floor" }, /area/tcommsat/server) +"wXE" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wXN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/room/threexthree, @@ -88136,6 +88146,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron, /area/engine/atmos) +"xeX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb, +/turf/open/floor/plating{ + burnt = 1 + }, +/area/quartermaster/warehouse) "xfb" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -89104,46 +89121,6 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/showroomfloor, /area/security/main) -"xuS" = ( -/obj/structure/sign/directions/evac{ - dir = 8; - pixel_y = 32 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/starkist{ - pixel_x = 10; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/shamblers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/lemon_lime{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/pwr_game{ - pixel_x = -4; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 6; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ - pixel_y = 20 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/science/aft) "xuX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -89317,6 +89294,24 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/hallway/primary/aft) +"xyt" = ( +/obj/structure/rack, +/obj/effect/turf_decal/bot, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/multitool, +/obj/item/storage/toolbox/electrical, +/obj/item/multitool{ + pixel_x = 4 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "xyv" = ( /obj/structure/sign/departments/engineering{ pixel_x = 32; @@ -90268,6 +90263,16 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) +"xOz" = ( +/obj/structure/mopbucket, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/structure/sign/warning/securearea{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/security/brig) "xON" = ( /obj/machinery/computer/holodeck/prison, /obj/effect/turf_decal/stripes/line{ @@ -90695,6 +90700,16 @@ burnt = 1 }, /area/maintenance/starboard) +"xVd" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/kitchen/rollingpin, +/obj/item/clothing/head/utility/chefhat, +/turf/open/floor/iron/techmaint, +/area/security/prison) "xVl" = ( /obj/effect/turf_decal/bot, /turf/open/floor/glass/reinforced, @@ -91280,21 +91295,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/bar/atrium) -"yeC" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/chapel/main) "yeI" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -108976,7 +108976,7 @@ qvH qvH nmY vbU -eja +xVd bQy hEG ciO @@ -109233,7 +109233,7 @@ qvH qvH jel iTH -qCD +npf aav mkY aXg @@ -109510,7 +109510,7 @@ gSb njG uoK njG -giB +xOz eyz njG aaa @@ -110797,7 +110797,7 @@ mbD hbo fmb woS -bkU +gYn wVu aUz aaa @@ -111028,7 +111028,7 @@ aav ijY epb ukl -izu +nKS qbu iQT gJr @@ -111246,7 +111246,7 @@ aNG pUD fbp ixg -qti +bbG nfy iVR fzU @@ -112289,7 +112289,7 @@ dbg lkt aQW afe -oMW +mBH cBi oDA afe @@ -112313,8 +112313,8 @@ uFY lCW yhn tja -uQT -dpY +nDC +etq avR rnM nhx @@ -112797,7 +112797,7 @@ xfL exk hDh aNn -hec +ouh yak cJW swl @@ -113311,7 +113311,7 @@ ttH prh jGn aQW -dpR +hqf yak vIG kwL @@ -113322,8 +113322,8 @@ bMi wKN bAN aWM -wkJ -juC +lAa +upK jWX aoH tjn @@ -114347,7 +114347,7 @@ buc soa ruo drQ -tyw +iAJ qyz iNU vlT @@ -114836,7 +114836,7 @@ aWG wCV btf btk -btq +uKa aWG hQz phw @@ -115348,7 +115348,7 @@ sSv kRL bsm xTj -sMK +hGj xna lXA aWG @@ -115861,7 +115861,7 @@ abN alf unx aWG -bta +oNw btC vJx gfr @@ -116380,7 +116380,7 @@ aWG bto xEe aWG -waM +ohR raS bwX btA @@ -116637,7 +116637,7 @@ bsm aWG cJQ aWG -yeC +rgL qZQ xqa wRe @@ -116672,7 +116672,7 @@ aoh prB bEY cIB -eWx +gEQ nHM aoA wUH @@ -118191,7 +118191,7 @@ ant uRI iEg btH -iAH +iod gbc lSB iAC @@ -119426,7 +119426,7 @@ aAg aAg asZ asZ -dAW +agN asZ asZ aAg @@ -119743,7 +119743,7 @@ rFb apX bkj qyJ -boy +gZV apX bmJ bAm @@ -120197,7 +120197,7 @@ aay acd cdY cdZ -cdW +gbr cdY acx acR @@ -120711,7 +120711,7 @@ aaU aaN cdZ cdY -cfK +lZd cdY abV acj @@ -121482,7 +121482,7 @@ asZ asZ aAg asZ -bLM +dZB asZ aAg asZ @@ -124378,7 +124378,7 @@ aox aox bAx asx -aqK +qvp azC bHG cIE @@ -124386,7 +124386,7 @@ cIL asx asx bOM -sHz +rft kPh aox vln @@ -125905,7 +125905,7 @@ bqK xjj lBA xfM -brB +pzi bar izD ajt @@ -125924,7 +125924,7 @@ rhI dcE cIA bnT -uGS +wIv bmM wlv bew @@ -126138,7 +126138,7 @@ aLh evG iny cDD -pmx +exI cFm vzg ejK @@ -126168,7 +126168,7 @@ jlV brQ jfd tNl -nZh +qFg mmO uZa bjn @@ -126416,7 +126416,7 @@ rKa ggQ bna dNG -lZo +bHy eIg ucI kLS @@ -126424,7 +126424,7 @@ eeK ohZ dsr fKZ -nPI +cKw xQc ubM icj @@ -126936,7 +126936,7 @@ teM teM teM fRS -bnL +lJJ fNb jJE pbs @@ -126953,7 +126953,7 @@ urA vgt drL kEB -nLF +ppB bmM aZd hdf @@ -127191,7 +127191,7 @@ ybb hCi snt wou -cYd +bpR qjA ajt dxY @@ -127206,8 +127206,8 @@ pmM yar sXZ vNK -vSy -tXJ +qgk +oYX boa boh bon @@ -127454,7 +127454,7 @@ bwi ajt rGx bph -bmS +uuH bmZ aZd bqS @@ -127694,7 +127694,7 @@ ixh gjd pzN eLw -wms +xyt aYH vOl rKa @@ -128991,7 +128991,7 @@ vpZ bch aYd vmw -tZQ +drK aYd bfn cbk @@ -129021,7 +129021,7 @@ bNM wAq lis siW -qXR +wps cjz bNv yaT @@ -129222,7 +129222,7 @@ nJt bzt nJt uZV -rpF +uLP dNN iBw dZe @@ -129789,7 +129789,7 @@ eEB cZB xGh bNM -nkq +pPm vqC wag bOH @@ -130344,7 +130344,7 @@ fkE coC cNF iKN -jQD +wXc cnu cnu cnd @@ -130509,7 +130509,7 @@ bbx aWJ bfs alB -kRc +dOp uhr ewi baL @@ -131280,7 +131280,7 @@ alB bwe bwe alB -xuS +rEb qSD aSr aZF @@ -132352,7 +132352,7 @@ ags exE inM bhQ -bNT +wXE bSz dpg qJq @@ -144596,7 +144596,7 @@ hHu cCU gzN rag -qVe +caP act tjz vpC @@ -144851,7 +144851,7 @@ abq iHi lga fde -lXx +oau wtt oGh act @@ -146659,7 +146659,7 @@ sMc iCX kHh act -jcF +dhi ega wKL cCr @@ -147941,7 +147941,7 @@ pWT kfw fnM lYs -htk +xeX dDY act act diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0271a1ec07e76..b50d40b457b81 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1120,6 +1120,32 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/port/fore) +"ald" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/wrench/medical, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/medical/patients_rooms) "aln" = ( /obj/machinery/computer/holodeck{ dir = 4 @@ -4241,24 +4267,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/crew_quarters/dorms) -"aKp" = ( -/obj/item/reagent_containers/spray/plantbgone, -/obj/item/reagent_containers/spray/pestspray{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/bottle/nutrient/ez, -/obj/item/reagent_containers/cup/bottle/nutrient/rh{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/structure/table, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/hydroponics/garden) "aKq" = ( /obj/machinery/biogenerator, /obj/machinery/firealarm{ @@ -4267,19 +4275,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/hydroponics/garden) -"aKr" = ( -/obj/structure/table, -/obj/item/cultivator, -/obj/item/hatchet, -/obj/item/crowbar, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/iron, -/area/hydroponics/garden) "aKt" = ( /obj/item/seeds/apple, /obj/item/seeds/banana, @@ -5794,18 +5789,6 @@ }, /turf/open/floor/iron, /area/hydroponics/garden) -"aSk" = ( -/obj/structure/table, -/obj/item/hatchet, -/obj/item/cultivator, -/obj/item/crowbar, -/obj/item/reagent_containers/cup/bucket, -/obj/item/plant_analyzer, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hydroponics/garden) "aSn" = ( /obj/item/storage/bag/plants/portaseeder, /obj/structure/table, @@ -6975,70 +6958,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) -"aZQ" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = -10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = -27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = -10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Secondary AI Core Access"; - obj_integrity = 300; - pixel_x = 4; - req_access_txt = "16" - }, -/turf/open/floor/circuit/green, -/area/ai_monitored/turret_protected/ai) -"aZY" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 10; - pixel_y = 22 - }, -/obj/item/radio/intercom{ - freerange = 1; - name = "Common Channel"; - pixel_x = 27 - }, -/obj/item/radio/intercom{ - freerange = 1; - frequency = 1447; - name = "Private Channel"; - pixel_x = 10; - pixel_y = -25 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Tertiary AI Core Access"; - obj_integrity = 300; - pixel_x = -3; - req_access_txt = "16" - }, -/turf/open/floor/circuit/green, -/area/ai_monitored/turret_protected/ai) "aZZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -7376,6 +7295,15 @@ "bbY" = ( /turf/open/floor/iron, /area/hallway/primary/port) +"bbZ" = ( +/obj/structure/table/glass, +/obj/item/storage/box/donkpockets, +/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/engine/break_room) "bcc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -8207,19 +8135,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain/private) -"bhu" = ( -/obj/machinery/light_switch{ - pixel_y = -25 - }, -/obj/structure/table/wood, -/obj/item/razor{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/reagent_containers/cup/glass/flask/gold, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) "bhv" = ( /obj/item/kirbyplants/random, /turf/open/floor/carpet/royalblue, @@ -10025,6 +9940,15 @@ /obj/item/stamp/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) +"btj" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron, +/area/hydroponics) "btu" = ( /obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance, @@ -10657,11 +10581,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/crew_quarters/heads/captain/private) -"byr" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/shaker, -/turf/open/floor/carpet/royalblue, -/area/crew_quarters/heads/captain/private) "byv" = ( /obj/machinery/firealarm{ dir = 4; @@ -12233,34 +12152,6 @@ }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) -"bHJ" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = 3; - pixel_y = -2 - }, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark_blue, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "bHK" = ( /obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; @@ -14573,24 +14464,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"bUn" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hydroponics) -"bUo" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron, -/area/hydroponics) "bUq" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -15185,14 +15058,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"bYn" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/bowl, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/prison, -/area/security/prison) "bYs" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -16767,71 +16632,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/quartermaster/office) -"cmb" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = -4; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/bottle/chloralhydrate, -/obj/item/reagent_containers/cup/bottle/toxin{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/morphine{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/cup/bottle/facid{ - name = "fluorosulfuric acid bottle"; - pixel_x = -3; - pixel_y = 6 - }, -/obj/item/reagent_containers/syringe{ - pixel_y = 5 - }, -/obj/item/reagent_containers/dropper, -/obj/machinery/button/ignition{ - id = "executionburn"; - name = "Justice Ignition Switch"; - pixel_x = -25; - pixel_y = 36 - }, -/obj/machinery/button/door{ - id = "executionfireblast"; - name = "Justice Area Lockdown"; - pixel_x = -25; - pixel_y = 26; - req_access_txt = "2" - }, -/obj/item/assembly/signaler{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/machinery/button/flasher{ - id = "justiceflash"; - name = "Justice Flash Control"; - pixel_x = -36; - pixel_y = 36; - req_access_txt = "1" - }, -/obj/machinery/button/door{ - id = "SecJusticeChamber"; - name = "Justice Vent Control"; - pixel_x = -36; - pixel_y = 26; - req_access_txt = "3" - }, -/obj/effect/turf_decal/tile/red/half{ - dir = 4 - }, -/obj/machinery/airalarm/all_access{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/iron/dark/smooth_half, -/area/security/execution/education) "cmc" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, @@ -17001,19 +16801,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/restrooms) -"cou" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = 8; - pixel_y = 12 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/science/shuttledock) "cow" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17905,6 +17692,28 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"cwo" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/sillycup{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/crew_quarters/fitness/recreation) "cwA" = ( /turf/open/floor/iron/white, /area/medical/genetics) @@ -18010,23 +17819,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"cxP" = ( -/obj/structure/table/wood/poker, -/obj/item/toy/cards/deck{ - pixel_x = -13; - pixel_y = -10 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = -8; - pixel_y = 8 - }, -/obj/item/holochip{ - credits = 30; - pixel_x = 5; - pixel_y = -4 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "cxT" = ( /obj/machinery/light{ dir = 4; @@ -18147,26 +17939,6 @@ }, /turf/open/floor/iron/dark, /area/science/xenobiology) -"cyJ" = ( -/obj/structure/table/glass, -/obj/item/stack/sheet/mineral/plasma{ - amount = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/dropper, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/science/xenobiology) "cyK" = ( /obj/structure/chair/office/light{ dir = 1 @@ -18558,20 +18330,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/robotics/lab) -"cDe" = ( -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 - }, -/obj/structure/rack, -/obj/item/book/manual/wiki/robotics_cyborgs{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/item/storage/belt/utility, -/obj/item/reagent_containers/cup/beaker/large, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/science/robotics/lab) "cDi" = ( /turf/closed/wall, /area/science/robotics/lab) @@ -19742,6 +19500,34 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"cPY" = ( +/obj/structure/table/glass, +/obj/item/folder/white{ + pixel_x = 6; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -2; + pixel_y = -4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/requests_console{ + department = "Chemistry Lab"; + name = "Chemistry RC"; + pixel_x = 32; + pixel_y = -2; + receive_ore_updates = 1 + }, +/turf/open/floor/iron, +/area/medical/chemistry) "cPZ" = ( /obj/structure/closet/crate/coffin, /turf/open/floor/plating, @@ -21198,6 +20984,34 @@ }, /turf/open/floor/engine, /area/engine/supermatter) +"dfn" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_blue, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "dfp" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -21707,21 +21521,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"diw" = ( -/obj/machinery/firealarm{ - pixel_y = 29 - }, -/obj/structure/sign/poster/official/random{ - pixel_x = 32 - }, -/obj/structure/closet/crate/hydroponics, -/obj/item/shovel/spade, -/obj/item/wrench, -/obj/item/reagent_containers/cup/bucket, -/obj/item/cultivator, -/obj/item/wirecutters, -/turf/open/floor/iron, -/area/hydroponics) "diz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23372,16 +23171,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/storage_shared) -"dJG" = ( -/obj/structure/table/reinforced, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -2; - pixel_y = 13 - }, -/obj/item/clothing/head/utility/chefhat, -/turf/open/floor/prison, -/area/security/prison) "dJI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -24009,6 +23798,71 @@ }, /turf/open/floor/iron, /area/medical/storage) +"dVH" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/bottle/chloralhydrate, +/obj/item/reagent_containers/cup/bottle/toxin{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/morphine{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/cup/bottle/facid{ + name = "fluorosulfuric acid bottle"; + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/reagent_containers/syringe{ + pixel_y = 5 + }, +/obj/item/reagent_containers/dropper, +/obj/machinery/button/ignition{ + id = "executionburn"; + name = "Justice Ignition Switch"; + pixel_x = -25; + pixel_y = 36 + }, +/obj/machinery/button/door{ + id = "executionfireblast"; + name = "Justice Area Lockdown"; + pixel_x = -25; + pixel_y = 26; + req_access_txt = "2" + }, +/obj/item/assembly/signaler{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/machinery/button/flasher{ + id = "justiceflash"; + name = "Justice Flash Control"; + pixel_x = -36; + pixel_y = 36; + req_access_txt = "1" + }, +/obj/machinery/button/door{ + id = "SecJusticeChamber"; + name = "Justice Vent Control"; + pixel_x = -36; + pixel_y = 26; + req_access_txt = "3" + }, +/obj/effect/turf_decal/tile/red/half{ + dir = 4 + }, +/obj/machinery/airalarm/all_access{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/iron/dark/smooth_half, +/area/security/execution/education) "dWb" = ( /obj/machinery/computer/shuttle_flight/mining{ dir = 4 @@ -26109,6 +25963,23 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/hallway/primary/central) +"ePG" = ( +/obj/structure/rack, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/storage/box/trackimp, +/obj/item/storage/lockbox/loyalty, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/machinery/light/small, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -26 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/security/main) "eQa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -26799,6 +26670,11 @@ }, /turf/open/floor/iron/smooth_half, /area/security/prison) +"feb" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "feW" = ( /turf/open/floor/iron, /area/maintenance/department/medical/central) @@ -28502,21 +28378,6 @@ }, /turf/open/floor/iron, /area/medical/storage) -"fIY" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen"; - name = "Serving Hatch" - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "fJp" = ( /obj/effect/turf_decal/tile/red, /turf/open/floor/iron/dark/smooth_corner, @@ -29433,6 +29294,24 @@ }, /turf/open/floor/iron/dark, /area/bridge) +"fZX" = ( +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/pestspray{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/bottle/nutrient/ez, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/structure/table, +/obj/structure/extinguisher_cabinet{ + pixel_x = -27 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/hydroponics/garden) "fZY" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -29825,6 +29704,18 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/maintenance/disposal/incinerator) +"ghT" = ( +/obj/structure/table, +/obj/item/hatchet, +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/reagent_containers/cup/bucket, +/obj/item/plant_analyzer, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hydroponics/garden) "giF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -29970,14 +29861,6 @@ /obj/item/restraints/handcuffs, /turf/open/floor/iron/dark/smooth_large, /area/security/main) -"glg" = ( -/obj/structure/table/wood/poker, -/obj/item/reagent_containers/cup/glass/bottle/wine{ - pixel_x = -9; - pixel_y = 6 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "glr" = ( /obj/effect/landmark/xeno_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30011,6 +29894,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/engine/gravity_generator) +"glP" = ( +/obj/structure/sign/warning/nosmoking{ + pixel_y = 32 + }, +/obj/structure/rack, +/obj/item/book/manual/wiki/robotics_cyborgs{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/storage/belt/utility, +/obj/item/reagent_containers/cup/beaker/large, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/science/robotics/lab) "gme" = ( /obj/item/radio/intercom{ pixel_y = 21 @@ -30688,6 +30585,29 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"gEa" = ( +/obj/machinery/button/door{ + id = "chemistbot"; + name = "Chemistry Shutter Control"; + pixel_x = -36; + pixel_y = 37; + req_access_txt = "33" + }, +/obj/item/radio/intercom{ + pixel_x = -32; + pixel_y = 23 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/machinery/reagentgrinder{ + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/iron, +/area/medical/chemistry) "gEg" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -30737,91 +30657,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) -"gEW" = ( -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/structure/closet/crate/medical, -/obj/effect/turf_decal/box, -/obj/item/circuitboard/machine/chem_heater, -/obj/machinery/firealarm/directional/west, -/obj/machinery/camera/directional/west, -/turf/open/floor/iron, -/area/medical/virology) "gEX" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/closet/crate{ @@ -30907,6 +30742,19 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) +"gGw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/mop, +/obj/structure/sign/poster/random{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/janitor) "gGB" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -31303,6 +31151,30 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"gPx" = ( +/obj/structure/table, +/obj/item/food/grown/tomato/blood{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/machinery/vending/wallmed{ + contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); + name = "Upgraded NanoMed"; + pixel_x = -1; + pixel_y = -32; + premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) + }, +/obj/item/reagent_containers/dropper{ + pixel_x = 2; + pixel_y = -5 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "gPy" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -31781,6 +31653,19 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) +"gWD" = ( +/obj/machinery/light_switch{ + pixel_y = -25 + }, +/obj/structure/table/wood, +/obj/item/razor{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/reagent_containers/cup/glass/flask/gold, +/turf/open/floor/carpet/royalblue, +/area/crew_quarters/heads/captain/private) "gWG" = ( /obj/structure/rack, /obj/item/storage/box/syringes{ @@ -34556,15 +34441,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/medbay/central) -"hVW" = ( -/obj/structure/table/glass, -/obj/item/storage/box/donkpockets, -/obj/item/reagent_containers/cup/soda_cans/thirteenloko{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/engine/break_room) "hVX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -34864,6 +34740,14 @@ }, /turf/open/floor/iron, /area/maintenance/disposal) +"icb" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/bowl, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/prison, +/area/security/prison) "icd" = ( /obj/machinery/door/airlock/research/glass{ name = "science Shuttle Dock"; @@ -35742,6 +35626,23 @@ "irA" = ( /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) +"irE" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck{ + pixel_x = -13; + pixel_y = -10 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/holochip{ + credits = 30; + pixel_x = 5; + pixel_y = -4 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "irK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -36166,33 +36067,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/crew_quarters/heads/hor) -"iBJ" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light, -/obj/item/stack/sheet/mineral/plasma{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_x = 5 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_x = 9 - }, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/dropper, -/obj/item/storage/box/beakers{ - pixel_x = -6; - pixel_y = 9 - }, -/turf/open/floor/iron/white, -/area/medical/chemistry) "iBM" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted, /turf/open/floor/iron, @@ -37184,30 +37058,6 @@ }, /turf/open/floor/iron, /area/engine/break_room) -"iTJ" = ( -/obj/structure/table, -/obj/item/food/grown/tomato/blood{ - pixel_x = 7; - pixel_y = 8 - }, -/obj/item/reagent_containers/syringe{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/machinery/vending/wallmed{ - contraband = list(/obj/item/reagent_containers/cup/bottle/chloralhydrate = 1, /obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/cup/bottle/random_virus = 1); - name = "Upgraded NanoMed"; - pixel_x = -1; - pixel_y = -32; - premium = list(/obj/item/storage/firstaid/regular = 3, /obj/item/storage/belt/medical = 3, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/healthanalyzer = 2, /obj/item/wrench/medical = 1); - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/reagent_containers/medspray = 6, /obj/item/storage/pill_bottle = 6, /obj/item/reagent_containers/cup/bottle = 10, /obj/item/reagent_containers/spray/cleaner = 1, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/hypospray/medipen = 8, /obj/item/reagent_containers/hypospray/medipen/dexalin = 8, /obj/item/reagent_containers/cup/bottle/epinephrine = 4, /obj/item/reagent_containers/cup/bottle/charcoal = 4, /obj/item/reagent_containers/cup/bottle/salglu_solution = 4, /obj/item/reagent_containers/cup/bottle/tricordrazine = 1, /obj/item/reagent_containers/cup/bottle/spaceacillin = 1, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/cup/bottle/toxin = 4, /obj/item/reagent_containers/medspray/sterilizine = 4) - }, -/obj/item/reagent_containers/dropper{ - pixel_x = 2; - pixel_y = -5 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "iTT" = ( /obj/machinery/firealarm{ dir = 4; @@ -37681,6 +37531,16 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"jgA" = ( +/obj/structure/table/reinforced, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -2; + pixel_y = 13 + }, +/obj/item/clothing/head/utility/chefhat, +/turf/open/floor/prison, +/area/security/prison) "jgG" = ( /obj/effect/turf_decal/tile/red/half, /obj/structure/extinguisher_cabinet{ @@ -38056,6 +37916,15 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plating, /area/medical/morgue) +"jru" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hydroponics) "jrE" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38210,6 +38079,28 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"jtD" = ( +/obj/machinery/turretid{ + icon_state = "control_stun"; + name = "AI Chamber turret control"; + pixel_x = 3; + pixel_y = -23 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/newscaster{ + pixel_x = 4; + pixel_y = 33 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai) "jtK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38943,6 +38834,18 @@ }, /turf/open/floor/wood/big, /area/crew_quarters/bar) +"jIT" = ( +/obj/structure/table/wood/poker, +/obj/item/clothing/mask/cigarette/cigar{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = 8; + pixel_y = 12 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "jJj" = ( /obj/machinery/camera/directional/east{ c_tag = "Teleporter Room" @@ -40207,6 +40110,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/science) +"kfb" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/item/storage/bag/plants, +/obj/item/reagent_containers/cup/bucket, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/kitchen/rollingpin, +/obj/item/book/manual/wiki/sopservice, +/turf/open/floor/iron, +/area/hallway/secondary/service) "kfm" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/machinery/airalarm/directional/north{ @@ -40327,29 +40242,6 @@ "kiq" = ( /turf/open/floor/iron/freezer, /area/security/prison) -"kir" = ( -/obj/machinery/button/door{ - id = "chemistbot"; - name = "Chemistry Shutter Control"; - pixel_x = -36; - pixel_y = 37; - req_access_txt = "33" - }, -/obj/item/radio/intercom{ - pixel_x = -32; - pixel_y = 23 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/table/glass, -/obj/machinery/reagentgrinder{ - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker/large, -/turf/open/floor/iron, -/area/medical/chemistry) "kiA" = ( /obj/structure/sign/warning/radiation/rad_area{ pixel_y = 32 @@ -40918,6 +40810,19 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"kuA" = ( +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = 8; + pixel_y = 12 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/science/shuttledock) "kuC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, @@ -42944,21 +42849,6 @@ }, /turf/open/floor/iron/white/textured_large, /area/security/brig) -"ljh" = ( -/obj/machinery/door/window{ - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/camera/directional/north{ - c_tag = "AI Chamber - Core" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai) "ljm" = ( /obj/machinery/door/airlock{ name = "Toilet Unit" @@ -43724,17 +43614,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/crew_quarters/fitness/recreation) -"lyj" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/holywater{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/organ/heart, -/obj/item/soulstone/anybody/chaplain, -/obj/item/book/granter/spell/smoke/lesser, -/turf/open/floor/cult, -/area/chapel/office) "lyF" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -44097,6 +43976,17 @@ }, /turf/open/floor/iron/dark/smooth_half, /area/security/brig) +"lGc" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/holywater{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/organ/heart, +/obj/item/soulstone/anybody/chaplain, +/obj/item/book/granter/spell/smoke/lesser, +/turf/open/floor/cult, +/area/chapel/office) "lGm" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -44444,6 +44334,34 @@ }, /turf/open/floor/iron, /area/science/robotics/mechbay) +"lLe" = ( +/obj/structure/rack, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -5 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -5 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "lLf" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload"; @@ -44806,6 +44724,17 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"lRg" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/reagent_containers/cup/rag{ + pixel_y = 5 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "lRs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44931,6 +44860,33 @@ }, /turf/open/floor/catwalk_floor/iron, /area/engine/atmos) +"lST" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 5 + }, +/obj/item/stack/sheet/mineral/plasma{ + pixel_x = 9 + }, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/dropper, +/obj/item/storage/box/beakers{ + pixel_x = -6; + pixel_y = 9 + }, +/turf/open/floor/iron/white, +/area/medical/chemistry) "lTw" = ( /obj/structure/window/reinforced{ dir = 8 @@ -45121,34 +45077,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"lXA" = ( -/obj/structure/table/glass, -/obj/item/folder/white{ - pixel_x = 6; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -2; - pixel_y = -4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/requests_console{ - department = "Chemistry Lab"; - name = "Chemistry RC"; - pixel_x = 32; - pixel_y = -2; - receive_ore_updates = 1 - }, -/turf/open/floor/iron, -/area/medical/chemistry) "lXH" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -48082,6 +48010,19 @@ }, /turf/open/floor/iron, /area/medical/genetics) +"mZk" = ( +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = -4; + pixel_y = -7 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/science/shuttledock) "mZn" = ( /obj/structure/table/wood, /obj/structure/cable/yellow{ @@ -49727,34 +49668,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"nIt" = ( -/obj/structure/rack, -/obj/item/storage/firstaid/regular, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -5 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -5 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -8; - pixel_y = -2 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -8; - pixel_y = -2 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "nII" = ( /obj/structure/table/reinforced, /obj/item/transfer_valve{ @@ -50050,23 +49963,6 @@ /obj/machinery/digital_clock/directional, /turf/closed/wall, /area/hallway/secondary/exit/departure_lounge) -"nNC" = ( -/obj/structure/rack, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/obj/item/storage/lockbox/loyalty, -/obj/item/reagent_containers/cup/bottle/morphine, -/obj/machinery/light/small, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -26 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/security/main) "nNG" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;4;5;6;29" @@ -50398,28 +50294,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/aft) -"nSE" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/sillycup{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/crew_quarters/fitness/recreation) "nSF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -51237,6 +51111,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/hallway/primary/port) +"ogP" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood/big, +/area/crew_quarters/bar) "ohh" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ name = "euthanization chamber freezer" @@ -52943,6 +52830,25 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) +"oJk" = ( +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 8 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white, +/area/medical/medbay/lobby) "oJn" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -54426,18 +54332,6 @@ /obj/item/xenoartifact, /turf/open/floor/engine, /area/science/explab) -"ppT" = ( -/obj/structure/table/wood/poker, -/obj/item/clothing/mask/cigarette/cigar{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = 8; - pixel_y = 12 - }, -/turf/open/floor/iron/techmaint, -/area/science/shuttledock) "ppV" = ( /obj/structure/disposalpipe/segment, /obj/machinery/holopad, @@ -55487,6 +55381,17 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"pLS" = ( +/obj/structure/table, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "pLY" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -55675,6 +55580,21 @@ }, /turf/open/floor/iron, /area/hallway/secondary/exit/departure_lounge) +"pPq" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen"; + name = "Serving Hatch" + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -3 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 3 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "pPJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 @@ -56487,6 +56407,14 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"qdo" = ( +/obj/structure/table/wood/poker, +/obj/item/reagent_containers/cup/glass/bottle/wine{ + pixel_x = -9; + pixel_y = 6 + }, +/turf/open/floor/iron/techmaint, +/area/science/shuttledock) "qdC" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -60166,17 +60094,6 @@ }, /turf/open/floor/iron/white, /area/medical/virology) -"rwt" = ( -/obj/structure/table, -/obj/item/kitchen/rollingpin, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "rxb" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "kitchen"; @@ -60913,32 +60830,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/locker) -"rMj" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/wrench/medical, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/medical/patients_rooms) "rMo" = ( /obj/structure/cable{ icon_state = "0-8" @@ -63433,17 +63324,6 @@ }, /turf/open/floor/iron, /area/science/storage) -"sGn" = ( -/obj/item/cultivator, -/obj/item/crowbar, -/obj/item/plant_analyzer, -/obj/item/reagent_containers/cup/bucket, -/obj/structure/table/glass, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/central) "sGG" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -63668,6 +63548,19 @@ /obj/effect/mapping_helpers/make_non_slip, /turf/open/floor/iron, /area/engine/engineering) +"sKq" = ( +/obj/structure/table, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/crowbar, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/hydroponics/garden) "sKv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -65976,6 +65869,21 @@ /mob/living/carbon/monkey, /turf/open/floor/iron/freezer, /area/medical/genetics) +"tAZ" = ( +/obj/machinery/firealarm{ + pixel_y = 29 + }, +/obj/structure/sign/poster/official/random{ + pixel_x = 32 + }, +/obj/structure/closet/crate/hydroponics, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/cup/bucket, +/obj/item/cultivator, +/obj/item/wirecutters, +/turf/open/floor/iron, +/area/hydroponics) "tBl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -66232,30 +66140,6 @@ }, /turf/open/floor/iron/dark, /area/bridge) -"tGk" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "tGF" = ( /obj/structure/table, /obj/item/storage/box/evidence, @@ -66500,19 +66384,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/security/brig) -"tLJ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -3 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 3 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "tLK" = ( /obj/structure/chair{ dir = 4 @@ -68484,6 +68355,38 @@ }, /turf/closed/wall, /area/quartermaster/sorting) +"uuJ" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = 10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "leftsecure"; + dir = 8; + icon_state = "leftsecure"; + name = "Tertiary AI Core Access"; + atom_integrity = 300; + pixel_x = -3; + req_access_txt = "16" + }, +/turf/open/floor/circuit/green, +/area/ai_monitored/turret_protected/ai) "uuZ" = ( /obj/machinery/light{ dir = 1 @@ -68751,25 +68654,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/aft) -"uzP" = ( -/obj/structure/table/reinforced, -/obj/structure/desk_bell{ - pixel_x = 8 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/effect/turf_decal/tile/blue/fourcorners/contrasted, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/medical/medbay/lobby) "uAd" = ( /obj/machinery/door/poddoor/preopen{ id = "executionfireblast" @@ -69823,6 +69707,26 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/white, /area/science/xenobiology) +"uUg" = ( +/obj/structure/table/glass, +/obj/item/stack/sheet/mineral/plasma{ + amount = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/dropper, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/science/xenobiology) "uUA" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -70412,19 +70316,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/maintenance/starboard) -"vfv" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = -4; - pixel_y = -7 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/shuttledock) "vfy" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -71509,6 +71400,38 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) +"vzK" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = -10; + pixel_y = 22 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = -27 + }, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = -10; + pixel_y = -25 + }, +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Secondary AI Core Access"; + atom_integrity = 300; + pixel_x = 4; + req_access_txt = "16" + }, +/turf/open/floor/circuit/green, +/area/ai_monitored/turret_protected/ai) "vzS" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/delivery/red, @@ -72016,17 +71939,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/central) -"vJj" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 5 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_y = 6 - }, -/obj/item/food/mint, -/turf/open/floor/iron/checker, -/area/crew_quarters/kitchen) "vJo" = ( /obj/machinery/power/apc{ areastring = "/area/construction/storage_wing"; @@ -72421,6 +72333,17 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"vOq" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 5 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_y = 6 + }, +/obj/item/food/mint, +/turf/open/floor/iron/checker, +/area/crew_quarters/kitchen) "vOs" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -73065,18 +72988,6 @@ }, /turf/open/floor/iron/white/smooth_corner, /area/security/brig) -"wdI" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table, -/obj/item/storage/bag/plants, -/obj/item/reagent_containers/cup/bucket, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/kitchen/rollingpin, -/obj/item/book/manual/wiki/sopservice, -/turf/open/floor/iron, -/area/hallway/secondary/service) "wdQ" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 @@ -73395,17 +73306,6 @@ }, /turf/open/floor/iron, /area/quartermaster/sorting) -"wld" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/reagent_containers/cup/rag{ - pixel_y = 5 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/wood/big, -/area/crew_quarters/bar) "wlg" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -76459,19 +76359,6 @@ "xol" = ( /turf/closed/wall, /area/medical/medbay/aft) -"xop" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/mop, -/obj/structure/sign/poster/random{ - pixel_x = 32 - }, -/turf/open/floor/iron, -/area/janitor) "xoA" = ( /obj/machinery/camera/directional/north, /obj/machinery/power/apc{ @@ -77444,28 +77331,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/aisat) -"xFe" = ( -/obj/machinery/turretid{ - icon_state = "control_stun"; - name = "AI Chamber turret control"; - pixel_x = 3; - pixel_y = -23 - }, -/obj/machinery/door/window{ - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - name = "Primary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/obj/machinery/newscaster{ - pixel_x = 4; - pixel_y = 33 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/turf/open/floor/iron/dark, -/area/ai_monitored/turret_protected/ai) "xFt" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -77802,6 +77667,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/aft) +"xKt" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "xLb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -77814,6 +77703,91 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/break_room) +"xLx" = ( +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/structure/closet/crate/medical, +/obj/effect/turf_decal/box, +/obj/item/circuitboard/machine/chem_heater, +/obj/machinery/firealarm/directional/west, +/obj/machinery/camera/directional/west, +/turf/open/floor/iron, +/area/medical/virology) "xLI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -78181,6 +78155,21 @@ }, /turf/open/floor/iron/grid/steel, /area/medical/virology) +"xRG" = ( +/obj/machinery/door/window{ + base_state = "rightsecure"; + dir = 4; + icon_state = "rightsecure"; + name = "Primary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/obj/machinery/camera/directional/north{ + c_tag = "AI Chamber - Core" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron/dark, +/area/ai_monitored/turret_protected/ai) "xSa" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot, @@ -78702,6 +78691,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/security/brig) +"ybm" = ( +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/plant_analyzer, +/obj/item/reagent_containers/cup/bucket, +/obj/structure/table/glass, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central) "ybn" = ( /obj/structure/chair/fancy/comfy, /obj/effect/landmark/blobstart, @@ -98701,7 +98701,7 @@ dle wEb npX rEg -gEW +xLx osp fKN dDz @@ -98956,7 +98956,7 @@ dSx jNU ybs lzI -tGk +xKt gFh vdt lzI @@ -99218,7 +99218,7 @@ dQx mnd coa lzI -iTJ +gPx cDL avr avr @@ -100737,7 +100737,7 @@ mpW mpW feW ycr -rMj +ald smE nqq vNW @@ -101795,7 +101795,7 @@ cCe eEV jRz cLa -lyj +lGc cLa oUI cOh @@ -102720,9 +102720,9 @@ ttO ttO ttO ttO -bYn +icb kZQ -dJG +jgA qOU tlg aqj @@ -103232,7 +103232,7 @@ abx abV acm uAd -cmb +dVH adm sdu iiC @@ -103819,7 +103819,7 @@ bSS bSS nll lJT -uzP +oJk bya otF vxg @@ -104587,7 +104587,7 @@ aYX iov bXN mdh -bHJ +dfn tMi sRD lQG @@ -105107,7 +105107,7 @@ uNs rhj wsV fHf -kir +gEa pFa gvA acB @@ -105627,7 +105627,7 @@ pYp gVH spm kUs -iBJ +lST cga oIj rdQ @@ -106135,7 +106135,7 @@ oJb aAv tiS rrO -lXA +cPY kKG uml wsV @@ -106327,7 +106327,7 @@ jIc veD fnW ipQ -nNC +ePG aqa lFK qUA @@ -108724,7 +108724,7 @@ ctL ctL ctL cCq -cDe +glP fzR oPJ gHe @@ -109699,7 +109699,7 @@ iCU bcj bdI bfz -bhu +gWD bjg egk bjg @@ -109965,7 +109965,7 @@ bqX cDV dCP mZn -byr +feb iWz bcj bDs @@ -112296,7 +112296,7 @@ soe oxO oxO mkI -sGn +ybm tjn vgq bSS @@ -112534,7 +112534,7 @@ boM brd bmO nXB -wld +lRg oFU eaJ eNK @@ -112804,7 +112804,7 @@ hfh ujJ paP qqj -vJj +vOq bST bUf vWU @@ -113059,7 +113059,7 @@ blf rxb ujJ ujJ -rwt +pLS qqj nSl bST @@ -113602,7 +113602,7 @@ cvX lft cwY thn -cyJ +uUg cSt pVv gWG @@ -113827,7 +113827,7 @@ xTu kJK xTu blf -fIY +pPq ujJ nuZ wde @@ -114078,7 +114078,7 @@ kky bmP ifc jIy -tLJ +ogP tkd xTu kJK @@ -114797,7 +114797,7 @@ aaa aaf aaa acQ -nSE +cwo kAr mbZ tsT @@ -115119,7 +115119,7 @@ bOX bQI uee bST -bUn +jru mPh gzi nrx @@ -115376,7 +115376,7 @@ rFZ rFZ aoW bST -bUo +btj bVy bWU xSD @@ -115594,7 +115594,7 @@ dIq aCH eYL aJh -aKp +fZX hWI vAZ oUR @@ -115857,7 +115857,7 @@ aNi mlI aNi cNf -aSk +ghT aJh ltK dnR @@ -116108,7 +116108,7 @@ mpL hmU twq aJh -aKr +sKq mhI aNi lcQ @@ -116149,7 +116149,7 @@ cgF bSY bUq bKe -diw +tAZ pvg sLD gba @@ -116663,7 +116663,7 @@ byN rPM tUh bVz -wdI +kfb nKe bVz ogw @@ -116684,10 +116684,10 @@ ovj mjJ nBT lzk -cou -nIt +kuA +lLe qjB -ppT +jIT jqu pVN dJI @@ -116943,8 +116943,8 @@ xGh ubB eal oFp -cxP -glg +irE +qdo tMl fmT ggj @@ -117457,7 +117457,7 @@ mjJ mjJ kvL uFK -vfv +mZk hUs hUs bxk @@ -117955,7 +117955,7 @@ oxX bcd xdW lUZ -xop +gGw kwL bcd nbv @@ -121009,7 +121009,7 @@ iKI iKI ofV fvZ -hVW +bbZ bne owR owR @@ -133338,7 +133338,7 @@ aRy aTV aTV aTV -aZQ +vzK aTV aTV aTV @@ -134109,7 +134109,7 @@ aTV aVn aWN aTV -xFe +jtD aTV aTV sUk @@ -134623,7 +134623,7 @@ aTX taY aWP aTV -ljh +xRG aTV aTV bew @@ -135394,7 +135394,7 @@ aRy aTV aTV aTV -aZY +uuJ aTV aTV aTV diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index 23d9aa66dabee..9dc77b97fe12b 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -12,25 +12,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/tech, /area/engine/engine_room) -"aak" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 32; - pixel_y = -1 - }, -/obj/structure/closet/secure_closet/captains, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/reagent_containers/cup/glass/flask/gold{ - pixel_x = 3; - pixel_y = 8 - }, -/obj/item/pinpointer/nuke{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain/private) "aap" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -843,6 +824,20 @@ }, /turf/open/floor/carpet/blue, /area/bridge/meeting_room) +"ane" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 8 + }, +/obj/item/reagent_containers/condiment/enzyme{ + pixel_x = 13; + pixel_y = 17 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "anx" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -1338,6 +1333,30 @@ /obj/structure/sign/departments/minsky/research/dorms, /turf/closed/wall, /area/maintenance/central) +"aug" = ( +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 8; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 9 + }, +/obj/item/storage/pill_bottle/mannitol{ + pixel_x = -10; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/table/glass, +/turf/open/floor/iron, +/area/medical/cryo) "aui" = ( /obj/machinery/conveyor{ id = "MailConv" @@ -2571,29 +2590,6 @@ "aNU" = ( /turf/closed/wall/r_wall, /area/ai_monitored/storage/satellite) -"aOm" = ( -/obj/structure/table, -/obj/item/food/spaghetti/meatballspaghetti{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/absinthe{ - pixel_x = -10; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 3; - pixel_y = 15 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 9; - pixel_y = 10 - }, -/obj/item/candle/infinite{ - pixel_x = 8 - }, -/turf/open/floor/iron/dark, -/area/security/execution/education) "aOq" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -3064,22 +3060,6 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/carpet/royalblack, /area/library) -"aVk" = ( -/obj/machinery/light{ - light_color = "#7AC3FF" - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 25 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 21 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "aVu" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -4250,6 +4230,40 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"bqq" = ( +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -8 + }, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/bucket, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 4 + }, +/obj/item/shovel/spade{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/cultivator{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/iron/techmaint, +/area/security/prison) "bqy" = ( /obj/machinery/requests_console{ department = "Security"; @@ -4366,18 +4380,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"brj" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/structure/table, -/obj/item/reagent_containers/cup/mortar, -/obj/item/pestle, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/iron, -/area/vacant_room/commissary/commissary2) "brn" = ( /obj/structure/railing/corner{ dir = 1 @@ -5760,20 +5762,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/lobby) -"bPM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 8 - }, -/obj/item/reagent_containers/condiment/enzyme{ - pixel_x = 13; - pixel_y = 17 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "bPR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6610,6 +6598,15 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"cey" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/paper, +/turf/open/floor/wood, +/area/security/prison) "ceW" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -7261,6 +7258,43 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) +"col" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/cup/bottle/charcoal{ + pixel_x = -4; + pixel_y = -3 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/obj/item/wallframe/defib_mount, +/obj/item/clothing/neck/stethoscope{ + pixel_y = 5 + }, +/turf/open/floor/iron, +/area/medical/sleeper) "cow" = ( /obj/effect/turf_decal/tile/neutral/half, /obj/machinery/camera/directional/east, @@ -7279,22 +7313,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, /area/medical/chemistry) -"coF" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -9; - pixel_y = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/dark, -/area/crew_quarters/bar) "coH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 @@ -7874,91 +7892,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/security/checkpoint/medical) -"cxD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/closet/crate/medical, -/obj/item/reagent_containers/cup/bottle/bromine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/aluminium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/chlorine{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/carbon{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/ethanol{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/copper{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/hydrogen{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/fluorine{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/water{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/lithium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/iron{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/iodine{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/oxygen{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/phosphorus{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/nitrogen{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/mercury{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/radium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/potassium{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/welding_fuel{ - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/sacid{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/silicon{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/silver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sodium{ - pixel_x = -6 - }, -/obj/item/reagent_containers/cup/bottle/sugar{ - pixel_x = 6 - }, -/obj/item/reagent_containers/cup/bottle/sulfur{ - pixel_x = -6 - }, -/obj/item/circuitboard/machine/chem_heater, -/turf/open/floor/iron/dark, -/area/medical/virology) "cxF" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -9708,17 +9641,6 @@ }, /turf/open/floor/iron/dark/side, /area/hallway/primary/central) -"dcy" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/machinery/door/window{ - base_state = "leftsecure"; - icon_state = "leftsecure"; - name = "Tertiary AI Core Access"; - obj_integrity = 300; - req_access_txt = "16" - }, -/turf/open/floor/engine/o2, -/area/ai_monitored/turret_protected/ai) "dcB" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -11142,30 +11064,6 @@ /obj/effect/landmark/start/mime, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"dBb" = ( -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -2; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 9 - }, -/obj/item/storage/pill_bottle/mannitol{ - pixel_x = -10; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/table/glass, -/turf/open/floor/iron, -/area/medical/cryo) "dBO" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -12554,27 +12452,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"dWm" = ( -/obj/machinery/light{ - light_color = "#7AC3FF" - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_y = 28 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 23 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/crayons{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "dWt" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; @@ -12662,6 +12539,15 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"dXx" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ + pixel_x = -2; + pixel_y = 12 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/carpet/royalblack, +/area/maintenance/port/aft) "dXE" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/bot, @@ -12939,6 +12825,35 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"edN" = ( +/obj/structure/closet/secure_closet/detective, +/obj/item/assembly/flash/handheld, +/obj/item/restraints/handcuffs, +/obj/item/clothing/head/fedora/det_hat{ + icon_state = "curator" + }, +/obj/item/clothing/suit/jacket/det_suit{ + icon_state = "curator" + }, +/obj/item/reagent_containers/cup/glass/flask/det, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/light_switch{ + pixel_x = -25; + pixel_y = -8 + }, +/obj/item/storage/secure/safe{ + pixel_x = -25; + pixel_y = 8 + }, +/obj/machinery/requests_console{ + department = "Detective's office"; + pixel_y = 25 + }, +/obj/item/holosign_creator/security, +/turf/open/floor/carpet/red, +/area/security/detectives_office) "een" = ( /obj/structure/chair/office/light{ dir = 4 @@ -15708,22 +15623,6 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) -"eUV" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/fancy/sofa/old/right{ - dir = 4 - }, -/obj/machinery/vending/wallmed{ - pixel_y = -32; - products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2) - }, -/obj/machinery/newscaster{ - pixel_x = -32; - pixel_y = 2 - }, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "eVa" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 4 @@ -16108,15 +16007,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/sepia, /area/maintenance/port/central) -"faQ" = ( -/obj/effect/spawner/lootdrop/ruinloot/medical, -/obj/effect/decal/cleanable/glass{ - dir = 1 - }, -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/bottle/carbon, -/turf/open/floor/plating/rust, -/area/maintenance/starboard/aft) "fbi" = ( /obj/structure/flora/rock/jungle, /mob/living/simple_animal/chick, @@ -16834,28 +16724,6 @@ "flg" = ( /turf/closed/wall/rust, /area/quartermaster/warehouse) -"fls" = ( -/obj/structure/table, -/obj/item/clothing/suit/jacket/straight_jacket, -/obj/item/clothing/mask/muzzle{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/clothing/glasses/blindfold{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/assembly/signaler{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/rag{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/security/execution/education) "flw" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -17614,20 +17482,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/heads/hop) -"fxG" = ( -/obj/structure/table/wood, -/obj/item/toy/cards/deck{ - pixel_x = 1; - pixel_y = 13 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/siding/wood, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 7; - pixel_y = 1 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/cafeteria) "fxR" = ( /turf/closed/wall, /area/medical/office) @@ -18684,25 +18538,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/security/checkpoint/escape) -"fOF" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/small, -/obj/machinery/status_display/door_timer{ - id = "cell"; - name = "Solitary confinement timer"; - pixel_y = 32 - }, -/obj/item/food/donut/apple{ - name = "forbidden toilet donut" - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = -10; - pixel_y = 17 - }, -/turf/open/floor/iron/freezer, -/area/security/prison) "fOG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19131,15 +18966,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"fWj" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -2; - pixel_y = 10 - }, -/turf/open/floor/iron/dark, -/area/security/execution/education) "fWm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/structure/disposalpipe/segment{ @@ -19305,47 +19131,18 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"fZt" = ( -/obj/structure/table, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; - pixel_y = 6 - }, -/obj/item/storage/box/papersack{ - pixel_x = 5; +"fZx" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/bottle/nutrient/ez{ + pixel_x = 9; pixel_y = 4 }, -/obj/item/storage/box/papersack{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/machinery/requests_console{ - department = "Kitchen"; - departmentType = 2; - pixel_y = 30 - }, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = -9; +/obj/item/pen/fountain/captain{ + pixel_x = -5; pixel_y = 5 }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) +/turf/open/floor/wood, +/area/crew_quarters/dorms) "fZF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -19815,6 +19612,14 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/hallway/primary/starboard) +"ggz" = ( +/obj/effect/decal/cleanable/food/flour, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -9; + pixel_y = 44 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "ggC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -20333,35 +20138,6 @@ }, /turf/open/floor/iron, /area/science/robotics) -"gnE" = ( -/obj/structure/closet/secure_closet/detective, -/obj/item/assembly/flash/handheld, -/obj/item/restraints/handcuffs, -/obj/item/clothing/head/fedora/det_hat{ - icon_state = "curator" - }, -/obj/item/clothing/suit/jacket/det_suit{ - icon_state = "curator" - }, -/obj/item/reagent_containers/cup/glass/flask/det, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/light_switch{ - pixel_x = -25; - pixel_y = -8 - }, -/obj/item/storage/secure/safe{ - pixel_x = -25; - pixel_y = 8 - }, -/obj/machinery/requests_console{ - department = "Detective's office"; - pixel_y = 25 - }, -/obj/item/holosign_creator/security, -/turf/open/floor/carpet/red, -/area/security/detectives_office) "gnN" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -22431,6 +22207,33 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engine_room) +"gXg" = ( +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/light{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/effect/spawner/lootdrop/glowstick/lit, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/central) +"gXu" = ( +/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -6; + pixel_y = 3 + }, +/turf/open/floor/iron, +/area/maintenance/central) "gXC" = ( /obj/structure/chair/office{ dir = 1 @@ -22648,6 +22451,21 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"hbi" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/science/misc_lab) "hbo" = ( /obj/structure/sink{ dir = 1; @@ -23252,6 +23070,10 @@ }, /turf/open/floor/iron, /area/maintenance/department/science) +"hlD" = ( +/obj/item/reagent_containers/cup/bottle/iodine, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "hlI" = ( /obj/machinery/flasher{ id = "aicore"; @@ -23328,6 +23150,23 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/crew_quarters/cafeteria) +"hmL" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ + pixel_x = -7; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = 12; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/soda_cans/starkist{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/soda_cans/space_up, +/turf/open/floor/iron, +/area/maintenance/port/aft) "hmO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -23476,6 +23315,29 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) +"hpV" = ( +/obj/structure/table, +/obj/item/food/spaghetti/meatballspaghetti{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/absinthe{ + pixel_x = -10; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 3; + pixel_y = 15 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 9; + pixel_y = 10 + }, +/obj/item/candle/infinite{ + pixel_x = 8 + }, +/turf/open/floor/iron/dark, +/area/security/execution/education) "hqd" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; @@ -24683,6 +24545,24 @@ }, /turf/open/floor/iron/dark, /area/engine/engine_room) +"hKK" = ( +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/chef_recipes{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/kitchen/rollingpin, +/obj/item/clothing/head/utility/chefhat, +/turf/open/floor/iron/techmaint, +/area/security/prison) "hKT" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -26074,16 +25954,6 @@ }, /turf/open/floor/carpet/red, /area/security/detectives_office) -"ijU" = ( -/obj/structure/table/wood, -/obj/item/toy/foamblade, -/obj/item/reagent_containers/cup/soda_cans/grey_bull{ - pixel_x = 7; - pixel_y = 15 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/wood, -/area/library) "ikf" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26529,6 +26399,47 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/office) +"isM" = ( +/obj/structure/table, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 6 + }, +/obj/item/storage/box/papersack{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/storage/box/papersack{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + pixel_y = 30 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/kitchen) "isP" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, @@ -26663,13 +26574,6 @@ /obj/machinery/air_sensor/atmos/air_tank, /turf/open/floor/engine/air, /area/engine/atmos) -"ivW" = ( -/obj/item/reagent_containers/cup/waterbottle/empty{ - pixel_x = -10 - }, -/obj/item/storage/belt/utility, -/turf/open/floor/iron/sepia, -/area/maintenance/port/central) "ivY" = ( /obj/machinery/power/terminal{ dir = 8 @@ -27067,6 +26971,16 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"iCN" = ( +/obj/structure/table/wood, +/obj/item/toy/foamblade, +/obj/item/reagent_containers/cup/soda_cans/grey_bull{ + pixel_x = 7; + pixel_y = 15 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/wood, +/area/library) "iCT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -27269,6 +27183,34 @@ /obj/structure/closet/secure_closet/hos, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"iIc" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = 2; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/glass/bottle/virusfood{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/spaceacillin{ + pixel_x = 2; + pixel_y = -1 + }, +/obj/structure/reagent_dispensers/virusfood{ + pixel_x = 31; + pixel_y = -1 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "iIs" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -29136,17 +29078,6 @@ }, /turf/open/floor/iron/white, /area/medical/office) -"jmw" = ( -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/structure/table/wood, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) "jne" = ( /obj/structure/sign/warning/pods, /turf/closed/wall, @@ -29221,21 +29152,6 @@ /obj/structure/railing/corner, /turf/open/floor/iron/dark/smooth_large, /area/hallway/primary/central) -"joH" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_x = 4; - pixel_y = 13 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -2; - pixel_y = 14 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/siding/wideplating/dark, -/turf/open/floor/iron/cafeteria, -/area/crew_quarters/kitchen) "joI" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/railing, @@ -30495,6 +30411,16 @@ }, /turf/open/floor/iron, /area/science/lobby) +"jIO" = ( +/obj/machinery/biogenerator, +/obj/item/reagent_containers/cup/bucket, +/obj/effect/turf_decal/bot, +/obj/machinery/door/window/eastleft{ + name = "Hydroponics Desk"; + req_one_access_txt = "35;28" + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "jIR" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -32126,17 +32052,6 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) -"kkQ" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "kkV" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted{ alpha = 180; @@ -33239,6 +33154,17 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) +"kDF" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/wood/fancy/purple, +/obj/item/book/granter/spell/smoke/lesser, +/obj/item/reagent_containers/cup/glass/bottle/holywater, +/obj/item/soulstone/anybody/chaplain, +/obj/item/organ/heart, +/turf/open/floor/carpet/grimy, +/area/chapel/office) "kDQ" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -33625,6 +33551,13 @@ /obj/machinery/vendor/exploration, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) +"kKb" = ( +/obj/item/reagent_containers/cup/waterbottle/empty{ + pixel_x = -10 + }, +/obj/item/storage/belt/utility, +/turf/open/floor/iron/sepia, +/area/maintenance/port/central) "kKx" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -33936,37 +33869,6 @@ /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"kPB" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/clothing/glasses/welding{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 9; - pixel_y = 10 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/reagent_containers/cup/beaker/large{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -32 - }, -/turf/open/floor/iron, -/area/science/lab) "kPT" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass, @@ -35329,17 +35231,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) -"llV" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/table/wood/fancy/purple, -/obj/item/book/granter/spell/smoke/lesser, -/obj/item/reagent_containers/cup/glass/bottle/holywater, -/obj/item/soulstone/anybody/chaplain, -/obj/item/organ/heart, -/turf/open/floor/carpet/grimy, -/area/chapel/office) "lmb" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/decal/cleanable/dirt, @@ -35359,6 +35250,36 @@ }, /turf/open/space/basic, /area/space/nearstation) +"lmH" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small, +/obj/machinery/status_display/door_timer{ + id = "cell"; + name = "Solitary confinement timer"; + pixel_y = 32 + }, +/obj/item/food/donut/apple{ + name = "forbidden toilet donut" + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = -10; + pixel_y = 17 + }, +/turf/open/floor/iron/freezer, +/area/security/prison) +"lmI" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "lmN" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/yellow{ @@ -35926,6 +35847,28 @@ /obj/structure/closet/crate, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"lvp" = ( +/obj/structure/table, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/mask/muzzle{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/clothing/glasses/blindfold{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/assembly/signaler{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/security/execution/education) "lvs" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -36106,6 +36049,25 @@ /obj/structure/chair, /turf/open/floor/plating, /area/maintenance/department/bridge) +"lyW" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/gun/energy/disabler{ + pixel_x = 2 + }, +/obj/item/clothing/glasses/sunglasses/advanced{ + pixel_x = -3; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/warden) "lzD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, @@ -37342,14 +37304,6 @@ dir = 1 }, /area/science/research) -"lYd" = ( -/obj/effect/decal/cleanable/food/flour, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = -9; - pixel_y = 44 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/kitchen) "lYp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -37363,18 +37317,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark/corner, /area/hallway/primary/central) -"lYy" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/champagne{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/stack/cable_coil/random/five{ - pixel_x = 2; - pixel_y = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "lYX" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -38626,10 +38568,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/port) -"mrr" = ( -/obj/item/reagent_containers/cup/bottle/iodine, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mrF" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/brown/fourcorners/contrasted, @@ -40069,17 +40007,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"mLo" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/reagent_containers/cup/soda_cans/pwr_game{ - pixel_x = -7; - pixel_y = 10 - }, -/obj/item/trash/can, -/turf/open/floor/plating, -/area/maintenance/port/aft) "mLp" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/three, @@ -40189,6 +40116,34 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/dark, /area/chapel/main) +"mNu" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/camera/motion{ + c_tag = "vault"; + dir = 10; + pixel_y = 8 + }, +/obj/machinery/airalarm/directional/west{ + pixel_x = -22 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 5; + pixel_y = 11 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ + pixel_x = -7; + pixel_y = 17 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "mNL" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, @@ -40565,6 +40520,20 @@ "mTR" = ( /turf/open/space/basic, /area/ai_monitored/turret_protected/ai) +"mTY" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/item/reagent_containers/cup/rag{ + pixel_x = 6; + pixel_y = 8 + }, +/turf/open/floor/iron/cafeteria_red, +/area/crew_quarters/bar) "mUd" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; @@ -41727,6 +41696,25 @@ }, /turf/open/floor/iron/dark, /area/science/nanite) +"nlX" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32; + pixel_y = -1 + }, +/obj/structure/closet/secure_closet/captains, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/reagent_containers/cup/glass/flask/gold{ + pixel_x = 3; + pixel_y = 8 + }, +/obj/item/pinpointer/nuke{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain/private) "nmf" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -42957,25 +42945,6 @@ }, /turf/open/floor/engine/n2, /area/engine/atmos) -"nFk" = ( -/obj/structure/table, -/obj/machinery/recharger{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/gun/energy/disabler{ - pixel_x = 2 - }, -/obj/item/clothing/glasses/sunglasses/advanced{ - pixel_x = -3; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/security/warden) "nFs" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/engine/vacuum, @@ -43644,12 +43613,6 @@ /obj/effect/landmark/prisonspawn, /turf/open/floor/iron/techmaint, /area/security/prison/shielded) -"nQW" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket, -/turf/open/floor/grass, -/area/hallway/primary/central) "nQZ" = ( /obj/effect/turf_decal/bot, /obj/structure/rack, @@ -44468,6 +44431,21 @@ /obj/machinery/meter, /turf/open/floor/iron/tech, /area/engine/engine_room) +"oeW" = ( +/obj/effect/landmark/start/security_officer, +/obj/structure/toilet{ + pixel_y = 13 + }, +/obj/machinery/flasher{ + id = "cell"; + pixel_x = -25 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ + pixel_x = 11; + pixel_y = 15 + }, +/turf/open/floor/iron/dark, +/area/security/prison/shielded) "oeZ" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180 @@ -44654,6 +44632,18 @@ /obj/machinery/deepfryer, /turf/open/floor/iron, /area/hallway/secondary/service) +"ohw" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/champagne{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/stack/cable_coil/random/five{ + pixel_x = 2; + pixel_y = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/dorms) "ohL" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/teleport/hub, @@ -44789,11 +44779,29 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/no_border, /area/hallway/secondary/exit/departure_lounge) -"okF" = ( -/obj/machinery/chem_master, -/obj/item/reagent_containers/cup/beaker/large, -/turf/open/floor/iron, -/area/medical/apothecary) +"oks" = ( +/obj/structure/table, +/obj/item/toy/cards/deck{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/item/book/manual/wiki/sopsecurity{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/security/main) "okN" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -46041,29 +46049,6 @@ /obj/effect/turf_decal/guideline/guideline_edge/brown, /turf/open/floor/iron, /area/hallway/primary/port) -"oHE" = ( -/obj/structure/lattice/catwalk, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/storage/fancy/cigarettes{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/item/trash/can{ - pixel_x = 11; - pixel_y = -4 - }, -/obj/item/cigbutt{ - pixel_x = -9 - }, -/turf/open/space/basic, -/area/space/nearstation) "oHG" = ( /turf/open/floor/circuit/telecomms/server, /area/science/xenobiology) @@ -46639,23 +46624,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/escape) -"oPl" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = 12; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/soda_cans/starkist{ - pixel_x = 10; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/soda_cans/space_up, -/turf/open/floor/iron, -/area/maintenance/port/aft) "oPx" = ( /obj/structure/chair/fancy/bench/right{ dir = 8 @@ -46814,6 +46782,28 @@ /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, /area/maintenance/port/aft) +"oRm" = ( +/obj/machinery/recharger, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/bottle/wine{ + pixel_x = -9; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 10; + pixel_y = 13 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 10; + pixel_y = 5 + }, +/obj/machinery/light, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/carpet, +/area/quartermaster/exploration_prep) "oRo" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -48017,24 +48007,27 @@ /obj/item/bedsheet/captain, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) -"piH" = ( -/obj/structure/janitorialcart, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 11; - pixel_y = -5 +"piS" = ( +/obj/machinery/light{ + light_color = "#7AC3FF" }, -/obj/item/mop{ - pixel_x = -6; - pixel_y = 3 +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 28 }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 8 +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 23 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/crayons{ + pixel_x = 3; + pixel_y = 7 }, -/turf/open/floor/iron, -/area/janitor) +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "pjf" = ( /obj/machinery/door/poddoor/preopen{ id = "detectivewindows"; @@ -49251,18 +49244,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig/dock) -"pED" = ( -/obj/machinery/chem_master, -/obj/effect/turf_decal/bot, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/reagent_containers/cup/beaker/large, -/turf/open/floor/iron, -/area/medical/apothecary) "pEF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -52205,6 +52186,29 @@ /obj/item/grenade/chem_grenade/smart_metal_foam, /turf/open/floor/iron/dark, /area/engine/atmos) +"qBv" = ( +/obj/structure/lattice/catwalk, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 9; + pixel_y = 6 + }, +/obj/item/storage/fancy/cigarettes{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/trash/can{ + pixel_x = 11; + pixel_y = -4 + }, +/obj/item/cigbutt{ + pixel_x = -9 + }, +/turf/open/space/basic, +/area/space/nearstation) "qBy" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/machinery/light_switch{ @@ -53825,6 +53829,22 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/kitchen) +"rbv" = ( +/obj/machinery/reagentgrinder, +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -9; + pixel_y = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/crew_quarters/bar) "rbJ" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -54092,6 +54112,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/storage) +"rge" = ( +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/effect/turf_decal/bot, +/obj/structure/table/wood{ + name = "Coffee warmer" + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "rgh" = ( /obj/structure/sign/departments/minsky/security/command, /turf/closed/wall, @@ -54749,6 +54781,11 @@ }, /turf/open/floor/iron, /area/security/prison) +"rpT" = ( +/obj/machinery/chem_master, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/iron, +/area/medical/apothecary) "rqd" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55280,34 +55317,6 @@ }, /turf/open/floor/iron, /area/science/lobby) -"ryj" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/motion{ - c_tag = "vault"; - dir = 10; - pixel_y = 8 - }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -22 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 5; - pixel_y = 11 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 9; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ - pixel_x = -7; - pixel_y = 17 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark, -/area/security/nuke_storage) "ryr" = ( /obj/effect/turf_decal/guideline/guideline_edge/purple{ dir = 8 @@ -55632,6 +55641,19 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/teleporter) +"rDv" = ( +/obj/structure/table/wood, +/obj/machinery/reagentgrinder{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/item/reagent_containers/cup/glass/shaker{ + pixel_x = -8; + pixel_y = 3 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "rDB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -56055,14 +56077,6 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) -"rJL" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/closet/cardboard, -/obj/item/storage/toolbox/emergency, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/item/reagent_containers/cup/glass/bottle/hooch, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "rJX" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/plating, @@ -56342,6 +56356,15 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/port/central) +"rPL" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = -2; + pixel_y = 10 + }, +/turf/open/floor/iron/dark, +/area/security/execution/education) "rQd" = ( /turf/closed/wall/r_wall/rust, /area/crew_quarters/heads/hor) @@ -57207,19 +57230,6 @@ "seT" = ( /turf/closed/wall, /area/lawoffice) -"seW" = ( -/obj/structure/table/wood, -/obj/machinery/reagentgrinder{ - pixel_x = 5; - pixel_y = 14 - }, -/obj/item/reagent_containers/cup/glass/shaker{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "seY" = ( /obj/effect/turf_decal/tile/neutral{ alpha = 140; @@ -57471,6 +57481,22 @@ }, /turf/open/floor/iron/techmaint, /area/science/xenobiology) +"sjq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/fancy/sofa/old/right{ + dir = 4 + }, +/obj/machinery/vending/wallmed{ + pixel_y = -32; + products = list(/obj/item/stack/medical/gauze = 4, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/hypospray/medipen/dexalin = 3, /obj/item/reagent_containers/cup/bottle/epinephrine = 2, /obj/item/reagent_containers/cup/bottle/charcoal = 2) + }, +/obj/machinery/newscaster{ + pixel_x = -32; + pixel_y = 2 + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "sjy" = ( /obj/effect/turf_decal/guideline/guideline_in/purple{ dir = 1 @@ -58492,6 +58518,18 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"sDP" = ( +/obj/machinery/chem_master, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/reagent_containers/cup/beaker/large, +/turf/open/floor/iron, +/area/medical/apothecary) "sEj" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /obj/effect/decal/cleanable/dirt/dust, @@ -59003,6 +59041,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron, /area/engine/atmospherics_engine) +"sLF" = ( +/obj/structure/table/wood, +/obj/item/toy/cards/deck{ + pixel_x = 1; + pixel_y = 13 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/wood, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 7; + pixel_y = 1 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/cafeteria) "sLM" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -59238,6 +59290,14 @@ }, /turf/open/floor/iron/dark/corner, /area/hallway/primary/central) +"sQu" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/closet/cardboard, +/obj/item/storage/toolbox/emergency, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/item/reagent_containers/cup/glass/bottle/hooch, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "sQy" = ( /obj/docking_port/stationary/random{ dir = 8; @@ -60336,34 +60396,6 @@ dir = 9 }, /area/bridge) -"thT" = ( -/obj/structure/table/reinforced, -/obj/structure/railing{ - dir = 1 - }, -/obj/item/reagent_containers/cup/bowl, -/obj/item/food/grown/carrot{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/food/grown/carrot{ - pixel_x = -1; - pixel_y = 6 - }, -/obj/item/food/grown/carrot{ - pixel_x = -1; - pixel_y = 11 - }, -/obj/item/food/grown/carrot{ - pixel_x = -6; - pixel_y = 12 - }, -/obj/effect/turf_decal/tile/black/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron/techmaint, -/area/security/prison) "tib" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/tree/jungle/small, @@ -60479,6 +60511,12 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"tjK" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/grass, +/area/hallway/primary/central) "tjM" = ( /obj/structure/window/reinforced{ dir = 1 @@ -60505,6 +60543,22 @@ }, /turf/open/floor/iron, /area/engine/engine_room) +"tkG" = ( +/obj/machinery/light{ + light_color = "#7AC3FF" + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_y = 25 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 21 + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "tkM" = ( /obj/effect/turf_decal/tile/blue/fourcorners/contrasted{ alpha = 200; @@ -61190,40 +61244,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/white, /area/science/xenobiology) -"tuz" = ( -/obj/effect/turf_decal/tile/black/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -8 - }, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -4 - }, -/obj/item/reagent_containers/cup/bucket, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = 4 - }, -/obj/item/shovel/spade{ - pixel_x = -5; - pixel_y = -4 - }, -/obj/item/cultivator{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/iron/techmaint, -/area/security/prison) "tuD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -62539,6 +62559,24 @@ }, /turf/open/floor/iron/white, /area/medical/apothecary) +"tNs" = ( +/obj/structure/table/reinforced, +/obj/item/paper/fluff/jobs/medical/hippocratic{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/glass/britcup{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/item/toy/plush/renault{ + pixel_x = 8 + }, +/obj/structure/desk_bell{ + pixel_x = -8 + }, +/turf/open/floor/iron/white, +/area/medical/office) "tNG" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -63111,6 +63149,15 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/construction/mining/aux_base) +"tYe" = ( +/obj/effect/spawner/lootdrop/ruinloot/medical, +/obj/effect/decal/cleanable/glass{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/carbon, +/turf/open/floor/plating/rust, +/area/maintenance/starboard/aft) "tYf" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -63162,6 +63209,17 @@ }, /turf/open/floor/iron/white, /area/medical/cryo) +"tYF" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/reagent_containers/cup/soda_cans/pwr_game{ + pixel_x = -7; + pixel_y = 10 + }, +/obj/item/trash/can, +/turf/open/floor/plating, +/area/maintenance/port/aft) "tYL" = ( /obj/structure/closet, /obj/item/clothing/under/color/random, @@ -63690,21 +63748,6 @@ dir = 4 }, /area/medical/sleeper) -"ugA" = ( -/obj/effect/landmark/start/security_officer, -/obj/structure/toilet{ - pixel_y = 13 - }, -/obj/machinery/flasher{ - id = "cell"; - pixel_x = -25 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/almost_empty{ - pixel_x = 11; - pixel_y = 15 - }, -/turf/open/floor/iron/dark, -/area/security/prison/shielded) "ugK" = ( /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ alpha = 180 @@ -63870,24 +63913,6 @@ }, /turf/open/floor/iron, /area/construction/mining/aux_base) -"ukp" = ( -/obj/structure/table/reinforced, -/obj/item/paper/fluff/jobs/medical/hippocratic{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 2; - pixel_y = 9 - }, -/obj/item/toy/plush/renault{ - pixel_x = 8 - }, -/obj/structure/desk_bell{ - pixel_x = -8 - }, -/turf/open/floor/iron/white, -/area/medical/office) "uku" = ( /obj/structure/railing/corner{ dir = 1 @@ -64101,6 +64126,34 @@ /obj/structure/curtain/directional, /turf/open/floor/plating, /area/security/courtroom) +"uod" = ( +/obj/structure/table/reinforced, +/obj/structure/railing{ + dir = 1 + }, +/obj/item/reagent_containers/cup/bowl, +/obj/item/food/grown/carrot{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/food/grown/carrot{ + pixel_x = -1; + pixel_y = 6 + }, +/obj/item/food/grown/carrot{ + pixel_x = -1; + pixel_y = 11 + }, +/obj/item/food/grown/carrot{ + pixel_x = -6; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/black/fourcorners, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron/techmaint, +/area/security/prison) "uog" = ( /obj/item/rollerbed, /turf/open/floor/plating, @@ -65463,22 +65516,6 @@ }, /turf/open/floor/iron/dark, /area/security/nuke_storage) -"uLH" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_x = 9; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_y = 3 - }, -/obj/item/reagent_containers/cup/glass/bottle/beer/light{ - pixel_x = -8; - pixel_y = 11 - }, -/obj/effect/spawner/lootdrop/glowstick/lit, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/central) "uLR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -66052,6 +66089,21 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"uWO" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_x = 4; + pixel_y = 13 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = -2; + pixel_y = 14 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/siding/wideplating/dark, +/turf/open/floor/iron/cafeteria, +/area/crew_quarters/kitchen) "uXd" = ( /obj/machinery/light, /obj/machinery/newscaster{ @@ -66219,15 +66271,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/department/science) -"uZg" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/item/paper, -/turf/open/floor/wood, -/area/security/prison) "uZs" = ( /obj/structure/chair/office{ dir = 1 @@ -66274,28 +66317,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/sepia, /area/maintenance/port/central) -"vam" = ( -/obj/machinery/recharger, -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/wine{ - pixel_x = -9; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 10; - pixel_y = 13 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ - pixel_x = 10; - pixel_y = 5 - }, -/obj/machinery/light, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/carpet, -/area/quartermaster/exploration_prep) "vaU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor{ @@ -66561,6 +66582,17 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/bridge) +"vgV" = ( +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "vhc" = ( /turf/open/floor/iron/dark, /area/crew_quarters/heads/chief) @@ -66646,15 +66678,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"viS" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/cup/soda_cans/dr_gibb{ - pixel_x = -2; - pixel_y = 12 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/carpet/royalblack, -/area/maintenance/port/aft) "viW" = ( /obj/structure/railing{ dir = 6 @@ -66770,18 +66793,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"vkC" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/bottle/nutrient/ez{ - pixel_x = 9; - pixel_y = 4 - }, -/obj/item/pen/fountain/captain{ - pixel_x = -5; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/dorms) "vkD" = ( /obj/structure/sign/warning/radiation_shelter{ pixel_x = 1; @@ -67662,43 +67673,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"vAV" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 7; - pixel_y = -3 - }, -/obj/item/reagent_containers/syringe, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/cup/bottle/charcoal{ - pixel_x = -4; - pixel_y = -3 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow, -/obj/item/wallframe/defib_mount, -/obj/item/clothing/neck/stethoscope{ - pixel_y = 5 - }, -/turf/open/floor/iron, -/area/medical/sleeper) "vBo" = ( /obj/effect/turf_decal/guideline/guideline_edge/purple, /turf/open/floor/iron/white/side{ @@ -68455,21 +68429,6 @@ }, /turf/open/space/basic, /area/solar/starboard/fore) -"vPl" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/bottle/beer{ - pixel_x = -5; - pixel_y = 16 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/science/misc_lab) "vPD" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -69637,17 +69596,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"wks" = ( -/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/cup/bucket{ - pixel_x = -6; - pixel_y = 3 - }, -/turf/open/floor/iron, -/area/maintenance/central) "wkt" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/machinery/disposal/bin, @@ -70047,6 +69995,91 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/crew_quarters/heads/hos) +"wsh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/closet/crate/medical, +/obj/item/reagent_containers/cup/bottle/bromine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/aluminium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/chlorine{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/carbon{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/ethanol{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/copper{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/hydrogen{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/fluorine{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/water{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/lithium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/iron{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/iodine{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/oxygen{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/phosphorus{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/nitrogen{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/mercury{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/potassium{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/welding_fuel{ + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/bottle/sacid{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/silicon{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/silver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sodium{ + pixel_x = -6 + }, +/obj/item/reagent_containers/cup/bottle/sugar{ + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/bottle/sulfur{ + pixel_x = -6 + }, +/obj/item/circuitboard/machine/chem_heater, +/turf/open/floor/iron/dark, +/area/medical/virology) "wsJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet{ @@ -70103,6 +70136,24 @@ }, /turf/open/floor/iron, /area/bridge) +"wuh" = ( +/obj/structure/janitorialcart, +/obj/item/reagent_containers/cup/bucket{ + pixel_x = 11; + pixel_y = -5 + }, +/obj/item/mop{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/janitor) "wul" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge"; @@ -71521,24 +71572,6 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"wQT" = ( -/obj/effect/turf_decal/tile/black/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/item/book/manual/chef_recipes{ - pixel_x = 2; - pixel_y = 6 - }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/kitchen/rollingpin, -/obj/item/clothing/head/utility/chefhat, -/turf/open/floor/iron/techmaint, -/area/security/prison) "wRl" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -71702,34 +71735,6 @@ }, /turf/open/floor/iron/grid/steel, /area/hydroponics) -"wUw" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = 2; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/glass/bottle/virusfood{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_containers/cup/bottle/spaceacillin{ - pixel_x = 2; - pixel_y = -1 - }, -/obj/structure/reagent_dispensers/virusfood{ - pixel_x = 31; - pixel_y = -1 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/virology) "wUE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/turf_decal/guideline/guideline_edge/red{ @@ -72483,18 +72488,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig/dock) -"xjA" = ( -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/effect/turf_decal/bot, -/obj/structure/table/wood{ - name = "Coffee warmer" - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "xjC" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -72607,29 +72600,6 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/department/engine) -"xkF" = ( -/obj/structure/table, -/obj/item/toy/cards/deck{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/glass/britcup{ - pixel_x = -8; - pixel_y = 10 - }, -/obj/item/book/manual/wiki/sopsecurity{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/security/main) "xkS" = ( /obj/effect/turf_decal/loading_area, /obj/machinery/firealarm/directional/west, @@ -74131,20 +74101,6 @@ }, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"xHw" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/siding/wideplating/dark, -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = -6; - pixel_y = 9 - }, -/obj/item/reagent_containers/cup/rag{ - pixel_x = 6; - pixel_y = 8 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "xHy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -74204,6 +74160,18 @@ }, /turf/open/floor/catwalk_floor, /area/maintenance/central) +"xIv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/obj/structure/table, +/obj/item/reagent_containers/cup/mortar, +/obj/item/pestle, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron, +/area/vacant_room/commissary/commissary2) "xII" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ alpha = 180 @@ -75245,16 +75213,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) -"yaV" = ( -/obj/machinery/biogenerator, -/obj/item/reagent_containers/cup/bucket, -/obj/effect/turf_decal/bot, -/obj/machinery/door/window/eastleft{ - name = "Hydroponics Desk"; - req_one_access_txt = "35;28" - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "ybh" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/airlock/maintenance_hatch{ @@ -75355,6 +75313,17 @@ }, /turf/open/floor/iron, /area/medical/storage) +"ycV" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/machinery/door/window{ + base_state = "leftsecure"; + icon_state = "leftsecure"; + name = "Tertiary AI Core Access"; + atom_integrity = 300; + req_access_txt = "16" + }, +/turf/open/floor/engine/o2, +/area/ai_monitored/turret_protected/ai) "ydA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -75486,6 +75455,37 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) +"yhq" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/clothing/glasses/welding{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 9; + pixel_y = 10 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/science/lab) "yhv" = ( /obj/structure/window/reinforced{ dir = 4 @@ -96779,7 +96779,7 @@ bgA hCg eua ayc -vam +oRm cMW fVz uKR @@ -97050,7 +97050,7 @@ frc frc fFP stS -vPl +hbi sLX sxX lfC @@ -98773,8 +98773,8 @@ xdi yaG cgq bAj -fls -aOm +lvp +hpV pmV kZu bAj @@ -98826,7 +98826,7 @@ ndT nQZ ggJ dvu -kPB +yhq ykj dLu mGb @@ -99039,7 +99039,7 @@ gsA gsA eSK xkc -ryj +mNu wGq eBH eSK @@ -99290,7 +99290,7 @@ trr yaP asB qNP -fWj +rPL bAj nmf nmf @@ -100658,7 +100658,7 @@ fAl qZZ sfR qZZ -viS +dXx rHt vEn xbP @@ -101178,7 +101178,7 @@ clJ clJ clJ qZZ -oPl +hmL vQr qZZ gsA @@ -101435,7 +101435,7 @@ jDt eYH efJ fAl -mLo +tYF gNm fAl gsA @@ -102154,7 +102154,7 @@ aSr lka jdV gOK -ivW +kKb nnB qRH saq @@ -102620,7 +102620,7 @@ hzk bpo qKg rVu -xkF +oks vwL bNr dTx @@ -102630,7 +102630,7 @@ rgL iZE rWM cUa -gnE +edN tJT rnw rAQ @@ -104676,7 +104676,7 @@ rqE hGk qLO xNd -nFk +lyW bDs pVy ifC @@ -104937,7 +104937,7 @@ mJF het sSE ifC -ugA +oeW byu ifC erK @@ -105704,7 +105704,7 @@ bjP bjP qdm jrH -tuz +bqq lHT bBO sFf @@ -105956,7 +105956,7 @@ mtI mtI mtI mtI -thT +uod paj tQy pym @@ -106214,7 +106214,7 @@ mtI mtI mtI eDH -wQT +hKK pNF iee kOb @@ -106474,7 +106474,7 @@ hQk uQP pNF xtP -uZg +cey dyS ldH wNH @@ -106716,7 +106716,7 @@ fZF kjm hsm hsm -aak +nlX piE coK hhv @@ -107037,7 +107037,7 @@ bzO mcm hBR cSY -brj +xIv bzO cFO nxD @@ -107481,7 +107481,7 @@ kYM sZZ kjF tpC -seW +rDv jXy rYf uLj @@ -107504,7 +107504,7 @@ wgN lCM uml mTK -fOF +lmH mTK dhT kTx @@ -107713,7 +107713,7 @@ xze uuQ uuQ uTv -dcy +ycV ahL vsb ycm @@ -109083,7 +109083,7 @@ nfS vDd mTH vJo -nQW +tjK tLv tmM jgD @@ -109255,7 +109255,7 @@ iVd uuQ uuQ uTv -dcy +ycV ahL mhA aoX @@ -109280,7 +109280,7 @@ vkS nlk pXK dbZ -xjA +rge rQC ydT bqh @@ -109366,7 +109366,7 @@ aCS rQG xBF tIG -pED +sDP aba lwM cKB @@ -110609,7 +110609,7 @@ leD cru dNE reS -piH +wuh ntf wkt oGS @@ -110641,7 +110641,7 @@ oIs fxR jlQ mbT -ukp +tNs lvJ kDQ xwH @@ -110650,7 +110650,7 @@ kfv vpR uig xBF -okF +rpT rAO oZL uFU @@ -111108,7 +111108,7 @@ yeA gsA efr mIj -uLH +gXg vmu sSv kui @@ -111376,7 +111376,7 @@ aMA mVN mfr hdp -wks +gXu mdB aMA pCi @@ -111429,7 +111429,7 @@ dwu fYI msM teB -faQ +tYe bgr oUC xVm @@ -111615,7 +111615,7 @@ rNr dea dzY gyP -llV +kDF rNr gsA yeA @@ -111938,7 +111938,7 @@ lLX diq ujr tWQ -vAV +col shZ ibc pfL @@ -112407,7 +112407,7 @@ iOn oio izn uxW -xHw +mTY kok ult hjM @@ -112919,17 +112919,17 @@ nXc nXc nXc nXc -coF +rbv soB vge kok bLt oJe -fxG +sLF qXx ykz lFE -eUV +sjq rfl iJe kgH @@ -113186,7 +113186,7 @@ iWh qXx mWi ubo -dWm +piS rfl iJe kgH @@ -113944,7 +113944,7 @@ qDa qFY eVo jgI -bPM +ane mQc pGW gmj @@ -114179,11 +114179,11 @@ cvT bMn wII rYG -vkC +fZx boZ wII mws -lYy +ohw wII kEh jUB @@ -114209,7 +114209,7 @@ lFS umg hnl eXD -joH +uWO szP tdk lSp @@ -114713,8 +114713,8 @@ wAq mBT dhK fwL -fZt -lYd +isM +ggz wlj sZT jlg @@ -114727,8 +114727,8 @@ qVc kok bSd mWi -jmw -aVk +vgV +tkG rfl iJe pZb @@ -115535,7 +115535,7 @@ wOB hjA opp sYS -dBb +aug sdl xat kMc @@ -116051,7 +116051,7 @@ qjI gqW jBS lQB -rJL +sQu iuX dkt maw @@ -116259,7 +116259,7 @@ otE otE iks hmO -yaV +jIO kcZ iks bPo @@ -117596,7 +117596,7 @@ kkj wLd ujz kMc -mrr +hlD dwU wKX xDh @@ -117797,7 +117797,7 @@ uKl uKl pKx sxp -kkQ +lmI bJj vft egv @@ -118070,7 +118070,7 @@ fZQ uTB wTw fZb -ijU +iCN ekZ sPf eUC @@ -119131,7 +119131,7 @@ kxl tfq sWR lsT -wUw +iIc baz pZF uhG @@ -119682,7 +119682,7 @@ pQd pQd gsA ewB -oHE +qBv gsA yeA yeA @@ -120417,7 +120417,7 @@ tfq hzd oWM qRi -cxD +wsh coJ koC oJV diff --git a/beestation.dme b/beestation.dme index 841de06de95d0..8fe549e383066 100644 --- a/beestation.dme +++ b/beestation.dme @@ -1017,6 +1017,7 @@ #include "code\datums\wires\tesla_coil.dm" #include "code\datums\wires\vending.dm" #include "code\game\alternate_appearance.dm" +#include "code\game\atom_defense.dm" #include "code\game\atoms.dm" #include "code\game\atoms_movable.dm" #include "code\game\communications.dm" diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm index 2008f9d67a21f..c5d3e717def13 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm @@ -14,6 +14,16 @@ #define COMSIG_ATOM_ATTACK_ANIMAL "attack_animal" //from base of atom/attack_basic_mob(): (/mob/user) #define COMSIG_ATOM_ATTACK_BASIC_MOB "attack_basic_mob" +/// from /atom/proc/atom_break: (damage_flag) +#define COMSIG_ATOM_BREAK "atom_break" +/// from base of [/atom/proc/atom_fix]: () +#define COMSIG_ATOM_FIX "atom_fix" +///from base of [/atom/proc/update_integrity]: (old_value, new_value) +#define COMSIG_ATOM_INTEGRITY_CHANGED "atom_integrity_changed" +///from base of [/atom/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration) +#define COMSIG_ATOM_TAKE_DAMAGE "atom_take_damage" + /// Return bitflags for the above signal which prevents the atom taking any damage. + #define COMPONENT_NO_TAKE_DAMAGE (1<<0) /* Attack signals. They should share the returned flags, to standardize the attack chain. */ /// tool_act -> pre_attack -> target.attackby (item.attack) -> afterattack diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm index dc127a0a0714f..512340addc76a 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm @@ -9,7 +9,7 @@ #define COMSIG_MOB_ITEM_ATTACKBY "item_attackby" ///from base of obj/item/attack_self(): (/mob) #define COMSIG_ITEM_ATTACK_SELF "item_attack_self" -///from base of obj/item/attack_obj(): (/obj, /mob) +///from base of obj/item/attack_atom(): (/obj, /mob) #define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj" ///from base of obj/item/pre_attack(): (atom/target, mob/user, params) #define COMSIG_ITEM_PRE_ATTACK "item_pre_attack" diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm index 21102eba3950d..70a267b692555 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_machine/signals_machinery.dm @@ -8,7 +8,7 @@ #define COMSIG_MACHINE_OPEN "machine_open" /// Sent from /obj/machinery/close_machine(): (atom/movable/target) #define COMSIG_MACHINE_CLOSE "machine_close" -//from /obj/machinery/obj_break(damage_flag): (damage_flag) +//from /obj/machinery/atom_break(damage_flag): (damage_flag) #define COMSIG_MACHINERY_BROKEN "machinery_broken" ///from base power_change() when power is lost #define COMSIG_MACHINERY_POWER_LOST "machinery_power_lost" diff --git a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm index c3eb6af24a09d..357d32dc19ae0 100644 --- a/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_obj/signals_object.dm @@ -4,12 +4,6 @@ // /obj signals -///from base of [/obj/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration) -#define COMSIG_OBJ_TAKE_DAMAGE "obj_take_damage" - /// Return bitflags for the above signal which prevents the object taking any damage. - #define COMPONENT_NO_TAKE_DAMAGE (1<<0) -///from base of [/obj/proc/update_integrity]: (old_value, new_value) -#define COMSIG_OBJ_INTEGRITY_CHANGED "obj_integrity_changed" ///from base of obj/deconstruct(): (disassembled) #define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" ///from base of code/game/machinery @@ -17,11 +11,6 @@ ///from base of /turf/proc/levelupdate(). (intact) true to hide and false to unhide #define COMSIG_OBJ_HIDE "obj_hide" -/// from /obj/proc/obj_break: () -#define COMSIG_OBJ_BREAK "obj_break" -/// from base of [/obj/proc/obj_fix]: () -#define COMSIG_OBJ_FIX "obj_fix" - /// from /obj/proc/make_unfrozen() #define COMSIG_OBJ_UNFREEZE "obj_unfreeze" diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 28e6409f2435a..c97cea153202f 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -48,19 +48,19 @@ * Called on an object being hit by an item * * Arguments: - * * obj/item/W - The item hitting this atom + * * obj/item/attacking_item - The item hitting this atom * * mob/user - The wielder of this item * * params - click params such as alt/shift etc * * See: [/obj/item/proc/melee_attack_chain] */ -/atom/proc/attackby(obj/item/W, mob/user, params) - if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, params) & COMPONENT_NO_AFTERATTACK) +/atom/proc/attackby(obj/item/attacking_item, mob/user, params) + if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, attacking_item, user, params) & COMPONENT_NO_AFTERATTACK) return TRUE return FALSE /obj/attackby(obj/item/I, mob/living/user, params) - return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_obj(src, user)) + return ..() || ((obj_flags & CAN_BE_HIT) && I.attack_atom(src, user, params)) /mob/living/attackby(obj/item/I, mob/living/user, params) if(..()) @@ -139,21 +139,21 @@ add_fingerprint(user) -/// The equivalent of the standard version of [/obj/item/proc/attack] but for object targets. -/obj/item/proc/attack_obj(obj/O, mob/living/user) - if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, O, user) & COMPONENT_CANCEL_ATTACK_CHAIN) +/// The equivalent of the standard version of [/obj/item/proc/attack] but for non mob targets. +/obj/item/proc/attack_atom(atom/attacked_atom, mob/living/user, params) + if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK_OBJ, attacked_atom, user) & COMPONENT_CANCEL_ATTACK_CHAIN) return if(item_flags & NOBLUDGEON) return user.changeNext_move(CLICK_CD_MELEE) - user.do_attack_animation(O) - O.attacked_by(src, user) + user.do_attack_animation(attacked_atom) + attacked_atom.attacked_by(src, user) -/// Called from [/obj/item/proc/attack_obj] and [/obj/item/proc/attack] if the attack succeeds -/atom/proc/attacked_by() - return +/// Called from [/obj/item/proc/attack_atom] and [/obj/item/proc/attack] if the attack succeeds +/atom/proc/attacked_by(obj/item/attacking_item, mob/living/user) + if(!uses_integrity) + CRASH("attacked_by() was called on an object that doesnt use integrity!") -/obj/attacked_by(obj/item/attacking_item, mob/living/user) if(!attacking_item.force) return @@ -164,6 +164,9 @@ "You hit [src] with [attacking_item][damage ? "." : ", without leaving a mark!"]", null, COMBAT_MESSAGE_RANGE) log_combat(user, src, "attacked", attacking_item) +/area/attacked_by(obj/item/attacking_item, mob/living/user) + CRASH("areas are NOT supposed to have attacked_by() called on them!") + /mob/living/attacked_by(obj/item/I, mob/living/user) send_item_attack_message(I, user) if(!I.force) diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm index 9a98e816e6d5e..06a109abd096c 100644 --- a/code/datums/components/shell.dm +++ b/code/datums/components/shell.dm @@ -133,7 +133,7 @@ if(istype(item, /obj/item/inducer)) var/obj/item/inducer/inducer = item - INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_obj), attached_circuit, attacker, list()) + INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_atom), attached_circuit, attacker, list()) return COMPONENT_NO_AFTERATTACK if(attached_circuit) diff --git a/code/datums/elements/obj_regen.dm b/code/datums/elements/obj_regen.dm index c27d23adee610..efb55f4bfa7c0 100644 --- a/code/datums/elements/obj_regen.dm +++ b/code/datums/elements/obj_regen.dm @@ -21,14 +21,14 @@ return ELEMENT_INCOMPATIBLE rate = _rate - RegisterSignal(target, COMSIG_OBJ_TAKE_DAMAGE, PROC_REF(on_take_damage)) + RegisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_take_damage)) if(target.get_integrity() < target.max_integrity) if(!length(processing)) START_PROCESSING(SSobj, src) processing |= target /datum/element/obj_regen/Detach(obj/target) - UnregisterSignal(target, COMSIG_OBJ_TAKE_DAMAGE) + UnregisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE) processing -= target if(!length(processing)) STOP_PROCESSING(SSobj, src) diff --git a/code/game/atom_defense.dm b/code/game/atom_defense.dm new file mode 100644 index 0000000000000..c51f88f08b7f6 --- /dev/null +++ b/code/game/atom_defense.dm @@ -0,0 +1,131 @@ +/// The essential proc to call when an atom must receive damage of any kind. +/atom/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0) + if(!uses_integrity) + CRASH("[src] had /atom/proc/take_damage() called on it without it being a type that has uses_integrity = TRUE!") + if(QDELETED(src)) + CRASH("[src] taking damage after deletion") + if(atom_integrity <= 0) + CRASH("[src] taking damage while having <= 0 integrity") + if(sound_effect) + play_attack_sound(damage_amount, damage_type, damage_flag) + if((resistance_flags & INDESTRUCTIBLE)) + return + damage_amount = run_atom_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) + if(damage_amount < DAMAGE_PRECISION) + return + if(SEND_SIGNAL(src, COMSIG_ATOM_TAKE_DAMAGE, damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration) & COMPONENT_NO_TAKE_DAMAGE) + return + + . = damage_amount + + update_integrity(atom_integrity - damage_amount) + + //BREAKING FIRST + if(integrity_failure && atom_integrity <= integrity_failure * max_integrity) + atom_break(damage_flag) + + //DESTROYING SECOND + if(atom_integrity <= 0) + atom_destruction(damage_flag) + +/// Proc for recovering atom_integrity. Returns the amount repaired by +/atom/proc/repair_damage(amount) + if(amount <= 0) // We only recover here + return + var/new_integrity = min(max_integrity, atom_integrity + amount) + . = new_integrity - atom_integrity + + update_integrity(new_integrity) + + if(integrity_failure && atom_integrity > integrity_failure * max_integrity) + atom_fix() + +/// Handles the integrity of an atom changing. This must be called instead of changing integrity directly. +/atom/proc/update_integrity(new_value) + SHOULD_NOT_OVERRIDE(TRUE) + if(!uses_integrity) + CRASH("/atom/proc/update_integrity() was called on [src] when it doesnt use integrity!") + var/old_value = atom_integrity + new_value = max(0, new_value) + if(atom_integrity == new_value) + return + atom_integrity = new_value + SEND_SIGNAL(src, COMSIG_ATOM_INTEGRITY_CHANGED, old_value, new_value) + +/// This mostly exists to keep atom_integrity private. Might be useful in the future. +/atom/proc/get_integrity() + SHOULD_BE_PURE(TRUE) + return atom_integrity + +///returns the damage value of the attack after processing the atom's various armor protections +/atom/proc/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) + if(!uses_integrity) + CRASH("/atom/proc/run_atom_armor was called on [src] without being implemented as a type that uses integrity!") + if(damage_flag == MELEE && damage_amount < damage_deflection) + return 0 + switch(damage_type) + if(BRUTE) + if(BURN) + else + return 0 + var/armor_protection = 0 + if(damage_flag) + armor_protection = armor?.getRating(damage_flag) + if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. + armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100) + return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) + +///the sound played when the atom is damaged. +/atom/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) + switch(damage_type) + if(BRUTE) + if(damage_amount) + playsound(src, 'sound/weapons/smash.ogg', 50, TRUE) + else + playsound(src, 'sound/weapons/tap.ogg', 50, TRUE) + if(BURN) + playsound(src.loc, 'sound/items/welder.ogg', 100, TRUE) + +///Called to get the damage that hulks will deal to the atom. +/atom/proc/hulk_damage() + return 150 //the damage hulks do on punches to this atom, is affected by melee armor + +/atom/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime + if(!uses_integrity) + CRASH("unimplemented /atom/proc/attack_generic()!") + user.do_attack_animation(src) + user.changeNext_move(CLICK_CD_MELEE) + return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration) + +/// Called after the atom takes damage and integrity is below integrity_failure level +/atom/proc/atom_break(damage_flag) + SHOULD_CALL_PARENT(TRUE) + SEND_SIGNAL(src, COMSIG_ATOM_BREAK) + +/// Called when integrity is repaired above the breaking point having been broken before +/atom/proc/atom_fix() + SHOULD_CALL_PARENT(TRUE) + SEND_SIGNAL(src, COMSIG_ATOM_FIX) + +///what happens when the atom's integrity reaches zero. +/atom/proc/atom_destruction(damage_flag) + return + +///changes max_integrity while retaining current health percentage, returns TRUE if the atom got broken. +/atom/proc/modify_max_integrity(new_max, can_break = TRUE, damage_type = BRUTE) + if(!uses_integrity) + CRASH("/atom/proc/modify_max_integrity() was called on [src] when it doesnt use integrity!") + var/current_integrity = atom_integrity + var/current_max = max_integrity + + if(current_integrity != 0 && current_max != 0) + var/percentage = current_integrity / current_max + current_integrity = max(1, round(percentage * new_max)) //don't destroy it as a result + atom_integrity = current_integrity + + max_integrity = new_max + + if(can_break && integrity_failure && current_integrity <= integrity_failure * max_integrity) + atom_break(damage_type) + return TRUE + return FALSE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 3e597f42e9fd4..09eeb7f68d196 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -124,6 +124,20 @@ ///AI controller that controls this atom. type on init, then turned into an instance during runtime var/datum/ai_controller/ai_controller + ///any atom that uses integrity and can be damaged must set this to true, otherwise the integrity procs will throw an error + var/uses_integrity = FALSE + + var/datum/armor/armor + VAR_PRIVATE/atom_integrity //defaults to max_integrity + var/max_integrity = 500 + var/integrity_failure = 0 //0 if we have no special broken behavior, otherwise is a percentage of at what point the atom breaks. 0.5 being 50% + ///Damage under this value will be completely ignored + var/damage_deflection = 0 + /// Maximum damage that can be taken in a single hit + var/max_hit_damage = null + + var/resistance_flags = NONE // INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF + /// Lazylist of all messages currently on this atom var/list/chat_messages @@ -232,6 +246,15 @@ CREATION_TEST_IGNORE_SUBTYPES(/atom) // apply materials properly from the default custom_materials value set_custom_materials(custom_materials) + if(uses_integrity) + if (islist(armor)) + armor = getArmor(arglist(armor)) + else if (!armor) + armor = getArmor() + else if (!istype(armor, /datum/armor)) + stack_trace("Invalid type [armor.type] found in .armor during /atom Initialize()") + atom_integrity = max_integrity + ComponentInitialize() InitializeAIController() diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index ae1f16fa499db..6fd745f7dcecf 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -400,7 +400,7 @@ var/image/holder = hud_list[DIAG_MECH_HUD] var/icon/I = icon(icon, icon_state, dir) holder.pixel_y = I.Height() - world.icon_size - holder.icon_state = "huddiag[RoundDiagBar(obj_integrity/max_integrity)]" + holder.icon_state = "huddiag[RoundDiagBar(atom_integrity/max_integrity)]" /obj/vehicle/sealed/mecha/proc/diag_hud_set_mechcell() diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 8c6adca5ef43c..fcda0cd57525b 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -149,7 +149,7 @@ return to_chat(user, "You repair [src].") set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() else to_chat(user, "[src] does not need repairs.") @@ -157,7 +157,7 @@ return ..() /obj/machinery/pdapainter/deconstruct(disassembled = TRUE) - obj_break() + atom_break() /obj/machinery/pdapainter/attack_hand(mob/user) if(!..()) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 6750dbcd92ae4..78cbdbe27c36d 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -557,7 +557,7 @@ Class Procs: new_frame.update_integrity(new_frame.max_integrity * 0.5) //the frame is already half broken transfer_fingerprints_to(new_frame) -/obj/machinery/obj_break(damage_flag) +/obj/machinery/atom_break(damage_flag) SHOULD_CALL_PARENT(TRUE) . = ..() if(!(machine_stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) @@ -585,7 +585,7 @@ Class Procs: deconstruct(FALSE) return ..() -/obj/machinery/run_obj_armor(damage_amount, damage_type, damage_flag = NONE, attack_dir) +/obj/machinery/run_atom_armor(damage_amount, damage_type, damage_flag = NONE, attack_dir) if(damage_flag == MELEE && damage_amount < damage_deflection) return 0 return ..() @@ -739,7 +739,7 @@ Class Procs: if(!(resistance_flags & INDESTRUCTIBLE)) if(resistance_flags & ON_FIRE) . += "It's on fire!" - var/healthpercent = (obj_integrity/max_integrity) * 100 + var/healthpercent = (atom_integrity/max_integrity) * 100 switch(healthpercent) if(50 to 99) . += "It looks slightly damaged." diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index 817eca6e9aaa5..8496516b8090a 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -812,7 +812,7 @@ visible_message("Sparks fly out of [src]!", "You emag [src], disabling its safeties.") playsound(src, "sparks", 50, 1) -/obj/machinery/advanced_airlock_controller/obj_break(damage_flag) +/obj/machinery/advanced_airlock_controller/atom_break(damage_flag) ..() update_icon() diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 8e6868d461959..31bf598145500 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) return TRUE /obj/machinery/announcement_system/proc/act_up() //does funny breakage stuff - if(!obj_break()) // if badmins flag this unbreakable or its already broken + if(!atom_break()) // if badmins flag this unbreakable or its already broken return arrival = pick("#!@%ERR-34%2 CANNOT LOCAT@# JO# F*LE!", "CRITICAL ERROR 99.", "ERR)#: DA#AB@#E NOT F(*ND!") diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index b4a41b00fae9f..0ee6fc56590a7 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -73,7 +73,7 @@ update_icon() else if(O.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!O.tool_start_check(user, amount=0)) return @@ -86,7 +86,7 @@ return to_chat(user, "You repair [src].") set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max(obj_integrity, max_integrity) + atom_integrity = max(atom_integrity, max_integrity) update_icon() else to_chat(user, "[src] does not need repairs.") diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index dadb0460a41ff..1af3f53d807e0 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -243,7 +243,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/camera) if(!panel_open) return FALSE toggle_cam(user, 1) - obj_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. + atom_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. I.play_tool_sound(src) return TRUE @@ -387,12 +387,12 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/camera) return ..() -/obj/machinery/camera/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/camera/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 12 && !(machine_stat & BROKEN)) return 0 . = ..() -/obj/machinery/camera/obj_break(damage_flag) +/obj/machinery/camera/atom_break(damage_flag) if(!status) return . = ..() diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index ebaa93ed3ada6..9425e4b6368f8 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -119,7 +119,7 @@ if(BURN) playsound(src.loc, 'sound/items/welder.ogg', 100, 1) -/obj/machinery/computer/obj_break(damage_flag) +/obj/machinery/computer/atom_break(damage_flag) if(!circuit) //no circuit, no breaking return . = ..() @@ -133,10 +133,10 @@ switch(severity) if(1) if(prob(50)) - obj_break(ENERGY) + atom_break(ENERGY) if(2) if(prob(10)) - obj_break(ENERGY) + atom_break(ENERGY) /obj/machinery/computer/deconstruct(disassembled = TRUE, mob/user) on_deconstruction() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index fe6205bdde6cb..4f121b443a7e0 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff_exponent = 10) if(obj_flags & EMAGGED) - new /obj/effect/spawner/newbomb/timer/syndicate(loc) + new /obj/effect/spawner/newbomb/timer(loc) new /obj/item/clothing/head/collectable/petehat(loc) message_admins("[ADMIN_LOOKUPFLW(usr)] has outbombed Cuban Pete and been awarded a bomb.") log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.") diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index abfb524aa0587..9426c196232bf 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -31,7 +31,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount/loaded, 28) end_processing() . = ..() -/obj/machinery/defibrillator_mount/obj_destruction() +/obj/machinery/defibrillator_mount/atom_destruction() if(defib) defib.forceMove(get_turf(src)) defib.visible_message("[defib] falls to the ground from the destroyed wall mount.") diff --git a/code/game/machinery/digital_clock.dm b/code/game/machinery/digital_clock.dm index a833cbcd8669a..5a2d5c7954e1e 100644 --- a/code/game/machinery/digital_clock.dm +++ b/code/game/machinery/digital_clock.dm @@ -37,14 +37,14 @@ . = ..() if(user.a_intent == INTENT_HARM) return - if(obj_integrity >= max_integrity) + if(atom_integrity >= max_integrity) balloon_alert(user, "it doesn't need repairs!") return TRUE to_chat(user, "You start to repair [name]...") if(!tool.use_tool(src, user, 4 SECONDS, amount = 0, volume=50)) return TRUE to_chat(user, "You finish to repair [name]...") - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) update_appearance() return TRUE diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 9bc1d1aa1b878..3aeb15a6cc0da 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -122,10 +122,10 @@ if(glass) airlock_material = "glass" if(security_level > AIRLOCK_SECURITY_IRON) - obj_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER + atom_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER max_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER else - obj_integrity = normal_integrity + atom_integrity = normal_integrity max_integrity = normal_integrity if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_IRON) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R @@ -642,9 +642,9 @@ SSvis_overlays.add_vis_overlay(src, overlays_file, "lights_emergency", FLOAT_LAYER, FLOAT_PLANE, dir) if(welded) SSvis_overlays.add_vis_overlay(src, overlays_file, "welded", FLOAT_LAYER, FLOAT_PLANE, dir) - if(obj_integrity < integrity_failure * max_integrity) + if(atom_integrity < integrity_failure * max_integrity) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_broken", FLOAT_LAYER, FLOAT_PLANE, dir) - else if(obj_integrity < (0.75 * max_integrity)) + else if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_damaged", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_DENY) @@ -653,25 +653,25 @@ SSvis_overlays.add_vis_overlay(src, overlays_file, "lights_denied", FLOAT_LAYER, FLOAT_PLANE, dir) if(welded) SSvis_overlays.add_vis_overlay(src, overlays_file, "welded", FLOAT_LAYER, FLOAT_PLANE, dir) - if(obj_integrity < integrity_failure * max_integrity) + if(atom_integrity < integrity_failure * max_integrity) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_broken", FLOAT_LAYER, FLOAT_PLANE, dir) - else if(obj_integrity < (0.75 * max_integrity)) + else if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_damaged", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_EMAG) if(welded) SSvis_overlays.add_vis_overlay(src, overlays_file, "welded", FLOAT_LAYER, FLOAT_PLANE, dir) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks", FLOAT_LAYER, FLOAT_PLANE, dir) - if(obj_integrity < integrity_failure * max_integrity) + if(atom_integrity < integrity_failure * max_integrity) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_broken", FLOAT_LAYER, FLOAT_PLANE, dir) - else if(obj_integrity < (0.75 * max_integrity)) + else if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_damaged", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_CLOSING) if(lights && hasPower()) SSvis_overlays.add_vis_overlay(src, overlays_file, "lights_closing", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_OPEN) - if(obj_integrity < (0.75 * max_integrity)) + if(atom_integrity < (0.75 * max_integrity)) SSvis_overlays.add_vis_overlay(src, overlays_file, "sparks_open", FLOAT_LAYER, FLOAT_PLANE, dir) if(AIRLOCK_OPENING) @@ -1129,14 +1129,14 @@ log_combat(user, src, welded? "welded shut":"unwelded", important = FALSE) update_icon() else - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return user.visible_message("[user] is welding the airlock.", \ "You begin repairing the airlock...", \ "You hear welding.") if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user))) - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) user.visible_message("[user.name] has repaired [src].", \ "You finish repairing the airlock.") @@ -1430,9 +1430,11 @@ add_hiddenprint(user) /obj/machinery/door/airlock/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) + if((damage_amount >= atom_integrity) && (damage_flag == BOMB)) + flags_1 |= NODECONSTRUCT_1 //If an explosive took us out, don't drop the assembly . = ..() - if(obj_integrity < (0.75 * max_integrity)) - update_icon() + if(atom_integrity < (0.75 * max_integrity)) + update_appearance() /obj/machinery/door/airlock/deconstruct(disassembled = TRUE, mob/user) if(!(flags_1 & NODECONSTRUCT_1)) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 5ee9958d26fb2..3a8560b9dc526 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -48,7 +48,7 @@ closets += WEAKREF(C) if(!length(doors) && !length(flashers) && length(closets)) - obj_break() + atom_break() //Main door timer loop, if it's timing and time is >0 reduce time by 1. // if it's less than 0, open door, reset timer diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index b303eb31cd972..c2c178a990861 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -227,7 +227,7 @@ /obj/machinery/door/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) if(damage_amount >= 10 && prob(30)) spark_system.start() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 58bae417d81cd..044eb5c6069bd 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -62,7 +62,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/door/window) /obj/machinery/door/window/Destroy() set_density(FALSE) air_update_turf(1) - if(obj_integrity == 0) + if(atom_integrity == 0) playsound(src, "shatter", 70, 1) electronics = null return ..() diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 9ac48367e42cc..b28f12dc17ee3 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -227,12 +227,12 @@ "You restore [src] to operation.") set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() else return ..() -/obj/machinery/droneDispenser/obj_break(damage_flag) +/obj/machinery/droneDispenser/atom_break(damage_flag) . = ..() if(!.) return diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index e1a78a1e48294..42e3e8d6c421a 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -211,13 +211,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/firealarm) if(panel_open) if(W.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(W.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair [src].") else to_chat(user, "[src] is already in good condition!") @@ -323,7 +323,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) /obj/machinery/firealarm/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() if(.) //damage received - if(obj_integrity > 0 && !(machine_stat & BROKEN) && buildstage != 0) + if(atom_integrity > 0 && !(machine_stat & BROKEN) && buildstage != 0) if(prob(33)) alarm() @@ -332,7 +332,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) deconstruct() ..() -/obj/machinery/firealarm/obj_break(damage_flag) +/obj/machinery/firealarm/atom_break(damage_flag) if(buildstage == 0) //can't break the electronics if there isn't any inside. return . = ..() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index d27471b9f74ae..a3ce6831e8a1b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -101,7 +101,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/flasher) if(anchored) flash() -/obj/machinery/flasher/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/flasher/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 10) //any melee attack below 10 dmg does nothing return 0 . = ..() @@ -144,7 +144,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/flasher) bulb.burn_out() power_change() -/obj/machinery/flasher/obj_break(damage_flag) +/obj/machinery/flasher/atom_break(damage_flag) . = ..() if(. && bulb) bulb.burn_out() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 6cb424f3feda4..2d5ad6ac59d0c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -134,7 +134,7 @@ Possible to do for anyone motivated enough: if(outgoing_call) outgoing_call.ConnectionFailure(src) -/obj/machinery/holopad/obj_break() +/obj/machinery/holopad/atom_break() . = ..() if(outgoing_call) outgoing_call.ConnectionFailure(src) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 4bf206dfc2fdf..0f3264d83d3cc 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -30,7 +30,7 @@ QDEL_NULL(beaker) return ..() -/obj/machinery/iv_drip/obj_destruction() +/obj/machinery/iv_drip/atom_destruction() if(beaker) beaker.forceMove(drop_location()) beaker.SplashReagents(drop_location()) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 04d4207fc0a84..0371af613d490 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -95,7 +95,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/newscaster) . += emissive_appearance(icon, "[base_icon_state]_alert", layer, alpha = src.alpha) ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) - var/hp_percent = (obj_integrity * 100) / max_integrity + var/hp_percent = (atom_integrity * 100) / max_integrity switch(hp_percent) if(75 to 100) return @@ -551,7 +551,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/newscaster) if(!(machine_stat & BROKEN)) return to_chat(user, "You repair [src].") - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) update_icon() else @@ -585,7 +585,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/newscaster) new /obj/item/shard(loc) qdel(src) -/obj/machinery/newscaster/obj_break(damage_flag) +/obj/machinery/newscaster/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 346c2b6fc4aa8..d8df4f3c5d524 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -374,7 +374,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) /obj/machinery/porta_turret/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) //damage received + if(. && atom_integrity > 0) //damage received if(prob(30)) spark_system.start() if(on && !attacked && !(obj_flags & EMAGGED)) @@ -387,7 +387,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/porta_turret) /obj/machinery/porta_turret/deconstruct(disassembled = TRUE) qdel(src) -/obj/machinery/porta_turret/obj_break(damage_flag) +/obj/machinery/porta_turret/atom_break(damage_flag) . = ..() if(.) power_change() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index a92709d21a5bb..1f3ea33523970 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -115,11 +115,8 @@ /obj/machinery/shieldgen/deconstruct(disassembled = TRUE) - if(!(flags_1 & NODECONSTRUCT_1)) - if(!(machine_stat && BROKEN)) - set_machine_stat(machine_stat | BROKEN) - locked = pick(0,1) - update_icon() + atom_break() + locked = pick(0,1) /obj/machinery/shieldgen/interact(mob/user) . = ..() @@ -165,7 +162,7 @@ if(coil.get_amount() < 1) return coil.use(1) - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) to_chat(user, "You repair \the [src].") update_icon() diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index fb20f6b958b2f..61975b7a673ed 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -108,10 +108,10 @@ return icon_state = "stasis" -/obj/machinery/stasis/obj_break(damage_flag) +/obj/machinery/stasis/atom_break(damage_flag) . = ..() - play_power_sound() - update_icon() + if(.) + play_power_sound() /obj/machinery/stasis/power_change() . = ..() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 4683a8e6e0add..8dd5ec0baa082 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -59,11 +59,11 @@ var/obj/item/transfer_valve/valve_payload = payload valve_payload.toggle_valve() -/obj/machinery/syndicatebomb/obj_break() +/obj/machinery/syndicatebomb/atom_break() if(!try_detonate()) ..() -/obj/machinery/syndicatebomb/obj_destruction() +/obj/machinery/syndicatebomb/atom_destruction() if(!try_detonate()) ..() @@ -193,11 +193,11 @@ to_chat(user, "You need at least [PLASTEEL_REPAIR_AMOUNT] sheets of plasteel to repair [src].") return if(do_after(user, delay = 2.5 SECONDS, target = src) && stack_sheets.use(PLASTEEL_REPAIR_AMOUNT)) - obj_integrity = min(obj_integrity + 100, max_integrity) + atom_integrity = min(atom_integrity + 100, max_integrity) else - var/old_integ = obj_integrity + var/old_integ = atom_integrity . = ..() - if((old_integ > obj_integrity) && active && (payload in src)) + if((old_integ > atom_integrity) && active && (payload in src)) to_chat(user, "That seems like a really bad idea...") /obj/machinery/syndicatebomb/interact(mob/user) @@ -230,7 +230,7 @@ if(!anchored) to_chat(user, "[src] must be anchored in order to arm!") return - if(obj_integrity != max_integrity) + if(atom_integrity != max_integrity) to_chat(user, "[src] must be undamaged in order to arm!") return visible_message("[icon2html(src, viewers(loc))] [timer_set] seconds until detonation, please clear the area.") diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 3fd2baed0fc38..14f3005bc80b3 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -228,7 +228,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) if(traffic > 0) traffic -= netspeed * delta_time -/obj/machinery/telecomms/obj_break(damage_flag) +/obj/machinery/telecomms/atom_break(damage_flag) . = ..() update_power() diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 700439c06377a..1a66796e2dae7 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -56,7 +56,7 @@ myseed.adjust_production(rand(-3,6)) myseed.adjust_endurance(rand(-3,6)) delay = delay - myseed.production * 100 //So the delay goes DOWN with better stats instead of up. :I - obj_integrity = round(myseed.endurance / 2) + atom_integrity = round(myseed.endurance / 2) max_integrity = round(myseed.endurance / 2) var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) if(ispath(G)) // Seeds were ported to initialize so their genes are still typepaths here, luckily their initializer is smart enough to handle us doing this diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 8a84e300264da..b6e2940429b69 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -20,7 +20,7 @@ to_chat(user, "The [I] gets stuck in \the [src]!") return ..() -/obj/structure/spider/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/spider/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE) switch(damage_type) if(BURN) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a5e3b0c6ec052..185206955f905 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -280,7 +280,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/blob_act(obj/structure/blob/B) if(B.loc == loc && !(resistance_flags & INDESTRUCTIBLE)) - qdel(src) + atom_destruction(MELEE) /obj/item/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 92c7348a3c81c..dbb91d6441ab4 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -433,7 +433,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( spark_system.start() playsound(get_turf(src), 'sound/effects/pop.ogg', 50, FALSE) -/obj/item/pipe_dispenser/attack_obj(obj/O, mob/living/user) +/obj/item/pipe_dispenser/attack_atom(obj/O, mob/living/user) // don't attempt to attack what we don't want to attack if(is_type_in_typecache(O, atmos_constructs) || is_type_in_typecache(O, rpd_targets) || is_type_in_typecache(O, rpd_whitelist)) return diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index a7382025dfd41..28b072da7a69c 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -61,7 +61,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) addtimer(CALLBACK(src, PROC_REF(startUp)), 50) player_modifier = length(GLOB.player_list) max_integrity = min(300+player_modifier*15, 600) - obj_integrity = max_integrity + atom_integrity = max_integrity calculate_runaway_condition() existing_machines++ @@ -69,7 +69,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) /obj/structure/checkoutmachine/examine(mob/living/user) . = ..() - . += "It's integrated integrity meter reads: HEALTH: [obj_integrity]." + . += "It's integrated integrity meter reads: HEALTH: [atom_integrity]." /obj/structure/checkoutmachine/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/card/id)) @@ -91,7 +91,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) return ..() /obj/structure/checkoutmachine/proc/calculate_runaway_condition() - next_health_to_teleport = obj_integrity - RUN_AWAY_THRESHOLD_HP - clamp((20-player_modifier)*10, 0, 100) + next_health_to_teleport = atom_integrity - RUN_AWAY_THRESHOLD_HP - clamp((20-player_modifier)*10, 0, 100) /* the less player you have, it will less run away: [1 pop] 315-75-dead [5 pop] 375-135-dead @@ -216,7 +216,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) var/link = FOLLOW_LINK(M, src) to_chat(M, "[link] [name] [total_credits_stolen ? "siphons total [total_credits_stolen] credits from [victim_count] bank accounts." : "tried to siphon bank accounts, but there're no victims."] location: [get_area(src)]") - if(obj_integrity>25) + if(atom_integrity>25) next_health_to_teleport -= round(max_integrity/60) take_damage(round(max_integrity/60)) // self-damage for self-destruction @@ -228,7 +228,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/checkoutmachine) Move(get_step(src, anydir), anydir) // Oh no, it RUNS AWAY!!! - if(obj_integrity && obj_integrity < next_health_to_teleport) // checks if obj_integrity is positive first + if(atom_integrity && atom_integrity < next_health_to_teleport) // checks if atom_integrity is positive first calculate_runaway_condition() var/turf/targetturf for(var/i in 1 to 100) // teleporting across z-levels is painful diff --git a/code/game/objects/items/deployable/barricade.dm b/code/game/objects/items/deployable/barricade.dm index 38688c4cc8eed..d08f3ddfcf5d9 100644 --- a/code/game/objects/items/deployable/barricade.dm +++ b/code/game/objects/items/deployable/barricade.dm @@ -54,13 +54,13 @@ /obj/structure/barricade/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM && bar_material == METAL) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(I.use_tool(src, user, 40, volume=40)) - obj_integrity = clamp(obj_integrity + 20, 0, max_integrity) + atom_integrity = clamp(atom_integrity + 20, 0, max_integrity) else if(I.GetID() && initial(locked_down)) if(allowed(user)) @@ -92,7 +92,7 @@ if(over_object == usr && Adjacent(usr)) if(!ishuman(usr) || !usr.canUseTopic(src, BE_CLOSE)) return - if(!pickup_damaged && obj_integrity < max_integrity) + if(!pickup_damaged && atom_integrity < max_integrity) to_chat(usr, "[src] is damaged! You'll have to repair it before you can relocate it.") return if(locked_down) @@ -104,9 +104,9 @@ //If the barricade is made of parts, some of them are damaged when the barricade is damaged so we set how many are being returned here if(initial(drop_amount) > 1) - drop_amount = round(drop_amount * (obj_integrity/max_integrity)) + drop_amount = round(drop_amount * (atom_integrity/max_integrity)) //If we are only picking up one item at most, it has a chance to fall apart based on damage the barricade accrued. Will always succeed if pickup_damaged is false. - else if(!prob(round((obj_integrity/max_integrity), 0.01) * 100)) + else if(!prob(round((atom_integrity/max_integrity), 0.01) * 100)) usr.visible_message("[usr] tries to pick up [src] but it falls apart!", "[src] is too damaged and falls apart!") qdel(src) return diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 3e38084aca31a..24914e3ff031e 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -249,3 +249,9 @@ ui_update() update_icon() + +/** + * Returns if this is ready to be detonated. Checks if both tanks are in place. + */ +/obj/item/transfer_valve/proc/ready() + return tank_one && tank_two diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index d25de6a13e892..d0f9a52121852 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -85,7 +85,7 @@ else return ..() -/obj/item/extinguisher/attack_obj(obj/O, mob/living/user) +/obj/item/extinguisher/attack_atom(obj/O, mob/living/user, params) if(AttemptRefill(O, user)) refilling = TRUE return FALSE diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index 04ccf705ba49e..e0cf0ab0d6b8a 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -33,7 +33,7 @@ if(cell && !(. & EMP_PROTECT_CONTENTS)) cell.emp_act(severity) -/obj/item/inducer/attack_obj(obj/O, mob/living/carbon/user) +/obj/item/inducer/attack_atom(obj/O, mob/living/carbon/user, params) if(user.a_intent == INTENT_HARM) return ..() diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 89f5ab3cae700..cff95a2585838 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -42,10 +42,10 @@ owner.visible_message("[L] injures themselves on [owner]'s [src]!") if(attackforce) owner.changeNext_move(CLICK_CD_MELEE) - if (obj_integrity <= attackforce) + if (atom_integrity <= attackforce) var/turf/T = get_turf(owner) T.visible_message("[hitby] destroys [src]!") - obj_integrity = 1 + atom_integrity = 1 shatter(owner) return FALSE take_damage(attackforce * ((100-(block_power))/100)) @@ -55,13 +55,13 @@ /obj/item/shield/attackby(obj/item/weldingtool/W, mob/living/user, params) if(istype(W)) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return user.visible_message("[user] is welding the [src].", \ "You begin repairing the [src]]...") if(W.use_tool(src, user, 40, volume=50)) - obj_integrity += 10 + atom_integrity += 10 user.visible_message("[user.name] has repaired some dents on [src].", \ "You finish repairing some of the dents on [src].") else @@ -70,7 +70,7 @@ /obj/item/shield/examine(mob/user) . = ..() - var/healthpercent = round((obj_integrity/max_integrity) * 100, 1) + var/healthpercent = round((atom_integrity/max_integrity) * 100, 1) switch(healthpercent) if(50 to 99) . += "It looks slightly damaged." @@ -110,12 +110,12 @@ playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1) cooldown = world.time else if(istype(W, /obj/item/stack/sheet/mineral/titanium)) - if (obj_integrity >= max_integrity) + if (atom_integrity >= max_integrity) to_chat(user, "[src] is already in perfect condition.") else var/obj/item/stack/sheet/mineral/titanium/T = W T.use(1) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair [src] with [T].") else return ..() @@ -316,8 +316,8 @@ w_class = WEIGHT_CLASS_BULKY playsound(user, 'sound/weapons/saberon.ogg', 35, 1) to_chat(user, "[src] is now active and back at full power.") - if(obj_integrity <= 1) - obj_integrity = max_integrity + if(atom_integrity <= 1) + atom_integrity = max_integrity else force = initial(force) throwforce = initial(throwforce) diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 6405e4b22a110..bffb7ab089494 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -1,5 +1,7 @@ #define TTV_NO_CASING_MOD 0.25 #define REACTIONS_BEFORE_EXPLOSION 3 +/// How much time (in seconds) is assumed to pass while assuming air. Used to scale overpressure/overtemp damage when assuming air. +#define ASSUME_AIR_DT_FACTOR 1 /obj/item/tank name = "tank" @@ -18,10 +20,15 @@ custom_materials = list(/datum/material/iron = 500) actions_types = list(/datum/action/item_action/set_internals) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 80, ACID = 30, STAMINA = 0, BLEED = 0) + integrity_failure = 0.5 + /// The gases this tank contains. var/datum/gas_mixture/air_contents = null - var/distribute_pressure = ONE_ATMOSPHERE - var/integrity = 3 + /// The volume of this tank. var/volume = 70 + /// Whether the tank is currently leaking. + var/leaking = FALSE + /// The pressure of the gases this tank supplies to internals. + var/distribute_pressure = ONE_ATMOSPHERE /// Mob that is currently breathing from the tank. var/mob/living/carbon/breathing_mob = null @@ -77,7 +84,7 @@ QDEL_NULL(air_contents) STOP_PROCESSING(SSobj, src) - . = ..() + return ..() /obj/item/tank/examine(mob/user) var/obj/icon = src @@ -109,25 +116,13 @@ . += "It feels [descriptive]." -/obj/item/tank/blob_act(obj/structure/blob/B) - if(B && B.loc == loc) - var/turf/location = get_turf(src) - if(!location) - qdel(src) - - if(air_contents) - location.assume_air(air_contents) - - qdel(src) - /obj/item/tank/deconstruct(disassembled = TRUE) - if(!disassembled) - var/turf/T = get_turf(src) - if(T) - T.assume_air(air_contents) - air_update_turf() - playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) - qdel(src) + var/turf/location = get_turf(src) + if(location) + location.assume_air(air_contents) + location.air_update_turf(FALSE, FALSE) + playsound(location, 'sound/effects/spray.ogg', 10, TRUE, -3) + return ..() /obj/item/tank/suicide_act(mob/living/user) var/mob/living/carbon/human/human_user = user @@ -221,21 +216,20 @@ /obj/item/tank/assume_air(datum/gas_mixture/giver) air_contents.merge(giver) - - check_status() - return 1 + handle_tolerances(ASSUME_AIR_DT_FACTOR) + return TRUE /obj/item/tank/assume_air_moles(datum/gas_mixture/giver, moles) giver.transfer_to(air_contents, moles) - check_status() - return 1 + handle_tolerances(ASSUME_AIR_DT_FACTOR) + return TRUE /obj/item/tank/assume_air_ratio(datum/gas_mixture/giver, ratio) giver.transfer_ratio_to(air_contents, ratio) - check_status() - return 1 + handle_tolerances(ASSUME_AIR_DT_FACTOR) + return TRUE /obj/item/tank/proc/remove_air_volume(volume_to_return) if(!air_contents) @@ -249,23 +243,71 @@ return remove_air(moles_needed) -/obj/item/tank/process() +/obj/item/tank/process(delta_time) + if(!air_contents) + return + //Allow for reactions air_contents.react(src) - check_status() - -/obj/item/tank/proc/check_status() - //Handle exploding, leaking, and rupturing of the tank - + handle_tolerances(delta_time) + if(QDELETED(src) || !leaking || !air_contents) + return + var/turf/location = get_turf(src) + if(!location) + return + var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(0.25) + location.assume_air(leaked_gas) + location.air_update_turf(FALSE, FALSE) + +/** + * Handles the minimum and maximum pressure tolerances of the tank. + * + * Arguments: + * - delta_time: How long has passed between ticks. + */ +/obj/item/tank/proc/handle_tolerances(delta_time) if(!air_contents) - return 0 + return FALSE var/pressure = air_contents.return_pressure() var/temperature = air_contents.return_temperature() + if(temperature >= TANK_MELT_TEMPERATURE) + var/temperature_damage_ratio = (temperature - TANK_MELT_TEMPERATURE) / temperature + take_damage(max_integrity * temperature_damage_ratio * delta_time, BURN, FIRE, FALSE, NONE) + if(QDELETED(src)) + return TRUE + + if(pressure >= TANK_LEAK_PRESSURE) + var/pressure_damage_ratio = (pressure - TANK_LEAK_PRESSURE) / (TANK_RUPTURE_PRESSURE - TANK_LEAK_PRESSURE) + take_damage(max_integrity * pressure_damage_ratio * delta_time, BRUTE, BOMB, FALSE, NONE) + return TRUE + +/// Handles the tank springing a leak. +/obj/item/tank/atom_break(damage_flag) + . = ..() + if(leaking) + return + + leaking = TRUE + if(atom_integrity < 0) // So we don't play the alerts while we are exploding or rupturing. + return + visible_message("[src] springs a leak!") + playsound(src, 'sound/effects/spray.ogg', 10, TRUE, -3) +/// Handles rupturing and fragmenting +/obj/item/tank/atom_destruction(damage_flag) + if(!air_contents) + return ..() + + var/turf/location = get_turf(src) + if(!location) + return ..() + + /// Handle fragmentation + var/pressure = air_contents.return_pressure() if(pressure > TANK_FRAGMENT_PRESSURE) var/explosion_mod = 1 - if(!istype(src.loc, /obj/item/transfer_valve)) + if(!istype(loc, /obj/item/transfer_valve)) log_bomber(details = "[src.fingerprintslast] was the last key to touch", bomb = src, additional_details = ", which ruptured explosively") else if(!istype(src.loc?.loc, /obj/machinery/syndicatebomb)) explosion_mod = TTV_NO_CASING_MOD @@ -274,38 +316,10 @@ air_contents.react(src) pressure = air_contents.return_pressure() var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE - var/turf/epicenter = get_turf(loc) - - - explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5), cap_modifier = explosion_mod) - if(istype(src.loc, /obj/item/transfer_valve)) - qdel(src.loc) - else - qdel(src) - - else if(pressure > TANK_RUPTURE_PRESSURE || temperature > TANK_MELT_TEMPERATURE) - if(integrity <= 0) - var/turf/T = get_turf(src) - if(!T) - return - T.assume_air(air_contents) - playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) - qdel(src) - else - integrity-- - - else if(pressure > TANK_LEAK_PRESSURE) - if(integrity <= 0) - var/turf/T = get_turf(src) - if(!T) - return - var/datum/gas_mixture/leaked_gas = air_contents.remove_ratio(0.25) - T.assume_air(leaked_gas) - else - integrity-- - - else if(integrity < 3) - integrity++ + + explosion(location, round(range*0.25), round(range*0.5), round(range), round(range*1.5), cap_modifier = explosion_mod) + return ..() #undef TTV_NO_CASING_MOD #undef REACTIONS_BEFORE_EXPLOSION +#undef ASSUME_AIR_DT_FACTOR diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 4fee093fd8c17..85177a5e04007 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -1,87 +1,3 @@ - -//the essential proc to call when an obj must receive damage of any kind. -/obj/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) - if(QDELETED(src)) - stack_trace("[src] taking damage after deletion") - return - if(obj_integrity <= 0) - stack_trace("[src] taking damage while having <= 0 integrity") - return - if(sound_effect) - play_attack_sound(damage_amount, damage_type, damage_flag) - if(resistance_flags & INDESTRUCTIBLE) - return - damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) - if(damage_amount < DAMAGE_PRECISION) - return - if (!isnull(max_hit_damage)) - damage_amount = min(damage_amount, max_hit_damage) - //Object is basssiiiiccaalllyyy guaranteed to take damage by this point, lets run our signal - if(SEND_SIGNAL(src, COMSIG_OBJ_TAKE_DAMAGE, damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration) & COMPONENT_NO_TAKE_DAMAGE) - return - . = damage_amount - - update_integrity(obj_integrity - damage_amount) - - //BREAKING FIRST - if(integrity_failure && obj_integrity <= integrity_failure * max_integrity) - obj_break(damage_flag) - - //DESTROYING SECOND - if(obj_integrity <= 0) - obj_destruction(damage_flag) - -/// Proc for recovering obj_integrity. Returns the amount repaired by -/obj/proc/repair_damage(amount) - if(amount <= 0) // We only recover here - return - var/new_integrity = min(max_integrity, obj_integrity + amount) - . = new_integrity - obj_integrity - - update_integrity(new_integrity) - - if(integrity_failure && obj_integrity > integrity_failure * max_integrity) - obj_fix() - -/// Handles the integrity of an object changing. This must be called instead of changing integrity directly. -/obj/proc/update_integrity(new_value) - SHOULD_NOT_OVERRIDE(TRUE) - new_value = max(0, new_value) - if(obj_integrity == new_value) - return - obj_integrity = new_value - SEND_SIGNAL(src, COMSIG_OBJ_INTEGRITY_CHANGED) - -/// This mostly exists to keep obj_integrity private. Might be useful in the future. -/obj/proc/get_integrity() - SHOULD_BE_PURE(TRUE) - return obj_integrity - -//returns the damage value of the attack after processing the obj's various armor protections -/obj/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) - switch(damage_type) - if(BRUTE) - if(BURN) - else - return 0 - var/armor_protection = 0 - if(damage_flag) - armor_protection = armor.getRating(damage_flag) - if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. - armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100) - return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) - -//the sound played when the obj is damaged. -/obj/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - switch(damage_type) - if(BRUTE) - if(damage_amount) - playsound(src, 'sound/weapons/smash.ogg', 50, 1) - else - playsound(src, 'sound/weapons/tap.ogg', 50, 1) - if(BURN) - playsound(src.loc, 'sound/items/welder.ogg', 100, 1) - /obj/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) ..() take_damage(AM.throwforce, BRUTE, MELEE, 1, get_dir(src, AM)) @@ -113,9 +29,6 @@ if(P.suppressed != SUPPRESSED_VERY) visible_message("[src] is hit by \a [P][damage ? "" : ", without leaving a mark"]!", null, null, COMBAT_MESSAGE_RANGE) -/obj/proc/hulk_damage() - return 150 //the damage hulks do on punches to this object, is affected by melee armor - /obj/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if(user.a_intent == INTENT_HARM) ..(user, 1) @@ -138,11 +51,6 @@ return take_damage(400, BRUTE, MELEE, 0, get_dir(src, B)) -/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime - user.do_attack_animation(src) - user.changeNext_move(CLICK_CD_MELEE) - return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration) - /obj/attack_alien(mob/living/carbon/alien/humanoid/user) if(attack_generic(user, 60, BRUTE, MELEE, 0)) playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) @@ -286,19 +194,8 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e SEND_SIGNAL(src, COMSIG_OBJ_DECONSTRUCT, disassembled) qdel(src) -/// Called after the obj takes damage and integrity is below integrity_failure level -/obj/proc/obj_break(damage_flag) - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_OBJ_BREAK) - -/// Called when integrity is repaired above the breaking point having been broken before -/obj/proc/obj_fix() - SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL(src, COMSIG_OBJ_FIX) - //what happens when the obj's integrity reaches zero. -/obj/proc/obj_destruction(damage_flag) - +/obj/atom_destruction(damage_flag) if(damage_flag == ACID) acid_melt() else if(damage_flag == FIRE) @@ -306,24 +203,6 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e else deconstruct(FALSE) -//changes max_integrity while retaining current health percentage -//returns TRUE if the obj broke, FALSE otherwise -/obj/proc/modify_max_integrity(new_max, can_break = TRUE, damage_type = BRUTE) - var/current_integrity = obj_integrity - var/current_max = max_integrity - - if(current_integrity != 0 && current_max != 0) - var/percentage = current_integrity / current_max - current_integrity = max(1, round(percentage * new_max)) //don't destroy it as a result - obj_integrity = current_integrity - - max_integrity = new_max - - if(can_break && integrity_failure && current_integrity <= integrity_failure * max_integrity) - obj_break(damage_type) - return TRUE - return FALSE - //returns how much the object blocks an explosion /obj/proc/GetExplosionBlock() CRASH("Unimplemented GetExplosionBlock()") diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index f0cee5f78010a..b76b9ac15ac60 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -13,12 +13,12 @@ CREATION_TEST_IGNORE_SELF(/obj) /// How much bleeding damage do we cause, see __DEFINES/mobs.dm var/bleed_force = 0 + /* var/datum/armor/armor - /// The integrity the object starts at. Defaults to max_integrity. - VAR_PRIVATE/obj_integrity //defaults to max_integrity + VAR_PRIVATE/atom_integrity //defaults to max_integrity /// The maximum integrity the object can have. var/max_integrity = 500 - /// The object will break once obj_integrity reaches this amount in take_damage(). 0 if we have no special broken behavior, otherwise is a percentage of at what point the obj breaks. 0.5 being 50% + /// The object will break once atom_integrity reaches this amount in take_damage(). 0 if we have no special broken behavior, otherwise is a percentage of at what point the obj breaks. 0.5 being 50% var/integrity_failure = 0 /// Damage under this value will be completely ignored var/damage_deflection = 0 @@ -27,6 +27,7 @@ CREATION_TEST_IGNORE_SELF(/obj) /// INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF var/resistance_flags = NONE + */ /// How much acid is on that obj var/acid_level = 0 @@ -58,6 +59,8 @@ CREATION_TEST_IGNORE_SELF(/obj) /// broadcasted to as long as the other guys network is on the same branch or above. var/network_id = null + uses_integrity = TRUE + var/investigate_flags = NONE // ADMIN_INVESTIGATE_TARGET: investigate_log on pickup/drop /// If the emag behavior should be toggleable @@ -70,13 +73,13 @@ CREATION_TEST_IGNORE_SELF(/obj) return ..() /obj/Initialize(mapload) - if (islist(armor)) - armor = getArmor(arglist(armor)) - else if (!armor) - armor = getArmor() - else if (!istype(armor, /datum/armor)) - stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()") - obj_integrity = max_integrity + //if (islist(armor)) + // armor = getArmor(arglist(armor)) + //else if (!armor) + // armor = getArmor() + //else if (!istype(armor, /datum/armor)) + // stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()") + //atom_integrity = max_integrity . = ..() //Do this after, else mat datums is mad. diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 3f97e790cae44..18018afc5874c 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -47,7 +47,7 @@ . += examine_status /obj/structure/proc/examine_status(mob/user) //An overridable proc, mostly for falsewalls. - var/healthpercent = (obj_integrity/max_integrity) * 100 + var/healthpercent = (atom_integrity/max_integrity) * 100 switch(healthpercent) if(50 to 99) return "It looks slightly damaged." diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 8517bb98133d6..cb218efabd838 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -11,7 +11,7 @@ icon = 'icons/mob/alien.dmi' max_integrity = 100 -/obj/structure/alien/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/alien/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE) switch(damage_type) if(BRUTE) @@ -258,7 +258,7 @@ addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) proximity_monitor = new(src, status == GROWN ? 1 : 0) if(status == BURST) - obj_integrity = integrity_failure * max_integrity + atom_integrity = integrity_failure * max_integrity /obj/structure/alien/egg/update_icon() ..() @@ -331,7 +331,7 @@ child.Leap(C) break -/obj/structure/alien/egg/obj_break(damage_flag) +/obj/structure/alien/egg/atom_break(damage_flag) . = ..() if(!(flags_1 & NODECONSTRUCT_1)) if(status != BURST) diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index 2ca66cc88647d..037da95a4b9a0 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -42,7 +42,7 @@ var/new_sign = new D return set_sign(new_sign) -/obj/structure/sign/barsign/obj_break(damage_flag) +/obj/structure/sign/barsign/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) broken = TRUE diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 8c8d67e3aec7d..c8ed5d023e6ec 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -315,7 +315,7 @@ new material_drop(loc, material_drop_amount) qdel(src) -/obj/structure/closet/obj_break(damage_flag) +/obj/structure/closet/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) bust_open() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index f459dda04fb4a..a52f0d6c0dee3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -7,7 +7,7 @@ armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80, STAMINA = 0, BLEED = 0) secure = TRUE -/obj/structure/closet/secure_closet/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/closet/secure_closet/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 20) return 0 . = ..() diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index d55a930f1260f..45fb0291f6174 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -9,7 +9,7 @@ var/tamperproof = 0 icon_door = "crate" -/obj/structure/closet/crate/secure/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/closet/crate/secure/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 25) return 0 . = ..() diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 9fece4d8b7fe8..2f2dcb4932e7a 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -99,7 +99,7 @@ trigger_alarm() qdel(src) -/obj/structure/displaycase/obj_break(damage_flag) +/obj/structure/displaycase/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) set_density(FALSE) @@ -149,13 +149,13 @@ to_chat(user, "You open [src].") toggle_lock(user) else if(W.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=5)) return to_chat(user, "You begin repairing [src]...") if(W.use_tool(src, user, 40, amount=5, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() to_chat(user, "You repair [src].") else @@ -190,7 +190,7 @@ if(do_after(user, 20, target = src)) G.use(2) broken = FALSE - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() else return ..() @@ -563,11 +563,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/showpiece_dummy) /obj/structure/displaycase/forsale/multitool_act(mob/living/user, obj/item/I) . = ..() - if(obj_integrity <= (integrity_failure * max_integrity)) + if(atom_integrity <= (integrity_failure * max_integrity)) to_chat(user, "You start recalibrating [src]'s hover field...") if(do_after(user, 20, target = src)) broken = FALSE - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() ui_update() return TRUE @@ -606,7 +606,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/showpiece_dummy) if(broken) . += "[src] is sparking and the hover field generator seems to be overloaded. Use a multitool to fix it." -/obj/structure/displaycase/forsale/obj_break(damage_flag) +/obj/structure/displaycase/forsale/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) broken = TRUE diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 27089c6c0b6f8..0452c98fff789 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -137,7 +137,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/extinguisher_cabinet) else icon_state = "extinguisher_empty" -/obj/structure/extinguisher_cabinet/obj_break(damage_flag) +/obj/structure/extinguisher_cabinet/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) broken = 1 diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index e4720096c9765..0f9bd1ad18a70 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -29,13 +29,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) if(iscyborg(user) || I.tool_behaviour == TOOL_MULTITOOL) toggle_lock(user) else if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP && !broken) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=2)) return to_chat(user, "You begin repairing [src].") if(I.use_tool(src, user, 40, volume=50, amount=2)) - obj_integrity = max_integrity + atom_integrity = max_integrity update_appearance() to_chat(user, "You repair [src].") else @@ -49,7 +49,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) to_chat(user, "You start fixing [src]...") if(do_after(user, 20, target = src) && G.use(2)) broken = 0 - obj_integrity = max_integrity + atom_integrity = max_integrity update_appearance() else if(open || broken) if(istype(I, /obj/item/fireaxe) && !fireaxe) @@ -85,7 +85,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) if(.) update_appearance() -/obj/structure/fireaxecabinet/obj_break(damage_flag) +/obj/structure/fireaxecabinet/atom_break(damage_flag) . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) update_appearance() @@ -148,7 +148,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32) if(fireaxe) add_overlay("axe") if(!open) - var/hp_percent = obj_integrity/max_integrity * 100 + var/hp_percent = atom_integrity/max_integrity * 100 if(broken) add_overlay("glass4") else diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index b9326d3200972..fe5d05fc53efa 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -6,6 +6,7 @@ name = "grille" icon = 'icons/obj/structures.dmi' icon_state = "grille" + base_icon_state = "grille" density = TRUE anchored = TRUE flags_1 = CONDUCT_1 @@ -26,21 +27,19 @@ /obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - update_icon() + update_appearance() -/obj/structure/grille/update_icon() +/obj/structure/grille/update_appearance(updates) if(QDELETED(src) || broken) return - var/ratio = obj_integrity / max_integrity - ratio = CEILING(ratio*4, 1) * 25 - + . = ..() if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) QUEUE_SMOOTH(src) - if(ratio > 50) - return - icon_state = "grille50_[rand(0,3)]" +/obj/structure/grille/update_icon_state() + icon_state = "[base_icon_state][((atom_integrity / max_integrity) <= 0.5) ? "50_[rand(0, 3)]" : null]" + return ..() /obj/structure/grille/examine(mob/user) . = ..() @@ -278,12 +277,12 @@ qdel(src) ..() -/obj/structure/grille/obj_break() +/obj/structure/grille/atom_break() . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) icon_state = "brokengrille" - density = FALSE - obj_integrity = 20 + set_density(FALSE) + atom_integrity = 20 broken = TRUE rods_amount = 1 rods_broken = FALSE @@ -297,8 +296,8 @@ /obj/structure/grille/proc/repair_grille() if(broken) icon_state = "grille" - density = TRUE - obj_integrity = max_integrity + set_density(TRUE) + atom_integrity = max_integrity broken = FALSE rods_amount = 2 rods_broken = TRUE @@ -386,7 +385,7 @@ src.device.activate() ..() -/obj/structure/grille/prison/obj_break() +/obj/structure/grille/prison/atom_break() var/turf/T = get_turf(src) var/obj/structure/cable/C = T.get_cable_node() if(C?.powernet) diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index 0ed3926978cdb..fe7364c5679ad 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -60,7 +60,7 @@ var/plunge_mod = 1 //time*plunge_mod = total time we take to plunge an object var/reinforced = FALSE //whether we do heavy duty stuff like geysers -/obj/item/plunger/attack_obj(obj/O, mob/living/user) +/obj/item/plunger/attack_atom(obj/O, mob/living/user) if(!O.plunger_act(src, user, reinforced)) return ..() diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index d46b64636271b..0ca845c67b855 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -200,7 +200,7 @@ /obj/item/gun_control/CanItemAutoclick() return TRUE -/obj/item/gun_control/attack_obj(obj/O, mob/living/user) +/obj/item/gun_control/attack_atom(obj/O, mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) O.attacked_by(src, user) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 0f28eb2d11f3f..e47a0f3c8afb4 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -316,7 +316,7 @@ /obj/structure/mineral_door/paperframe/examine(mob/user) . = ..() - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) . += "It looks a bit damaged, you may be able to fix it with some paper." /obj/structure/mineral_door/paperframe/pickaxe_door(mob/living/user, obj/item/I) @@ -333,10 +333,10 @@ fire_act(I.is_hot()) return - if((user.a_intent != INTENT_HARM) && istype(I, /obj/item/paper) && (obj_integrity < max_integrity)) + if((user.a_intent != INTENT_HARM) && istype(I, /obj/item/paper) && (atom_integrity < max_integrity)) user.visible_message("[user] starts to patch the holes in [src].", "You start patching some of the holes in [src]!") if(do_after(user, 20, src)) - obj_integrity = min(obj_integrity+4,max_integrity) + atom_integrity = min(atom_integrity+4,max_integrity) qdel(I) user.visible_message("[user] patches some of the holes in [src].", "You patch some of the holes in [src]!") return TRUE diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 5f7c20babfaaa..9146087aa93c9 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -19,7 +19,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/mirror) /obj/structure/mirror/Initialize(mapload, dir, building) . = ..() if(icon_state == "mirror_broke" && !broken) - obj_break(null, mapload) + atom_break(null, mapload) /obj/structure/mirror/attack_hand(mob/user) . = ..() @@ -57,7 +57,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/mirror) return list()// no message spam return ..() -/obj/structure/mirror/obj_break(damage_flag, mapload) +/obj/structure/mirror/atom_break(damage_flag, mapload) . = ..() if(broken || (flags_1 & NODECONSTRUCT_1)) return diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index 62987b94c02d6..06c17e96e169d 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -24,8 +24,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/statue/petrified) ADD_TRAIT(L, TRAIT_NO_BLOOD, STATUE_MUTE) L.faction += "mimic" //Stops mimics from instaqdeling people in statues L.status_flags |= GODMODE - obj_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues - max_integrity = obj_integrity + atom_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues + max_integrity = atom_integrity START_PROCESSING(SSobj, src) /obj/structure/statue/petrified/process(delta_time) @@ -64,7 +64,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/statue/petrified) petrified_mob.forceMove(loc) REMOVE_TRAIT(petrified_mob, TRAIT_MUTE, STATUE_MUTE) REMOVE_TRAIT(petrified_mob, TRAIT_NO_BLOOD, STATUE_MUTE) - petrified_mob.take_overall_damage((petrified_mob.health - obj_integrity + 100)) //any new damage the statue incurred is transfered to the mob + petrified_mob.take_overall_damage((petrified_mob.health - atom_integrity + 100)) //any new damage the statue incurred is transfered to the mob petrified_mob.faction -= "mimic" petrified_mob = null return ..() diff --git a/code/game/objects/structures/popout_cake.dm b/code/game/objects/structures/popout_cake.dm index 271f6e3fb7f4a..083ecf02a838c 100644 --- a/code/game/objects/structures/popout_cake.dm +++ b/code/game/objects/structures/popout_cake.dm @@ -41,7 +41,7 @@ to_chat(user, "There's already someone inside!") return - if(obj_integrity <= integrity_failure) + if(atom_integrity <= integrity_failure) to_chat(user, "The [src] is too damaged to hold anyone inside!") return diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 1a2b538b39d9e..cd6f467120bcc 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -37,13 +37,13 @@ add_fingerprint(user) if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(I.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair [src].") else to_chat(user, "[src] is already in good condition!") diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index c55b152ab3394..c5c45d270c918 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -101,7 +101,7 @@ new buildstacktype(drop_location(), buildstackamount) qdel(src) else if(W.tool_behaviour == TOOL_WELDER) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.tool_start_check(user, amount=0)) return @@ -109,7 +109,7 @@ "You begin repairing [src]...", "You hear welding.") if(W.use_tool(src, user, 40, volume=40)) - obj_integrity = max_integrity + atom_integrity = max_integrity user.visible_message("[user] has repaired [src].", \ "You finish repairing [src].") diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 7c791af59dd82..55de8fdee8216 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -186,13 +186,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) add_fingerprint(user) if(I.tool_behaviour == TOOL_WELDER && user.a_intent == INTENT_HELP) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!I.tool_start_check(user, amount=0)) return to_chat(user, "You begin repairing [src]...") if(I.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity update_nearby_icons() to_chat(user, "You repair [src].") else @@ -351,7 +351,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) if(!fulltile) return - var/ratio = obj_integrity / max_integrity + var/ratio = atom_integrity / max_integrity ratio = CEILING(ratio*4, 1) * 25 if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) @@ -507,7 +507,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) /obj/structure/window/depleteduranium/unanchored anchored = FALSE -/* Full Tile Windows (more obj_integrity) */ +/* Full Tile Windows (more atom_integrity) */ /obj/structure/window/fulltile icon = 'icons/obj/smooth_structures/windows/window.dmi' @@ -690,7 +690,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) /obj/structure/window/paperframe/examine(mob/user) . = ..() - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) . += "It looks a bit damaged, you may be able to fix it with some paper." /obj/structure/window/paperframe/spawnDebris(location) @@ -715,7 +715,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) update_appearance() /obj/structure/window/paperframe/update_icon() - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) cut_overlay(paper) add_overlay(torn) set_opacity(FALSE) @@ -732,13 +732,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/window) return if(user.a_intent == INTENT_HARM) return ..() - if(istype(W, /obj/item/paper) && obj_integrity < max_integrity) + if(istype(W, /obj/item/paper) && atom_integrity < max_integrity) user.visible_message("[user] starts to patch the holes in \the [src].") if(do_after(user, 20, target = src)) - obj_integrity = min(obj_integrity+4,max_integrity) + atom_integrity = min(atom_integrity+4,max_integrity) qdel(W) user.visible_message("[user] patches some of the holes in \the [src].") - if(obj_integrity == max_integrity) + if(atom_integrity == max_integrity) update_appearance() return ..() diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 15e769167b12b..b6296fa9f14d4 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -46,6 +46,9 @@ underlay_appearance.icon_state = fixed_underlay["icon_state"] underlays += underlay_appearance +/turf/closed/wall/atom_destruction(damage_flag) + dismantle_wall(TRUE, FALSE) + /turf/closed/wall/Destroy() if(is_station_level(z)) GLOB.station_turfs -= src diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 2a1875a7ad17d..d4fd9cea32f72 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -148,6 +148,15 @@ CREATION_TEST_IGNORE_SELF(/turf) set_custom_materials(temp_list) ComponentInitialize() + + if(uses_integrity) + atom_integrity = max_integrity + + if (islist(armor)) + armor = getArmor(arglist(armor)) + else if (!armor) + armor = getArmor() + if(isopenturf(src)) var/turf/open/O = src __auxtools_update_turf_temp_info(isspaceturf(get_z_base_turf()) && !O.planetary_atmos) diff --git a/code/game/turfs/turf_integrity.dm b/code/game/turfs/turf_integrity.dm index 316ea436512ec..dc685c2952001 100644 --- a/code/game/turfs/turf_integrity.dm +++ b/code/game/turfs/turf_integrity.dm @@ -9,16 +9,14 @@ var/can_hit = TRUE /// Has armour been generated yet? var/armor_generated - /// The armour of the turf. Capable of being null for optimisation purposes - var/datum/armor/armor /// The integrity that the turf starts at, defaulting to max_integrity var/integrity /// The maximum integrity that the turf has - var/max_integrity = 450 + max_integrity = 450 /// INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF - var/resistance_flags = NONE + resistance_flags = NONE /// If damage is less than this value for melee attacks, it will deal 0 damage - var/damage_deflection = 5 + damage_deflection = 5 /turf/examine(mob/user) . = ..() @@ -56,12 +54,14 @@ else armor = armour_val -/turf/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) +/turf/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) + if(QDELETED(src)) + CRASH("[src] taking damage after deletion") if(sound_effect) play_attack_sound(damage_amount, damage_type, damage_flag) if((resistance_flags & INDESTRUCTIBLE) || integrity <= 0) return - damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) + damage_amount = run_atom_armor(damage_amount, damage_type, damage_flag, attack_dir, armour_penetration) if(damage_amount < DAMAGE_PRECISION) return . = damage_amount @@ -75,7 +75,7 @@ after_damage(damage_amount, damage_type, damage_flag) //returns the damage value of the attack after processing the obj's various armor protections -/turf/proc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) +/turf/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir, armour_penetration = 0) if(damage_flag == MELEE && damage_amount < damage_deflection) return 0 switch(damage_type) @@ -88,21 +88,10 @@ if (!armor_generated) generate_armor() armor_protection = armor?.getRating(damage_flag) - if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. + if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100) return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) -//the sound played when the obj is damaged. -/turf/proc/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) - switch(damage_type) - if(BRUTE) - if(damage_amount) - playsound(src, 'sound/weapons/smash.ogg', 50, 1) - else - playsound(src, 'sound/weapons/tap.ogg', 50, 1) - if(BURN) - playsound(src, 'sound/items/welder.ogg', 100, 1) - /turf/proc/after_damage(damage_amount, damage_type, damage_flag) return @@ -248,9 +237,6 @@ // Mob Attacks //==================================== -/turf/proc/hulk_damage() - return 150 //the damage hulks do on punches to this object, is affected by melee armor - /turf/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) if (!can_hit) return ..() @@ -273,11 +259,6 @@ return take_damage(400, BRUTE, MELEE, 0, get_dir(src, B)) -/turf/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime - user.do_attack_animation(src) - user.changeNext_move(CLICK_CD_MELEE) - return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration) - /turf/attack_alien(mob/living/carbon/alien/humanoid/user) if (!can_hit) return ..() diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index 49b62ad129736..8836bba8305f8 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -116,7 +116,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) if(pulse_timestamp <= world.time) ConsumeTile() if(heal_timestamp <= world.time) - obj_integrity = min(max_integrity, obj_integrity+health_regen) + atom_integrity = min(max_integrity, atom_integrity+health_regen) heal_timestamp = world.time + 20 update_icon() pulse_timestamp = world.time + 10 @@ -250,7 +250,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) /obj/structure/blob/proc/typereport(mob/user) RETURN_TYPE(/list) return list("Blob Type: [uppertext(initial(name))]", - "Health: [obj_integrity]/[max_integrity]", + "Health: [atom_integrity]/[max_integrity]", "Effects: [scannerreport()]") @@ -269,7 +269,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) if(BURN) playsound(src.loc, 'sound/items/welder.ogg', 100, 1) -/obj/structure/blob/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/blob/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) switch(damage_type) if(BRUTE) damage_amount *= brute_resist @@ -288,10 +288,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) /obj/structure/blob/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) update_icon() -/obj/structure/blob/obj_destruction(damage_flag) +/obj/structure/blob/atom_destruction(damage_flag) if(overmind) overmind.blobstrain.death_reaction(src, damage_flag) ..() @@ -343,13 +343,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob) update_integrity(21) //doesn't start at full health /obj/structure/blob/normal/scannerreport() - if(obj_integrity <= 15) + if(atom_integrity <= 15) return "Currently weak to brute damage." return "N/A" /obj/structure/blob/normal/update_icon() ..() - if(obj_integrity <= 15) + if(atom_integrity <= 15) icon_state = "blob_damaged" name = "fragile blob" desc = "A thin lattice of slightly twitching tendrils." diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index 6b563022aeb6c..d1d503ba7b95a 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -50,7 +50,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/blob/core) /obj/structure/blob/core/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(obj_integrity > 0) + if(atom_integrity > 0) if(overmind) //we should have an overmind, but... overmind.update_health_hud() diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm index f39f8613c25e7..2246e8ba44c8e 100644 --- a/code/modules/antagonists/blob/structures/shield.dm +++ b/code/modules/antagonists/blob/structures/shield.dm @@ -21,20 +21,20 @@ /obj/structure/blob/shield/update_name(updates) . = ..() - name = "[(obj_integrity < (max_integrity * 0.5)) ? "weakened " : null][initial(name)]" + name = "[(atom_integrity < (max_integrity * 0.5)) ? "weakened " : null][initial(name)]" /obj/structure/blob/shield/update_desc(updates) . = ..() - desc = (obj_integrity < (max_integrity * 0.5)) ? "[damaged_desc]" : initial(desc) + desc = (atom_integrity < (max_integrity * 0.5)) ? "[damaged_desc]" : initial(desc) /obj/structure/blob/shield/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) - atmosblock = obj_integrity < (max_integrity * 0.5) + if(. && atom_integrity > 0) + atmosblock = atom_integrity < (max_integrity * 0.5) air_update_turf(TRUE) /obj/structure/blob/shield/update_icon_state() - icon_state = "[initial(icon_state)][(obj_integrity < (max_integrity * 0.5)) ? "_damaged" : null]" + icon_state = "[initial(icon_state)][(atom_integrity < (max_integrity * 0.5)) ? "_damaged" : null]" return ..() /obj/structure/blob/shield/reflective diff --git a/code/modules/antagonists/clock_cult/clockwork_turfs.dm b/code/modules/antagonists/clock_cult/clockwork_turfs.dm index 67e43966441e2..67406d57e8c28 100644 --- a/code/modules/antagonists/clock_cult/clockwork_turfs.dm +++ b/code/modules/antagonists/clock_cult/clockwork_turfs.dm @@ -392,7 +392,7 @@ /obj/machinery/door/airlock/clockwork/hasPower() return TRUE //yes we do have power -/obj/machinery/door/airlock/clockwork/obj_break(damage_flag) +/obj/machinery/door/airlock/clockwork/atom_break(damage_flag) . = ..() if(!.) //not a clue if this will work out propely... return @@ -496,12 +496,12 @@ /obj/structure/grille/ratvar/ratvar_act() return -/obj/structure/grille/ratvar/obj_break() +/obj/structure/grille/ratvar/atom_break() . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) icon_state = "brokenratvargrille" - density = FALSE - obj_integrity = 20 + set_density(FALSE) + atom_integrity = 20 broken = TRUE rods_amount = 1 rods_broken = FALSE @@ -515,8 +515,8 @@ /obj/structure/grille/ratvar/repair_grille() if(broken) icon_state = "ratvargrille" - density = TRUE - obj_integrity = max_integrity + set_density(TRUE) + atom_integrity = max_integrity broken = FALSE rods_amount = 2 rods_broken = TRUE diff --git a/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm b/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm index 830ecd6b589c6..97c61732910c2 100644 --- a/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm +++ b/code/modules/antagonists/clock_cult/items/clockwork_weapon.dm @@ -140,7 +140,7 @@ to_chat(user, "You strike [target] with an electromagnetic pulse!") playsound(user, 'sound/magic/lightningshock.ogg', 40) -/obj/item/clockwork/weapon/brass_sword/attack_obj(obj/O, mob/living/user) +/obj/item/clockwork/weapon/brass_sword/attack_atom(obj/O, mob/living/user) ..() if(!(istype(O, /obj/vehicle/sealed/mecha) && is_reebe(user.z))) return diff --git a/code/modules/antagonists/clock_cult/items/integration_cog.dm b/code/modules/antagonists/clock_cult/items/integration_cog.dm index 6c2ba0c8b3b38..dd970991fdbb2 100644 --- a/code/modules/antagonists/clock_cult/items/integration_cog.dm +++ b/code/modules/antagonists/clock_cult/items/integration_cog.dm @@ -5,7 +5,7 @@ clockwork_desc = "A sharp cog that can cut through and be inserted into APCs to extract power for the gateway." item_flags = ISWEAPON -/obj/item/clockwork/integration_cog/attack_obj(obj/O, mob/living/user) +/obj/item/clockwork/integration_cog/attack_atom(obj/O, mob/living/user) if(!is_servant_of_ratvar(user)) return ..() if(!istype(O, /obj/machinery/power/apc)) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 24bc9b2e21f66..b1ad2aae50664 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -42,17 +42,17 @@ if(iscultist(user) || isobserver(user)) var/t_It = p_they(TRUE) var/t_is = p_are() - return "[t_It] [t_is] at [round(obj_integrity * 100 / max_integrity)]% stability." + return "[t_It] [t_is] at [round(atom_integrity * 100 / max_integrity)]% stability." return ..() /obj/structure/destructible/cult/attack_animal(mob/living/simple_animal/M) if(istype(M, /mob/living/simple_animal/hostile/construct/artificer)) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) M.changeNext_move(CLICK_CD_MELEE) - obj_integrity = min(max_integrity, obj_integrity + 5) + atom_integrity = min(max_integrity, atom_integrity + 5) Beam(M, icon_state="sendbeam", time=4) M.visible_message("[M] repairs \the [src].", \ - "You repair [src], leaving [p_they()] at [round(obj_integrity * 100 / max_integrity)]% stability.") + "You repair [src], leaving [p_they()] at [round(atom_integrity * 100 / max_integrity)]% stability.") else to_chat(M, "You cannot repair [src], as [p_theyre()] undamaged!") else diff --git a/code/modules/antagonists/heretic/structures/mawed_crucible.dm b/code/modules/antagonists/heretic/structures/mawed_crucible.dm index 154b6ed7f7754..09f3ea581b82d 100644 --- a/code/modules/antagonists/heretic/structures/mawed_crucible.dm +++ b/code/modules/antagonists/heretic/structures/mawed_crucible.dm @@ -55,7 +55,7 @@ /obj/structure/destructible/eldritch_crucible/examine_status(mob/user) if(IS_HERETIC_OR_MONSTER(user) || isobserver(user)) - return "It's at [round(obj_integrity * 100 / max_integrity)]% stability." + return "It's at [round(atom_integrity * 100 / max_integrity)]% stability." return ..() /obj/structure/destructible/eldritch_crucible/attacked_by(obj/item/weapon, mob/living/user) diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm index 9b6576fb36478..1a7385229810f 100644 --- a/code/modules/antagonists/space_dragon/carp_rift.dm +++ b/code/modules/antagonists/space_dragon/carp_rift.dm @@ -169,7 +169,7 @@ charge_state = CHARGE_COMPLETED var/area/A = get_area(src) priority_announce("Spatial object has reached peak energy charge in [initial(A.name)], please stand-by.", "Central Command Wildlife Observations") - obj_integrity = INFINITY + atom_integrity = INFINITY icon_state = "carp_rift_charged" set_light_color(LIGHT_COLOR_DIM_YELLOW) update_light() diff --git a/code/modules/aquarium/aquarium.dm b/code/modules/aquarium/aquarium.dm index 5884be2514680..ae5de231d9eaf 100644 --- a/code/modules/aquarium/aquarium.dm +++ b/code/modules/aquarium/aquarium.dm @@ -111,7 +111,7 @@ if(do_after(user, 2 SECONDS, target = src)) glass.use(2) broken = FALSE - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() return TRUE else @@ -228,7 +228,7 @@ ui = new(user, src, "Aquarium", name) ui.open() -/obj/structure/aquarium/obj_break(damage_flag) +/obj/structure/aquarium/atom_break(damage_flag) . = ..() if(!broken) aquarium_smash() diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 7d445ac6eed0a..4f07e1fff707c 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -858,7 +858,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/airalarm) visible_message("Sparks fly out of [src]!", "You emag [src], disabling its safeties.") playsound(src, "sparks", 50, 1) -/obj/machinery/airalarm/obj_break(damage_flag) +/obj/machinery/airalarm/atom_break(damage_flag) ..() update_icon() diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm index 1258f5504392b..fe07d92789a8d 100644 --- a/code/modules/atmospherics/machinery/pipes/pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/pipes.dm @@ -106,7 +106,7 @@ /obj/machinery/atmospherics/pipe/returnPipenets() . = list(parent) -/obj/machinery/atmospherics/pipe/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/atmospherics/pipe/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 12) return 0 . = ..() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 587ed2f6e1529..9939d30ac3fb9 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -342,7 +342,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/portable_atmospherics/canister) return TRUE -/obj/machinery/portable_atmospherics/canister/obj_break(damage_flag) +/obj/machinery/portable_atmospherics/canister/atom_break(damage_flag) . = ..() if(!.) return diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1a176335e5520..cd400331bccf8 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -166,7 +166,7 @@ /// Set the clothing's integrity back to 100%, remove all damage to bodyparts, and generally fix it up /obj/item/clothing/proc/repair(mob/user, params) update_clothes_damaged_state(CLOTHING_PRISTINE) - obj_integrity = max_integrity + atom_integrity = max_integrity name = initial(name) // remove "tattered" or "shredded" if there's a prefix body_parts_covered = initial(body_parts_covered) slot_flags = initial(slot_flags) @@ -231,7 +231,7 @@ body_parts_covered &= ~i if(body_parts_covered == NONE) // if there are no more parts to break then the whole thing is kaput - obj_destruction((damage_type == BRUTE ? "melee" : "laser")) // melee/laser is good enough since this only procs from direct attacks anyway and not from fire/bombs + atom_destruction((damage_type == BRUTE ? MELEE : LASER)) // melee/laser is good enough since this only procs from direct attacks anyway and not from fire/bombs return switch(zones_disabled) @@ -390,7 +390,7 @@ else if (armor_value < compare_value) . = "[.]" -/obj/item/clothing/obj_break(damage_flag) +/obj/item/clothing/atom_break(damage_flag) . = ..() update_clothes_damaged_state(CLOTHING_DAMAGED) @@ -544,7 +544,7 @@ BLIND // can't see anything /obj/item/clothing/proc/_spawn_shreds() new /obj/effect/decal/cleanable/shreds(get_turf(src), name) -/obj/item/clothing/obj_destruction(damage_flag) +/obj/item/clothing/atom_destruction(damage_flag) if(damage_flag == BOMB) //so the shred survives potential turf change from the explosion. addtimer(CALLBACK(src, PROC_REF(_spawn_shreds)), 1) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index e83b3e298df58..9fec37410bc64 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -206,7 +206,7 @@ else REMOVE_TRAIT(user, carrytrait, CLOTHING_TRAIT) -/obj/item/clothing/gloves/color/latex/obj_break() +/obj/item/clothing/gloves/color/latex/atom_break() ..() if(ishuman(loc)) REMOVE_TRAIT(loc, carrytrait, CLOTHING_TRAIT) diff --git a/code/modules/exploration_crew/discovery_research/discovery_scanner.dm b/code/modules/exploration_crew/discovery_research/discovery_scanner.dm index ec72019ab85f4..109f7b4aa3875 100644 --- a/code/modules/exploration_crew/discovery_research/discovery_scanner.dm +++ b/code/modules/exploration_crew/discovery_research/discovery_scanner.dm @@ -24,7 +24,7 @@ . += "[src] has unlimited range." . += "Science goggles can help detect researchable items." -/obj/item/discovery_scanner/attack_obj(obj/O, mob/living/user) +/obj/item/discovery_scanner/attack_atom(obj/O, mob/living/user) if(istype(O, /obj/machinery/computer/rdconsole)) to_chat(user, "You link [src] to [O].") var/obj/machinery/computer/rdconsole/rdconsole = O diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 08310ad408ac1..0471c256df0ae 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -277,6 +277,23 @@ update_appearance() return TRUE +/obj/machinery/smartfridge/welder_act(mob/living/user, obj/item/I) + . = ..() + if(machine_stat & BROKEN) + if(!I.tool_start_check(user, amount=0)) + return + user.visible_message("[user] is repairing [src].", \ + "You begin repairing [src]...", \ + "You hear welding.") + if(I.use_tool(src, user, 40, volume=50)) + if(!(machine_stat & BROKEN)) + return + to_chat(user, "You repair [src].") + atom_integrity = max_integrity + set_machine_stat(machine_stat & ~BROKEN) + update_icon() + else + to_chat(user, "[src] does not need repairs.") // ---------------------------- // Drying Rack 'smartfridge' diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index f14ccc217ffdd..40168e56f1f3d 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -61,11 +61,11 @@ /obj/item/clothing/mask/facehugger/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(obj_integrity < 90) + if(atom_integrity < 90) Die() /obj/item/clothing/mask/facehugger/attackby(obj/item/O, mob/user, params) - return O.attack_obj(src, user) + return O.attack_atom(src, user, params) /obj/item/clothing/mask/facehugger/attack_alien(mob/user) //can be picked up by aliens return attack_hand(user) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 3ceb2011d325c..16bdb8e72f7c5 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -280,9 +280,9 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar /obj/item/modular_computer/examine(mob/user) . = ..() - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) . += "It is heavily damaged!" - else if(obj_integrity < max_integrity) + else if(atom_integrity < max_integrity) . += "It is damaged." . += get_modular_computer_parts_examine(user) @@ -302,7 +302,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(can_store_pai && stored_pai_card) add_overlay(stored_pai_card.pai ? mutable_appearance(init_icon, "pai-overlay") : mutable_appearance(init_icon, "pai-off-overlay")) - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) add_overlay(mutable_appearance(init_icon, "bsod")) add_overlay(mutable_appearance(init_icon, "broken")) @@ -312,7 +312,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar ui_interact(user) return TRUE var/issynth = issilicon(user) // Robots and AIs get different activation messages. - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) if(issynth) to_chat(user, "You send an activation signal to \the [src], but it responds with an error code. It must be damaged.") else @@ -347,7 +347,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar last_power_usage = 0 return 0 - if(obj_integrity <= integrity_failure * max_integrity) + if(atom_integrity <= integrity_failure * max_integrity) shutdown_computer() return 0 @@ -672,7 +672,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar return if(attacking_item.tool_behaviour == TOOL_WELDER) - if(obj_integrity == max_integrity) + if(atom_integrity == max_integrity) to_chat(user, "\The [src] does not require repairs.") return @@ -681,7 +681,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar to_chat(user, "You begin repairing damage to \the [src]...") if(attacking_item.use_tool(src, user, 20, volume=50, amount=1)) - obj_integrity = max_integrity + atom_integrity = max_integrity to_chat(user, "You repair \the [src].") update_icon() return diff --git a/code/modules/modular_computers/computers/item/computer_damage.dm b/code/modules/modular_computers/computers/item/computer_damage.dm index 0898aaebca071..586cae2887d48 100644 --- a/code/modules/modular_computers/computers/item/computer_damage.dm +++ b/code/modules/modular_computers/computers/item/computer_damage.dm @@ -1,6 +1,6 @@ /obj/item/modular_computer/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - var/component_probability = min(50, max(damage_amount*0.1, 1 - obj_integrity/max_integrity)) + var/component_probability = min(50, max(damage_amount*0.1, 1 - atom_integrity/max_integrity)) switch(damage_flag) if(BULLET) component_probability = damage_amount * 0.5 diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index d725676716c81..a0a9ed32d700e 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -108,11 +108,11 @@ return ..() -/obj/item/modular_computer/tablet/attack_obj(obj/target, mob/living/user) +/obj/item/modular_computer/tablet/attack_atom(obj/target, mob/living/user) // Send to programs for processing - this should go LAST // Used to implement the gas scanner. for(var/datum/computer_file/program/thread in (idle_threads + active_program)) - if(thread.use_attack_obj && !thread.attack_obj(target, user)) + if(thread.use_attack_obj && !thread.attack_atom(target, user)) return ..() diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 86bf1f179c06f..bb8d49e964e71 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -33,7 +33,7 @@ var/alert_pending = FALSE /// If this program should process attack calls var/use_attack = FALSE - /// If this program should process attack_obj calls + /// If this program should process attack_atom calls var/use_attack_obj = FALSE /datum/computer_file/program/New(obj/item/modular_computer/comp = null) @@ -188,7 +188,7 @@ /// Return TRUE if nothing was processed. Return FALSE to prevent further actions running. /// Set use_attack_obj = TRUE to receive proccalls from the parent computer. -/datum/computer_file/program/proc/attack_obj(obj/target, mob/living/user) +/datum/computer_file/program/proc/attack_atom(obj/target, mob/living/user) return TRUE /// Called when the datum/tgui is initialized by the computer diff --git a/code/modules/modular_computers/file_system/programs/phys_scanner.dm b/code/modules/modular_computers/file_system/programs/phys_scanner.dm index 6a81c41c8b27f..024c580d821ec 100644 --- a/code/modules/modular_computers/file_system/programs/phys_scanner.dm +++ b/code/modules/modular_computers/file_system/programs/phys_scanner.dm @@ -76,7 +76,7 @@ return FALSE return ..() -/datum/computer_file/program/phys_scanner/attack_obj(obj/target, mob/living/user) +/datum/computer_file/program/phys_scanner/attack_atom(obj/target, mob/living/user) switch(current_mode) if(DISK_ATMOS) var/scan_result = atmosanalyzer_scan(user, target, silent = TRUE, to_chat = FALSE) diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index b2398841278f8..61eee31e9d43e 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -54,12 +54,12 @@ // Cable coil. Works as repair method, but will probably require multiple applications and more cable. if(istype(I, /obj/item/stack/cable_coil)) var/obj/item/stack/S = I - if(obj_integrity == max_integrity) + if(atom_integrity == max_integrity) to_chat(user, "\The [src] doesn't seem to require repairs.") return 1 if(S.use(1)) to_chat(user, "You patch up \the [src] with a bit of \the [I].") - obj_integrity = min(obj_integrity + 10, max_integrity) + atom_integrity = min(atom_integrity + 10, max_integrity) return 1 if(try_insert(I, user)) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index e44c66410cc99..f5681ea4cfec9 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -422,7 +422,7 @@ else return ..() -/obj/machinery/photocopier/obj_break(damage_flag) +/obj/machinery/photocopier/atom_break(damage_flag) . = ..() if(. && toner_cartridge.charges) new /obj/effect/decal/cleanable/oil(get_turf(src)) diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm index fbc7b20d60116..0143ec06186ec 100644 --- a/code/modules/power/apc/apc_attack.dm +++ b/code/modules/power/apc/apc_attack.dm @@ -103,7 +103,7 @@ to_chat(user, "[src] has both electronics and a cell.") return else if (istype(W, /obj/item/wallframe/apc) && opened) - if (!(machine_stat & BROKEN || opened==APC_COVER_REMOVED || obj_integrity < max_integrity)) // There is nothing to repair + if (!(machine_stat & BROKEN || opened==APC_COVER_REMOVED || atom_integrity < max_integrity)) // There is nothing to repair to_chat(user, "You find no reason for repairing this APC.") return if (!(machine_stat & BROKEN) && opened==APC_COVER_REMOVED) @@ -125,7 +125,7 @@ to_chat(user, "You replace the damaged APC frame with a new one.") qdel(W) set_machine_stat(machine_stat & ~BROKEN) - obj_integrity = max_integrity + atom_integrity = max_integrity if (opened==APC_COVER_REMOVED) opened = APC_COVER_OPENED update_appearance() @@ -231,7 +231,7 @@ if((machine_stat & MAINT) && !opened) //no board; no interface return -/obj/machinery/power/apc/obj_break(damage_flag) +/obj/machinery/power/apc/atom_break(damage_flag) . = ..() if(.) set_broken() @@ -272,8 +272,8 @@ /obj/machinery/power/apc/proc/set_broken() if(malfai && operating) malfai.malf_picker.processing_time = clamp(malfai.malf_picker.processing_time - 10,0,1000) - machine_stat |= BROKEN operating = FALSE + atom_break() if(occupier) malfvacate(1) update_appearance() diff --git a/code/modules/power/apc/apc_power_proc.dm b/code/modules/power/apc/apc_power_proc.dm index 29eeaf55daf04..131ae6f002564 100644 --- a/code/modules/power/apc/apc_power_proc.dm +++ b/code/modules/power/apc/apc_power_proc.dm @@ -184,7 +184,7 @@ area.power_environ = FALSE area.power_change() -/obj/machinery/power/apc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/machinery/power/apc/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 10 && (!(machine_stat & BROKEN) || malfai)) return 0 . = ..() diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm index f93c25bc167d7..c21dc653f888d 100644 --- a/code/modules/power/floodlight.dm +++ b/code/modules/power/floodlight.dm @@ -112,7 +112,7 @@ /obj/machinery/power/floodlight/attack_silicon(mob/user) return attack_hand(user) -/obj/machinery/power/floodlight/obj_break(damage_flag) +/obj/machinery/power/floodlight/atom_break(damage_flag) . = ..() if(!.) return diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index a3f750b502701..4f91bdd2f00c7 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -58,7 +58,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne qdel(src) /obj/machinery/gravity_generator/proc/set_broken() - set_machine_stat(machine_stat | BROKEN) + atom_break() /obj/machinery/gravity_generator/proc/set_fix() set_machine_stat(machine_stat & ~BROKEN) diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm index a346f2e03f75c..bfe3dd776cc38 100644 --- a/code/modules/power/lighting/light_items.dm +++ b/code/modules/power/lighting/light_items.dm @@ -111,7 +111,7 @@ ..() shatter() -/obj/item/light/attack_obj(obj/O, mob/living/user) +/obj/item/light/attack_atom(obj/O, mob/living/user, params) ..() shatter() diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index f0dd2565fb238..ce00cf86dfd14 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -199,7 +199,7 @@ else . += "[src]'s display displays the words: \"Research point production mode. Please insert Tritium and Oxygen. Use a multitool to change production modes.\"" -/obj/machinery/power/rad_collector/obj_break(damage_flag) +/obj/machinery/power/rad_collector/atom_break(damage_flag) . = ..() if(.) eject() diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index f50fec2850a5b..3bfe60777db2d 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -58,7 +58,7 @@ break dir_loop if(!terminal) - set_machine_stat(machine_stat | BROKEN) + atom_break() return terminal.master = src update_icon() @@ -205,7 +205,7 @@ if(terminal) terminal.master = null terminal = null - set_machine_stat(machine_stat | BROKEN) + atom_break() /obj/machinery/power/smes/update_icon() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index a6001958c924a..db004a2371de6 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -54,7 +54,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/solar) S.forceMove(src) if(S.glass_type == /obj/item/stack/sheet/rglass) //if the panel is in reinforced glass max_integrity *= 2 //this need to be placed here, because panels already on the map don't have an assembly linked to - obj_integrity = max_integrity + atom_integrity = max_integrity update_icon() /obj/machinery/power/solar/crowbar_act(mob/user, obj/item/I) @@ -77,7 +77,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/solar) playsound(loc, 'sound/items/welder.ogg', 100, 1) -/obj/machinery/power/solar/obj_break(damage_flag) +/obj/machinery/power/solar/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) @@ -458,7 +458,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/solar) if(BURN) playsound(src.loc, 'sound/items/welder.ogg', 100, 1) -/obj/machinery/power/solar_control/obj_break(damage_flag) +/obj/machinery/power/solar_control/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index 79f18024c8052..111b9cfb71c4d 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -70,7 +70,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/power/tracker) deconstruct(TRUE) return TRUE -/obj/machinery/power/tracker/obj_break(damage_flag) +/obj/machinery/power/tracker/atom_break(damage_flag) . = ..() if(.) playsound(loc, 'sound/effects/glassbr3.ogg', 100, TRUE) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 85f1e7f1e998f..f4a77de779931 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -83,7 +83,7 @@ inturf = get_step(src, dir) locate_machinery() if(!turbine) - set_machine_stat(machine_stat | BROKEN) + atom_break() #define COMPFRICTION 5e5 @@ -119,7 +119,7 @@ set_machine_stat(machine_stat & ~BROKEN) else to_chat(user, "Turbine not connected.") - set_machine_stat(machine_stat | BROKEN) + atom_break() return default_deconstruction_crowbar(I) @@ -176,7 +176,7 @@ outturf = get_step(src, dir) locate_machinery() if(!compressor) - set_machine_stat(machine_stat | BROKEN) + atom_break() connect_to_network() /obj/machinery/power/turbine/RefreshParts() @@ -249,7 +249,7 @@ set_machine_stat(machine_stat & ~BROKEN) else to_chat(user, "Compressor not connected.") - set_machine_stat(machine_stat | BROKEN) + atom_break() return default_deconstruction_crowbar(I) diff --git a/code/modules/projectiles/autofire.dm b/code/modules/projectiles/autofire.dm index 3d8bc6dd8e0ac..0aae2de156984 100644 --- a/code/modules/projectiles/autofire.dm +++ b/code/modules/projectiles/autofire.dm @@ -96,7 +96,7 @@ Everything else should be handled for you. Good luck soldier. if(L.Adjacent(autofire_target)) //Melee attack? Or ranged attack? if(isobj(autofire_target)) next_process = world.time + CLICK_CD_MELEE - G.attack_obj(autofire_target, L) + G.attack_atom(autofire_target, L) return else if(isliving(autofire_target) && L.a_intent == INTENT_HARM) // Prevents trying to attack turfs next to the shooter G.attack(autofire_target, L) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index dd9e4ae8ebd38..e32e75a4cf3ba 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -516,7 +516,7 @@ return ..() return -/obj/item/gun/attack_obj(obj/O, mob/user) +/obj/item/gun/attack_atom(obj/O, mob/living/user, params) if(user.a_intent == INTENT_HARM) if(bayonet) O.attackby(bayonet, user) diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm index 741be266bf6bb..5cdc74638340d 100644 --- a/code/modules/projectiles/guns/misc/blastcannon.dm +++ b/code/modules/projectiles/guns/misc/blastcannon.dm @@ -54,24 +54,25 @@ name = initial(name) desc = initial(desc) -/obj/item/gun/blastcannon/attackby(obj/O, mob/user) - if(istype(O, /obj/item/transfer_valve)) - var/obj/item/transfer_valve/T = O - if(!T.tank_one || !T.tank_two) - to_chat(user, "What good would an incomplete bomb do?") - return FALSE - if(!user.transferItemToLoc(T, src)) - to_chat(user, "[T] seems to be stuck to your hand!") - return FALSE - user.visible_message("[user] attaches [T] to [src]!") - bomb = T - update_icon() - return TRUE - return ..() +/obj/item/gun/blastcannon/attackby(obj/item/transfer_valve/bomb_to_attach, mob/user) + if(!istype(bomb_to_attach)) + return ..() + + if(!bomb_to_attach.ready()) + to_chat(user, "What good would an incomplete bomb do?") + return FALSE + if(!user.transferItemToLoc(bomb_to_attach, src)) + to_chat(user, "[bomb_to_attach] seems to be stuck to your hand!") + return FALSE + + user.visible_message("[user] attaches [bomb_to_attach] to [src]!") + bomb = bomb_to_attach + update_icon() + return TRUE //returns the third value of a bomb blast /obj/item/gun/blastcannon/proc/calculate_bomb() - if(!istype(bomb) || !istype(bomb.tank_one) || !istype(bomb.tank_two)) + if(!istype(bomb) || !bomb.ready()) return 0 var/datum/gas_mixture/temp = new(max(reaction_volume_mod, 0)) bomb.merge_gases(temp) @@ -83,7 +84,6 @@ for(var/i in 1 to reaction_cycles) temp.react(src) var/pressure = temp.return_pressure() - qdel(temp) if(pressure < TANK_FRAGMENT_PRESSURE) return 0 return ((pressure - TANK_FRAGMENT_PRESSURE) / TANK_FRAGMENT_SCALE) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index fd1e798805540..197effcb27bfa 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -49,7 +49,7 @@ /obj/structure/reagent_dispensers/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) if(tank_volume && (damage_flag == BULLET || damage_flag == LASER)) boom() diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index f72c7c9419320..5eeb1484b13fe 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -273,7 +273,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/conveyor) // make the conveyor broken // also propagate inoperability to any connected conveyor with the same ID /obj/machinery/conveyor/proc/broken() - set_machine_stat(machine_stat | BROKEN) + atom_break() update() var/obj/machinery/conveyor/C = locate() in get_step(src, dir) diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 6e9af35d0cf19..b16f44e2e14f3 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -116,7 +116,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/disposalpipe) H.contents_explosion(severity, target) -/obj/structure/disposalpipe/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/structure/disposalpipe/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) if(damage_flag == MELEE && damage_amount < 10) return 0 return ..() diff --git a/code/modules/religion/sects/carp_sect.dm b/code/modules/religion/sects/carp_sect.dm index b1626b865fb45..47ad695bcc376 100644 --- a/code/modules/religion/sects/carp_sect.dm +++ b/code/modules/religion/sects/carp_sect.dm @@ -104,7 +104,7 @@ /datum/religion_rites/summon_carpsuit/invoke_effect(mob/living/user, atom/religious_tool) if(!QDELETED(chosen_clothing) && get_turf(religious_tool) == chosen_clothing.loc) //check if the same clothing is still there user.visible_message("The [chosen_clothing] transforms!") - chosen_clothing.obj_destruction() + chosen_clothing.atom_destruction() chosen_clothing = null new /obj/item/clothing/suit/hooded/carp_costume/spaceproof/old(get_turf(religious_tool)) playsound(get_turf(religious_tool), 'sound/effects/slosh.ogg', 50, TRUE) diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm index 2eb76203360ba..f54a072c32e76 100644 --- a/code/modules/research/xenobiology/crossbreeding/_structures.dm +++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(bluespace_slime_crystals) if(master_crystal) invisibility = INVISIBILITY_MAXIMUM max_integrity = 1000 - obj_integrity = 1000 + atom_integrity = 1000 /obj/structure/slime_crystal/Initialize(mapload) . = ..() diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index cebfb3a5bf7ec..4bb90f5ba2c76 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -60,7 +60,7 @@ meat_counter++ H.investigate_log("has been gibbed by the necropolis tendril.", INVESTIGATE_DEATHS) H.gib() - obj_integrity = min(obj_integrity + max_integrity*0.05,max_integrity)//restores 5% hp of tendril + atom_integrity = min(atom_integrity + max_integrity*0.05,max_integrity)//restores 5% hp of tendril for(var/mob/living/L in viewers(5, src)) if(L.mind?.has_antag_datum(/datum/antagonist/ashwalker)) SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "oogabooga", /datum/mood_event/sacrifice_good) diff --git a/code/modules/security/genpop.dm b/code/modules/security/genpop.dm index d4b9b929abe5b..2643546f05395 100644 --- a/code/modules/security/genpop.dm +++ b/code/modules/security/genpop.dm @@ -260,14 +260,14 @@ qdel(src) return - if(obj_integrity >= max_integrity) + if(atom_integrity >= max_integrity) to_chat(user, "The turnstile doesn't need repairing.") return user.visible_message("[user] is welding the turnstile.", \ "You begin repairing the turnstile...", \ "You hear welding.") if(I.use_tool(src, user, 40, volume=50)) - obj_integrity = max_integrity + atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) user.visible_message("[user.name] has repaired [src].", \ "You finish repairing the turnstile.") diff --git a/code/modules/surgery/anesthetic_machine.dm b/code/modules/surgery/anesthetic_machine.dm index dbfb594cf514c..ad976e999608f 100644 --- a/code/modules/surgery/anesthetic_machine.dm +++ b/code/modules/surgery/anesthetic_machine.dm @@ -103,7 +103,7 @@ QDEL_NULL(attached_mask) . = ..() -/obj/machinery/anesthetic_machine/obj_destruction() +/obj/machinery/anesthetic_machine/atom_destruction() if(mask_out) retract_mask() QDEL_NULL(attached_mask) diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index bacce6c3aee88..6a41365f0ca2b 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -44,7 +44,7 @@ . = ..() if(resistance_flags & ON_FIRE) . += "It's on fire!" - var/healthpercent = obj_integrity/max_integrity * 100 + var/healthpercent = atom_integrity/max_integrity * 100 switch(healthpercent) if(50 to 99) . += "It looks slightly damaged." diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index a81633cf9a561..1c674b0c1b940 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -67,21 +67,21 @@ /obj/vehicle/ridden/atv/attackby(obj/item/W as obj, mob/user as mob, params) if(W.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(W.use_tool(src, user, 0, volume=50, amount=1)) user.visible_message("[user] repairs some damage to [name].", "You repair some damage to \the [src].") - obj_integrity += min(10, max_integrity-obj_integrity) - if(obj_integrity == max_integrity) + atom_integrity += min(10, max_integrity-atom_integrity) + if(atom_integrity == max_integrity) to_chat(user, "It looks to be fully repaired now.") return TRUE return ..() -/obj/vehicle/ridden/secway/obj_break() +/obj/vehicle/ridden/secway/atom_break() START_PROCESSING(SSobj, src) return ..() /obj/vehicle/ridden/atv/process(delta_time) - if(obj_integrity >= integrity_failure * max_integrity) + if(atom_integrity >= integrity_failure * max_integrity) return PROCESS_KILL if(DT_PROB(10, delta_time)) return @@ -96,7 +96,7 @@ return TRUE return ..() -/obj/vehicle/ridden/atv/obj_destruction() +/obj/vehicle/ridden/atv/atom_destruction() explosion(src, -1, 0, 2, 4, flame_range = 3) return ..() diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm index f7e4b33402b25..6c1fc5ce6f5e5 100644 --- a/code/modules/vehicles/cars/car.dm +++ b/code/modules/vehicles/cars/car.dm @@ -101,7 +101,7 @@ M.forceMove(src) add_occupant(M, VEHICLE_CONTROL_KIDNAPPED) -/obj/vehicle/sealed/car/obj_destruction(damage_flag) +/obj/vehicle/sealed/car/atom_destruction(damage_flag) explosion(loc, 0, 1, 2, 3, 0) log_message("[src] exploded due to destruction", LOG_ATTACK) return ..() diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 1d6fe84f3d1ca..c382fc7de1363 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -60,7 +60,7 @@ . = ..() if(istype(I, /obj/item/food/grown/banana)) var/obj/item/food/grown/banana/banana = I - obj_integrity += min(banana.seed.potency, max_integrity-obj_integrity) + atom_integrity += min(banana.seed.potency, max_integrity-atom_integrity) to_chat(user, "You use the [banana] to repair the [src]!") qdel(banana) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index ba4154222f30c..601b44e634860 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -256,7 +256,7 @@ GLOB.mechas_list -= src //global mech list return ..() -/obj/vehicle/sealed/mecha/obj_destruction() +/obj/vehicle/sealed/mecha/atom_destruction() loc.assume_air(cabin_air) air_update_turf(FALSE, FALSE) Eject() @@ -353,7 +353,7 @@ /obj/vehicle/sealed/mecha/examine(mob/user) . = ..() - var/integrity = obj_integrity*100/max_integrity + var/integrity = atom_integrity*100/max_integrity switch(integrity) if(85 to 100) . += "It's fully intact." @@ -459,7 +459,7 @@ else occupant.throw_alert("charge", /atom/movable/screen/alert/emptycell) - var/integrity = obj_integrity/max_integrity*100 + var/integrity = atom_integrity/max_integrity*100 switch(integrity) if(30 to 45) occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 1) @@ -736,7 +736,7 @@ if(!islist(possible_int_damage) || !length(possible_int_damage)) return if(prob(20)) - if(ignore_threshold || obj_integrity*100/max_integrity < internal_damage_threshold) + if(ignore_threshold || atom_integrity*100/max_integrity < internal_damage_threshold) for(var/T in possible_int_damage) if(internal_damage & T) possible_int_damage -= T @@ -744,7 +744,7 @@ if(int_dam_flag) set_internal_damage(int_dam_flag) if(prob(5)) - if(ignore_threshold || obj_integrity*100/max_integrity < internal_damage_threshold) + if(ignore_threshold || atom_integrity*100/max_integrity < internal_damage_threshold) if(LAZYLEN(equipment)) var/obj/item/mecha_parts/mecha_equipment/ME = safepick(equipment) qdel(ME) @@ -922,7 +922,7 @@ visible_message("[M] starts to climb into [name].") if(do_after(M, enter_delay, target = src)) - if(obj_integrity <= 0) + if(atom_integrity <= 0) to_chat(M, "You cannot get in the [name], it has been destroyed!") else if(LAZYLEN(occupants) >= max_occupants) to_chat(M, "[occupants[occupants.len]] was faster! Try better next time, loser.")//get the last one that hopped in diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm index 14e478a16c73d..fc3cd7d44734f 100644 --- a/code/modules/vehicles/mecha/combat/durand.dm +++ b/code/modules/vehicles/mecha/combat/durand.dm @@ -229,13 +229,13 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/durand_shield) return . = ..() flick("shield_impact", src) - if(!chassis.use_power((max_integrity - obj_integrity) * 100)) + if(!chassis.use_power((max_integrity - atom_integrity) * 100)) chassis.cell?.charge = 0 for(var/O in chassis.occupants) var/mob/living/occupant = O var/datum/action/action = LAZYACCESSASSOC(chassis.occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/mech_defense_mode) action.Trigger(FALSE) - obj_integrity = 10000 + atom_integrity = 10000 /obj/durand_shield/play_attack_sound() playsound(src, 'sound/mecha/mech_shield_deflect.ogg', 100, TRUE) diff --git a/code/modules/vehicles/mecha/combat/honker.dm b/code/modules/vehicles/mecha/combat/honker.dm index 07ae4e6faaf0b..7648a9dd0a713 100644 --- a/code/modules/vehicles/mecha/combat/honker.dm +++ b/code/modules/vehicles/mecha/combat/honker.dm @@ -17,7 +17,7 @@ var/squeak = 0 /obj/vehicle/sealed/mecha/combat/honker/get_stats_part(mob/user) - var/integrity = obj_integrity/max_integrity*100 + var/integrity = atom_integrity/max_integrity*100 var/cell_charge = get_charge() var/datum/gas_mixture/int_tank_air = internal_tank.return_air() var/tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None" diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm index bb467c0351670..161d39e3aeecd 100644 --- a/code/modules/vehicles/mecha/mecha_defense.dm +++ b/code/modules/vehicles/mecha/mecha_defense.dm @@ -8,7 +8,7 @@ /obj/vehicle/sealed/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0) . = ..() - if(. && obj_integrity > 0) + if(. && atom_integrity > 0) spark_system.start() switch(damage_flag) if(FIRE) @@ -21,7 +21,7 @@ to_chat(occupants, "[icon2html(src, occupants)]Taking damage!") log_message("Took [damage_amount] points of damage. Damage type: [damage_type].", LOG_MECHA) -/obj/vehicle/sealed/mecha/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) +/obj/vehicle/sealed/mecha/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) . = ..() if(!damage_amount) return 0 @@ -309,12 +309,12 @@ clear_internal_damage(MECHA_INT_TANK_BREACH) to_chat(user, "You repair the damaged gas tank.") return - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(!W.use_tool(src, user, 0, volume=50, amount=1)) return user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [src].") - obj_integrity += min(10, max_integrity-obj_integrity) - if(obj_integrity == max_integrity) + atom_integrity += min(10, max_integrity-atom_integrity) + if(atom_integrity == max_integrity) to_chat(user, "It looks to be fully repaired now.") return to_chat(user, "The [name] is at full integrity!") @@ -337,7 +337,7 @@ . = ..() /obj/vehicle/sealed/mecha/proc/full_repair(charge_cell) - obj_integrity = max_integrity + atom_integrity = max_integrity if(cell && charge_cell) cell.charge = cell.maxcharge if(internal_damage & MECHA_INT_FIRE) @@ -366,7 +366,7 @@ visual_effect_icon = ATTACK_EFFECT_MECHTOXIN ..() -/obj/vehicle/sealed/mecha/obj_destruction() +/obj/vehicle/sealed/mecha/atom_destruction() if(wreckage) var/mob/living/silicon/ai/AI for(var/crew in occupants) diff --git a/code/modules/vehicles/mecha/mecha_topic.dm b/code/modules/vehicles/mecha/mecha_topic.dm index b7bc5104d16d3..595967f93833d 100644 --- a/code/modules/vehicles/mecha/mecha_topic.dm +++ b/code/modules/vehicles/mecha/mecha_topic.dm @@ -53,7 +53,7 @@ ///Returns the status of the mech. /obj/vehicle/sealed/mecha/proc/get_stats_part(mob/user) - var/integrity = obj_integrity/max_integrity*100 + var/integrity = atom_integrity/max_integrity*100 var/cell_charge = get_charge() var/datum/gas_mixture/int_tank_air = 0 var/tank_pressure = 0 diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm index b68c58a21a819..a02a295cd5aad 100644 --- a/code/modules/vehicles/motorized_wheelchair.dm +++ b/code/modules/vehicles/motorized_wheelchair.dm @@ -31,7 +31,7 @@ /obj/vehicle/ridden/wheelchair/motorized/get_cell() return power_cell -/obj/vehicle/ridden/wheelchair/motorized/obj_destruction(damage_flag) +/obj/vehicle/ridden/wheelchair/motorized/atom_destruction(damage_flag) var/turf/T = get_turf(src) for(var/c in contents) var/atom/movable/thing = c diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index 0dc23070ea4b6..caa76e091fda0 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -15,12 +15,12 @@ D.empable = TRUE D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 4), TEXT_SOUTH = list(0, 4), TEXT_EAST = list(0, 4), TEXT_WEST = list( 0, 4))) -/obj/vehicle/ridden/secway/obj_break() +/obj/vehicle/ridden/secway/atom_break() START_PROCESSING(SSobj, src) return ..() /obj/vehicle/ridden/secway/process(delta_time) - if(obj_integrity >= integrity_failure * max_integrity) + if(atom_integrity >= integrity_failure * max_integrity) return PROCESS_KILL if(DT_PROB(10, delta_time)) return @@ -30,16 +30,16 @@ /obj/vehicle/ridden/secway/attackby(obj/item/W, mob/user, params) if(W.tool_behaviour == TOOL_WELDER && user.a_intent != INTENT_HARM) - if(obj_integrity < max_integrity) + if(atom_integrity < max_integrity) if(W.use_tool(src, user, 0, volume = 50, amount = 1)) user.visible_message("[user] repairs some damage to [name].", "You repair some damage to \the [src].") - obj_integrity += min(10, max_integrity-obj_integrity) - if(obj_integrity == max_integrity) + atom_integrity += min(10, max_integrity-atom_integrity) + if(atom_integrity == max_integrity) to_chat(user, "It looks to be fully repaired now.") return TRUE return ..() -/obj/vehicle/ridden/secway/obj_destruction() +/obj/vehicle/ridden/secway/atom_destruction() explosion(src, -1, 0, 2, 4, flame_range = 3) return ..() diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index abd6ec9dc7787..a8f41f4a2cba5 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -27,7 +27,7 @@ . = ..() AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null) -/obj/vehicle/ridden/wheelchair/obj_destruction(damage_flag) +/obj/vehicle/ridden/wheelchair/atom_destruction(damage_flag) new /obj/item/stack/rods(drop_location(), 1) new /obj/item/stack/sheet/iron(drop_location(), 1) ..() diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index be0c54b580232..c17ba6039c0a7 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -275,7 +275,7 @@ . += emissive_appearance(icon, light_mask, layer) ADD_LUM_SOURCE(src, LUM_SOURCE_MANAGED_OVERLAY) -/obj/machinery/vending/obj_break(damage_flag) +/obj/machinery/vending/atom_break(damage_flag) . = ..() if(!.) return diff --git a/tools/UpdatePaths/Scripts/11290_atomintegrity.txt b/tools/UpdatePaths/Scripts/11290_atomintegrity.txt new file mode 100644 index 0000000000000..410eb13eae40f --- /dev/null +++ b/tools/UpdatePaths/Scripts/11290_atomintegrity.txt @@ -0,0 +1 @@ +/obj/@SUBTYPES{obj_integrity=@ANY} : /obj/@SUBTYPES{atom_integrity=@OLD:obj_integrity}