___
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 @@ -20853,6 +21036,18 @@ 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" @@ -22062,12 +22257,6 @@ /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 @@ -22282,35 +22471,6 @@ /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, @@ -23395,29 +23555,6 @@ }, /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 @@ -23600,15 +23737,6 @@ }, /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{ @@ -24267,28 +24395,6 @@ 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{ @@ -25694,6 +25800,16 @@ /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; @@ -26028,17 +26144,6 @@ }, /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, @@ -26198,6 +26303,19 @@ }, /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 @@ -26336,29 +26454,6 @@ }, /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" @@ -26974,31 +27069,6 @@ }, /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, @@ -27565,12 +27635,6 @@ /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" @@ -27599,6 +27663,12 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"hbu" = ( +/obj/item/toy/beach_ball, +/mob/living/carbon/human/species/monkey, +/obj/effect/turf_decal/siding/dark_green, +/turf/open/floor/iron/grid/steel, +/area/medical/virology) "hbD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -27711,6 +27781,40 @@ "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{ @@ -28585,6 +28689,32 @@ /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
@@ -28790,36 +28920,23 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/maintenance/department/science)
-"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/reagent_containers/cup/bucket{
- pixel_x = 8;
- pixel_y = -1
- },
-/obj/item/cultivator{
- pixel_x = 1;
- pixel_y = -1
+"hus" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/cup/glass/shaker,
+/obj/machinery/computer/security/telescreen/minisat{
+ dir = 1;
+ pixel_y = -29
},
-/obj/item/shovel/spade{
- pixel_x = -5;
- pixel_y = -4
+/obj/item/clothing/mask/cigarette/cigar/cohiba{
+ pixel_x = 3
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/item/clothing/mask/cigarette/cigar,
+/obj/item/clothing/mask/cigarette/cigar/havana{
+ pixel_x = -3
},
-/turf/open/floor/iron/techmaint,
-/area/security/prison)
+/obj/machinery/light/small,
+/turf/open/floor/carpet/royalblue,
+/area/crew_quarters/heads/captain)
"huM" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -29420,29 +29537,6 @@
},
/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
@@ -29924,6 +30018,29 @@
/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,
@@ -30994,6 +31111,16 @@
},
/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,
@@ -31205,6 +31332,19 @@
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"
@@ -31619,6 +31759,17 @@
},
/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,
@@ -31660,13 +31811,6 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/ai)
-"ifW" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/mob/living/carbon/monkey,
-/turf/open/floor/vault,
-/area/medical/genetics)
"igc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -31826,6 +31970,41 @@
},
/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
@@ -32390,6 +32569,20 @@
},
/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"
@@ -33296,15 +33489,6 @@
/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
@@ -33443,6 +33627,12 @@
/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
@@ -34536,6 +34726,27 @@
/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,
@@ -34787,6 +34998,38 @@
},
/turf/open/floor/iron/techmaint,
/area/bridge)
+"iUz" = (
+/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)
"iUO" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
@@ -34968,15 +35211,6 @@
},
/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"
@@ -35072,6 +35306,21 @@
/obj/structure/rack,
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
+"iZB" = (
+/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)
"iZE" = (
/obj/effect/turf_decal/box,
/obj/machinery/holopad,
@@ -36223,22 +36472,6 @@
},
/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{
@@ -36444,6 +36677,27 @@
/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,
@@ -36492,6 +36746,23 @@
},
/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
@@ -37163,27 +37434,6 @@
/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"
@@ -37306,19 +37556,6 @@
},
/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,
@@ -39418,6 +39655,12 @@
},
/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,
@@ -39496,21 +39739,6 @@
},
/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,
@@ -39974,11 +40202,6 @@
},
/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
@@ -40839,88 +41062,6 @@
},
/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,
@@ -40952,16 +41093,6 @@
},
/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,
@@ -41541,28 +41672,6 @@
},
/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)
@@ -43944,34 +44053,6 @@
/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
@@ -44119,6 +44200,16 @@
},
/turf/open/floor/iron/dark,
/area/medical/storage)
+"ljE" = (
+/mob/living/carbon/human/species/monkey,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/effect/turf_decal/siding/dark_green/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"ljI" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -45080,19 +45171,6 @@
/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{
@@ -45238,6 +45316,38 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
+"lwV" = (
+/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)
"lwW" = (
/obj/effect/turf_decal/guideline/guideline_in/bar{
dir = 8
@@ -45493,20 +45603,6 @@
/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"
@@ -46078,6 +46174,12 @@
/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
@@ -47736,38 +47838,6 @@
/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
@@ -48295,40 +48365,6 @@
"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{
@@ -48471,6 +48507,13 @@
},
/turf/open/floor/carpet/orange,
/area/quartermaster/qm)
+"msL" = (
+/mob/living/carbon/human/species/monkey,
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/medical/genetics)
"mta" = (
/obj/machinery/vending/coffee,
/obj/effect/turf_decal/delivery,
@@ -49404,6 +49447,11 @@
/obj/machinery/holopad,
/turf/open/floor/iron/dark,
/area/hallway/primary/central)
+"mEp" = (
+/obj/structure/chair/stool,
+/mob/living/carbon/human/species/monkey/punpun,
+/turf/open/floor/carpet,
+/area/crew_quarters/bar/atrium)
"mEs" = (
/obj/effect/turf_decal/guideline/guideline_out/blue{
dir = 1
@@ -50279,19 +50327,6 @@
},
/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,
@@ -50644,17 +50679,6 @@
/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,
@@ -50858,27 +50882,6 @@
},
/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,
@@ -50958,12 +50961,6 @@
burnt = 1
},
/area/maintenance/port/central)
-"mZO" = (
-/obj/item/toy/beach_ball,
-/mob/living/carbon/monkey,
-/obj/effect/turf_decal/siding/dark_green,
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"mZR" = (
/obj/structure/window/reinforced,
/obj/structure/flora/ausbushes/ppflowers,
@@ -50988,6 +50985,22 @@
"nak" = (
/turf/open/floor/iron/dark,
/area/hallway/secondary/exit/departure_lounge)
+"naD" = (
+/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)
"naL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -51216,6 +51229,17 @@
},
/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
@@ -51692,6 +51716,15 @@
},
/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,
@@ -52596,6 +52629,23 @@
},
/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,
@@ -53943,20 +53993,6 @@
/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{
@@ -55559,38 +55595,6 @@
/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";
@@ -55797,11 +55801,6 @@
},
/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"
@@ -55849,6 +55848,15 @@
/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,
@@ -57861,22 +57869,6 @@
/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
@@ -59575,42 +59567,6 @@
/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{
@@ -60252,6 +60208,15 @@
},
/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;
@@ -60319,12 +60284,6 @@
},
/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,
@@ -60370,26 +60329,6 @@
},
/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"
@@ -61796,19 +61735,6 @@
},
/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
@@ -61948,28 +61874,36 @@
/obj/machinery/light,
/turf/open/floor/wood,
/area/library/lounge)
-"pZF" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/cup/glass/bottle/holywater{
- pixel_x = 4;
- pixel_y = 4
+"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
},
-/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
- pixel_x = -3;
- pixel_y = 15
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = 8;
+ pixel_y = -1
},
-/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
- pixel_x = -6;
- pixel_y = 3
+/obj/item/cultivator{
+ pixel_x = 1;
+ pixel_y = -1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
+/obj/item/shovel/spade{
+ pixel_x = -5;
+ pixel_y = -4
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 10
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/turf/open/floor/carpet,
-/area/chapel/office)
+/turf/open/floor/iron/techmaint,
+/area/security/prison)
"pZM" = (
/obj/structure/chair/fancy/sofa/old{
color = "#742925";
@@ -63199,6 +63133,12 @@
},
/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
@@ -63555,6 +63495,38 @@
},
/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
@@ -63836,6 +63808,21 @@
},
/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
@@ -63995,6 +63982,22 @@
},
/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"
@@ -64560,40 +64563,6 @@
/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,
@@ -65627,15 +65596,6 @@
},
/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{
@@ -65916,6 +65876,13 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/solar/starboard/fore)
+"qYF" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/vault,
+/area/medical/genetics)
"qYN" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -66707,6 +66674,20 @@
},
/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,
@@ -68457,6 +68438,21 @@
/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,
@@ -70995,6 +70991,11 @@
/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,
@@ -71224,6 +71225,17 @@
},
/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
@@ -72413,19 +72425,6 @@
},
/turf/open/floor/noslip/standard,
/area/crew_quarters/fitness/recreation)
-"sEp" = (
-/obj/machinery/light{
- dir = 4
- },
-/mob/living/carbon/monkey,
-/obj/effect/turf_decal/siding/dark_green/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"sEu" = (
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -73886,6 +73885,22 @@
/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
@@ -74772,21 +74787,6 @@
},
/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
@@ -75045,11 +75045,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron/techmaint,
/area/crew_quarters/locker)
-"toR" = (
-/obj/structure/chair/stool,
-/mob/living/carbon/monkey/punpun,
-/turf/open/floor/carpet,
-/area/crew_quarters/bar/atrium)
"toW" = (
/obj/machinery/power/smes{
charge = 1e+006
@@ -75412,12 +75407,6 @@
/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"
@@ -75567,24 +75556,6 @@
/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,
@@ -75604,6 +75575,26 @@
},
/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{
@@ -77043,6 +77034,29 @@
/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;
@@ -77670,40 +77684,6 @@
/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
@@ -79155,29 +79135,6 @@
},
/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{
@@ -79609,13 +79566,6 @@
},
/turf/open/floor/carpet/grimy,
/area/crew_quarters/locker)
-"uvS" = (
-/mob/living/carbon/monkey,
-/obj/effect/turf_decal/siding/dark_green{
- dir = 1
- },
-/turf/open/floor/grass,
-/area/medical/genetics)
"uvU" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow{
@@ -81000,6 +80950,22 @@
},
/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)
@@ -81192,6 +81158,34 @@
},
/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,
@@ -82357,6 +82351,16 @@
/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
@@ -82668,23 +82672,6 @@
},
/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
@@ -83606,17 +83593,6 @@
},
/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"
@@ -83687,35 +83663,6 @@
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
@@ -84392,6 +84339,15 @@
/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
@@ -85452,22 +85408,6 @@
/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"
@@ -86187,18 +86127,6 @@
},
/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{
@@ -86644,6 +86572,16 @@
},
/turf/open/floor/iron/grid/steel,
/area/science/mixing)
+"vZG" = (
+/mob/living/carbon/human/species/monkey,
+/obj/effect/turf_decal/siding/dark_green{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"vZJ" = (
/obj/machinery/rnd/destructive_analyzer,
/obj/effect/turf_decal/bot,
@@ -87157,20 +87095,6 @@
},
/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,
@@ -87585,16 +87509,6 @@
/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
@@ -87793,6 +87707,35 @@
},
/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)
@@ -87850,14 +87793,6 @@
},
/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
@@ -88391,6 +88326,42 @@
},
/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
@@ -88615,41 +88586,6 @@
},
/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;
@@ -89346,38 +89282,6 @@
/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"
@@ -89461,6 +89365,35 @@
/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{
@@ -89685,12 +89618,6 @@
},
/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{
@@ -90049,6 +89976,40 @@
},
/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{
@@ -92930,14 +92891,6 @@
},
/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{
@@ -93072,23 +93025,6 @@
},
/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"
@@ -93428,6 +93364,20 @@
},
/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{
@@ -94945,6 +94895,28 @@
},
/turf/open/floor/carpet,
/area/hallway/secondary/entry)
+"xNR" = (
+/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)
"xNW" = (
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
@@ -95072,6 +95044,20 @@
/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,
@@ -95234,12 +95220,6 @@
},
/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
@@ -95460,6 +95440,11 @@
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,
@@ -95724,6 +95709,29 @@
/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"
@@ -95931,36 +95939,28 @@
"xZW" = (
/turf/open/floor/iron,
/area/quartermaster/storage)
-"yab" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/cup/glass/bottle/patron{
- pixel_x = -5;
- pixel_y = 16
- },
-/obj/item/reagent_containers/cup/glass/bottle/grappa{
- pixel_x = 10;
- pixel_y = 15
- },
-/obj/item/reagent_containers/cup/glass/bottle/absinthe{
- pixel_x = -5;
- pixel_y = 4
- },
-/obj/item/reagent_containers/cup/glass/bottle/kahlua{
- pixel_x = 9;
- pixel_y = 7
+"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
},
-/obj/item/reagent_containers/cup/glass/bottle/vodka{
- pixel_x = 2;
- pixel_y = 4
+/obj/item/reagent_containers/condiment/peppermill{
+ pixel_x = 5;
+ pixel_y = 6
},
-/obj/effect/turf_decal/tile/bar/opposingcorners{
- dir = 1
+/obj/effect/spawner/lootdrop/three_course_meal,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/light/small{
+ dir = 4
},
-/obj/item/radio/intercom{
- pixel_y = 24
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
},
-/turf/open/floor/iron/dark,
-/area/crew_quarters/bar)
+/turf/open/floor/iron/cafeteria,
+/area/crew_quarters/cafeteria)
"yag" = (
/obj/effect/turf_decal/guideline/guideline_in/red,
/turf/open/floor/iron/dark/corner{
@@ -111748,7 +111748,7 @@ bXv
vQG
wpn
wxd
-jDR
+jsw
wxd
kHH
kHH
@@ -113492,7 +113492,7 @@ leT
leT
leT
eFZ
-xRu
+cgB
wXp
eFZ
leT
@@ -114301,7 +114301,7 @@ ovf
ocT
cZb
qar
-qTl
+vye
sha
xDh
wxd
@@ -114803,7 +114803,7 @@ cXA
cXA
cXA
dCU
-mUs
+ifl
dCU
dCU
cXA
@@ -115586,7 +115586,7 @@ rNo
tjo
sha
led
-oUy
+qzO
sha
wuE
amH
@@ -115840,7 +115840,7 @@ cqq
cXA
foJ
mxb
-hDD
+tPo
sha
sha
sha
@@ -116051,8 +116051,8 @@ abN
abN
kHH
yjW
-fIp
-vsd
+ePp
+ndu
yjW
aMO
byH
@@ -116093,7 +116093,7 @@ jbB
mbf
tNe
tNe
-cVU
+gCw
cXA
sha
sha
@@ -116615,7 +116615,7 @@ lsd
tkV
xfm
rxd
-xxe
+nwP
wOu
gci
nnV
@@ -116872,7 +116872,7 @@ ahM
rxd
rxd
rxd
-yab
+emH
qqr
hkQ
vlF
@@ -116920,7 +116920,7 @@ abm
msj
wUY
uQX
-vSU
+ftA
jpl
sGf
ygc
@@ -117338,7 +117338,7 @@ abN
bau
blm
cAg
-pZF
+cIH
mvI
dQg
beY
@@ -117652,7 +117652,7 @@ mRd
tuj
mRd
mRd
-toR
+mEp
uJh
lru
vAS
@@ -118119,7 +118119,7 @@ fgq
woq
hQe
hQe
-gbd
+exT
erC
swI
swI
@@ -118150,7 +118150,7 @@ arZ
arZ
arZ
arZ
-mQj
+gJI
oje
rxd
oSW
@@ -118407,7 +118407,7 @@ mbT
mEz
txf
tdp
-kyc
+vdJ
hin
rxd
aib
@@ -119191,7 +119191,7 @@ eqe
vqH
vqH
sRp
-pDz
+tvw
sRp
sxz
vqH
@@ -119705,10 +119705,10 @@ ttS
roM
fhD
mib
-gSV
+dam
czD
mib
-haU
+lJu
wRF
hvk
vmw
@@ -119963,9 +119963,9 @@ mib
mib
rfs
sis
-wpp
+fiV
mib
-iBZ
+njG
jOJ
oZr
bwH
@@ -120217,7 +120217,7 @@ mWm
xNi
iLg
pYP
-tkK
+qxm
mib
mLj
czD
@@ -121525,7 +121525,7 @@ xTG
cnU
uOq
avq
-kmD
+xTR
lPp
piR
xPG
@@ -122248,17 +122248,17 @@ ygM
hZS
pgb
tNV
-uqM
+aLS
gms
xJa
-ifW
-uvS
+fjR
+msL
ygM
cxE
hMo
dgU
aWV
-abi
+cSw
oRE
xvj
wqJ
@@ -122508,7 +122508,7 @@ mCy
wQQ
ndk
nSK
-erB
+qYF
dop
ygM
kuB
@@ -122539,7 +122539,7 @@ qQj
qQj
hUT
xNh
-pXS
+ial
qlN
eJK
qKp
@@ -123567,7 +123567,7 @@ qQj
sXP
hUT
qQj
-opu
+smb
pji
qjc
nfx
@@ -123765,14 +123765,14 @@ cNt
ask
aeJ
aJt
-elN
+cbU
aRn
-aGg
+ljE
cWr
bIL
ddX
jGv
-tXb
+eWR
aeJ
rqd
aya
@@ -124021,7 +124021,7 @@ lLM
cNt
atw
aeJ
-mZO
+hbu
vgi
oQR
gld
@@ -124057,7 +124057,7 @@ mhb
esg
fTN
jId
-bkf
+xAu
fdE
uYN
wqJ
@@ -124279,15 +124279,15 @@ cNt
bDD
aeJ
cVH
-dlL
+vZG
mHL
-sEp
+aOb
cWr
cpH
atK
nWX
bkU
-mqw
+wSr
ozj
uuW
aQZ
@@ -124543,7 +124543,7 @@ rGy
hfy
eBn
nbL
-wge
+irn
aPd
vqt
uuW
@@ -125852,7 +125852,7 @@ lvn
tNk
dkR
iLD
-fYC
+xXA
kXx
vhU
gwS
@@ -126592,7 +126592,7 @@ crQ
asn
aeJ
fqS
-kxf
+aGl
aeJ
fXx
hxg
@@ -126626,7 +126626,7 @@ vhU
vhU
vhU
vhU
-fLf
+wKu
heB
kVj
vhU
@@ -127396,7 +127396,7 @@ pyX
iyB
heB
ocm
-lil
+uPL
uho
lMx
nDy
@@ -127656,7 +127656,7 @@ lMx
lMx
lPU
lMx
-wzo
+iiZ
vhU
shm
xCx
@@ -127944,8 +127944,8 @@ cSo
snr
hUT
iSJ
-bSN
-fpa
+ayM
+hqs
cmy
wPJ
oRk
@@ -128435,7 +128435,7 @@ wrM
vUR
wdH
rGl
-jFK
+bgd
vUR
szG
hUW
@@ -129505,7 +129505,7 @@ cnM
cnM
oVz
rAx
-bqg
+keX
isS
vDc
qbd
@@ -129768,7 +129768,7 @@ mMf
qbd
gtO
yfq
-dsX
+jti
kAx
fIf
xJr
@@ -130300,7 +130300,7 @@ oth
tAi
eUq
ehQ
-nPp
+rkq
kDo
akh
xip
@@ -130829,13 +130829,13 @@ eNp
ozc
oYg
dlC
-dOQ
+cHu
rxv
lis
tCO
lis
ide
-kGy
+xNR
siW
qTo
bmB
@@ -131079,7 +131079,7 @@ kJm
eUi
iHz
aZB
-tuO
+dBq
iQp
swU
rcR
@@ -131286,7 +131286,7 @@ uGP
nHb
gjj
pXI
-mYp
+iRk
fUO
ssT
ybT
@@ -131876,7 +131876,7 @@ sMR
qTc
tBr
qTc
-vLO
+uNi
haP
ozc
nnx
@@ -132557,7 +132557,7 @@ xIV
wyg
kkX
nVS
-ptv
+wvS
iyg
iOw
nVS
@@ -133343,7 +133343,7 @@ nWr
mCC
cuR
tJu
-hux
+pZt
bcg
qOM
mju
@@ -133659,7 +133659,7 @@ ere
kFN
lkl
eLS
-bhK
+sYd
mHj
abN
nnx
@@ -133842,7 +133842,7 @@ wOG
wzW
wyg
wYw
-ejc
+rGZ
kjg
nBj
dOq
@@ -133857,9 +133857,9 @@ oEf
oEf
tWe
rDR
-onm
+qtM
tLe
-fmn
+pBN
eRO
uxl
oYl
@@ -134173,7 +134173,7 @@ sTZ
eeu
mKd
iIX
-iXG
+oqj
mHj
abN
abN
@@ -134624,7 +134624,7 @@ fsb
hcE
mPD
aJK
-gLr
+hKB
fsb
ehr
cNy
@@ -135941,7 +135941,7 @@ xrc
gEs
wBR
cTl
-pCA
+qpL
xSV
uAE
myi
@@ -136194,7 +136194,7 @@ rlX
gad
wLT
wZg
-lAL
+xPy
gEs
abA
wiV
@@ -141266,7 +141266,7 @@ hFK
hFi
nFb
wfA
-ttm
+iDU
gwI
ivi
dVN
@@ -141324,7 +141324,7 @@ cBt
tXM
oPn
qyd
-gHI
+soC
pFP
ykQ
gfk
@@ -141521,14 +141521,14 @@ hrQ
wfA
hip
hGf
-wmv
+hYl
wfA
uzu
gwI
ivG
gUi
jvr
-viq
+hus
yiC
mqi
aTF
@@ -141770,7 +141770,7 @@ csJ
nnx
nnx
yeb
-lvi
+dMN
osY
flj
tPT
@@ -142811,7 +142811,7 @@ wfA
puK
tvl
tvl
-vsI
+wok
hcD
oFa
yiC
@@ -143935,7 +143935,7 @@ ylJ
ylJ
kEC
vXB
-wNm
+dqI
ylJ
ylJ
uBK
@@ -144092,7 +144092,7 @@ ydm
xVC
fvs
gCA
-qGZ
+hdx
hKK
qIr
ydm
@@ -150815,7 +150815,7 @@ wZD
xyd
qjE
yic
-gjN
+yaa
qjE
wCr
anQ
@@ -152100,7 +152100,7 @@ wZR
ptW
wDO
vPF
-xvy
+eDM
wDI
vjo
ycc
@@ -153342,9 +153342,9 @@ flv
gLC
eYA
bti
-jpj
+naD
fLF
-kgy
+iZB
bti
ifi
rPA
@@ -154625,13 +154625,13 @@ aYu
aYu
kOu
kOu
-mif
+lwV
kOu
goB
gQS
hnr
kOu
-wIW
+iUz
kOu
kOu
aYu
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index f3a2253a807ac..b045ae361b062 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -1688,38 +1688,6 @@
/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,
@@ -3384,6 +3352,26 @@
},
/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"
@@ -8954,35 +8942,6 @@
},
/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
@@ -10383,6 +10342,39 @@
"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";
@@ -10688,6 +10680,27 @@
},
/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{
@@ -10866,6 +10879,27 @@
},
/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
@@ -11079,6 +11113,18 @@
},
/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,
@@ -11267,28 +11313,6 @@
},
/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,
@@ -11579,6 +11603,31 @@
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)
@@ -11764,6 +11813,18 @@
},
/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;
@@ -11841,6 +11902,29 @@
/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{
@@ -14441,27 +14525,6 @@
/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,
@@ -15438,6 +15501,13 @@
},
/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{
@@ -17078,17 +17148,6 @@
},
/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,
@@ -18918,6 +18977,21 @@
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/maintenance/fore)
+"cjk" = (
+/obj/machinery/door/window/westleft{
+ name = "Monkey Pen";
+ pixel_y = 1;
+ req_access_txt = "9";
+ dir = 1
+ },
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/blue/half/contrasted{
+ dir = 8
+ },
+/mob/living/carbon/human/species/monkey,
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/showroomfloor,
+/area/medical/genetics)
"cjl" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -24407,23 +24481,6 @@
/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,
@@ -26145,6 +26202,28 @@
},
/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
@@ -26486,6 +26565,26 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/iron/dark,
/area/maintenance/aft)
+"ddy" = (
+/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)
"ddG" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -26760,10 +26859,6 @@
},
/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{
@@ -27211,6 +27306,46 @@
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"
@@ -27342,23 +27477,6 @@
},
/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,
@@ -28661,35 +28779,6 @@
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,
@@ -29351,38 +29440,6 @@
},
/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{
@@ -30110,6 +30167,16 @@
},
/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{
@@ -30726,23 +30793,6 @@
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
@@ -31055,27 +31105,6 @@
/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
@@ -32389,6 +32418,25 @@
},
/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{
@@ -33073,6 +33121,19 @@
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/turf/open/floor/iron,
/area/security/main)
+"fhu" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/machinery/door/window/westleft{
+ name = "Monkey Pen";
+ pixel_y = 1;
+ req_access_txt = "9";
+ dir = 1
+ },
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/dark,
+/area/medical/virology)
"fhz" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/firealarm{
@@ -35671,28 +35732,6 @@
/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{
@@ -36056,6 +36095,16 @@
/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{
@@ -37067,25 +37116,6 @@
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,
@@ -37289,6 +37319,38 @@
},
/turf/open/floor/iron,
/area/maintenance/disposal/incinerator)
+"gIQ" = (
+/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)
"gIR" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
@@ -38173,39 +38235,6 @@
},
/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{
@@ -38284,18 +38313,6 @@
},
/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,
@@ -38486,6 +38503,27 @@
},
/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;
@@ -39207,6 +39245,14 @@
},
/turf/open/floor/iron,
/area/crew_quarters/fitness/recreation)
+"hpw" = (
+/mob/living/carbon/human/species/monkey,
+/mob/living/carbon/human/species/monkey,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/medical/virology)
"hpC" = (
/obj/structure/girder,
/obj/structure/grille/broken,
@@ -39226,29 +39272,6 @@
},
/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,
@@ -39506,6 +39529,13 @@
},
/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
@@ -40396,31 +40426,6 @@
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,
@@ -42377,24 +42382,6 @@
},
/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,
@@ -42887,6 +42874,19 @@
/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
@@ -42977,36 +42977,24 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/bar)
-"iAJ" = (
-/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
+"iAH" = (
+/obj/structure/table/wood,
+/obj/item/clipboard,
+/obj/item/reagent_containers/cup/glass/shaker{
+ pixel_x = -2;
+ pixel_y = 2
},
-/obj/item/reagent_containers/cup/bottle/spaceacillin{
- pixel_x = 9;
- pixel_y = -7
+/obj/item/toy/figure/bartender{
+ pixel_x = 8;
+ pixel_y = 2
},
-/obj/machinery/light{
- bulb_colour = "#22bfa2";
- bulb_vacuum_colour = "#22bfa2";
- dir = 4;
- nightshift_light_color = "#22bfa2"
+/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/medical/virology)
+/area/crew_quarters/bar)
"iAR" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -44713,6 +44701,10 @@
/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"
@@ -45975,6 +45967,95 @@
},
/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"
@@ -47313,6 +47394,27 @@
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"
@@ -49965,6 +50067,17 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"kJL" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/mob/living/carbon/human/species/monkey,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/dark,
+/area/medical/virology)
"kJV" = (
/obj/effect/turf_decal/bot_white,
/obj/machinery/holopad,
@@ -50280,6 +50393,35 @@
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{
@@ -52567,48 +52709,6 @@
},
/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{
@@ -53118,27 +53218,6 @@
},
/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"
@@ -53997,6 +54076,24 @@
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
@@ -54060,26 +54157,6 @@
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,
@@ -54119,6 +54196,27 @@
/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{
@@ -55509,34 +55607,6 @@
/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"
@@ -57440,6 +57510,21 @@
/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;
@@ -57664,15 +57749,6 @@
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{
@@ -58366,12 +58442,6 @@
},
/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{
@@ -58860,19 +58930,6 @@
},
/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
@@ -58955,6 +59012,27 @@
},
/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,
@@ -59176,6 +59254,23 @@
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"
@@ -59770,6 +59865,31 @@
},
/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{
@@ -59895,24 +60015,6 @@
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
@@ -60365,20 +60467,6 @@
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";
@@ -60899,6 +60987,27 @@
},
/turf/open/floor/iron/dark,
/area/security/brig/aft)
+"oql" = (
+/obj/item/kirbyplants{
+ icon_state = "plant-17";
+ pixel_x = 8;
+ pixel_y = 3
+ },
+/obj/machinery/light_switch{
+ pixel_x = 24;
+ pixel_y = 40
+ },
+/obj/machinery/button/door{
+ id = "bar_1";
+ name = "Bar Shutters Toggle";
+ pixel_x = 24;
+ pixel_y = 24;
+ req_access_txt = "25"
+ },
+/mob/living/carbon/human/species/monkey/punpun,
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/turf/open/floor/iron/dark,
+/area/crew_quarters/bar)
"oqn" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -61160,27 +61269,6 @@
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{
@@ -62247,6 +62335,34 @@
},
/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
@@ -62263,18 +62379,6 @@
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{
@@ -62973,15 +63077,6 @@
/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,
@@ -63837,6 +63932,27 @@
},
/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
@@ -64017,27 +64133,6 @@
/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"
@@ -64713,31 +64808,6 @@
},
/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;
@@ -65631,21 +65701,6 @@
/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
@@ -65675,19 +65730,6 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/shuttledock)
-"pPN" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 1
- },
-/obj/machinery/door/window/westleft{
- name = "Monkey Pen";
- pixel_y = 1;
- req_access_txt = "9";
- dir = 1
- },
-/mob/living/carbon/monkey,
-/turf/open/floor/iron/dark,
-/area/medical/virology)
"pPO" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -66414,17 +66456,6 @@
},
/turf/open/floor/iron/dark,
/area/crew_quarters/fitness/recreation)
-"qbG" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
- dir = 1
- },
-/mob/living/carbon/monkey,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/mob/living/carbon/monkey,
-/turf/open/floor/iron/dark,
-/area/medical/virology)
"qbO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/corner,
@@ -66650,19 +66681,6 @@
/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,
@@ -67338,6 +67356,35 @@
/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
@@ -67499,26 +67546,6 @@
/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,
@@ -67921,6 +67948,15 @@
/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,
@@ -68082,31 +68118,6 @@
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
@@ -69005,6 +69016,17 @@
},
/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
@@ -69153,6 +69175,25 @@
},
/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,
@@ -69677,16 +69718,6 @@
/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,
@@ -69764,21 +69795,38 @@
},
/turf/open/floor/iron/showroomfloor,
/area/science/storage)
-"rgL" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/window/reinforced{
- dir = 4
+"rgD" = (
+/obj/effect/landmark/start/ai/secondary,
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_x = -10;
+ pixel_y = 22
},
-/obj/structure/reagent_dispensers/watertank/high,
-/obj/item/reagent_containers/cup/bucket,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = -27
},
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 4
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = -10;
+ pixel_y = -25
},
-/turf/open/floor/iron/dark,
-/area/chapel/main)
+/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)
"rgZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/ash,
@@ -70411,6 +70459,29 @@
/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{
@@ -71123,46 +71194,6 @@
},
/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,
@@ -74125,6 +74156,16 @@
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
@@ -74401,6 +74442,31 @@
/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{
@@ -76570,6 +76636,36 @@
},
/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{
@@ -77758,6 +77854,15 @@
},
/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"
@@ -77796,6 +77901,23 @@
/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,
@@ -78710,95 +78832,6 @@
/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";
@@ -79181,27 +79214,6 @@
},
/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"
@@ -79913,6 +79925,19 @@
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"
@@ -80018,29 +80043,6 @@
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
@@ -80215,29 +80217,6 @@
/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
@@ -80506,6 +80485,12 @@
/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{
@@ -81295,6 +81280,28 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
/turf/open/floor/iron/dark,
/area/crew_quarters/kitchen)
+"vfB" = (
+/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)
"vfQ" = (
/obj/machinery/modular_computer/console/preset/engineering{
dir = 8
@@ -83763,6 +83770,19 @@
},
/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{
@@ -84386,6 +84406,20 @@
"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
@@ -85021,6 +85055,48 @@
},
/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
@@ -85110,6 +85186,24 @@
/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{
@@ -85296,25 +85390,6 @@
},
/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,
@@ -86612,19 +86687,6 @@
},
/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{
@@ -87408,14 +87470,6 @@
},
/turf/open/floor/iron,
/area/hydroponics)
-"wTN" = (
-/mob/living/carbon/monkey,
-/mob/living/carbon/monkey,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/medical/virology)
"wTY" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -87632,27 +87686,6 @@
},
/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{
@@ -87689,13 +87722,6 @@
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,
@@ -88146,13 +88172,6 @@
/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,
@@ -89121,6 +89140,46 @@
/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
@@ -89294,24 +89353,6 @@
/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;
@@ -89699,21 +89740,6 @@
/obj/item/restraints/handcuffs,
/turf/open/floor/iron/showroomfloor,
/area/security/main)
-"xEQ" = (
-/obj/machinery/door/window/westleft{
- name = "Monkey Pen";
- pixel_y = 1;
- req_access_txt = "9";
- dir = 1
- },
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 8
- },
-/mob/living/carbon/monkey,
-/mob/living/carbon/monkey,
-/turf/open/floor/iron/showroomfloor,
-/area/medical/genetics)
"xFi" = (
/obj/effect/turf_decal/plaque{
icon_state = "L14"
@@ -90263,16 +90289,6 @@
},
/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{
@@ -90700,16 +90716,6 @@
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,
@@ -91295,6 +91301,21 @@
/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,
@@ -91522,27 +91543,6 @@
},
/turf/open/floor/iron/dark,
/area/storage/tech)
-"yio" = (
-/obj/item/kirbyplants{
- icon_state = "plant-17";
- pixel_x = 8;
- pixel_y = 3
- },
-/obj/machinery/light_switch{
- pixel_x = 24;
- pixel_y = 40
- },
-/obj/machinery/button/door{
- id = "bar_1";
- name = "Bar Shutters Toggle";
- pixel_x = 24;
- pixel_y = 24;
- req_access_txt = "25"
- },
-/mob/living/carbon/monkey/punpun,
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/turf/open/floor/iron/dark,
-/area/crew_quarters/bar)
"yis" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -108976,7 +108976,7 @@ qvH
qvH
nmY
vbU
-xVd
+eja
bQy
hEG
ciO
@@ -109233,7 +109233,7 @@ qvH
qvH
jel
iTH
-npf
+qCD
aav
mkY
aXg
@@ -109510,7 +109510,7 @@ gSb
njG
uoK
njG
-xOz
+giB
eyz
njG
aaa
@@ -110797,7 +110797,7 @@ mbD
hbo
fmb
woS
-gYn
+bkU
wVu
aUz
aaa
@@ -110984,7 +110984,7 @@ aNG
pME
gHb
imK
-xEQ
+cjk
aNG
bCi
uPx
@@ -111028,7 +111028,7 @@ aav
ijY
epb
ukl
-nKS
+izu
qbu
iQT
gJr
@@ -111246,7 +111246,7 @@ aNG
pUD
fbp
ixg
-bbG
+qti
nfy
iVR
fzU
@@ -112289,7 +112289,7 @@ dbg
lkt
aQW
afe
-mBH
+oMW
cBi
oDA
afe
@@ -112313,8 +112313,8 @@ uFY
lCW
yhn
tja
-nDC
-etq
+uQT
+dpY
avR
rnM
nhx
@@ -112553,7 +112553,7 @@ bAN
qLW
lvi
ukd
-wTN
+hpw
afe
vWW
lzt
@@ -112797,7 +112797,7 @@ xfL
exk
hDh
aNn
-ouh
+hec
yak
cJW
swl
@@ -112810,7 +112810,7 @@ vlT
kvt
cnx
lbk
-pPN
+fhu
atK
twN
bJi
@@ -113067,7 +113067,7 @@ vlT
rJv
eIV
jXV
-qbG
+kJL
afe
xCs
bJi
@@ -113311,7 +113311,7 @@ ttH
prh
jGn
aQW
-hqf
+dpR
yak
vIG
kwL
@@ -113322,8 +113322,8 @@ bMi
wKN
bAN
aWM
-lAa
-upK
+wkJ
+juC
jWX
aoH
tjn
@@ -114347,7 +114347,7 @@ buc
soa
ruo
drQ
-iAJ
+tyw
qyz
iNU
vlT
@@ -114836,7 +114836,7 @@ aWG
wCV
btf
btk
-uKa
+btq
aWG
hQz
phw
@@ -115348,7 +115348,7 @@ sSv
kRL
bsm
xTj
-hGj
+sMK
xna
lXA
aWG
@@ -115861,7 +115861,7 @@ abN
alf
unx
aWG
-oNw
+bta
btC
vJx
gfr
@@ -116380,7 +116380,7 @@ aWG
bto
xEe
aWG
-ohR
+waM
raS
bwX
btA
@@ -116637,7 +116637,7 @@ bsm
aWG
cJQ
aWG
-rgL
+yeC
qZQ
xqa
wRe
@@ -116672,7 +116672,7 @@ aoh
prB
bEY
cIB
-gEQ
+eWx
nHM
aoA
wUH
@@ -118191,7 +118191,7 @@ ant
uRI
iEg
btH
-iod
+iAH
gbc
lSB
iAC
@@ -118449,7 +118449,7 @@ oVg
fZV
btI
lSk
-yio
+oql
kJV
mgS
omi
@@ -119426,7 +119426,7 @@ aAg
aAg
asZ
asZ
-agN
+rgD
asZ
asZ
aAg
@@ -119743,7 +119743,7 @@ rFb
apX
bkj
qyJ
-gZV
+boy
apX
bmJ
bAm
@@ -120197,7 +120197,7 @@ aay
acd
cdY
cdZ
-gbr
+vfB
cdY
acx
acR
@@ -120711,7 +120711,7 @@ aaU
aaN
cdZ
cdY
-lZd
+ddy
cdY
abV
acj
@@ -121482,7 +121482,7 @@ asZ
asZ
aAg
asZ
-dZB
+gIQ
asZ
aAg
asZ
@@ -124378,7 +124378,7 @@ aox
aox
bAx
asx
-qvp
+aqK
azC
bHG
cIE
@@ -124386,7 +124386,7 @@ cIL
asx
asx
bOM
-rft
+sHz
kPh
aox
vln
@@ -125905,7 +125905,7 @@ bqK
xjj
lBA
xfM
-pzi
+brB
bar
izD
ajt
@@ -125924,7 +125924,7 @@ rhI
dcE
cIA
bnT
-wIv
+uGS
bmM
wlv
bew
@@ -126138,7 +126138,7 @@ aLh
evG
iny
cDD
-exI
+pmx
cFm
vzg
ejK
@@ -126168,7 +126168,7 @@ jlV
brQ
jfd
tNl
-qFg
+nZh
mmO
uZa
bjn
@@ -126416,7 +126416,7 @@ rKa
ggQ
bna
dNG
-bHy
+lZo
eIg
ucI
kLS
@@ -126424,7 +126424,7 @@ eeK
ohZ
dsr
fKZ
-cKw
+nPI
xQc
ubM
icj
@@ -126936,7 +126936,7 @@ teM
teM
teM
fRS
-lJJ
+bnL
fNb
jJE
pbs
@@ -126953,7 +126953,7 @@ urA
vgt
drL
kEB
-ppB
+nLF
bmM
aZd
hdf
@@ -127191,7 +127191,7 @@ ybb
hCi
snt
wou
-bpR
+cYd
qjA
ajt
dxY
@@ -127206,8 +127206,8 @@ pmM
yar
sXZ
vNK
-qgk
-oYX
+vSy
+tXJ
boa
boh
bon
@@ -127454,7 +127454,7 @@ bwi
ajt
rGx
bph
-uuH
+bmS
bmZ
aZd
bqS
@@ -127694,7 +127694,7 @@ ixh
gjd
pzN
eLw
-xyt
+wms
aYH
vOl
rKa
@@ -128991,7 +128991,7 @@ vpZ
bch
aYd
vmw
-drK
+tZQ
aYd
bfn
cbk
@@ -129021,7 +129021,7 @@ bNM
wAq
lis
siW
-wps
+qXR
cjz
bNv
yaT
@@ -129222,7 +129222,7 @@ nJt
bzt
nJt
uZV
-uLP
+rpF
dNN
iBw
dZe
@@ -129789,7 +129789,7 @@ eEB
cZB
xGh
bNM
-pPm
+nkq
vqC
wag
bOH
@@ -130344,7 +130344,7 @@ fkE
coC
cNF
iKN
-wXc
+jQD
cnu
cnu
cnd
@@ -130509,7 +130509,7 @@ bbx
aWJ
bfs
alB
-dOp
+kRc
uhr
ewi
baL
@@ -131280,7 +131280,7 @@ alB
bwe
bwe
alB
-rEb
+xuS
qSD
aSr
aZF
@@ -132352,7 +132352,7 @@ ags
exE
inM
bhQ
-wXE
+bNT
bSz
dpg
qJq
@@ -144596,7 +144596,7 @@ hHu
cCU
gzN
rag
-caP
+qVe
act
tjz
vpC
@@ -144851,7 +144851,7 @@ abq
iHi
lga
fde
-oau
+lXx
wtt
oGh
act
@@ -146659,7 +146659,7 @@ sMc
iCX
kHh
act
-dhi
+jcF
ega
wKL
cCr
@@ -147941,7 +147941,7 @@ pWT
kfw
fnM
lYs
-xeX
+htk
dDY
act
act
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index b50d40b457b81..919c323d2e9e6 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1120,32 +1120,6 @@
/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
@@ -4267,6 +4241,24 @@
/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{
@@ -4275,6 +4267,19 @@
/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,
@@ -5789,6 +5794,18 @@
},
/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,
@@ -7274,14 +7291,6 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/quartermaster/sorting)
-"bbQ" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/mob/living/carbon/monkey,
-/turf/open/floor/iron,
-/area/maintenance/aft)
"bbT" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -7295,15 +7304,6 @@
"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"
@@ -8135,6 +8135,19 @@
},
/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,
@@ -9940,15 +9953,6 @@
/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,
@@ -10581,6 +10585,11 @@
/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;
@@ -12152,6 +12161,34 @@
},
/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;
@@ -14464,6 +14501,24 @@
},
/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
@@ -15058,6 +15113,14 @@
},
/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,
@@ -16632,6 +16695,71 @@
/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,
@@ -16801,6 +16929,19 @@
/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
@@ -16808,6 +16949,38 @@
/obj/machinery/rnd/production/techfab/department/service,
/turf/open/floor/iron,
/area/hallway/secondary/service)
+"coI" = (
+/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)
"cpd" = (
/obj/effect/landmark/start/scientist,
/obj/structure/cable/yellow{
@@ -17692,28 +17865,6 @@
},
/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)
@@ -17819,6 +17970,23 @@
},
/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;
@@ -17939,6 +18107,26 @@
},
/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
@@ -18330,6 +18518,20 @@
/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)
@@ -19500,34 +19702,6 @@
},
/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,
@@ -20984,34 +21158,6 @@
},
/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
@@ -21521,6 +21667,21 @@
},
/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"
@@ -23009,10 +23170,6 @@
},
/turf/open/floor/iron/dark,
/area/science/shuttledock)
-"dFf" = (
-/mob/living/carbon/monkey/punpun,
-/turf/open/floor/wood/big,
-/area/crew_quarters/bar)
"dFo" = (
/obj/machinery/airalarm/directional/north,
/turf/open/floor/iron,
@@ -23171,6 +23328,16 @@
/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
@@ -23798,71 +23965,6 @@
},
/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
@@ -25963,23 +26065,6 @@
/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
@@ -26670,11 +26755,6 @@
},
/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)
@@ -27524,6 +27604,14 @@
dir = 1
},
/area/security/brig)
+"fvC" = (
+/obj/effect/turf_decal/delivery,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron,
+/area/maintenance/aft)
"fvX" = (
/obj/machinery/door/airlock/security/glass{
name = "Labor Camp Shuttle Airlock";
@@ -28378,6 +28466,21 @@
},
/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,
@@ -29294,24 +29397,6 @@
},
/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"
@@ -29704,18 +29789,6 @@
},
/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"
@@ -29861,6 +29934,14 @@
/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{
@@ -29894,20 +29975,6 @@
/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
@@ -30585,29 +30652,6 @@
},
/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,
@@ -30657,6 +30701,91 @@
},
/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{
@@ -30742,19 +30871,6 @@
},
/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"
@@ -31151,30 +31267,6 @@
},
/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"
@@ -31653,19 +31745,6 @@
},
/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{
@@ -34441,6 +34520,15 @@
/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
@@ -34740,14 +34828,6 @@
},
/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";
@@ -35150,6 +35230,19 @@
},
/turf/open/floor/iron,
/area/security/courtroom)
+"ijE" = (
+/obj/machinery/door/window/westleft{
+ dir = 2;
+ name = "Monkey Pen";
+ pixel_y = 1;
+ req_access_txt = "9"
+ },
+/mob/living/carbon/human/species/monkey,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/iron/freezer,
+/area/medical/genetics)
"ijF" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -35626,23 +35719,6 @@
"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
@@ -36067,6 +36143,33 @@
/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,
@@ -37058,6 +37161,30 @@
},
/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;
@@ -37403,6 +37530,13 @@
},
/turf/open/floor/iron,
/area/hallway/primary/central)
+"jeJ" = (
+/obj/structure/window/reinforced{
+ pixel_y = 1
+ },
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/freezer,
+/area/medical/genetics)
"jeS" = (
/obj/structure/chair{
dir = 8
@@ -37531,16 +37665,6 @@
},
/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{
@@ -37916,15 +38040,6 @@
/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
@@ -38079,28 +38194,6 @@
},
/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"
@@ -38834,18 +38927,6 @@
},
/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"
@@ -40110,18 +40191,6 @@
/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{
@@ -40242,6 +40311,29 @@
"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
@@ -40492,6 +40584,21 @@
/obj/effect/turf_decal/tile/brown/half/contrasted,
/turf/open/floor/iron,
/area/storage/primary)
+"kna" = (
+/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)
"knj" = (
/obj/machinery/camera/directional/east{
c_tag = "Auxiliary Tool Storage"
@@ -40810,19 +40917,6 @@
},
/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,
@@ -40992,6 +41086,28 @@
},
/turf/open/floor/iron,
/area/hallway/primary/fore)
+"kxi" = (
+/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)
"kxk" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -43614,6 +43730,17 @@
/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{
@@ -43976,17 +44103,6 @@
},
/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{
@@ -44334,34 +44450,6 @@
},
/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";
@@ -44724,17 +44812,6 @@
},
/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"
@@ -44860,33 +44937,6 @@
},
/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
@@ -45077,6 +45127,34 @@
},
/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"
@@ -45501,6 +45579,38 @@
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood/big,
/area/crew_quarters/bar)
+"miT" = (
+/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)
"miW" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -48010,19 +48120,6 @@
},
/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{
@@ -49204,6 +49301,10 @@
},
/turf/open/floor/iron,
/area/medical/break_room)
+"nzc" = (
+/mob/living/carbon/human/species/monkey/punpun,
+/turf/open/floor/wood/big,
+/area/crew_quarters/bar)
"nzh" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 6
@@ -49668,6 +49769,34 @@
},
/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{
@@ -49963,6 +50092,23 @@
/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"
@@ -50294,6 +50440,28 @@
},
/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"
@@ -51111,19 +51279,6 @@
/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"
@@ -52830,25 +52985,6 @@
},
/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
@@ -54332,6 +54468,18 @@
/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,
@@ -55381,17 +55529,6 @@
},
/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"
@@ -55580,21 +55717,6 @@
},
/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
@@ -56407,14 +56529,6 @@
},
/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,
@@ -58489,19 +58603,6 @@
},
/turf/open/floor/iron/dark,
/area/maintenance/department/science/xenobiology)
-"qRE" = (
-/obj/machinery/door/window/westleft{
- dir = 2;
- name = "Monkey Pen";
- pixel_y = 1;
- req_access_txt = "9"
- },
-/mob/living/carbon/monkey,
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/iron/freezer,
-/area/medical/genetics)
"qRL" = (
/obj/effect/landmark/start/bartender,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -60094,6 +60195,17 @@
},
/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";
@@ -60445,13 +60557,6 @@
},
/turf/open/floor/iron/dark,
/area/bridge)
-"rEJ" = (
-/mob/living/carbon/monkey,
-/obj/structure/window/reinforced{
- pixel_y = 1
- },
-/turf/open/floor/iron/freezer,
-/area/medical/genetics)
"rEK" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -60830,6 +60935,32 @@
},
/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"
@@ -60890,10 +61021,6 @@
},
/turf/open/floor/iron,
/area/maintenance/aft)
-"rNQ" = (
-/mob/living/carbon/monkey,
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"rOa" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -63324,6 +63451,17 @@
},
/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{
@@ -63548,19 +63686,6 @@
/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"
@@ -65862,28 +65987,6 @@
},
/turf/open/floor/iron,
/area/maintenance/starboard/fore)
-"tAW" = (
-/obj/structure/window/reinforced{
- pixel_y = 1
- },
-/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
@@ -66140,6 +66243,30 @@
},
/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,
@@ -66384,6 +66511,19 @@
},
/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
@@ -67587,6 +67727,13 @@
},
/turf/open/floor/iron/white,
/area/medical/medbay/aft)
+"ugh" = (
+/mob/living/carbon/human/species/monkey,
+/obj/structure/window/reinforced{
+ pixel_y = 1
+ },
+/turf/open/floor/iron/freezer,
+/area/medical/genetics)
"ugp" = (
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
@@ -68355,38 +68502,6 @@
},
/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
@@ -68654,6 +68769,25 @@
/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"
@@ -69707,26 +69841,6 @@
/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
@@ -70316,6 +70430,19 @@
/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"
@@ -70784,6 +70911,10 @@
},
/turf/open/floor/iron,
/area/construction/storage_wing)
+"vnY" = (
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"vnZ" = (
/obj/machinery/firealarm{
dir = 1;
@@ -71400,38 +71531,6 @@
},
/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,
@@ -71939,6 +72038,17 @@
/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";
@@ -72333,17 +72443,6 @@
/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
@@ -72988,6 +73087,18 @@
},
/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
@@ -73306,6 +73417,17 @@
},
/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;
@@ -76359,6 +76481,19 @@
"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{
@@ -77667,30 +77802,6 @@
/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"
@@ -77703,91 +77814,6 @@
/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
@@ -78155,21 +78181,6 @@
},
/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,
@@ -78691,17 +78702,6 @@
/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,
@@ -97411,7 +97411,7 @@ xRh
ecO
lCt
cDL
-rNQ
+vnY
lzI
mDQ
vOg
@@ -97668,8 +97668,8 @@ iBM
fnM
cOQ
cDL
-rNQ
-rNQ
+vnY
+vnY
xRy
sth
dUR
@@ -97926,7 +97926,7 @@ crm
bpW
cDL
dLv
-rNQ
+vnY
yls
roJ
rwn
@@ -98701,7 +98701,7 @@ dle
wEb
npX
rEg
-xLx
+gEW
osp
fKN
dDz
@@ -98956,7 +98956,7 @@ dSx
jNU
ybs
lzI
-xKt
+tGk
gFh
vdt
lzI
@@ -99218,7 +99218,7 @@ dQx
mnd
coa
lzI
-gPx
+iTJ
cDL
avr
avr
@@ -100737,7 +100737,7 @@ mpW
mpW
feW
ycr
-ald
+rMj
smE
nqq
vNW
@@ -101795,7 +101795,7 @@ cCe
eEV
jRz
cLa
-lGc
+lyj
cLa
oUI
cOh
@@ -102720,9 +102720,9 @@ ttO
ttO
ttO
ttO
-icb
+bYn
kZQ
-jgA
+dJG
qOU
tlg
aqj
@@ -103232,7 +103232,7 @@ abx
abV
acm
uAd
-dVH
+cmb
adm
sdu
iiC
@@ -103334,7 +103334,7 @@ bnS
avr
hzz
hik
-bbQ
+fvC
vaQ
oBe
cMI
@@ -103819,7 +103819,7 @@ bSS
bSS
nll
lJT
-oJk
+uzP
bya
otF
vxg
@@ -104587,7 +104587,7 @@ aYX
iov
bXN
mdh
-dfn
+bHJ
tMi
sRD
lQG
@@ -105107,7 +105107,7 @@ uNs
rhj
wsV
fHf
-gEa
+kir
pFa
gvA
acB
@@ -105627,7 +105627,7 @@ pYp
gVH
spm
kUs
-lST
+iBJ
cga
oIj
rdQ
@@ -105636,7 +105636,7 @@ eGp
lQB
hIc
rdQ
-tAW
+jeJ
efl
uVp
igd
@@ -105893,7 +105893,7 @@ qxo
lbd
gzm
rdQ
-qRE
+ijE
oCH
oOa
vti
@@ -106135,7 +106135,7 @@ oJb
aAv
tiS
rrO
-cPY
+lXA
kKG
uml
wsV
@@ -106150,7 +106150,7 @@ bYs
xph
rdQ
rdQ
-rEJ
+ugh
mYS
ydT
ctB
@@ -106327,7 +106327,7 @@ jIc
veD
fnW
ipQ
-ePG
+nNC
aqa
lFK
qUA
@@ -108724,7 +108724,7 @@ ctL
ctL
ctL
cCq
-glP
+cDe
fzR
oPJ
gHe
@@ -109699,7 +109699,7 @@ iCU
bcj
bdI
bfz
-gWD
+bhu
bjg
egk
bjg
@@ -109965,7 +109965,7 @@ bqX
cDV
dCP
mZn
-feb
+byr
iWz
bcj
bDs
@@ -112296,7 +112296,7 @@ soe
oxO
oxO
mkI
-ybm
+sGn
tjn
vgq
bSS
@@ -112534,7 +112534,7 @@ boM
brd
bmO
nXB
-lRg
+wld
oFU
eaJ
eNK
@@ -112804,7 +112804,7 @@ hfh
ujJ
paP
qqj
-vOq
+vJj
bST
bUf
vWU
@@ -113059,7 +113059,7 @@ blf
rxb
ujJ
ujJ
-pLS
+rwt
qqj
nSl
bST
@@ -113306,7 +113306,7 @@ bmO
bmO
buN
ltZ
-dFf
+nzc
wiR
gFs
wmZ
@@ -113602,7 +113602,7 @@ cvX
lft
cwY
thn
-uUg
+cyJ
cSt
pVv
gWG
@@ -113827,7 +113827,7 @@ xTu
kJK
xTu
blf
-pPq
+fIY
ujJ
nuZ
wde
@@ -114078,7 +114078,7 @@ kky
bmP
ifc
jIy
-ogP
+tLJ
tkd
xTu
kJK
@@ -114797,7 +114797,7 @@ aaa
aaf
aaa
acQ
-cwo
+nSE
kAr
mbZ
tsT
@@ -115119,7 +115119,7 @@ bOX
bQI
uee
bST
-jru
+bUn
mPh
gzi
nrx
@@ -115376,7 +115376,7 @@ rFZ
rFZ
aoW
bST
-btj
+bUo
bVy
bWU
xSD
@@ -115594,7 +115594,7 @@ dIq
aCH
eYL
aJh
-fZX
+aKp
hWI
vAZ
oUR
@@ -115857,7 +115857,7 @@ aNi
mlI
aNi
cNf
-ghT
+aSk
aJh
ltK
dnR
@@ -116108,7 +116108,7 @@ mpL
hmU
twq
aJh
-sKq
+aKr
mhI
aNi
lcQ
@@ -116149,7 +116149,7 @@ cgF
bSY
bUq
bKe
-tAZ
+diw
pvg
sLD
gba
@@ -116663,7 +116663,7 @@ byN
rPM
tUh
bVz
-kfb
+wdI
nKe
bVz
ogw
@@ -116684,10 +116684,10 @@ ovj
mjJ
nBT
lzk
-kuA
-lLe
+cou
+nIt
qjB
-jIT
+ppT
jqu
pVN
dJI
@@ -116943,8 +116943,8 @@ xGh
ubB
eal
oFp
-irE
-qdo
+cxP
+glg
tMl
fmT
ggj
@@ -117457,7 +117457,7 @@ mjJ
mjJ
kvL
uFK
-mZk
+vfv
hUs
hUs
bxk
@@ -117955,7 +117955,7 @@ oxX
bcd
xdW
lUZ
-gGw
+xop
kwL
bcd
nbv
@@ -121009,7 +121009,7 @@ iKI
iKI
ofV
fvZ
-bbZ
+hVW
bne
owR
owR
@@ -133338,7 +133338,7 @@ aRy
aTV
aTV
aTV
-vzK
+miT
aTV
aTV
aTV
@@ -134109,7 +134109,7 @@ aTV
aVn
aWN
aTV
-jtD
+kxi
aTV
aTV
sUk
@@ -134623,7 +134623,7 @@ aTX
taY
aWP
aTV
-xRG
+kna
aTV
aTV
bew
@@ -135394,7 +135394,7 @@ aRy
aTV
aTV
aTV
-uuJ
+coI
aTV
aTV
aTV
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 9dc77b97fe12b..0847f47be99c3 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -12,6 +12,25 @@
/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;
@@ -824,20 +843,6 @@
},
/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;
@@ -1333,30 +1338,6 @@
/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"
@@ -2590,6 +2571,29 @@
"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;
@@ -3060,6 +3064,22 @@
/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
@@ -4230,40 +4250,6 @@
/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";
@@ -4380,6 +4366,18 @@
},
/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
@@ -4690,6 +4688,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/maintenance/department/security)
+"bwo" = (
+/obj/machinery/door/window/westleft{
+ dir = 4;
+ name = "Monkey Pen";
+ req_access_txt = "9"
+ },
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/vault,
+/area/medical/genetics)
"bws" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -5762,6 +5769,20 @@
},
/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"
@@ -5985,6 +6006,10 @@
},
/turf/open/floor/iron,
/area/crew_quarters/cafeteria)
+"bSn" = (
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"bSZ" = (
/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
/obj/structure/cable/yellow{
@@ -6598,15 +6623,6 @@
},
/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
@@ -7258,43 +7274,6 @@
},
/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,
@@ -7313,6 +7292,22 @@
/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
@@ -7892,6 +7887,91 @@
/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{
@@ -8633,15 +8713,6 @@
},
/turf/open/floor/iron/dark,
/area/engine/atmos)
-"cLH" = (
-/obj/machinery/door/window/westleft{
- dir = 4;
- name = "Monkey Pen";
- req_access_txt = "9"
- },
-/mob/living/carbon/monkey,
-/turf/open/floor/vault,
-/area/medical/genetics)
"cLT" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -11064,6 +11135,30 @@
/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
@@ -12452,6 +12547,27 @@
},
/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";
@@ -12539,15 +12655,6 @@
},
/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,
@@ -12825,35 +12932,6 @@
},
/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
@@ -15623,6 +15701,22 @@
},
/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
@@ -16007,6 +16101,15 @@
/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,
@@ -16724,6 +16827,28 @@
"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
@@ -17482,6 +17607,20 @@
},
/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)
@@ -17578,6 +17717,17 @@
/obj/effect/turf_decal/tile/yellow/half,
/turf/open/floor/iron/large,
/area/hallway/primary/central)
+"fzm" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/machinery/light{
+ dir = 1
+ },
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/vault,
+/area/medical/genetics)
"fzn" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -18538,6 +18688,25 @@
/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
@@ -18966,6 +19135,15 @@
},
/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{
@@ -19131,18 +19309,47 @@
},
/turf/open/floor/iron,
/area/hallway/primary/port)
-"fZx" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/cup/bottle/nutrient/ez{
- pixel_x = 9;
+"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;
pixel_y = 4
},
-/obj/item/pen/fountain/captain{
- pixel_x = -5;
+/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/wood,
-/area/crew_quarters/dorms)
+/turf/open/floor/iron/white,
+/area/crew_quarters/kitchen)
"fZF" = (
/obj/structure/window/reinforced{
dir = 1
@@ -19612,14 +19819,6 @@
/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"
@@ -20138,6 +20337,35 @@
},
/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"
@@ -22207,33 +22435,6 @@
/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
@@ -22451,21 +22652,6 @@
},
/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;
@@ -23070,10 +23256,6 @@
},
/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";
@@ -23150,23 +23332,6 @@
/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"
@@ -23315,29 +23480,6 @@
},
/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;
@@ -24154,6 +24296,11 @@
},
/turf/open/floor/iron/dark,
/area/ai_monitored/turret_protected/aisat_interior)
+"hDt" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"hDu" = (
/turf/open/floor/plating,
/area/maintenance/department/engine)
@@ -24545,24 +24692,6 @@
},
/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
@@ -25954,6 +26083,16 @@
},
/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"
@@ -26399,47 +26538,6 @@
},
/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,
@@ -26574,6 +26672,13 @@
/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
@@ -26971,16 +27076,6 @@
},
/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"
@@ -27183,34 +27278,6 @@
/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
@@ -29078,6 +29145,17 @@
},
/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,
@@ -29152,6 +29230,21 @@
/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,
@@ -30411,16 +30504,6 @@
},
/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
@@ -32052,6 +32135,17 @@
},
/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;
@@ -32549,10 +32643,6 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/engine/engine_room)
-"ktc" = (
-/mob/living/carbon/monkey,
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"ktu" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
@@ -33154,17 +33244,6 @@
/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
@@ -33551,13 +33630,6 @@
/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
@@ -33869,6 +33941,37 @@
/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,
@@ -35231,6 +35334,17 @@
},
/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,
@@ -35250,36 +35364,6 @@
},
/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{
@@ -35847,28 +35931,6 @@
/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{
@@ -36049,25 +36111,6 @@
/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,
@@ -37304,6 +37347,14 @@
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
@@ -37317,6 +37368,18 @@
/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"
@@ -38568,6 +38631,10 @@
},
/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,
@@ -40007,6 +40074,17 @@
},
/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,
@@ -40116,34 +40194,6 @@
/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,
@@ -40520,20 +40570,6 @@
"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;
@@ -41696,25 +41732,6 @@
},
/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,
@@ -42945,6 +42962,25 @@
},
/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,
@@ -43613,6 +43649,12 @@
/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,
@@ -44431,21 +44473,6 @@
/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
@@ -44632,18 +44659,6 @@
/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,
@@ -44779,29 +44794,11 @@
/obj/structure/flora/ausbushes/ppflowers,
/turf/open/floor/grass/no_border,
/area/hallway/secondary/exit/departure_lounge)
-"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)
+"okF" = (
+/obj/machinery/chem_master,
+/obj/item/reagent_containers/cup/beaker/large,
+/turf/open/floor/iron,
+/area/medical/apothecary)
"okN" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -46049,6 +46046,29 @@
/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)
@@ -46624,6 +46644,23 @@
},
/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
@@ -46782,28 +46819,6 @@
/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
@@ -48007,27 +48022,24 @@
/obj/item/bedsheet/captain,
/turf/open/floor/carpet/blue,
/area/crew_quarters/heads/captain/private)
-"piS" = (
-/obj/machinery/light{
- light_color = "#7AC3FF"
- },
-/obj/item/reagent_containers/condiment/peppermill{
- pixel_y = 28
+"piH" = (
+/obj/structure/janitorialcart,
+/obj/item/reagent_containers/cup/bucket{
+ pixel_x = 11;
+ pixel_y = -5
},
-/obj/item/reagent_containers/condiment/saltshaker{
- pixel_y = 23
+/obj/item/mop{
+ pixel_x = -6;
+ pixel_y = 3
},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/crayons{
- pixel_x = 3;
- pixel_y = 7
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+ dir = 8
},
-/obj/machinery/computer/security/telescreen/entertainment{
- pixel_y = -32
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/table/wood,
-/turf/open/floor/carpet/green,
-/area/crew_quarters/cafeteria)
+/turf/open/floor/iron,
+/area/janitor)
"pjf" = (
/obj/machinery/door/poddoor/preopen{
id = "detectivewindows";
@@ -49244,6 +49256,18 @@
},
/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{
@@ -49310,11 +49334,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/white,
/area/crew_quarters/kitchen)
-"pFF" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/mob/living/carbon/monkey,
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"pGg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -52186,29 +52205,6 @@
/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{
@@ -53829,22 +53825,6 @@
},
/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
@@ -54112,18 +54092,6 @@
/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,
@@ -54781,11 +54749,6 @@
},
/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
@@ -55317,6 +55280,34 @@
},
/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
@@ -55641,19 +55632,6 @@
/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
@@ -55859,17 +55837,6 @@
},
/turf/open/floor/iron/tech,
/area/engine/atmos)
-"rGf" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/machinery/light{
- dir = 1
- },
-/mob/living/carbon/monkey,
-/turf/open/floor/vault,
-/area/medical/genetics)
"rGp" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -56077,6 +56044,14 @@
},
/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,
@@ -56356,15 +56331,6 @@
},
/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)
@@ -57230,6 +57196,19 @@
"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;
@@ -57481,22 +57460,6 @@
},
/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
@@ -58518,18 +58481,6 @@
},
/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,
@@ -59041,20 +58992,6 @@
/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{
@@ -59290,14 +59227,6 @@
},
/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;
@@ -60396,6 +60325,34 @@
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,
@@ -60511,12 +60468,6 @@
/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
@@ -60543,22 +60494,6 @@
},
/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;
@@ -61244,6 +61179,40 @@
/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"
@@ -62456,6 +62425,13 @@
},
/turf/open/floor/iron,
/area/hallway/secondary/entry)
+"tMd" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/vault,
+/area/medical/genetics)
"tMD" = (
/obj/machinery/door/poddoor/preopen{
id = "Engineering";
@@ -62559,24 +62535,6 @@
},
/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
@@ -63149,15 +63107,6 @@
/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,
@@ -63209,17 +63158,6 @@
},
/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,
@@ -63748,6 +63686,21 @@
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
@@ -63913,6 +63866,24 @@
},
/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
@@ -64126,34 +64097,6 @@
/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,
@@ -64852,6 +64795,11 @@
},
/turf/open/floor/iron/dark,
/area/quartermaster/exploration_prep)
+"uBE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/mob/living/carbon/human/species/monkey,
+/turf/open/floor/iron/grid/steel,
+/area/medical/virology)
"uBW" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/modular_computer/console/preset/engineering,
@@ -65516,6 +65464,22 @@
},
/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"
@@ -66089,21 +66053,6 @@
},
/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{
@@ -66271,6 +66220,15 @@
/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
@@ -66317,6 +66275,28 @@
/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{
@@ -66582,17 +66562,6 @@
/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)
@@ -66624,11 +66593,6 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/iron/dark,
/area/science/robotics)
-"vhE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/mob/living/carbon/monkey,
-/turf/open/floor/iron/grid/steel,
-/area/medical/virology)
"vhM" = (
/obj/machinery/door/airlock/maintenance{
name = "Plumbing Factory Maintenance";
@@ -66678,6 +66642,15 @@
},
/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
@@ -66793,6 +66766,18 @@
},
/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;
@@ -67673,6 +67658,43 @@
},
/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{
@@ -68429,6 +68451,21 @@
},
/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,
@@ -69115,13 +69152,6 @@
"waw" = (
/turf/closed/wall,
/area/quartermaster/sorting)
-"waM" = (
-/obj/structure/window/reinforced{
- dir = 4
- },
-/mob/living/carbon/monkey,
-/turf/open/floor/vault,
-/area/medical/genetics)
"waT" = (
/obj/effect/turf_decal/guideline/guideline_in/darkblue{
dir = 8
@@ -69596,6 +69626,17 @@
},
/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,
@@ -69878,6 +69919,17 @@
/obj/item/storage/toolbox/electrical,
/turf/open/floor/carpet/royalblack,
/area/maintenance/port/aft)
+"wpu" = (
+/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)
"wpw" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -69995,91 +70047,6 @@
/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{
@@ -70136,24 +70103,6 @@
},
/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";
@@ -71572,6 +71521,24 @@
/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
@@ -71735,6 +71702,34 @@
},
/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{
@@ -72488,6 +72483,18 @@
},
/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"
@@ -72600,6 +72607,29 @@
},
/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,
@@ -74101,6 +74131,20 @@
},
/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
@@ -74160,18 +74204,6 @@
},
/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
@@ -75213,6 +75245,16 @@
},
/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{
@@ -75313,17 +75355,6 @@
},
/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"
@@ -75455,37 +75486,6 @@
},
/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
-oRm
+vam
cMW
fVz
uKR
@@ -97050,7 +97050,7 @@ frc
frc
fFP
stS
-hbi
+vPl
sLX
sxX
lfC
@@ -98773,8 +98773,8 @@ xdi
yaG
cgq
bAj
-lvp
-hpV
+fls
+aOm
pmV
kZu
bAj
@@ -98826,7 +98826,7 @@ ndT
nQZ
ggJ
dvu
-yhq
+kPB
ykj
dLu
mGb
@@ -99039,7 +99039,7 @@ gsA
gsA
eSK
xkc
-mNu
+ryj
wGq
eBH
eSK
@@ -99290,7 +99290,7 @@ trr
yaP
asB
qNP
-rPL
+fWj
bAj
nmf
nmf
@@ -100658,7 +100658,7 @@ fAl
qZZ
sfR
qZZ
-dXx
+viS
rHt
vEn
xbP
@@ -101178,7 +101178,7 @@ clJ
clJ
clJ
qZZ
-hmL
+oPl
vQr
qZZ
gsA
@@ -101435,7 +101435,7 @@ jDt
eYH
efJ
fAl
-tYF
+mLo
gNm
fAl
gsA
@@ -102154,7 +102154,7 @@ aSr
lka
jdV
gOK
-kKb
+ivW
nnB
qRH
saq
@@ -102620,7 +102620,7 @@ hzk
bpo
qKg
rVu
-oks
+xkF
vwL
bNr
dTx
@@ -102630,7 +102630,7 @@ rgL
iZE
rWM
cUa
-edN
+gnE
tJT
rnw
rAQ
@@ -104676,7 +104676,7 @@ rqE
hGk
qLO
xNd
-lyW
+nFk
bDs
pVy
ifC
@@ -104937,7 +104937,7 @@ mJF
het
sSE
ifC
-oeW
+ugA
byu
ifC
erK
@@ -105704,7 +105704,7 @@ bjP
bjP
qdm
jrH
-bqq
+tuz
lHT
bBO
sFf
@@ -105956,7 +105956,7 @@ mtI
mtI
mtI
mtI
-uod
+thT
paj
tQy
pym
@@ -106214,7 +106214,7 @@ mtI
mtI
mtI
eDH
-hKK
+wQT
pNF
iee
kOb
@@ -106474,7 +106474,7 @@ hQk
uQP
pNF
xtP
-cey
+uZg
dyS
ldH
wNH
@@ -106716,7 +106716,7 @@ fZF
kjm
hsm
hsm
-nlX
+aak
piE
coK
hhv
@@ -107037,7 +107037,7 @@ bzO
mcm
hBR
cSY
-xIv
+brj
bzO
cFO
nxD
@@ -107481,7 +107481,7 @@ kYM
sZZ
kjF
tpC
-rDv
+seW
jXy
rYf
uLj
@@ -107504,7 +107504,7 @@ wgN
lCM
uml
mTK
-lmH
+fOF
mTK
dhT
kTx
@@ -107713,7 +107713,7 @@ xze
uuQ
uuQ
uTv
-ycV
+wpu
ahL
vsb
ycm
@@ -109083,7 +109083,7 @@ nfS
vDd
mTH
vJo
-tjK
+nQW
tLv
tmM
jgD
@@ -109255,7 +109255,7 @@ iVd
uuQ
uuQ
uTv
-ycV
+wpu
ahL
mhA
aoX
@@ -109280,7 +109280,7 @@ vkS
nlk
pXK
dbZ
-rge
+xjA
rQC
ydT
bqh
@@ -109366,7 +109366,7 @@ aCS
rQG
xBF
tIG
-sDP
+pED
aba
lwM
cKB
@@ -110609,7 +110609,7 @@ leD
cru
dNE
reS
-wuh
+piH
ntf
wkt
oGS
@@ -110641,7 +110641,7 @@ oIs
fxR
jlQ
mbT
-tNs
+ukp
lvJ
kDQ
xwH
@@ -110650,7 +110650,7 @@ kfv
vpR
uig
xBF
-rpT
+okF
rAO
oZL
uFU
@@ -111108,7 +111108,7 @@ yeA
gsA
efr
mIj
-gXg
+uLH
vmu
sSv
kui
@@ -111376,7 +111376,7 @@ aMA
mVN
mfr
hdp
-gXu
+wks
mdB
aMA
pCi
@@ -111429,7 +111429,7 @@ dwu
fYI
msM
teB
-tYe
+faQ
bgr
oUC
xVm
@@ -111615,7 +111615,7 @@ rNr
dea
dzY
gyP
-kDF
+llV
rNr
gsA
yeA
@@ -111938,7 +111938,7 @@ lLX
diq
ujr
tWQ
-col
+vAV
shZ
ibc
pfL
@@ -112407,7 +112407,7 @@ iOn
oio
izn
uxW
-mTY
+xHw
kok
ult
hjM
@@ -112450,9 +112450,9 @@ rtj
req
gxo
bWm
-rGf
-cLH
-waM
+fzm
+bwo
+tMd
bWm
bQH
dHW
@@ -112919,17 +112919,17 @@ nXc
nXc
nXc
nXc
-rbv
+coF
soB
vge
kok
bLt
oJe
-sLF
+fxG
qXx
ykz
lFE
-sjq
+eUV
rfl
iJe
kgH
@@ -113186,7 +113186,7 @@ iWh
qXx
mWi
ubo
-piS
+dWm
rfl
iJe
kgH
@@ -113944,7 +113944,7 @@ qDa
qFY
eVo
jgI
-ane
+bPM
mQc
pGW
gmj
@@ -114179,11 +114179,11 @@ cvT
bMn
wII
rYG
-fZx
+vkC
boZ
wII
mws
-ohw
+lYy
wII
kEh
jUB
@@ -114209,7 +114209,7 @@ lFS
umg
hnl
eXD
-uWO
+joH
szP
tdk
lSp
@@ -114713,8 +114713,8 @@ wAq
mBT
dhK
fwL
-isM
-ggz
+fZt
+lYd
wlj
sZT
jlg
@@ -114727,8 +114727,8 @@ qVc
kok
bSd
mWi
-vgV
-tkG
+jmw
+aVk
rfl
iJe
pZb
@@ -115535,7 +115535,7 @@ wOB
hjA
opp
sYS
-aug
+dBb
sdl
xat
kMc
@@ -116051,7 +116051,7 @@ qjI
gqW
jBS
lQB
-sQu
+rJL
iuX
dkt
maw
@@ -116259,7 +116259,7 @@ otE
otE
iks
hmO
-jIO
+yaV
kcZ
iks
bPo
@@ -117596,7 +117596,7 @@ kkj
wLd
ujz
kMc
-hlD
+mrr
dwU
wKX
xDh
@@ -117797,7 +117797,7 @@ uKl
uKl
pKx
sxp
-lmI
+kkQ
bJj
vft
egv
@@ -118070,7 +118070,7 @@ fZQ
uTB
wTw
fZb
-iCN
+ijU
ekZ
sPf
eUC
@@ -119131,7 +119131,7 @@ kxl
tfq
sWR
lsT
-iIc
+wUw
baz
pZF
uhG
@@ -119643,7 +119643,7 @@ aJb
odc
nan
tfq
-ktc
+bSn
hzd
nSi
rGU
@@ -119682,7 +119682,7 @@ pQd
pQd
gsA
ewB
-qBv
+oHE
gsA
yeA
yeA
@@ -119900,8 +119900,8 @@ kLq
vwY
fbJ
tfq
-ktc
-pFF
+bSn
+hDt
hOa
mbJ
eTq
@@ -120158,7 +120158,7 @@ soP
rKv
tfq
qXN
-vhE
+uBE
jeg
dxq
oYZ
@@ -120417,7 +120417,7 @@ tfq
hzd
oWM
qRi
-wsh
+cxD
coJ
koC
oJV
diff --git a/beestation.dme b/beestation.dme
index 8fe549e383066..6ea218629378b 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -382,7 +382,6 @@
#include "code\_onclick\hud\lavaland_elite.dm"
#include "code\_onclick\hud\map_popups.dm"
#include "code\_onclick\hud\minebot.dm"
-#include "code\_onclick\hud\monkey.dm"
#include "code\_onclick\hud\movable_screen_objects.dm"
#include "code\_onclick\hud\nymph.dm"
#include "code\_onclick\hud\pai.dm"
@@ -558,7 +557,6 @@
#include "code\datums\mind.dm"
#include "code\datums\movement_detector.dm"
#include "code\datums\mutable_appearance.dm"
-#include "code\datums\mutations.dm"
#include "code\datums\numbered_display.dm"
#include "code\datums\outfit.dm"
#include "code\datums\profiling.dm"
@@ -957,6 +955,7 @@
#include "code\datums\mood_events\mood_event.dm"
#include "code\datums\mood_events\needs_events.dm"
#include "code\datums\mutations\_combined.dm"
+#include "code\datums\mutations\_mutations.dm"
#include "code\datums\mutations\actions.dm"
#include "code\datums\mutations\antenna.dm"
#include "code\datums\mutations\body.dm"
@@ -3103,6 +3102,7 @@
#include "code\modules\mob\living\carbon\human\human_stripping.dm"
#include "code\modules\mob\living\carbon\human\inventory.dm"
#include "code\modules\mob\living\carbon\human\life.dm"
+#include "code\modules\mob\living\carbon\human\monkey.dm"
#include "code\modules\mob\living\carbon\human\physiology.dm"
#include "code\modules\mob\living\carbon\human\say.dm"
#include "code\modules\mob\living\carbon\human\species.dm"
@@ -3123,7 +3123,7 @@
#include "code\modules\mob\living\carbon\human\species_types\IPC.dm"
#include "code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
#include "code\modules\mob\living\carbon\human\species_types\lizardpeople.dm"
-#include "code\modules\mob\living\carbon\human\species_types\monkey.dm"
+#include "code\modules\mob\living\carbon\human\species_types\monkeys.dm"
#include "code\modules\mob\living\carbon\human\species_types\mothmen.dm"
#include "code\modules\mob\living\carbon\human\species_types\oozelings.dm"
#include "code\modules\mob\living\carbon\human\species_types\plasmamen.dm"
@@ -3136,13 +3136,6 @@
#include "code\modules\mob\living\carbon\human\species_types\vampire.dm"
#include "code\modules\mob\living\carbon\human\species_types\zombies.dm"
#include "code\modules\mob\living\carbon\human\verbs\give.dm"
-#include "code\modules\mob\living\carbon\monkey\death.dm"
-#include "code\modules\mob\living\carbon\monkey\inventory.dm"
-#include "code\modules\mob\living\carbon\monkey\life.dm"
-#include "code\modules\mob\living\carbon\monkey\monkey.dm"
-#include "code\modules\mob\living\carbon\monkey\monkey_defense.dm"
-#include "code\modules\mob\living\carbon\monkey\punpun.dm"
-#include "code\modules\mob\living\carbon\monkey\update_icons.dm"
#include "code\modules\mob\living\silicon\damage_procs.dm"
#include "code\modules\mob\living\silicon\death.dm"
#include "code\modules\mob\living\silicon\examine.dm"
diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm
index 132effc767fd6..b712f9f6a20a0 100644
--- a/code/__DEFINES/DNA.dm
+++ b/code/__DEFINES/DNA.dm
@@ -3,61 +3,61 @@
#define CHECK_DNA_AND_SPECIES(C) if((!(C.dna)) || (!(C.dna.species))) return
// Defines copying names of mutations in all cases, make sure to change this if you change mutation's type
-#define HULK /datum/mutation/hulk
-#define XRAY /datum/mutation/thermal/x_ray
-#define SPACEMUT /datum/mutation/space_adaptation
-#define TK /datum/mutation/telekinesis
-#define NERVOUS /datum/mutation/nervousness
-#define EPILEPSY /datum/mutation/epilepsy
-#define MUTATE /datum/mutation/bad_dna
-#define COUGH /datum/mutation/cough
-#define DWARFISM /datum/mutation/dwarfism
-#define GIGANTISM /datum/mutation/gigantism
-#define CLOWNMUT /datum/mutation/clumsy
-#define TOURETTES /datum/mutation/tourettes
-#define DEAFMUT /datum/mutation/deaf
-#define BLINDMUT /datum/mutation/blind
-#define RACEMUT /datum/mutation/race
-#define BADSIGHT /datum/mutation/nearsight
-#define LASEREYES /datum/mutation/laser_eyes
-#define CHAMELEON /datum/mutation/chameleon
-#define WACKY /datum/mutation/wacky
-#define MUT_MUTE /datum/mutation/mute
-#define SMILE /datum/mutation/smile
-#define STONER /datum/mutation/stoner
-#define UNINTELLIGIBLE /datum/mutation/unintelligible
-#define SWEDISH /datum/mutation/swedish
-#define CHAV /datum/mutation/chav
-#define ELVIS /datum/mutation/elvis
-#define RADIOACTIVE /datum/mutation/radioactive
-#define GLOWY /datum/mutation/glow
-#define ANTIGLOWY /datum/mutation/glow/anti
-#define TELEPATHY /datum/mutation/telepathy
-#define FIREBREATH /datum/mutation/firebreath
-#define VOID /datum/mutation/void
-#define STRONG /datum/mutation/strong
-#define FIRESWEAT /datum/mutation/fire
-#define THERMAL /datum/mutation/thermal
-#define ANTENNA /datum/mutation/antenna
-#define PARANOIA /datum/mutation/paranoia
-#define INSULATED /datum/mutation/insulated
-#define SHOCKTOUCH /datum/mutation/shock
-#define OLFACTION /datum/mutation/olfaction
-#define ACIDFLESH /datum/mutation/acidflesh
-#define BADBLINK /datum/mutation/badblink
-#define SPASTIC /datum/mutation/spastic
-#define EXTRASTUN /datum/mutation/extrastun
-#define GELADIKINESIS /datum/mutation/geladikinesis
-#define CRYOKINESIS /datum/mutation/cryokinesis
-#define CLUWNEMUT /datum/mutation/cluwne
-#define WAXSALIVA /datum/mutation/wax_saliva
-#define STRONGWINGS /datum/mutation/strongwings
-#define CATCLAWS /datum/mutation/catclaws
-#define OVERLOAD /datum/mutation/overload
-#define ACIDOOZE /datum/mutation/acidooze
-#define MEDIEVAL /datum/mutation/medieval
-#define SPORES /datum/mutation/spores
-#define DRONE /datum/mutation/drone
+#define HULK /datum/mutation/human/hulk
+#define XRAY /datum/mutation/human/thermal/x_ray
+#define SPACEMUT /datum/mutation/human/space_adaptation
+#define TK /datum/mutation/human/telekinesis
+#define NERVOUS /datum/mutation/human/nervousness
+#define EPILEPSY /datum/mutation/human/epilepsy
+#define MUTATE /datum/mutation/human/bad_dna
+#define COUGH /datum/mutation/human/cough
+#define DWARFISM /datum/mutation/human/dwarfism
+#define GIGANTISM /datum/mutation/human/gigantism
+#define CLOWNMUT /datum/mutation/human/clumsy
+#define TOURETTES /datum/mutation/human/tourettes
+#define DEAFMUT /datum/mutation/human/deaf
+#define BLINDMUT /datum/mutation/human/blind
+#define RACEMUT /datum/mutation/human/race
+#define BADSIGHT /datum/mutation/human/nearsight
+#define LASEREYES /datum/mutation/human/laser_eyes
+#define CHAMELEON /datum/mutation/human/chameleon
+#define WACKY /datum/mutation/human/wacky
+#define MUT_MUTE /datum/mutation/human/mute
+#define SMILE /datum/mutation/human/smile
+#define STONER /datum/mutation/human/stoner
+#define UNINTELLIGIBLE /datum/mutation/human/unintelligible
+#define SWEDISH /datum/mutation/human/swedish
+#define CHAV /datum/mutation/human/chav
+#define ELVIS /datum/mutation/human/elvis
+#define RADIOACTIVE /datum/mutation/human/radioactive
+#define GLOWY /datum/mutation/human/glow
+#define ANTIGLOWY /datum/mutation/human/glow/anti
+#define TELEPATHY /datum/mutation/human/telepathy
+#define FIREBREATH /datum/mutation/human/firebreath
+#define VOID /datum/mutation/human/void
+#define STRONG /datum/mutation/human/strong
+#define FIRESWEAT /datum/mutation/human/fire
+#define THERMAL /datum/mutation/human/thermal
+#define ANTENNA /datum/mutation/human/antenna
+#define PARANOIA /datum/mutation/human/paranoia
+#define INSULATED /datum/mutation/human/insulated
+#define SHOCKTOUCH /datum/mutation/human/shock
+#define OLFACTION /datum/mutation/human/olfaction
+#define ACIDFLESH /datum/mutation/human/acidflesh
+#define BADBLINK /datum/mutation/human/badblink
+#define SPASTIC /datum/mutation/human/spastic
+#define EXTRASTUN /datum/mutation/human/extrastun
+#define GELADIKINESIS /datum/mutation/human/geladikinesis
+#define CRYOKINESIS /datum/mutation/human/cryokinesis
+#define CLUWNEMUT /datum/mutation/human/cluwne
+#define WAXSALIVA /datum/mutation/human/wax_saliva
+#define STRONGWINGS /datum/mutation/human/strongwings
+#define CATCLAWS /datum/mutation/human/catclaws
+#define OVERLOAD /datum/mutation/human/overload
+#define ACIDOOZE /datum/mutation/human/acidooze
+#define MEDIEVAL /datum/mutation/human/medieval
+#define SPORES /datum/mutation/human/spores
+#define DRONE /datum/mutation/human/drone
#define UI_CHANGED "ui changed"
#define UE_CHANGED "ue changed"
@@ -95,17 +95,6 @@
#define DNA_MUTATION_BLOCKS 8
#define DNA_UNIQUE_ENZYMES_LEN 32
-//Transformation proc stuff
-#define TR_KEEPITEMS (1<<0)
-#define TR_KEEPVIRUS (1<<1)
-#define TR_KEEPDAMAGE (1<<2)
-#define TR_HASHNAME (1<<3) // hashing names (e.g. monkey(e34f)) (only in monkeyize)
-#define TR_KEEPIMPLANTS (1<<4)
-#define TR_KEEPSE (1<<5) // changelings shouldn't edit the DNA's SE when turning into a monkey
-#define TR_DEFAULTMSG (1<<6)
-#define TR_KEEPORGANS (1<<8)
-#define TR_KEEPAI (1<<9)
-
#define CLONER_FRESH_CLONE "fresh"
#define CLONER_MATURE_CLONE "mature"
@@ -140,6 +129,10 @@
// #define HAS_BONE 24 [add if we ever port TGs wound system]
/// If we have a limb-specific overlay sprite
#define HAS_MARKINGS 25
+/// Do not draw blood overlay
+#define NOBLOODOVERLAY 26
+///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png
+#define NOAUGMENTS 27
//organ slots
#define ORGAN_SLOT_BRAIN "brain"
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm
index 3748b57a5271d..c5f1435bac6d6 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm
@@ -14,6 +14,8 @@
#define COMSIG_MOB_ITEM_ATTACK_QDELETED "mob_item_attack_qdeleted"
///from base of mob/RangedAttack(): (atom/A, params)
#define COMSIG_MOB_ATTACK_RANGED "mob_attack_ranged"
+///From base of atom/ctrl_click(): (atom/A)
+#define COMSIG_MOB_CTRL_CLICKED "mob_ctrl_clicked"
///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity)
#define COMSIG_HUMAN_EARLY_UNARMED_ATTACK "human_early_unarmed_attack"
///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity)
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 2831abed7a3b2..0e38ca120a489 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -96,14 +96,14 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define iscatperson(A) (is_species(A, /datum/species/human/felinid) )
#define isethereal(A) (is_species(A, /datum/species/ethereal))
#define isvampire(A) (is_species(A,/datum/species/vampire))
+#define isdullahan(A) (is_species(A, /datum/species/dullahan))
+#define ismonkey(A) (is_species(A, /datum/species/monkey))
+#define isteratoma(A) (is_species(A, /datum/species/monkey/teratoma))
#define isipc(A) (is_species(A, /datum/species/ipc))
#define isapid(A) (is_species(A, /datum/species/apid))
#define isandroid(A) (is_species(A, /datum/species/android))
#define ispsyphoza(A) (is_species(A, /datum/species/psyphoza))
-//more carbon mobs
-#define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
-
#define isxeno(A) (istype(A, /mob/living/carbon/xenomorph))
#define isalien(A) (istype(A, /mob/living/carbon/alien))
diff --git a/code/__DEFINES/monkeys.dm b/code/__DEFINES/monkeys.dm
index 139933bbeb5c9..fb68009ebab3e 100644
--- a/code/__DEFINES/monkeys.dm
+++ b/code/__DEFINES/monkeys.dm
@@ -1,7 +1,7 @@
//Monkey defines, placed here so they can be read by other things!
/// below this health value the monkey starts to flee from enemies
-#define MONKEY_FLEE_HEALTH 50
+#define MONKEY_FLEE_HEALTH 40
/// how close an enemy must be to trigger aggression
#define MONKEY_ENEMY_VISION 9
/// how close an enemy must be before it triggers flee
@@ -22,7 +22,7 @@
/// probability that monkey will get into mischief, i.e. finding/stealing items
#define MONKEY_SHENANIGAN_PROB 20
/// probability that monkey will disarm an armed attacker
-#define MONKEY_ATTACK_DISARM_PROB 50
+#define MONKEY_ATTACK_DISARM_PROB 20
/// probability that monkey will get recruited when friend is attacked
#define MONKEY_RECRUIT_PROB 25
@@ -44,6 +44,3 @@
///Monkey recruit cooldown
#define MONKEY_RECRUIT_COOLDOWN 1 MINUTES
-
-/// List of monkey_icons for clothing
-GLOBAL_LIST_EMPTY(monkey_icon_cache)
diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index ec85d708cbd62..6e8686b9b1275 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -148,7 +148,12 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_NONECRODISEASE "nonecrodisease"
#define TRAIT_NICE_SHOT "nice_shot" //hnnnnnnnggggg..... you're pretty good....
#define TRAIT_ALWAYS_STUBS "always_stubs_toe" //you will always stub your toe on tables, even if you're wearing shoes
-#define TRAIT_NAIVE "naive" //All dead people will appear as sleeping.
+//All dead people will appear as sleeping.
+#define TRAIT_NAIVE "naive"
+//Catch-all inherent species trait for when we want a carbon to not be mentally developed enough to understand how to operate something (ashwalkers, monkeys)
+#define TRAIT_PRIMITIVE "primitive"
+//Catch-all inherent species trait for when we want a carbon to not physically be able to operate something (monkeys)
+#define TRAIT_INFERIORFORM "inferiorform"
#define TRAIT_DROPS_ITEMS_ON_DEATH "drops_items_on_death" //used for battle royale
#define TRAIT_DRINKSBLOOD "drinks_blood"
#define TRAIT_MINDSWAPPED "mindswapped"
@@ -158,9 +163,13 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_MOTH_BURNT "moth_burnt"
#define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" ///Increases chance of getting special traumas, makes them harder to cure
#define TRAIT_METALANGUAGE_KEY_ALLOWED "metalanguage_key_allowed" // you can use language key for metalanguage (,`) and but also you see lang icon
-#define TRAIT_HYPERSPACED "hyperspaced" // Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we werent
-#define TRAIT_FREE_HYPERSPACE_MOVEMENT "free_hyperspace_movement" // Gives the movable free hyperspace movement without being pulled during shuttle transit
+/// Sanity trait to keep track of when we're in hyperspace and add the appropriate element if we werent
+#define TRAIT_HYPERSPACED "hyperspaced"
+///Gives the movable free hyperspace movement without being pulled during shuttle transit
+#define TRAIT_FREE_HYPERSPACE_MOVEMENT "free_hyperspace_movement"
#define TRAIT_FAST_CUFF_REMOVAL "fast_cuff_removal" // Faster cuff removal
+/// Revenants draining you only get a very small benefit.
+#define TRAIT_WEAK_SOUL "weak_soul"
#define TRAIT_BLEED_HELD "bleed_held" // For when a mob is holding their wounds, preventing them from bleeding further
#define TRAIT_NO_BLOOD "no_blood" // Bleeding heals itself and bleeding is impossible
#define TRAIT_NO_BLEEDING "no_bleed" // The user can acquire the bleeding status effect, but will no lose blood
@@ -267,6 +276,14 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
// Trait for allowing an item that isn't food into the customizable reagent holder
#define TRAIT_ODD_CUSTOMIZABLE_FOOD_INGREDIENT "odd_customizable_food_ingredient"
+/* Traits for ventcrawling.
+ * Both give access to ventcrawling, but *_NUDE requires the user to be
+ * wearing no clothes and holding no items. If both present, *_ALWAYS
+ * takes precedence.
+ */
+#define TRAIT_VENTCRAWLER_ALWAYS "ventcrawler_always"
+#define TRAIT_VENTCRAWLER_NUDE "ventcrawler_nude"
+
///Trait applied to turfs when an atmos holosign is placed on them. It will stop firedoors from closing.
#define TRAIT_FIREDOOR_STOP "firedoor_stop"
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index aee6b5e598bda..989067441885b 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -745,6 +745,15 @@
return TRUE
return FALSE
+/proc/assoc_to_keys_features(list/input)
+ var/list/keys = list()
+ for(var/key in input)
+ var/datum/sprite_accessory/value = input[key]
+ if(value?.locked)
+ continue
+ UNTYPED_LIST_ADD(keys, key)
+ return keys
+
/// Gets the first key that contains the given value in an associative list, otherwise, returns null.
/proc/assoc_key_for_value(list/input, check_for)
for(var/key in input)
diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm
index 8845301ac8add..1aafefdb6f149 100644
--- a/code/_globalvars/genetics.dm
+++ b/code/_globalvars/genetics.dm
@@ -1,5 +1,5 @@
//faster than having to constantly loop for them
-GLOBAL_LIST_EMPTY_TYPED(all_mutations, /datum/mutation) //! type = initialized mutation
+GLOBAL_LIST_EMPTY_TYPED(all_mutations, /datum/mutation/human) //! type = initialized mutation
GLOBAL_LIST_EMPTY(full_sequences) //! type = correct sequence
GLOBAL_LIST_EMPTY(bad_mutations) //! bad initialized mutations
GLOBAL_LIST_EMPTY(good_mutations) //! good initialized mutations
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 3c7a948fdfa5b..fbea19345a8b4 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -17,6 +17,7 @@ GLOBAL_LIST_EMPTY(undershirt_m) //stores only undershirt name
GLOBAL_LIST_EMPTY(undershirt_f) //stores only undershirt name
//Socks
GLOBAL_LIST_EMPTY(socks_list) //stores /datum/sprite_accessory/socks indexed by name
+
/// Body sizes. The names (keys) are what is actually stored in the database. Don't get crazy with changing them.
GLOBAL_LIST_INIT(body_sizes, list(
"Normal" = BODY_SIZE_NORMAL,
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 4e498da8cb96d..a3b8c9e2def27 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -49,6 +49,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_RESISTHIGHPRESSURE" = TRAIT_RESISTHIGHPRESSURE,
"TRAIT_RESISTLOWPRESSURE" = TRAIT_RESISTLOWPRESSURE,
"TRAIT_RADIMMUNE" = TRAIT_RADIMMUNE,
+ "TRAIT_VENTCRAWLER_ALWAYS" = TRAIT_VENTCRAWLER_ALWAYS,
+ "TRAIT_VENTCRAWLER_NUDE" = TRAIT_VENTCRAWLER_NUDE,
"TRAIT_VIRUSIMMUNE" = TRAIT_VIRUSIMMUNE,
"TRAIT_PIERCEIMMUNE" = TRAIT_PIERCEIMMUNE,
"TRAIT_NODISMEMBER" = TRAIT_NODISMEMBER,
@@ -127,6 +129,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NICE_SHOT" = TRAIT_NICE_SHOT,
"TRAIT_ALWAYS_STUBS" = TRAIT_ALWAYS_STUBS,
"TRAIT_NAIVE" = TRAIT_NAIVE,
+ "TRAIT_PRIMITIVE" = TRAIT_PRIMITIVE,
+ "TRAIT_INFERIORFORM" = TRAIT_INFERIORFORM,
"TRAIT_DROPS_ITEMS_ON_DEATH" = TRAIT_DROPS_ITEMS_ON_DEATH,
"TRAIT_DRINKSBLOOD" = TRAIT_DRINKSBLOOD,
"TRAIT_MINDSWAPPED" = TRAIT_MINDSWAPPED,
@@ -173,6 +177,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SUIT_SENSORS" = TRAIT_SUIT_SENSORS,
"TRAIT_NANITE_SENSORS" = TRAIT_NANITE_SENSORS,
"TRAIT_PSYCHIC_SENSE" = TRAIT_PSYCHIC_SENSE,
+ "TRAIT_WEAK_SOUL" = TRAIT_WEAK_SOUL,
+ "TRAIT_PSYCHIC_SENSE" = TRAIT_PSYCHIC_SENSE,
"TRAIT_PLANTHEALING" = TRAIT_PLANTHEALING,
"TRAIT_NORADDAMAGE" = TRAIT_NORADDAMAGE,
"TRAIT_MOBILE" = TRAIT_MOBILE
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index b9a4877f4e464..f2f7a00e8a998 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -333,6 +333,7 @@
/atom/proc/CtrlClick(mob/user)
SEND_SIGNAL(src, COMSIG_CLICK_CTRL, user)
+ SEND_SIGNAL(user, COMSIG_MOB_CTRL_CLICKED, src)
var/mob/living/ML = user
if(istype(ML))
ML.pulled(src)
diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm
deleted file mode 100644
index 42d0ff7866dfc..0000000000000
--- a/code/_onclick/hud/monkey.dm
+++ /dev/null
@@ -1,183 +0,0 @@
-/datum/hud/monkey/New(mob/living/carbon/monkey/owner)
- ..()
- var/atom/movable/screen/using
- var/atom/movable/screen/inventory/inv_box
-
- action_intent = new /atom/movable/screen/act_intent()
- action_intent.icon = ui_style
- action_intent.icon_state = mymob.a_intent
- action_intent.screen_loc = ui_acti
- action_intent.hud = src
- static_inventory += action_intent
-
- using = new /atom/movable/screen/mov_intent()
- using.icon = ui_style
- using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
- using.screen_loc = ui_movi
- using.hud = src
- static_inventory += using
-
- using = new/atom/movable/screen/language_menu
- using.icon = ui_style
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/drop()
- using.icon = ui_style
- using.screen_loc = ui_drop_throw
- using.hud = src
- static_inventory += using
-
- build_hand_slots()
-
- using = new /atom/movable/screen/swap_hand()
- using.icon = ui_style
- using.icon_state = "swap_1_m" //extra wide!
- using.screen_loc = ui_swaphand_position(owner,1)
- using.hud = src
- static_inventory += using
-
- using = new /atom/movable/screen/swap_hand()
- using.icon = ui_style
- using.icon_state = "swap_2"
- using.screen_loc = ui_swaphand_position(owner,2)
- using.hud = src
- static_inventory += using
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "uniform"
- inv_box.icon = ui_style
- inv_box.icon_state = "uniform"
- inv_box.screen_loc = ui_monkey_body
- inv_box.slot_id = ITEM_SLOT_ICLOTHING
- inv_box.hud = src
- static_inventory += inv_box
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "mask"
- inv_box.icon = ui_style
- inv_box.icon_state = "mask"
-// inv_box.icon_full = "template"
- inv_box.screen_loc = ui_monkey_mask
- inv_box.slot_id = ITEM_SLOT_MASK
- inv_box.hud = src
- static_inventory += inv_box
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "neck"
- inv_box.icon = ui_style
- inv_box.icon_state = "neck"
-// inv_box.icon_full = "template"
- inv_box.screen_loc = ui_monkey_neck
- inv_box.slot_id = ITEM_SLOT_NECK
- inv_box.hud = src
- static_inventory += inv_box
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "head"
- inv_box.icon = ui_style
- inv_box.icon_state = "head"
-// inv_box.icon_full = "template"
- inv_box.screen_loc = ui_monkey_head
- inv_box.slot_id = ITEM_SLOT_HEAD
- inv_box.hud = src
- static_inventory += inv_box
-
- inv_box = new /atom/movable/screen/inventory()
- inv_box.name = "back"
- inv_box.icon = ui_style
- inv_box.icon_state = "back"
- inv_box.screen_loc = ui_monkey_back
- inv_box.slot_id = ITEM_SLOT_BACK
- inv_box.hud = src
- static_inventory += inv_box
-
- throw_icon = new /atom/movable/screen/throw_catch()
- throw_icon.icon = ui_style
- throw_icon.screen_loc = ui_drop_throw
- throw_icon.hud = src
- hotkeybuttons += throw_icon
-
- internals = new /atom/movable/screen/internals()
- internals.hud = src
- infodisplay += internals
-
- healths = new /atom/movable/screen/healths()
- healths.hud = src
- infodisplay += healths
-
- pull_icon = new /atom/movable/screen/pull()
- pull_icon.icon = ui_style
- pull_icon.update_icon()
- pull_icon.screen_loc = ui_above_movement
- pull_icon.hud = src
- static_inventory += pull_icon
-
- lingchemdisplay = new /atom/movable/screen/ling/chems()
- lingchemdisplay.hud = src
- infodisplay += lingchemdisplay
-
- lingstingdisplay = new /atom/movable/screen/ling/sting()
- lingstingdisplay.hud = src
- infodisplay += lingstingdisplay
-
-
- zone_select = new /atom/movable/screen/zone_sel()
- zone_select.icon = ui_style
- zone_select.update_icon()
- zone_select.hud = src
- static_inventory += zone_select
-
- mymob.client.screen = list()
-
- using = new /atom/movable/screen/resist()
- using.icon = ui_style
- using.screen_loc = ui_above_intent
- using.hud = src
- hotkeybuttons += using
-
- for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
- if(inv.slot_id)
- inv.hud = src
- inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
- inv.update_icon()
-
-/datum/hud/monkey/persistent_inventory_update()
- if(!mymob)
- return
- var/mob/living/carbon/monkey/M = mymob
-
- if(hud_shown)
- if(M.back)
- M.back.screen_loc = ui_monkey_back
- M.client.screen += M.back
- if(M.wear_mask)
- M.wear_mask.screen_loc = ui_monkey_mask
- M.client.screen += M.wear_mask
- if(M.wear_neck)
- M.wear_neck.screen_loc = ui_monkey_neck
- M.client.screen += M.wear_neck
- if(M.head)
- M.head.screen_loc = ui_monkey_head
- M.client.screen += M.head
- if(M.w_uniform)
- M.w_uniform.screen_loc = ui_monkey_body
- M.client.screen += M.w_uniform
- else
- if(M.back)
- M.back.screen_loc = null
- if(M.wear_mask)
- M.wear_mask.screen_loc = null
- if(M.head)
- M.head.screen_loc = null
- if(M.w_uniform)
- M.w_uniform.screen_loc = null
-
- if(hud_version != HUD_STYLE_NOHUD)
- for(var/obj/item/I in M.held_items)
- I.screen_loc = ui_hand_position(M.get_held_index_of_item(I))
- M.client.screen += I
- else
- for(var/obj/item/I in M.held_items)
- I.screen_loc = null
- M.client.screen -= I
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index f0c53ad7a8884..0a4a15872e1b0 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -27,13 +27,16 @@
var/override = 0
- for(var/datum/mutation/HM as() in dna.mutations)
+ for(var/datum/mutation/human/HM as() in dna.mutations)
override += HM.on_attack_hand(A, proximity)
if(override)
return
- SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A)
+ SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, proximity)
+
+ if(dna?.species?.spec_unarmedattack(src, A)) //Because species like monkeys dont use attack hand
+ return
A.attack_hand(src)
/// Return TRUE to cancel other attack hand effects that respect it.
@@ -99,7 +102,7 @@
. = ..()
if(!dna)
return
- for(var/datum/mutation/HM as() in dna.mutations)
+ for(var/datum/mutation/human/HM as() in dna.mutations)
HM.on_ranged_attack(A, mouseparams)
/mob/living/carbon/human/RangedAttack(atom/A, mouseparams)
@@ -131,38 +134,6 @@
SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_BASIC_MOB, user)
return
-/*
- Monkeys
-*/
-/mob/living/carbon/monkey/UnarmedAttack(atom/A, proximity)
- if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
- if(a_intent != INTENT_HARM || is_muzzled())
- return
- if(!iscarbon(A))
- return
- var/mob/living/carbon/victim = A
- var/obj/item/bodypart/affecting = null
- if(ishuman(victim))
- var/mob/living/carbon/human/human_victim = victim
- affecting = human_victim.get_bodypart(pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
- var/armor = victim.run_armor_check(affecting, MELEE)
- if(prob(25))
- victim.visible_message("[src]'s bite misses [victim]!",
- "You avoid [src]'s bite!", "You hear jaws snapping shut!", COMBAT_MESSAGE_RANGE, src)
- to_chat(src, "Your bite misses [victim]!")
- return
- victim.apply_damage(rand(1, 3), BRUTE, affecting, armor)
- victim.visible_message("[name] bites [victim]!",
- "[name] bites you!", "You hear a chomp!", COMBAT_MESSAGE_RANGE, name)
- to_chat(name, "You bite [victim]!")
- if(armor >= 2)
- return
- for(var/d in diseases)
- var/datum/disease/bite_infection = d
- victim.ForceContractDisease(bite_infection)
- return
- A.attack_paw(src)
-
/atom/proc/attack_paw(mob/user)
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
return TRUE
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index 142f1539861a5..2594a7864134c 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -222,13 +222,13 @@ SUBSYSTEM_DEF(atoms)
BadInitializeCalls = SSatoms.BadInitializeCalls
/datum/controller/subsystem/atoms/proc/setupGenetics()
- var/list/mutations = subtypesof(/datum/mutation)
+ var/list/mutations = subtypesof(/datum/mutation/human)
shuffle_inplace(mutations)
for(var/datum/generecipe/GR as() in subtypesof(/datum/generecipe))
GLOB.mutation_recipes[initial(GR.required)] = initial(GR.result)
for(var/i in 1 to length(mutations))
var/path = mutations[i] //byond gets pissy when we do it in one line
- var/datum/mutation/B = new path ()
+ var/datum/mutation/human/B = new path ()
B.alias = "Mutation [i]"
GLOB.all_mutations[B.type] = B
GLOB.full_sequences[B.type] = generate_gene_sequence(B.blocks)
diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm
index f7abdcdc659c6..667603ad6bd40 100644
--- a/code/datums/ai/_ai_controller.dm
+++ b/code/datums/ai/_ai_controller.dm
@@ -270,3 +270,8 @@ multiple modular subtrees with behaviors
if(iter_behavior.required_distance < minimum_distance)
minimum_distance = iter_behavior.required_distance
return minimum_distance
+
+/// If this controller is applied to a human subtype, this proc will be called to generate examine text
+/datum/ai_controller/proc/get_human_examine_text()
+ var/text = "["[pawn.p_they(TRUE)] do[pawn.p_es()]n't appear to be [pawn.p_them()]self."]"
+ return text
diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm
index 8195daac3be6b..7bea409430c8b 100644
--- a/code/datums/ai/monkey/monkey_controller.dm
+++ b/code/datums/ai/monkey/monkey_controller.dm
@@ -81,6 +81,10 @@ have ways of interacting with a specific mob and control it.
if(IS_DEAD_OR_INCAP(living_pawn))
return FALSE
+/datum/ai_controller/monkey/get_human_examine_text()
+ var/text = "["[pawn.p_they(TRUE)] have a primal look in [pawn.p_their()] eyes."]"
+ return text
+
///re-used behavior pattern by monkeys for finding a weapon
/datum/ai_controller/monkey/proc/TryFindWeapon()
var/mob/living/living_pawn = pawn
diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm
index 0a68478904236..b15f36c6dfb4b 100644
--- a/code/datums/components/bloodysoles.dm
+++ b/code/datums/components/bloodysoles.dm
@@ -241,19 +241,17 @@
/datum/component/bloodysoles/feet/update_icon()
if(ishuman(wielder))
- // Monkeys get no bloody feet :(
+ var/mob/living/carbon/human/human = wielder
+ if(NOBLOODOVERLAY in human.dna.species.species_traits)
+ return
if(bloody_shoes[BLOOD_STATE_HUMAN] > 0 && !is_obscured())
- wielder.remove_overlay(SHOES_LAYER)
- wielder.overlays_standing[SHOES_LAYER] = bloody_feet
- wielder.apply_overlay(SHOES_LAYER)
+ human.remove_overlay(SHOES_LAYER)
+ human.overlays_standing[SHOES_LAYER] = bloody_feet
+ human.apply_overlay(SHOES_LAYER)
else
- wielder.update_inv_shoes()
+ human.update_inv_shoes()
/datum/component/bloodysoles/feet/add_parent_to_footprint(obj/effect/decal/cleanable/blood/footprints/FP)
- if(ismonkey(wielder))
- FP.species_types |= "monkey"
- return
-
if(!ishuman(wielder))
FP.species_types |= "unknown"
return
diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm
index 5e735edae3d25..75e7b47d3049d 100644
--- a/code/datums/components/creamed.dm
+++ b/code/datums/components/creamed.dm
@@ -1,6 +1,5 @@
GLOBAL_LIST_INIT(creamable, typecacheof(list(
/mob/living/carbon/human,
- /mob/living/carbon/monkey,
/mob/living/simple_animal/pet/dog/corgi,
/mob/living/silicon/ai)))
@@ -24,11 +23,11 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list(
var/mob/living/carbon/human/H = parent
if(islizard(H))
creamface.icon_state = "creampie_lizard"
+ else if(ismonkey(H))
+ creamface.icon_state = "creampie_monkey"
else
creamface.icon_state = "creampie_human"
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "creampie", /datum/mood_event/creampie)
- else if(ismonkey(parent))
- creamface.icon_state = "creampie_monkey"
else if(iscorgi(parent))
creamface.icon_state = "creampie_corgi"
else if(isAI(parent))
diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm
index 7175e68cf58fe..b1ce7e2a430c6 100644
--- a/code/datums/components/explodable.dm
+++ b/code/datums/components/explodable.dm
@@ -98,7 +98,7 @@
var/mob/living/carbon/human/H = C
equipment_items += list(H.wear_suit, H.w_uniform, H.belt, H.s_store, H.wear_id)
if(ismonkey(C))
- var/mob/living/carbon/monkey/H = C
+ var/mob/living/carbon/human/species/monkey/H = C
equipment_items += list(H.w_uniform)
for(var/bp in equipment_items)
diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm
index b0b1127c7cb01..ac9ca10d2c518 100644
--- a/code/datums/components/twohanded.dm
+++ b/code/datums/components/twohanded.dm
@@ -162,15 +162,15 @@
if(attached_atom.loc != user)
to_chat(user, "You attempt to wield [parent] via the power of telekenisis, but it is too much for you to handle...")
return
- if(ismonkey(user))
- to_chat(user, "It's too heavy for you to wield fully.")
- return
- if(swap_hands ? user.get_active_held_item() : user.get_inactive_held_item())
+ if((swap_hands ? user.get_active_held_item() : user.get_inactive_held_item()) || ismonkey(user))
if(require_twohands)
to_chat(user, "[parent] is too cumbersome to carry in one hand!")
user.dropItemToGround(parent, force=TRUE)
else
- to_chat(user, "You need your other hand to be empty!")
+ if(HAS_TRAIT(user, TRAIT_INFERIORFORM)) //monkeys
+ to_chat(user, "You don't have the upper body strength to hold this in two hands!")
+ else
+ to_chat(user, "You need your other hand to be empty!")
return
if(user.usable_hands < 2)
if(require_twohands)
diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm
index affaee1538536..d397808b99c97 100644
--- a/code/datums/diseases/_MobProcs.dm
+++ b/code/datums/diseases/_MobProcs.dm
@@ -61,7 +61,17 @@
else
target_zone = check_zone(target_zone)
- if(ishuman(src))
+
+
+ if(ismonkey(src))
+ var/mob/living/carbon/human/M = src
+ switch(target_zone)
+ if(BODY_ZONE_HEAD)
+ if(M.wear_mask && isobj(M.wear_mask))
+ Cl = M.wear_mask
+ passed = prob((Cl.permeability_coefficient*100) - 1)
+
+ else if(ishuman(src))
var/mob/living/carbon/human/H = src
switch(target_zone)
@@ -99,14 +109,6 @@
Cl = H.shoes
passed = prob((Cl.permeability_coefficient*100) - 1)
- else if(ismonkey(src))
- var/mob/living/carbon/monkey/M = src
- switch(target_zone)
- if(BODY_ZONE_HEAD)
- if(M.wear_mask && isobj(M.wear_mask))
- Cl = M.wear_mask
- passed = prob((Cl.permeability_coefficient*100) - 1)
-
if(passed)
D.try_infect(src)
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 3903f5cb097c5..5f2db993dc306 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -23,7 +23,7 @@
agent = "advance microbes"
max_stages = 5
spread_text = "Unknown"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/monkey/tumor)
+ viable_mobtypes = list(/mob/living/carbon/human)
/// last player to modify the disease.
var/last_modified_by = "no CKEY"
diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm
index d039923f63231..9b00e69e1d4a6 100644
--- a/code/datums/diseases/anxiety.dm
+++ b/code/datums/diseases/anxiety.dm
@@ -7,7 +7,7 @@
cure_text = "Ethanol"
cures = list(/datum/reagent/consumable/ethanol)
agent = "Excess Lepidopticides"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated subject will regurgitate butterflies."
danger = DISEASE_MINOR
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index b26618640fefe..1fd6701d7ce0a 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -7,7 +7,7 @@
cure_text = "Sugar"
cures = list(/datum/reagent/consumable/sugar)
agent = "Apidae Infection"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated subject will regurgitate bees."
danger = DISEASE_MEDIUM
infectable_biotypes = list(MOB_ORGANIC, MOB_UNDEAD) //bees nesting in corpses
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index 0e2254d6d9450..05ea3dd306b1a 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -4,7 +4,7 @@
cure_text = "Rest & Spaceacillin"
cures = list(/datum/reagent/medicine/spaceacillin)
agent = "XY-rhinovirus"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.5
desc = "If left untreated, the subject will contract the flu."
danger = DISEASE_NONTHREAT
diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm
index cb7776969c7c7..caf085b354934 100644
--- a/code/datums/diseases/fake_gbs.dm
+++ b/code/datums/diseases/fake_gbs.dm
@@ -6,7 +6,7 @@
cure_text = "Synaptizine & Sulfur"
cures = list(/datum/reagent/medicine/synaptizine,/datum/reagent/sulfur)
agent = "Gravitokinetic Bipotential SADS-"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated death will occur."
danger = DISEASE_BIOHAZARD
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 9989f839c5a9b..14987e350e9a8 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -6,7 +6,7 @@
cures = list(/datum/reagent/medicine/spaceacillin)
cure_chance = 10
agent = "H13N1 flu virion"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ viable_mobtypes = list(/mob/living/carbon/human)
permeability_mod = 0.75
desc = "If left untreated the subject will feel quite unwell."
danger = DISEASE_MINOR
diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm
index 984492979b8e2..9ef81ddd5ac83 100644
--- a/code/datums/diseases/transformation.dm
+++ b/code/datums/diseases/transformation.dm
@@ -5,7 +5,7 @@
spread_flags = DISEASE_SPREAD_SPECIAL
cure_text = "A coder's love (theoretical)."
agent = "Shenanigans"
- viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey, /mob/living/carbon/alien)
+ viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/alien)
danger = DISEASE_BIOHAZARD
stage_prob = 10
visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index cb5f1b1cd4bd9..a87e2cc4e3bb6 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -18,12 +18,13 @@
var/scrambled = FALSE //Did we take something like mutagen? In that case we cant get our genes scanned to instantly cheese all the powers.
var/current_body_size = BODY_SIZE_NORMAL
//Holder for the displacement appearance, related to species height
- var/icon/height_displacement
+ var/atom/movable/height_displacement_holder
/datum/dna/New(mob/living/new_holder)
if(istype(new_holder))
holder = new_holder
- height_displacement = icon('icons/effects/64x64.dmi', "height_displacement")
+ update_height_holder()
+ new_holder?.vis_contents += height_displacement_holder
/datum/dna/Destroy()
if(iscarbon(holder))
@@ -31,8 +32,9 @@
if(cholder?.dna == src)
cholder.dna = null
holder?.remove_filter("species_height_displacement")
+ holder?.vis_contents -= height_displacement_holder
holder = null
- QDEL_NULL(height_displacement)
+ QDEL_NULL(height_displacement_holder)
if(delete_species)
QDEL_NULL(species)
@@ -56,7 +58,7 @@
if(transfer_SE)
destination.dna.mutation_index = mutation_index
destination.dna.default_mutation_genes = default_mutation_genes
- for(var/datum/mutation/M as() in mutations)
+ for(var/datum/mutation/human/M as() in mutations)
if(!istype(M, RACEMUT))
destination.dna.add_mutation(M, M.class)
@@ -69,7 +71,7 @@
new_dna.features = features.Copy()
new_dna.species = new species.type
new_dna.real_name = real_name
- new_dna.update_body_size() //Must come after features.Copy()
+ new_dna.update_body_size(TRUE) //Must come after features.Copy()
new_dna.mutations = mutations.Copy()
/datum/dna/proc/compare_dna(datum/dna/other)
@@ -84,8 +86,8 @@
//See mutation.dm for what 'class' does. 'time' is time till it removes itself in decimals. 0 for no timer
/datum/dna/proc/add_mutation(mutation, class = MUT_OTHER, time)
var/mutation_type = mutation
- if(istype(mutation, /datum/mutation))
- var/datum/mutation/HM = mutation
+ if(istype(mutation, /datum/mutation/human))
+ var/datum/mutation/human/HM = mutation
mutation_type = HM.type
if(get_mutation(mutation_type))
return
@@ -104,7 +106,7 @@
/datum/dna/proc/remove_mutation_group(list/group, list/classes = list(MUT_NORMAL, MUT_EXTRA, MUT_OTHER), mutadone = FALSE)
if(!group)
return
- for(var/datum/mutation/HM as() in group)
+ for(var/datum/mutation/human/HM as() in group)
if((HM.class in classes) && !(HM.mutadone_proof && mutadone))
force_lose(HM)
@@ -150,14 +152,10 @@
mutation_index.Cut()
default_mutation_genes.Cut()
shuffle_inplace(mutations_temp)
- if(ismonkey(holder))
- mutations |= new RACEMUT(MUT_NORMAL)
- mutation_index[RACEMUT] = GET_SEQUENCE(RACEMUT)
- else
- mutation_index[RACEMUT] = create_sequence(RACEMUT, FALSE)
+ mutation_index[RACEMUT] = create_sequence(RACEMUT, FALSE)
default_mutation_genes[RACEMUT] = mutation_index[RACEMUT]
for(var/i in 2 to DNA_MUTATION_BLOCKS)
- var/datum/mutation/M = mutations_temp[i]
+ var/datum/mutation/human/M = mutations_temp[i]
mutation_index[M.type] = create_sequence(M.type, FALSE, M.difficulty)
default_mutation_genes[M.type] = mutation_index[M.type]
shuffle_inplace(mutation_index)
@@ -173,7 +171,7 @@
//Used to create a chipped gene sequence
/proc/create_sequence(mutation, active, difficulty)
if(!difficulty)
- var/datum/mutation/A = GET_INITIALIZED_MUTATION(mutation) //leaves the possibility to change difficulty mid-round
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(mutation) //leaves the possibility to change difficulty mid-round
if(!A)
return
difficulty = A.difficulty
@@ -227,7 +225,7 @@
setblock(uni_identity, blocknumber, construct_block(GLOB.hair_gradients_list.Find(H.gradient_style), GLOB.hair_gradients_list.len))
//Please use add_mutation or activate_mutation instead
-/datum/dna/proc/force_give(datum/mutation/HM)
+/datum/dna/proc/force_give(datum/mutation/human/HM)
if(holder && HM)
if(HM.class == MUT_NORMAL)
set_se(TRUE, HM)
@@ -237,10 +235,11 @@
update_instability()
//Use remove_mutation instead
-/datum/dna/proc/force_lose(datum/mutation/HM)
+/datum/dna/proc/force_lose(datum/mutation/human/HM)
if(holder && (HM in mutations))
set_se(FALSE, HM)
. = HM.on_losing(holder)
+ qdel()
update_instability(FALSE)
return
@@ -252,7 +251,7 @@
/datum/dna/proc/update_instability(alert=TRUE)
stability = 100
- for(var/datum/mutation/M as() in mutations)
+ for(var/datum/mutation/human/M as() in mutations)
if(M.class == MUT_EXTRA)
stability -= M.instability * GET_MUTATION_STABILIZER(M)
if(holder)
@@ -301,22 +300,20 @@
return
/////////////////////////// DNA MOB-PROCS //////////////////////
-/datum/dna/proc/update_body_size(force)
+/datum/dna/proc/update_body_size(force, height)
+ update_height_holder()
var/list/heights = species?.get_species_height()
if((!holder || !features["body_size"] || !length(heights)) && !force)
return
-
- var/desired_size = heights[features["body_size"]]
-
+ var/desired_size = height || heights[features["body_size"]]
if(desired_size == current_body_size && !force)
return
-
//Weird little fix - if height < 0, our guy gets cut off!! We can fix this by layering an invisible 64x64 icon, aka the displacement
holder.remove_filter("height_cutoff_fix")
- holder.add_filter("height_cutoff_fix", 1, layering_filter(icon = height_displacement, color = "#ffffff00"))
+ holder.add_filter("height_cutoff_fix", 1, layering_filter(render_source = height_displacement_holder.render_target, color = "#ffffff00"))
//Build / setup displacement filter
holder.remove_filter("species_height_displacement")
- holder.add_filter("species_height_displacement", 1.1, displacement_map_filter(icon = height_displacement, y = 8, size = desired_size))
+ holder.add_filter("species_height_displacement", 1.1, displacement_map_filter(render_source = height_displacement_holder.render_target, y = 8, size = desired_size))
/mob/proc/set_species(datum/species/mrace, icon_update = 1)
return
@@ -328,7 +325,6 @@
else
stored_dna.species = mrace //not calling any species update procs since we're a brain, not a monkey/human
-
/mob/living/carbon/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE)
if(mrace && has_dna())
var/datum/species/new_race
@@ -401,7 +397,7 @@
update_mutations_overlay()
if(LAZYLEN(mutations))
- for(var/datum/mutation/HM as() in mutations)
+ for(var/datum/mutation/human/HM as() in mutations)
if(HM.allow_transfer || force_transfer_mutations)
dna.force_give(new HM.type(HM.class, copymut=HM)) //using force_give since it may include exotic mutations that otherwise wont be handled properly
@@ -460,13 +456,12 @@
return
for(var/mutation in dna.mutation_index)
- if(ismob(dna.check_block(mutation)))
- return //we got monkeyized/humanized, this mob will be deleted, no need to continue.
+ dna.check_block(mutation)
update_mutations_overlay()
/datum/dna/proc/check_block(mutation)
- var/datum/mutation/HM = get_mutation(mutation)
+ var/datum/mutation/human/HM = get_mutation(mutation)
if(check_block_string(mutation))
if(!HM)
. = add_mutation(mutation, MUT_NORMAL)
@@ -475,7 +470,7 @@
//Return the active mutation of a type if there is one
/datum/dna/proc/get_mutation(A)
- for(var/datum/mutation/HM in mutations)
+ for(var/datum/mutation/human/HM in mutations)
if(HM.type == A)
return HM
@@ -487,7 +482,7 @@
/datum/dna/proc/is_gene_active(mutation)
return (mutation_index[mutation] == GET_SEQUENCE(mutation))
-/datum/dna/proc/set_se(on=TRUE, datum/mutation/HM)
+/datum/dna/proc/set_se(on=TRUE, datum/mutation/human/HM)
if(!HM || !(HM.type in mutation_index) || (LAZYLEN(mutation_index) < DNA_MUTATION_BLOCKS))
return
. = TRUE
@@ -502,8 +497,8 @@
if(!mutation)
return FALSE
var/mutation_type = mutation
- if(istype(mutation, /datum/mutation))
- var/datum/mutation/M = mutation
+ if(istype(mutation, /datum/mutation/human))
+ var/datum/mutation/human/M = mutation
mutation_type = M.type
if(!mutation_in_sequence(mutation_type)) //cant activate what we dont have, use add_mutation
return FALSE
@@ -531,8 +526,8 @@
/datum/dna/proc/mutation_in_sequence(mutation)
if(!mutation)
return
- if(istype(mutation, /datum/mutation))
- var/datum/mutation/HM = mutation
+ if(istype(mutation, /datum/mutation/human))
+ var/datum/mutation/human/HM = mutation
if(HM.type in mutation_index)
return TRUE
else if(mutation in mutation_index)
@@ -556,7 +551,7 @@
if(quality & MINOR_NEGATIVE)
mutations += GLOB.not_good_mutations
var/list/possible = list()
- for(var/datum/mutation/A as() in mutations)
+ for(var/datum/mutation/human/A as() in mutations)
if((!sequence || dna.mutation_in_sequence(A.type)) && !dna.get_mutation(A.type))
possible += A.type
if(exclude_monkey)
@@ -565,7 +560,7 @@
var/mutation = pick(possible)
. = dna.activate_mutation(mutation)
if(scrambled)
- var/datum/mutation/HM = dna.get_mutation(mutation)
+ var/datum/mutation/human/HM = dna.get_mutation(mutation)
if(HM)
HM.scrambled = TRUE
return TRUE
@@ -714,3 +709,15 @@
qdel(eyes)
visible_message("[src] looks up and their eyes melt away!", "I understand now.")
addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 20)
+
+/datum/dna/proc/update_height_holder()
+ if(!height_displacement_holder)
+ height_displacement_holder = new()
+ //Update the icon, just in-case we changed species or whatever, also becuase of species delay in general //TODO: make sure this isn't expensive with changing clothes - Racc
+ height_displacement_holder.appearance = species?.get_species_height_map() || icon('icons/effects/64x64.dmi', "height_displacement")
+ //ALL our important visual stuff gets reset when we update appearance, so we have to set it back
+ height_displacement_holder.vis_flags = VIS_UNDERLAY | VIS_INHERIT_DIR
+ height_displacement_holder.appearance_flags = TILE_BOUND | PIXEL_SCALE | RESET_TRANSFORM
+ height_displacement_holder.plane = PLANE_SPACE
+ height_displacement_holder.layer = 0
+ height_displacement_holder.render_target = "[ref(height_displacement_holder)]"
diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm
index e5d98218dbf6d..38559abaade86 100644
--- a/code/datums/elements/strippable.dm
+++ b/code/datums/elements/strippable.dm
@@ -108,9 +108,6 @@
if(HAS_TRAIT(equipping, TRAIT_NODROP))
to_chat(user, "You can't put [equipping] on [source], it's stuck to your hand!")
return FALSE
- //This is important due to the fact otherwise it will be equipped without a proper existing icon, because it's forced on through the strip menu
- if(ismonkey(source))
- equipping.compile_monkey_icon()
return TRUE
/// Start the equipping process. This is the proc you should yield in.
diff --git a/code/datums/mapgen/biomes/_biome.dm b/code/datums/mapgen/biomes/_biome.dm
index e1e1f7e11988b..f84b239e6d537 100644
--- a/code/datums/mapgen/biomes/_biome.dm
+++ b/code/datums/mapgen/biomes/_biome.dm
@@ -134,7 +134,7 @@
/mob/living/simple_animal/hostile/lizard,
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/sloth,
- /mob/living/carbon/monkey
+ /mob/living/carbon/human/species/monkey
)
/datum/biome/grassclearing
diff --git a/code/datums/mutations/_combined.dm b/code/datums/mutations/_combined.dm
index 842aaddb8aba4..f8e474d5f28b2 100644
--- a/code/datums/mutations/_combined.dm
+++ b/code/datums/mutations/_combined.dm
@@ -14,17 +14,17 @@
/* RECIPES */
/datum/generecipe/hulk
- required = "/datum/mutation/strong; /datum/mutation/radioactive"
+ required = "/datum/mutation/human/strong; /datum/mutation/human/radioactive"
result = HULK
/datum/generecipe/shock
- required = "/datum/mutation/insulated; /datum/mutation/radioactive"
+ required = "/datum/mutation/human/insulated; /datum/mutation/human/radioactive"
result = SHOCKTOUCH
/datum/generecipe/antiglow
- required = "/datum/mutation/glow; /datum/mutation/void"
+ required = "/datum/mutation/human/glow; /datum/mutation/human/void"
result = ANTIGLOWY
/datum/generecipe/cluwne
- required = "/datum/mutation/clumsy; /datum/mutation/badblink"
+ required = "/datum/mutation/human/clumsy; /datum/mutation/human/badblink"
result = CLUWNEMUT
diff --git a/code/datums/mutations.dm b/code/datums/mutations/_mutations.dm
similarity index 61%
rename from code/datums/mutations.dm
rename to code/datums/mutations/_mutations.dm
index 4de7dbca16153..d9e0cda8cda9e 100644
--- a/code/datums/mutations.dm
+++ b/code/datums/mutations/_mutations.dm
@@ -1,57 +1,98 @@
/datum/mutation
- var/name = "mutation"
+ var/name
+
+/datum/mutation/human
+ name = "mutation"
+ /// Description of the mutation
var/desc = "A mutation."
+ /// Is this mutation currently locked?
var/locked
+ /// Quality of the mutation
var/quality
+ /// Visual indicators upon the character of the owner of this mutation
var/static/list/visual_indicators = list()
+ /// The path of action we grant to our user on mutation gain
var/obj/effect/proc_holder/spell/power
/// A list of traits to apply to the user whenever this mutation is active.
var/list/traits
- var/layer_used = MUTATIONS_LAYER //which mutation layer to use
- var/list/species_allowed = list() //to restrict mutation to only certain species
- var/list/mobtypes_allowed = list() //to restrict mutation to only certain mobs
- var/health_req //minimum health required to acquire the mutation
- var/limb_req //required limbs to acquire this mutation
+ /// which mutation layer to use
+ var/layer_used = MUTATIONS_LAYER
+ /// To restrict mutation to only certain species
+ var/list/species_allowed = list()
+ /// To restrict mutation to only certain mobs
+ var/list/mobtypes_allowed = list()
+ /// Minimum health required to acquire the mutation
+ var/health_req
+ /// Required limbs to acquire this mutation
+ var/limb_req
+ /// The owner of this mutation's DNA
var/datum/dna/dna
+ /// Owner of this mutation
var/mob/living/carbon/owner
- var/instability = 0 //instability the holder gets when the mutation is not native
- var/blocks = 4 //Amount of those big blocks with gene sequences
- var/difficulty = 8 //Amount of missing sequences. Sometimes it removes an entire pair for 2 points
- var/timed = FALSE //Boolean to easily check if we're going to self-destruct
- var/alias //'Mutation #49', decided every round to get some form of distinction between undiscovered mutations
- var/scrambled = FALSE //Wheter we can read it if it's active. To avoid cheesing with mutagen
- var/class //Decides player accesibility, sorta
- var/list/conflicts //any mutations that might conflict. put mutation typepath defines in here. make sure to enter it both ways (so that A conflicts with B, and B with A)
- var/allow_transfer //Do we transfer upon cloning?
+ /// Instability the holder gets when the mutation is not native
+ var/instability = 0
+ /// Amount of those big blocks with gene sequences
+ var/blocks = 4
+ /// Amount of missing sequences. Sometimes it removes an entire pair for 2 points
+ var/difficulty = 8
+ //Boolean to easily check if we're going to self-destruct
+ var/timed = FALSE
+ /// 'Mutation #49', decided every round to get some form of distinction between undiscovered mutations
+ var/alias
+ /// Whether we can read it if it's active. To avoid cheesing with mutagen
+ var/scrambled = FALSE
+ /// The class of mutation (MUT_NORMAL, MUT_EXTRA, MUT_OTHER)
+ var/class
+ /**
+ * any mutations that might conflict.
+ * put mutation typepath defines in here.
+ * make sure to enter it both ways (so that A conflicts with B, and B with A)
+ */
+ var/list/conflicts
+ //Do we transfer upon cloning?
+ var/allow_transfer
//MUT_NORMAL - A mutation that can be activated and deactived by completing a sequence
//MUT_EXTRA - A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console
//MUT_OTHER Cannot be interacted with by players through normal means. I.E. wizards mutate
- var/list/valid_chrom_list = list() //List of strings of valid chromosomes this mutation can accept.
-
- var/can_chromosome = CHROMOSOME_NONE //can we take chromosomes? 0: CHROMOSOME_NEVER never, 1:CHROMOSOME_NONE yeah, 2: CHROMOSOME_USED no, already have one
- var/chromosome_name //purely cosmetic
- var/modified = FALSE //ugly but we really don't want chromosomes and on_acquiring to overlap and apply double the powers
+ /**
+ * can we take chromosomes?
+ * 0: CHROMOSOME_NEVER never
+ * 1: CHROMOSOME_NONE yeah
+ * 2: CHROMOSOME_USED no, already have one
+ */
+ var/can_chromosome = CHROMOSOME_NONE
+ /// Name of the chromosome
+ var/chromosome_name
+ /// Has the chromosome been modified
+ var/modified = FALSE //ugly but we really don't want chromosomes and on_acquiring to overlap and apply double the powers
+ /// Is this mutation mutadone proof
var/mutadone_proof = FALSE
//Chromosome stuff - set to -1 to prevent people from changing it. Example: It'd be a waste to decrease cooldown on mutism
- var/stabilizer_coeff = 1 //genetic stability coeff
- var/synchronizer_coeff = -1 //makes the mutation hurt the user less
- var/power_coeff = -1 //boosts mutation strength
- var/energy_coeff = -1 //lowers mutation cooldown
-
-/datum/mutation/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
+ /// genetic stability coeff
+ var/stabilizer_coeff = 1
+ /// Makes the mutation hurt the user less
+ var/synchronizer_coeff = -1
+ /// Boosts mutation strength
+ var/power_coeff = -1
+ /// Lowers mutation cooldown
+ var/energy_coeff = -1
+ /// List of strings of valid chromosomes this mutation can accept.
+ var/list/valid_chrom_list = list()
+
+/datum/mutation/human/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
. = ..()
class = class_
if(timer)
addtimer(CALLBACK(src, PROC_REF(remove)), timer)
timed = TRUE
- if(copymut && istype(copymut, /datum/mutation))
+ if(copymut && istype(copymut, /datum/mutation/human))
copy_mutation(copymut)
if(traits && !islist(traits))
traits = list(traits)
-/datum/mutation/proc/on_acquiring(mob/living/carbon/C)
+/datum/mutation/human/proc/on_acquiring(mob/living/carbon/C)
if(!istype(C) || C.stat == DEAD || !C.has_dna() || (src in C.dna.mutations))
return TRUE
if(length(mobtypes_allowed) && !mobtypes_allowed.Find(C.type))
@@ -62,7 +103,7 @@
return TRUE
if(limb_req && !C.get_bodypart(limb_req))
return TRUE
- for(var/datum/mutation/M as() in C.dna.mutations)//check for conflicting powers
+ for(var/datum/mutation/human/M as() in C.dna.mutations)//check for conflicting powers
if(!(M.type in conflicts) && !(type in M.conflicts))
continue
to_chat(C, "You feel your genes resisting something.")
@@ -87,23 +128,23 @@
for(var/trait in traits)
ADD_TRAIT(C, trait, "[type]")
-/datum/mutation/proc/get_visual_indicator()
+/datum/mutation/human/proc/get_visual_indicator()
return
-/datum/mutation/proc/on_attack_hand(atom/target, proximity)
+/datum/mutation/human/proc/on_attack_hand(atom/target, proximity)
return
-/datum/mutation/proc/on_ranged_attack(atom/target)
+/datum/mutation/human/proc/on_ranged_attack(atom/target)
return
-/datum/mutation/proc/on_move(new_loc)
+/datum/mutation/human/proc/on_move(new_loc)
SIGNAL_HANDLER
return
-/datum/mutation/proc/on_life()
+/datum/mutation/human/proc/on_life()
return
-/datum/mutation/proc/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/proc/on_losing(mob/living/carbon/owner)
if(istype(owner) && (owner.dna.mutations.Remove(src)))
if(length(visual_indicators))
var/list/mut_overlay = list()
@@ -124,7 +165,7 @@
/mob/living/carbon/proc/update_mutations_overlay()
if(!has_dna())
return
- for(var/datum/mutation/CM as() in dna.mutations)
+ for(var/datum/mutation/human/CM as() in dna.mutations)
if(length(CM.mobtypes_allowed) && !CM.mobtypes_allowed.Find(src.type))
dna.force_lose(CM)
continue
@@ -144,14 +185,14 @@
overlays_standing[CM.layer_used] = mut_overlay
apply_overlay(CM.layer_used)
-/datum/mutation/proc/modify() //called when a genome is applied so we can properly update some stats without having to remove and reapply the mutation from someone
+/datum/mutation/human/proc/modify() //called when a genome is applied so we can properly update some stats without having to remove and reapply the mutation from someone
if(modified || !power || !owner)
return
power.charge_max *= GET_MUTATION_ENERGY(src)
power.charge_counter *= GET_MUTATION_ENERGY(src)
modified = TRUE
-/datum/mutation/proc/copy_mutation(datum/mutation/HM)
+/datum/mutation/human/proc/copy_mutation(datum/mutation/human/HM)
if(!istype(HM))
return
chromosome_name = HM.chromosome_name
@@ -163,7 +204,7 @@
can_chromosome = HM.can_chromosome
valid_chrom_list = HM.valid_chrom_list
-/datum/mutation/proc/remove_chromosome()
+/datum/mutation/human/proc/remove_chromosome()
stabilizer_coeff = initial(stabilizer_coeff)
synchronizer_coeff = initial(synchronizer_coeff)
power_coeff = initial(power_coeff)
@@ -172,13 +213,13 @@
can_chromosome = initial(can_chromosome)
chromosome_name = null
-/datum/mutation/proc/remove()
+/datum/mutation/human/proc/remove()
if(dna)
dna.force_lose(src)
else
qdel(src)
-/datum/mutation/proc/grant_spell()
+/datum/mutation/human/proc/grant_spell()
if(!ispath(power) || !owner)
return FALSE
@@ -193,7 +234,7 @@
// Runs through all the coefficients and uses this to determine which chromosomes the
// mutation can take. Stores these as text strings in a list.
-/datum/mutation/proc/update_valid_chromosome_list()
+/datum/mutation/human/proc/update_valid_chromosome_list()
valid_chrom_list.Cut()
if(can_chromosome == CHROMOSOME_NEVER)
diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm
index a086dc49f19d3..23e1ad93d5f79 100644
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -1,4 +1,4 @@
-/datum/mutation/telepathy
+/datum/mutation/human/telepathy
name = "Telepathy"
desc = "A rare mutation that allows the user to telepathically communicate to others."
quality = POSITIVE
@@ -6,7 +6,7 @@
power = /obj/effect/proc_holder/spell/targeted/telepathy
instability = 10
-/datum/mutation/olfaction
+/datum/mutation/human/olfaction
name = "Transcendent Olfaction"
desc = "Your sense of smell is comparable to that of a canine."
quality = POSITIVE
@@ -73,7 +73,7 @@
if(direction_text)
to_chat(user,"You consider [tracking_target]'s scent. The trail leads [direction_text].")
-/datum/mutation/firebreath
+/datum/mutation/human/firebreath
name = "Fire Breath"
desc = "An ancient mutation that gives lizards breath of fire."
quality = POSITIVE
@@ -85,7 +85,7 @@
power_coeff = 1
species_allowed = list(SPECIES_LIZARD)
-/datum/mutation/firebreath/modify()
+/datum/mutation/human/firebreath/modify()
..()
if(power)
var/obj/effect/proc_holder/spell/aimed/firebreath/firebreath = power
@@ -133,7 +133,7 @@
exp_fire = 4
magic = FALSE
-/datum/mutation/void
+/datum/mutation/human/void
name = "Void Magnet"
desc = "A rare genome that attracts odd forces not usually observed."
quality = MINOR_NEGATIVE //upsides and downsides
@@ -142,7 +142,7 @@
energy_coeff = 1
synchronizer_coeff = 1
-/datum/mutation/void/on_life()
+/datum/mutation/human/void/on_life()
if(!isturf(owner.loc))
return
if(prob((0.5 + ((100 - dna.stability) / 20))) * GET_MUTATION_SYNCHRONIZER(src)) //very rare, but enough to annoy you hopefully. +0.5 probability for every 10 points lost in stability
@@ -167,7 +167,7 @@
. = ..()
new /obj/effect/immortality_talisman/void(get_turf(user), user)
-/datum/mutation/self_amputation
+/datum/mutation/human/self_amputation
name = "Autotomy"
desc = "Allows a creature to voluntary discard a random appendage."
quality = POSITIVE
@@ -196,7 +196,7 @@
var/obj/item/bodypart/yeeted_limb = pick(parts)
yeeted_limb.dismember()
-/datum/mutation/overload
+/datum/mutation/human/overload
name = "Overload"
desc = "Allows an Ethereal to overload their skin to cause a bright flash."
quality = POSITIVE
@@ -207,7 +207,7 @@
energy_coeff = 1
power_coeff = 1
-/datum/mutation/overload/modify()
+/datum/mutation/human/overload/modify()
..()
if(power)
var/static/max_range = min(getviewsize(world.view)[1], getviewsize(world.view)[2]) - 2
@@ -236,13 +236,13 @@
if(C.flash_act(1))
C.Paralyze(10 + (5*max_distance))
-/datum/mutation/overload/modify()
+/datum/mutation/human/overload/modify()
if(power)
var/obj/effect/proc_holder/spell/self/overload/S = power
S.max_distance = 4 * GET_MUTATION_POWER(src)
//Psyphoza species mutation
-/datum/mutation/spores
+/datum/mutation/human/spores
name = "Agaricale Pores" //Pores, not spores
desc = "An ancient mutation that gives psyphoza the ability to produce spores."
quality = POSITIVE
@@ -291,7 +291,7 @@
holder.clear_reagents()
//Diona species mutation
-/datum/mutation/drone
+/datum/mutation/human/drone
name = "Nymph Drone"
desc = "An ancient mutation that gives diona the ability to send out a nymph drone."
quality = POSITIVE
diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
index 237b1d64e372b..15d7bd78b42f3 100644
--- a/code/datums/mutations/antenna.dm
+++ b/code/datums/mutations/antenna.dm
@@ -1,4 +1,4 @@
-/datum/mutation/antenna
+/datum/mutation/human/antenna
name = "Antenna"
desc = "The affected person sprouts an antenna. This is known to allow them to access common radio channels passively."
quality = POSITIVE
@@ -7,26 +7,26 @@
layer_used = BODY_LAYER
var/datum/weakref/radio_weakref
-/datum/mutation/antenna/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/antenna/on_acquiring(mob/living/carbon/owner)
if(..())
return
var/obj/item/implant/radio/antenna/linked_radio = new(owner)
linked_radio.implant(owner, null, TRUE, TRUE)
radio_weakref = WEAKREF(linked_radio)
-/datum/mutation/antenna/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/antenna/on_losing(mob/living/carbon/owner)
if(..())
return
var/obj/item/implant/radio/antenna/linked_radio = radio_weakref.resolve()
if(linked_radio)
QDEL_NULL(linked_radio)
-/datum/mutation/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
+/datum/mutation/human/antenna/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "antenna"))
-/datum/mutation/antenna/get_visual_indicator()
+/datum/mutation/human/antenna/get_visual_indicator()
return visual_indicators[type][1]
/obj/item/implant/radio/antenna
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index f9a35479b9b8f..7c28adb77c180 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -1,14 +1,14 @@
//These mutations change your overall "form" somehow, like size
//Epilepsy gives a very small chance to have a seizure every life tick, knocking you unconscious.
-/datum/mutation/epilepsy
+/datum/mutation/human/epilepsy
name = "Epilepsy"
desc = "A genetic defect that sporadically causes seizures."
quality = NEGATIVE
synchronizer_coeff = 1
power_coeff = 1
-/datum/mutation/epilepsy/on_life()
+/datum/mutation/human/epilepsy/on_life()
if(prob(1 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
owner.visible_message("[owner] starts having a seizure!", "You have a seizure!")
owner.Unconscious(200 * GET_MUTATION_POWER(src))
@@ -16,19 +16,19 @@
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy)
addtimer(CALLBACK(src, PROC_REF(jitter_less)), 9 SECONDS)
-/datum/mutation/epilepsy/proc/jitter_less()
+/datum/mutation/human/epilepsy/proc/jitter_less()
if(owner)
owner.jitteriness = 10
//Unstable DNA induces random mutations!
-/datum/mutation/bad_dna
+/datum/mutation/human/bad_dna
name = "Unstable DNA"
desc = "Strange mutation that causes the holder to randomly mutate."
quality = NEGATIVE
locked = TRUE
-/datum/mutation/bad_dna/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/owner)
if(..())
return
var/mob/new_mob
@@ -46,14 +46,14 @@
//Cough gives you a chronic cough that causes you to drop items.
-/datum/mutation/cough
+/datum/mutation/human/cough
name = "Cough"
desc = "A chronic cough."
quality = MINOR_NEGATIVE
synchronizer_coeff = 1
power_coeff = 1
-/datum/mutation/cough/on_life()
+/datum/mutation/human/cough/on_life()
if(prob(5 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS)
owner.drop_all_held_items()
owner.emote("cough")
@@ -62,19 +62,19 @@
var/turf/target = get_ranged_target_turf(owner, turn(owner.dir, 180), cough_range)
owner.throw_at(target, cough_range, GET_MUTATION_POWER(src))
-/datum/mutation/paranoia
+/datum/mutation/human/paranoia
name = "Paranoia"
desc = "Subject is easily terrified, and may suffer from hallucinations."
quality = NEGATIVE
-/datum/mutation/paranoia/on_life()
+/datum/mutation/human/paranoia/on_life()
if(prob(5) && owner.stat == CONSCIOUS)
owner.emote("scream")
if(prob(25))
owner.hallucination += 20
//Dwarfism shrinks your body and lets you pass tables.
-/datum/mutation/dwarfism
+/datum/mutation/human/dwarfism
name = "Dwarfism"
desc = "A mutation believed to be the cause of dwarfism."
quality = POSITIVE
@@ -83,7 +83,7 @@
conflicts = list(GIGANTISM)
locked = TRUE // Default intert species for now, so locked from regular pool.
-/datum/mutation/dwarfism/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/owner)
if(..())
return
owner.resize = 0.8
@@ -91,7 +91,7 @@
passtable_on(owner, GENETIC_MUTATION)
owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..")
-/datum/mutation/dwarfism/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/dwarfism/on_losing(mob/living/carbon/owner)
if(..())
return
owner.resize = 1.25
@@ -101,20 +101,20 @@
//Clumsiness has a very large amount of small drawbacks depending on item.
-/datum/mutation/clumsy
+/datum/mutation/human/clumsy
name = "Clumsiness"
desc = "A genome that inhibits certain brain functions, causing the holder to appear clumsy. Honk"
quality = MINOR_NEGATIVE
traits = TRAIT_CLUMSY
//Tourettes causes you to randomly stand in place and shout.
-/datum/mutation/tourettes
+/datum/mutation/human/tourettes
name = "Tourette's Syndrome"
desc = "A chronic twitch that forces the user to scream bad words." //definitely needs rewriting
quality = NEGATIVE
synchronizer_coeff = 1
-/datum/mutation/tourettes/on_life()
+/datum/mutation/human/tourettes/on_life()
if(prob(10 * GET_MUTATION_SYNCHRONIZER(src)) && owner.stat == CONSCIOUS && !owner.IsStun())
owner.Stun(20)
switch(rand(1, 3))
@@ -131,37 +131,41 @@
//Deafness makes you deaf.
-/datum/mutation/deaf
+/datum/mutation/human/deaf
name = "Deafness"
desc = "The holder of this genome is completely deaf."
quality = NEGATIVE
traits = TRAIT_DEAF
-/datum/mutation/deaf/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/deaf/on_acquiring(mob/living/carbon/owner)
if(..())
return
SEND_SOUND(owner, sound(null))
//Monified turns you into a monkey.
-/datum/mutation/race
+/datum/mutation/human/race
name = "Monkified"
desc = "A strange genome, believed to be what differentiates monkeys from humans."
quality = NEGATIVE
- mobtypes_allowed = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
locked = TRUE //Species specific, keep out of actual gene pool
var/datum/species/original_species = /datum/species/human
+ var/original_name
-/datum/mutation/race/on_acquiring(mob/living/carbon/human/owner)
+/datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- original_species = owner.dna.species.type
- . = owner.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE | TR_KEEPAI, FALSE, TRUE)
-
-/datum/mutation/race/on_losing(mob/living/carbon/monkey/owner)
- if(istype(owner) && owner.stat != DEAD && !..())
- . = owner.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE | TR_KEEPAI, TRUE, original_species)
-
-/datum/mutation/glow
+ if(!ismonkey(owner))
+ original_species = owner.dna.species.type
+ original_name = owner.real_name
+ owner.fully_replace_character_name(null, "monkey ([rand(1,999)])")
+ . = owner.monkeyize()
+
+/datum/mutation/human/race/on_losing(mob/living/carbon/human/owner)
+ if(owner && owner.stat != DEAD && (owner.dna.mutations.Remove(src)) && ismonkey(owner))
+ owner.fully_replace_character_name(null, original_name)
+ . = owner.humanize(original_species)
+
+/datum/mutation/human/glow
name = "Glowy"
desc = "You permanently emit a light with a random color and intensity."
quality = POSITIVE
@@ -173,7 +177,7 @@
var/glow_color
var/obj/effect/dummy/lighting_obj/moblight/glow
-/datum/mutation/glow/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/glow/on_acquiring(mob/living/carbon/owner)
. = ..()
if(.)
return
@@ -181,43 +185,43 @@
glow = owner.mob_light()
modify()
-/datum/mutation/glow/modify()
+/datum/mutation/human/glow/modify()
if(!glow)
return
glow.set_light_range_power_color(glow_range * GET_MUTATION_POWER(src), glow_power, glow_color)
/// Returns the color for the glow effect
-/datum/mutation/glow/proc/glow_color()
+/datum/mutation/human/glow/proc/glow_color()
return pick(COLOR_RED, COLOR_BLUE, COLOR_YELLOW, COLOR_GREEN, COLOR_PURPLE, COLOR_ORANGE)
-/datum/mutation/glow/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/glow/on_losing(mob/living/carbon/owner)
. = ..()
if(.)
return
QDEL_NULL(glow)
/// Returns a color for the glow effect
-/datum/mutation/glow/proc/get_glow_color()
+/datum/mutation/human/glow/proc/get_glow_color()
return pick(COLOR_RED, COLOR_BLUE, COLOR_YELLOW, COLOR_GREEN, COLOR_PURPLE, COLOR_ORANGE)
-/datum/mutation/glow/anti
+/datum/mutation/human/glow/anti
name = "Anti-Glow"
desc = "Your skin seems to attract and absorb nearby light creating 'darkness' around you."
glow_power = -1.5
conflicts = list(GLOWY)
locked = TRUE
-/datum/mutation/glow/anti/get_glow_color()
+/datum/mutation/human/glow/anti/get_glow_color()
return COLOR_BLACK
-/datum/mutation/strong
+/datum/mutation/human/strong
name = "Strength"
desc = "The user's muscles slightly expand."
quality = POSITIVE
difficulty = 16
-/datum/mutation/insulated
+/datum/mutation/human/insulated
name = "Insulated"
desc = "The affected person does not conduct electricity."
quality = POSITIVE
@@ -225,7 +229,7 @@
instability = 25
traits = TRAIT_SHOCKIMMUNE
-/datum/mutation/fire
+/datum/mutation/human/fire
name = "Fiery Sweat"
desc = "The user's skin will randomly combust, but is generally alot more resilient to burning."
quality = NEGATIVE
@@ -233,26 +237,26 @@
synchronizer_coeff = 1
power_coeff = 1
-/datum/mutation/fire/on_life()
+/datum/mutation/human/fire/on_life()
if(prob((1+(100-dna.stability)/10)) * GET_MUTATION_SYNCHRONIZER(src))
owner.adjust_fire_stacks(2 * GET_MUTATION_POWER(src))
owner.IgniteMob()
-/datum/mutation/fire/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/fire/on_acquiring(mob/living/carbon/owner)
if(..())
return
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
H.physiology.burn_mod *= 0.5
-/datum/mutation/fire/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/fire/on_losing(mob/living/carbon/owner)
if(..())
return
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
H.physiology.burn_mod *= 2
-/datum/mutation/badblink
+/datum/mutation/human/badblink
name = "Spatial Instability"
desc = "The victim of the mutation has a very weak link to spatial reality, and may be displaced. Often causes extreme nausea."
quality = NEGATIVE
@@ -263,7 +267,7 @@
power_coeff = 1
var/warpchance = 0
-/datum/mutation/badblink/on_life()
+/datum/mutation/human/badblink/on_life()
if(prob(warpchance))
var/warpmessage = pick(
"With a sickening 720 degree twist of their back, [owner] vanishes into thin air.",
@@ -280,14 +284,14 @@
else
warpchance += 0.25 * GET_MUTATION_ENERGY(src)
-/datum/mutation/acidflesh
+/datum/mutation/human/acidflesh
name = "Acidic Flesh"
desc = "Subject has acidic chemicals building up underneath their skin. This is often lethal."
quality = NEGATIVE
difficulty = 18//high so it's hard to unlock and use on others
COOLDOWN_DECLARE(message_cooldown)
-/datum/mutation/acidflesh/on_life()
+/datum/mutation/human/acidflesh/on_life()
if(prob(25))
if(COOLDOWN_FINISHED(src, message_cooldown))
to_chat(owner, "Your acid flesh bubbles...")
@@ -297,51 +301,51 @@
owner.visible_message("[owner]'s skin bubbles and pops.", "Your bubbling flesh pops! It burns!")
playsound(owner, 'sound/weapons/sear.ogg', vol = 50, vary = TRUE)
-/datum/mutation/gigantism
+/datum/mutation/human/gigantism
name = "Gigantism"//negative version of dwarfism
desc = "The cells within the subject spread out to cover more area, making them appear larger."
quality = MINOR_NEGATIVE
difficulty = 12
conflicts = list(DWARFISM)
-/datum/mutation/gigantism/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/owner)
if(..())
return
owner.resize = 1.25
owner.update_transform()
owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..")
-/datum/mutation/gigantism/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/gigantism/on_losing(mob/living/carbon/owner)
if(..())
return
owner.resize = 0.8
owner.update_transform()
owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..")
-/datum/mutation/spastic
+/datum/mutation/human/spastic
name = "Spastic"
desc = "Subject suffers from muscle spasms."
quality = NEGATIVE
difficulty = 16
-/datum/mutation/spastic/on_acquiring()
+/datum/mutation/human/spastic/on_acquiring()
if(..())
return
owner.apply_status_effect(STATUS_EFFECT_SPASMS)
-/datum/mutation/spastic/on_losing()
+/datum/mutation/human/spastic/on_losing()
if(..())
return
owner.remove_status_effect(STATUS_EFFECT_SPASMS)
-/datum/mutation/extrastun
+/datum/mutation/human/extrastun
name = "Two Left Feet"
desc = "A mutation that disrupts coordination in the legs. It makes standing up after getting knocked down very difficult."
quality = NEGATIVE
difficulty = 16
COOLDOWN_DECLARE(stun_cooldown)
-/datum/mutation/extrastun/on_life()
+/datum/mutation/human/extrastun/on_life()
if(!COOLDOWN_FINISHED(src, stun_cooldown))
return
var/knockdown = owner.AmountKnockdown()
@@ -352,7 +356,7 @@
owner.visible_message("[owner] tries to stand up, but trips!", "You trip over your own feet!")
COOLDOWN_START(src, stun_cooldown, 30 SECONDS)
-/datum/mutation/strongwings
+/datum/mutation/human/strongwings
name = "Strengthened Wings"
desc = "Subject's wing muscle volume rapidly increases."
quality = POSITIVE
@@ -362,7 +366,7 @@
power_coeff = 1
species_allowed = list(SPECIES_APID, SPECIES_MOTH)
-/datum/mutation/strongwings/on_acquiring()
+/datum/mutation/human/strongwings/on_acquiring()
if(..())
return
var/obj/item/organ/wings/wings = owner.getorganslot(ORGAN_SLOT_WINGS)
@@ -381,7 +385,7 @@
return
to_chat(owner, "Your wings feel stronger.")
-/datum/mutation/strongwings/on_losing()
+/datum/mutation/human/strongwings/on_losing()
if(..())
return
var/obj/item/organ/wings/wings = owner.getorganslot(ORGAN_SLOT_WINGS)
@@ -397,12 +401,12 @@
bee_wings.jumpdist = initial(bee_wings.jumpdist)
to_chat(owner, "Your wings feel weak.")
-/datum/mutation/strongwings/modify()
+/datum/mutation/human/strongwings/modify()
..()
var/obj/item/organ/wings/bee/bee_wings = owner.getorganslot(ORGAN_SLOT_WINGS)
if(istype(bee_wings))
bee_wings.jumpdist = initial(bee_wings.jumpdist) + (6 * GET_MUTATION_POWER(src)) - 3
-/datum/mutation/catclaws
+/datum/mutation/human/catclaws
name = "Cat Claws"
desc = "Subject's hands grow sharpened claws."
quality = POSITIVE
@@ -413,7 +417,7 @@
species_allowed = list(SPECIES_FELINID)
var/added_damage = 6
-/datum/mutation/catclaws/on_acquiring()
+/datum/mutation/human/catclaws/on_acquiring()
if(..())
return
added_damage = min(17, initial(added_damage) * GET_MUTATION_POWER(src) + owner.dna.species.punchdamage) - owner.dna.species.punchdamage
@@ -423,7 +427,7 @@
owner.dna.species.miss_sound = 'sound/weapons/slashmiss.ogg'
to_chat(owner, "Claws extend from your fingertips.")
-/datum/mutation/catclaws/on_losing()
+/datum/mutation/human/catclaws/on_losing()
if(..())
return
to_chat(owner, " Your claws retract into your hand.")
@@ -432,7 +436,7 @@
owner.dna.species.attack_sound = initial(owner.dna.species.attack_sound)
owner.dna.species.miss_sound = initial(owner.dna.species.miss_sound)
-/datum/mutation/catclaws/modify()
+/datum/mutation/human/catclaws/modify()
..()
if(added_damage)
owner.dna.species.punchdamage -= added_damage
diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm
index 9c9e06915347c..ac3a9917f46b9 100644
--- a/code/datums/mutations/chameleon.dm
+++ b/code/datums/mutations/chameleon.dm
@@ -1,5 +1,5 @@
//Chameleon causes the owner to slowly become transparent when not moving.
-/datum/mutation/chameleon
+/datum/mutation/human/chameleon
name = "Chameleon"
desc = "A mutation that adapts the user's skin pigmentation to their environment. The adaptation has been observed to be most effective while the user is standing still."
quality = POSITIVE
@@ -9,26 +9,26 @@
/// How much the user's alpha is reduced every life tick they are not moving.
var/effect_speed = 25
-/datum/mutation/chameleon/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/chameleon/on_acquiring(mob/living/carbon/owner)
if(..())
return
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
-/datum/mutation/chameleon/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/chameleon/on_losing(mob/living/carbon/owner)
if(..())
return
owner.alpha = 255
-/datum/mutation/chameleon/on_life()
+/datum/mutation/human/chameleon/on_life()
owner.alpha = max(0, owner.alpha - effect_speed)
-/datum/mutation/chameleon/on_move()
+/datum/mutation/human/chameleon/on_move()
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
-/datum/mutation/chameleon/on_attack_hand(atom/target, proximity)
+/datum/mutation/human/chameleon/on_attack_hand(atom/target, proximity)
if(proximity) //stops tk from breaking chameleon
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
-/datum/mutation/chameleon/modify()
+/datum/mutation/human/chameleon/modify()
..()
effect_speed = round(initial(effect_speed) * GET_MUTATION_POWER(src))
diff --git a/code/datums/mutations/cluwne.dm b/code/datums/mutations/cluwne.dm
index 318e5e63db173..0b9d819e29e65 100644
--- a/code/datums/mutations/cluwne.dm
+++ b/code/datums/mutations/cluwne.dm
@@ -1,10 +1,10 @@
-/datum/mutation/cluwne
+/datum/mutation/human/cluwne
name = "Cluwne"
desc = "Turns a person into a Cluwne, a poor soul cursed to a short and miserable life by the honkmother."
quality = NEGATIVE
locked = TRUE
-/datum/mutation/cluwne/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/cluwne/on_acquiring(mob/living/carbon/owner)
if(..())
return
owner.dna.add_mutation(CLOWNMUT)
@@ -30,7 +30,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/cluwne(H), ITEM_SLOT_FEET)
owner.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/white(owner), ITEM_SLOT_GLOVES) // ditto
-/datum/mutation/cluwne/on_life()
+/datum/mutation/human/cluwne/on_life()
if(prob(15) && owner.IsUnconscious())
owner.setOrganLoss(ORGAN_SLOT_BRAIN, 199)
switch(rand(1, 6))
@@ -43,7 +43,7 @@
owner.Knockdown(20)
owner.Jitter(500)
-/datum/mutation/cluwne/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/cluwne/on_losing(mob/living/carbon/owner)
owner.adjust_fire_stacks(1)
owner.IgniteMob()
owner.dna.add_mutation(CLUWNEMUT)
diff --git a/code/datums/mutations/cold.dm b/code/datums/mutations/cold.dm
index be012a988cce0..ecdc520282ec1 100644
--- a/code/datums/mutations/cold.dm
+++ b/code/datums/mutations/cold.dm
@@ -1,4 +1,4 @@
-/datum/mutation/geladikinesis
+/datum/mutation/human/geladikinesis
name = "Geladikinesis"
desc = "Allows the user to concentrate moisture and sub-zero forces into snow."
quality = POSITIVE
@@ -15,7 +15,7 @@
delete_old = FALSE
action_icon_state = "snow"
-/datum/mutation/wax_saliva
+/datum/mutation/human/wax_saliva
name = "Waxy Saliva"
desc = "Allows the user to secrete wax."
quality = POSITIVE
@@ -33,7 +33,7 @@
delete_old = FALSE
action_icon_state = "honey"
-/datum/mutation/cryokinesis
+/datum/mutation/human/cryokinesis
name = "Cryokinesis"
desc = "Draws negative energy from the sub-zero void to freeze surrounding temperatures at subject's will."
quality = POSITIVE //upsides and downsides
@@ -43,7 +43,7 @@
power_coeff = 1
power = /obj/effect/proc_holder/spell/aimed/cryo
-/datum/mutation/cryokinesis/modify()
+/datum/mutation/human/cryokinesis/modify()
..()
if(power)
var/obj/effect/proc_holder/spell/aimed/cryo/cryobeam = power
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index 35b65db187607..9e107e6db6386 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -1,5 +1,5 @@
//Hulk turns your skin green, and allows you to punch through walls.
-/datum/mutation/hulk
+/datum/mutation/human/hulk
name = "Hulk"
desc = "A poorly understood genome that causes the holder's muscles to expand, inhibit speech and gives the person a bad skin condition."
quality = POSITIVE
@@ -20,30 +20,30 @@
TRAIT_FAST_CUFF_REMOVAL
)
-/datum/mutation/hulk/on_acquiring(mob/living/carbon/human/owner)
+/datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
owner.update_body_parts()
-/datum/mutation/hulk/on_attack_hand(atom/target, proximity)
+/datum/mutation/human/hulk/on_attack_hand(atom/target, proximity)
if(proximity) //no telekinetic hulk attack
return target.attack_hulk(owner)
-/datum/mutation/hulk/on_life()
+/datum/mutation/human/hulk/on_life()
if(owner.health < 0)
on_losing(owner)
to_chat(owner, "You suddenly feel very weak.")
-/datum/mutation/hulk/on_losing(mob/living/carbon/human/owner)
+/datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner)
if(..())
return
SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk")
owner.update_body_parts()
UnregisterSignal(owner, COMSIG_MOB_SAY)
-/datum/mutation/hulk/proc/handle_speech(datum/source, list/speech_args)
+/datum/mutation/human/hulk/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/message = speech_args[SPEECH_MESSAGE]
diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm
index 2ede583cb1467..b3a83d2959049 100644
--- a/code/datums/mutations/radioactive.dm
+++ b/code/datums/mutations/radioactive.dm
@@ -1,4 +1,4 @@
-/datum/mutation/radioactive
+/datum/mutation/human/radioactive
name = "Radioactivity"
desc = "A volatile mutation that causes the host to sent out deadly beta radiation. This affects both the hosts and their surroundings."
quality = NEGATIVE
@@ -6,13 +6,13 @@
difficulty = 8
power_coeff = 1
-/datum/mutation/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
+/datum/mutation/human/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation"))
-/datum/mutation/radioactive/on_life()
+/datum/mutation/human/radioactive/on_life()
radiation_pulse(owner, 20 * GET_MUTATION_POWER(src))
-/datum/mutation/radioactive/get_visual_indicator()
+/datum/mutation/human/radioactive/get_visual_indicator()
return visual_indicators[type][1]
diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm
index 67b4925fdfeed..7c41bbf7b314a 100644
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -1,38 +1,38 @@
//Nearsightedness restricts your vision by several tiles.
-/datum/mutation/nearsight
+/datum/mutation/human/nearsight
name = "Near Sightness"
desc = "A hereditary mutation causing Myopia and poor vision."
quality = MINOR_NEGATIVE
-/datum/mutation/nearsight/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/owner)
if(..())
return
owner.become_nearsighted(GENETIC_MUTATION)
-/datum/mutation/nearsight/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/nearsight/on_losing(mob/living/carbon/owner)
if(..())
return
owner.cure_nearsighted(GENETIC_MUTATION)
//Blind makes you blind. Who knew?
-/datum/mutation/blind
+/datum/mutation/human/blind
name = "Blindness"
desc = "A hereditary mutation which renders the optic nerves of the individual inert, making them effectively blind. No amount of corrective surgery can fix this."
quality = NEGATIVE
-/datum/mutation/blind/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/blind/on_acquiring(mob/living/carbon/owner)
if(..())
return
owner.become_blind(GENETIC_MUTATION)
-/datum/mutation/blind/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/blind/on_losing(mob/living/carbon/owner)
if(..())
return
owner.cure_blind(GENETIC_MUTATION)
-/datum/mutation/thermal
+/datum/mutation/human/thermal
name = "Thermal Vision"
desc = "The mutation enables the growth of Heat Pits in the eyes, not unlike those of a reptile, which can visually perceive the unique infrared thermal signature of living creatures."
quality = POSITIVE
@@ -41,18 +41,18 @@
locked = TRUE
traits = TRAIT_THERMAL_VISION
-/datum/mutation/thermal/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/thermal/on_acquiring(mob/living/carbon/owner)
if(..())
return
owner.update_sight()
-/datum/mutation/thermal/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/thermal/on_losing(mob/living/carbon/owner)
if(..())
return
owner.update_sight()
//X-ray Vision lets you see through walls.
-/datum/mutation/thermal/x_ray
+/datum/mutation/human/thermal/x_ray
name = "X Ray Vision"
desc = "A strange mutation that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb
instability = 35
@@ -60,7 +60,7 @@
traits = TRAIT_XRAY_VISION
//Laser Eyes lets you shoot lasers from your eyes!
-/datum/mutation/laser_eyes
+/datum/mutation/human/laser_eyes
name = "Laser Eyes"
desc = "A mutation that allows for the reflection of concentrated light from the back of the eyes."
quality = POSITIVE
@@ -69,14 +69,14 @@
layer_used = FRONT_MUTATIONS_LAYER
limb_req = BODY_ZONE_HEAD
-/datum/mutation/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
+/datum/mutation/human/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "lasereyes"))
-/datum/mutation/laser_eyes/get_visual_indicator()
+/datum/mutation/human/laser_eyes/get_visual_indicator()
return visual_indicators[type][1]
-/datum/mutation/laser_eyes/on_ranged_attack(atom/target, mouseparams)
+/datum/mutation/human/laser_eyes/on_ranged_attack(atom/target, mouseparams)
if(owner.a_intent == INTENT_HARM)
owner.LaserEyes(target, mouseparams)
diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm
index 3b19fa3e9e622..5372bef1dd00b 100644
--- a/code/datums/mutations/space_adaptation.dm
+++ b/code/datums/mutations/space_adaptation.dm
@@ -1,5 +1,5 @@
//Cold Resistance gives your entire body an orange halo, and makes you immune to the effects of vacuum and cold.
-/datum/mutation/space_adaptation
+/datum/mutation/human/space_adaptation
name = "Space Adaptation"
desc = "A strange mutation that renders the host's skin, muscuoskeletal system and sensory organs immune to the vacuum of space. The mutation is ineffective toward lung tissue, which will remain vulnerable without an air tank."
quality = POSITIVE
@@ -7,10 +7,10 @@
instability = 30
traits = list(TRAIT_RESISTCOLD, TRAIT_RESISTLOWPRESSURE)
-/datum/mutation/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
+/datum/mutation/human/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire"))
-/datum/mutation/space_adaptation/get_visual_indicator()
+/datum/mutation/human/space_adaptation/get_visual_indicator()
return visual_indicators[type][1]
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 2e55f493b662b..21cfefc16f8a3 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -1,57 +1,57 @@
//These are all minor mutations that affect your speech somehow.
//Individual ones aren't commented since their functions should be evident at a glance
-/datum/mutation/nervousness
+/datum/mutation/human/nervousness
name = "Nervousness"
desc = "A hereditary mutation characterized by its signature speech disorder."
quality = MINOR_NEGATIVE
-/datum/mutation/nervousness/on_life()
+/datum/mutation/human/nervousness/on_life()
if(prob(10))
owner.stuttering = max(10, owner.stuttering)
-/datum/mutation/wacky
+/datum/mutation/human/wacky
name = "Wacky"
desc = "Effects not tested..."
quality = MINOR_NEGATIVE
-/datum/mutation/wacky/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/wacky/on_acquiring(mob/living/carbon/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-/datum/mutation/wacky/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/wacky/on_losing(mob/living/carbon/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)
-/datum/mutation/wacky/proc/handle_speech(datum/source, list/speech_args)
+/datum/mutation/human/wacky/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
speech_args[SPEECH_SPANS] |= SPAN_SANS
-/datum/mutation/mute
+/datum/mutation/human/mute
name = "Mute"
desc = "Inherited mutation that completely inhibits the vocal section of the brain."
quality = NEGATIVE
traits = TRAIT_MUTE
-/datum/mutation/smile
+/datum/mutation/human/smile
name = "Smile"
desc = "Hereditary mutation reminiscent of Bipolar Disorder. Characterized by a near constant state of mania and an apathy towards negative stimuli."
quality = MINOR_NEGATIVE
-/datum/mutation/smile/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/smile/on_acquiring(mob/living/carbon/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-/datum/mutation/smile/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/smile/on_losing(mob/living/carbon/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)
-/datum/mutation/smile/proc/handle_speech(datum/source, list/speech_args)
+/datum/mutation/human/smile/proc/handle_speech(datum/source, list/speech_args)
var/message = speech_args[SPEECH_MESSAGE]
if(message)
message = " [message] "
@@ -101,28 +101,28 @@
speech_args[SPEECH_MESSAGE] = trim(message)
-/datum/mutation/unintelligible
+/datum/mutation/human/unintelligible
name = "Unintelligible"
desc = "Hereditary mutation that partially inhibits the vocal center of the brain, resulting in a severe speech disorder."
quality = NEGATIVE
traits = TRAIT_UNINTELLIGIBLE_SPEECH
-/datum/mutation/swedish
+/datum/mutation/human/swedish
name = "Swedish"
desc = "A horrible mutation originating from the distant past. Thought to be eradicated after the incident in 2037."
quality = MINOR_NEGATIVE
-/datum/mutation/swedish/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-/datum/mutation/swedish/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/swedish/on_losing(mob/living/carbon/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)
-/datum/mutation/swedish/proc/handle_speech(datum/source, list/speech_args)
+/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/message = speech_args[SPEECH_MESSAGE]
@@ -136,22 +136,22 @@
message += " Bork[pick("",", bork",", bork, bork")]!"
speech_args[SPEECH_MESSAGE] = trim(message)
-/datum/mutation/chav
+/datum/mutation/human/chav
name = "Chav"
desc = "Unknown"
quality = MINOR_NEGATIVE
-/datum/mutation/chav/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/chav/on_acquiring(mob/living/carbon/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-/datum/mutation/chav/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/chav/on_losing(mob/living/carbon/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)
-/datum/mutation/chav/proc/handle_speech(datum/source, list/speech_args)
+/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/message = speech_args[SPEECH_MESSAGE]
@@ -184,13 +184,13 @@
speech_args[SPEECH_MESSAGE] = trim(message)
-/datum/mutation/elvis
+/datum/mutation/human/elvis
name = "Elvis"
desc = "A terrifying mutation named after its 'patient-zero'."
quality = MINOR_NEGATIVE
locked = TRUE
-/datum/mutation/elvis/on_life()
+/datum/mutation/human/elvis/on_life()
switch(pick(1,2))
if(1)
if(prob(15))
@@ -201,17 +201,17 @@
if(prob(15))
owner.visible_message("[owner] [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")
-/datum/mutation/elvis/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-/datum/mutation/elvis/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/elvis/on_losing(mob/living/carbon/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)
-/datum/mutation/elvis/proc/handle_speech(datum/source, list/speech_args)
+/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/message = speech_args[SPEECH_MESSAGE]
@@ -229,38 +229,38 @@
speech_args[SPEECH_MESSAGE] = trim(message)
-/datum/mutation/stoner
+/datum/mutation/human/stoner
name = "Stoner"
desc = "A common mutation that severely decreases intelligence."
quality = NEGATIVE
locked = TRUE
-/datum/mutation/stoner/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/stoner/on_acquiring(mob/living/carbon/owner)
..()
owner.grant_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_STONER)
owner.add_blocked_language(subtypesof(/datum/language) - /datum/language/beachbum, LANGUAGE_STONER)
-/datum/mutation/stoner/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/stoner/on_losing(mob/living/carbon/owner)
..()
owner.remove_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_STONER)
owner.remove_blocked_language(subtypesof(/datum/language) - /datum/language/beachbum, LANGUAGE_STONER)
-/datum/mutation/medieval
+/datum/mutation/human/medieval
name = "Medieval"
desc = "A horrific genetic condition suffered in ancient times."
quality = MINOR_NEGATIVE
-/datum/mutation/medieval/on_acquiring(mob/living/carbon/owner)
+/datum/mutation/human/medieval/on_acquiring(mob/living/carbon/owner)
if(..())
return
RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-/datum/mutation/medieval/on_losing(mob/living/carbon/owner)
+/datum/mutation/human/medieval/on_losing(mob/living/carbon/owner)
if(..())
return
UnregisterSignal(owner, COMSIG_MOB_SAY)
-/datum/mutation/medieval/proc/handle_speech(datum/source, list/speech_args)
+/datum/mutation/human/medieval/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
var/message = speech_args[SPEECH_MESSAGE]
diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm
index 906b27c316380..651ec6639ab30 100644
--- a/code/datums/mutations/telekinesis.dm
+++ b/code/datums/mutations/telekinesis.dm
@@ -1,5 +1,5 @@
//Telekinesis lets you interact with objects from range, and gives you a light blue halo around your head.
-/datum/mutation/telekinesis
+/datum/mutation/human/telekinesis
name = "Telekinesis"
desc = "A strange mutation that allows the holder to interact with objects purely through thought."
quality = POSITIVE
@@ -7,13 +7,13 @@
limb_req = BODY_ZONE_HEAD
instability = 30
-/datum/mutation/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
+/datum/mutation/human/telekinesis/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "telekinesishead"))
-/datum/mutation/telekinesis/get_visual_indicator()
+/datum/mutation/human/telekinesis/get_visual_indicator()
return visual_indicators[type][1]
-/datum/mutation/telekinesis/on_ranged_attack(atom/target)
+/datum/mutation/human/telekinesis/on_ranged_attack(atom/target)
target.attack_tk(owner)
diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm
index e0d6164274f40..939c05fa5ed3d 100644
--- a/code/datums/mutations/touch.dm
+++ b/code/datums/mutations/touch.dm
@@ -1,4 +1,4 @@
-/datum/mutation/shock
+/datum/mutation/human/shock
name = "Shock Touch"
desc = "A mutation that allows the user to store accumulated bioelectric and static charge, consciously discharging it upon others with no harm to themselves."
quality = POSITIVE
@@ -48,7 +48,7 @@
use_charge(user)
return ..()
-/datum/mutation/acidooze
+/datum/mutation/human/acidooze
name = "Acidic Hands"
desc = "Allows an Oozeling to metabolize some of their blood into acid, concentrated on their hands."
quality = POSITIVE
diff --git a/code/game/gamemodes/objectives/basic/ninja/capture.dm b/code/game/gamemodes/objectives/basic/ninja/capture.dm
index 13210347918e5..563e69420584e 100644
--- a/code/game/gamemodes/objectives/basic/ninja/capture.dm
+++ b/code/game/gamemodes/objectives/basic/ninja/capture.dm
@@ -18,7 +18,7 @@
var/worth = 0
if (istype(L, /mob/living/carbon/human))
worth = 1
- else if (istype(L, /mob/living/carbon/monkey))
+ else if (istype(L, /mob/living/carbon/human/species/monkey))
worth = 0.1
else if (istype(L, /mob/living/carbon/alien/larva))
worth = 1
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index 301b7ddd293e1..aaaaab5fc2095 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -173,7 +173,7 @@
for(var/datum/mind/rev_mind in revolution.head_revolutionaries())
var/turf/T = get_turf(rev_mind.current)
if(!considered_afk(rev_mind) && considered_alive(rev_mind) && is_station_level(T.z))
- if(ishuman(rev_mind.current) || ismonkey(rev_mind.current))
+ if(ishuman(rev_mind.current))
return FALSE
return TRUE
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 78cbdbe27c36d..47cbe13f7be31 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -166,6 +166,18 @@ Class Procs:
return INITIALIZE_HINT_LATELOAD
+/obj/machinery/computer/can_interact(mob/user)
+ var/mob/living/living_user = user
+ //Quick check for lesserbeings (monkeys, teratomas)
+ if(HAS_TRAIT(living_user, TRAIT_INFERIORFORM))
+ to_chat(living_user, "What is this thing?! Your fingers dance around the buttons.")
+ //We fuck around on the keys for a bit, like any toddler would
+ if(do_after(living_user, 2 SECONDS, src))
+ to_chat(living_user, " Shiny! Not much use to me though!")
+ else
+ . = ..()
+
+
/obj/machinery/proc/set_occupant(atom/movable/new_occupant)
SHOULD_CALL_PARENT(TRUE)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index a61e6ce240743..1c855066c74c2 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -150,7 +150,7 @@
/obj/item/disk/data/debug/Initialize(mapload)
. = ..()
- for(var/datum/mutation/HM as() in GLOB.all_mutations)
+ for(var/datum/mutation/human/HM as() in GLOB.all_mutations)
mutations += new HM
//Clonepod
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 876a1a417104c..bfccb359c156d 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -105,7 +105,7 @@
else
if(sbed)
data["table"] = sbed
- if(!ishuman(sbed.occupant) && !ismonkey(sbed.occupant))
+ if(!ishuman(sbed.occupant))
return data
data["patient"] = list()
if(isliving(sbed.occupant))
diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 39175fd2bf73f..c09ecd974057c 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -512,7 +512,7 @@
// Go over all standard mutations and check if they've been discovered.
for(var/mutation_type in scanner_occupant.dna.mutation_index)
- var/datum/mutation/HM = GET_INITIALIZED_MUTATION(mutation_type)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation_type)
check_discovery(HM.alias)
return
@@ -613,7 +613,7 @@
// GUARD CHECK - Only search occupant for this specific ref, since your
// can only apply chromosomes to mutations occupants.
- var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
@@ -670,7 +670,7 @@
search_flags |= SEARCH_DISKETTE
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, search_flags)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
@@ -734,7 +734,7 @@
var/path = GET_MUTATION_TYPE_FROM_ALIAS(params["alias"])
if(stored_research && stored_research.discovered_mutations[path])
- var/datum/mutation/HM = GET_INITIALIZED_MUTATION(path)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(path)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
return
@@ -765,7 +765,7 @@
search_flags |= SEARCH_DISKETTE
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, search_flags)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags)
if(!HM)
return
@@ -805,13 +805,13 @@
return
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, search_flags)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
return
- var/datum/mutation/A = new HM.type()
+ var/datum/mutation/human/A = new HM.type()
A.copy_mutation(HM)
stored_mutations += A
to_chat(usr, "Mutation successfully stored.")
@@ -855,13 +855,13 @@
search_flags |= SEARCH_STORED
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, search_flags)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flags)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
return
- var/datum/mutation/A = new HM.type()
+ var/datum/mutation/human/A = new HM.type()
A.copy_mutation(HM)
diskette.mutations += A
to_chat(usr, "Mutation successfully stored to disk.")
@@ -878,7 +878,7 @@
return
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_OCCUPANT)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
@@ -897,7 +897,7 @@
// params["mutref"] - ATOM Ref of specific mutation to delete
if("delete_console_mut")
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_STORED)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_STORED)
if(HM)
stored_mutations.Remove(HM)
@@ -921,7 +921,7 @@
return
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_DISKETTE)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_DISKETTE)
if(HM)
diskette.mutations.Remove(HM)
@@ -967,11 +967,11 @@
// GUARD CHECK - Find the source and destination mutations on the console
// and make sure they actually exist.
- var/datum/mutation/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ var/datum/mutation/human/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE)
if(!source_mut)
return
- var/datum/mutation/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ var/datum/mutation/human/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE)
if(!dest_mut)
return
@@ -991,7 +991,7 @@
if(stored_research.discovered_mutations[result_path])
return
- var/datum/mutation/HM = GET_INITIALIZED_MUTATION(result_path)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(result_path)
stored_research.discovered_mutations[result_path] = TRUE
say("Successfully mutated [HM.name].")
return
@@ -1029,11 +1029,11 @@
// GUARD CHECK - Find the source and destination mutations on the console
// and make sure they actually exist.
- var/datum/mutation/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ var/datum/mutation/human/source_mut = get_mut_by_ref(first_bref, SEARCH_STORED | SEARCH_DISKETTE)
if(!source_mut)
return
- var/datum/mutation/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE)
+ var/datum/mutation/human/dest_mut = get_mut_by_ref(second_bref, SEARCH_STORED | SEARCH_DISKETTE)
if(!dest_mut)
return
@@ -1053,7 +1053,7 @@
if(stored_research.discovered_mutations[result_path])
return
- var/datum/mutation/HM = GET_INITIALIZED_MUTATION(result_path)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(result_path)
stored_research.discovered_mutations[result_path] = TRUE
say("Successfully mutated [HM.name].")
return
@@ -1443,7 +1443,7 @@
// Run through each mutation in our Advanced Injector and add them to a
// new injector
- for(var/datum/mutation/HM as() in injector)
+ for(var/datum/mutation/human/HM as() in injector)
I.add_mutations += new HM.type(copymut=HM)
// Force apply any mutations, this is functionality similar to mutators
@@ -1501,7 +1501,7 @@
var/bref = params["mutref"]
// We've already made sure we can modify the occupant, so this is safe to
// call
- var/datum/mutation/HM = get_mut_by_ref(bref, search_flag)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, search_flag)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
@@ -1513,7 +1513,7 @@
// We then add the instabilities of all other mutations in the injector,
// remembering to apply the Stabilizer chromosome modifiers
- for(var/datum/mutation/I as() in injector_selection[adv_inj])
+ for(var/datum/mutation/human/I as() in injector_selection[adv_inj])
instability_total += I.instability * GET_MUTATION_STABILIZER(I)
// If this would take us over the max instability, we inform the user.
@@ -1523,7 +1523,7 @@
// If we've got here, all our checks are passed and we can successfully
// add the mutation to the advanced injector.
- var/datum/mutation/A = new HM.type()
+ var/datum/mutation/human/A = new HM.type()
A.copy_mutation(HM)
injector_selection[adv_inj] += A
to_chat(usr, "Mutation successfully added to advanced injector.")
@@ -1535,7 +1535,7 @@
if("delete_injector_mut")
var/bref = params["mutref"]
- var/datum/mutation/HM = get_mut_by_ref(bref, SEARCH_ADV_INJ)
+ var/datum/mutation/human/HM = get_mut_by_ref(bref, SEARCH_ADV_INJ)
// GUARD CHECK - This should not be possible. Unexpected result
if(!HM)
@@ -1740,7 +1740,7 @@
// ---------------------------------------------------------------------- //
// Start cataloguing all mutations that the occupant has by default
for(var/mutation_type in scanner_occupant.dna.mutation_index)
- var/datum/mutation/HM = GET_INITIALIZED_MUTATION(mutation_type)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation_type)
var/list/mutation_data = list()
var/text_sequence = scanner_occupant.dna.mutation_index[mutation_type]
@@ -1767,7 +1767,7 @@
// Check if the mutation is currently activated. If it is, we can add even
// MORE information to send to tgui.
- var/datum/mutation/A = scanner_occupant.dna.get_mutation(mutation_type)
+ var/datum/mutation/human/A = scanner_occupant.dna.get_mutation(mutation_type)
if(A)
mutation_data["Active"] = TRUE
mutation_data["Scrambled"] = A.scrambled
@@ -1800,7 +1800,7 @@
// ---------------------------------------------------------------------- //
// Now get additional/"extra" mutations that they shouldn't have by default
- for(var/datum/mutation/HM as() in scanner_occupant.dna.mutations)
+ for(var/datum/mutation/human/HM as() in scanner_occupant.dna.mutations)
// If it's in the mutation index array, we've already catalogued this
// mutation and can safely skip over it. It really shouldn't be, but this
// will catch any weird edge cases
@@ -1813,7 +1813,7 @@
// These will all be active mutations. They're added by injector and their
// sequencing code can't be changed. They can only be nullified, which
// completely removes them.
- var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type)
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
mutation_data["Alias"] = A.alias
mutation_data["Sequence"] = text_sequence
@@ -1848,10 +1848,10 @@
// ------------------------------------------------------------------------ //
// Build the list of mutations stored within the DNA Console
- for(var/datum/mutation/HM as() in stored_mutations)
+ for(var/datum/mutation/human/HM as() in stored_mutations)
var/list/mutation_data = list()
- var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type)
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
mutation_data["Alias"] = A.alias
mutation_data["Name"] = HM.name
@@ -1886,10 +1886,10 @@
// ------------------------------------------------------------------------ //
// Build the list of mutations stored on any inserted diskettes
if(diskette)
- for(var/datum/mutation/HM as() in diskette.mutations)
+ for(var/datum/mutation/human/HM as() in diskette.mutations)
var/list/mutation_data = list()
- var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type)
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
mutation_data["Alias"] = A.alias
mutation_data["Name"] = HM.name
@@ -1914,10 +1914,10 @@
if(LAZYLEN(injector_selection))
for(var/I in injector_selection)
var/list/mutations = list()
- for(var/datum/mutation/HM as() in injector_selection[I])
+ for(var/datum/mutation/human/HM as() in injector_selection[I])
var/list/mutation_data = list()
- var/datum/mutation/A = GET_INITIALIZED_MUTATION(HM.type)
+ var/datum/mutation/human/A = GET_INITIALIZED_MUTATION(HM.type)
mutation_data["Alias"] = A.alias
mutation_data["Name"] = HM.name
@@ -1983,13 +1983,13 @@
// then the mutation isn't eligible for discovery. If it is but is scrambled,
// then the mutation isn't eligible for discovery. Finally, check if the
// mutation is in discovered mutations - If it isn't, add it to discover.
- var/datum/mutation/M = scanner_occupant.dna.get_mutation(path)
+ var/datum/mutation/human/M = scanner_occupant.dna.get_mutation(path)
if(!M)
return FALSE
if(M.scrambled)
return FALSE
if(stored_research && !stored_research.discovered_mutations[path])
- var/datum/mutation/HM = GET_INITIALIZED_MUTATION(path)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(path)
stored_research.discovered_mutations[path] = TRUE
say("Successfully discovered [HM.name].")
return TRUE
@@ -2112,7 +2112,7 @@
to_chat(user, "You insert [diskie].")
if(stored_research)
var/list/upload_names
- for(var/datum/mutation/upload in diskie.mutations)
+ for(var/datum/mutation/human/upload in diskie.mutations)
var/path = upload.type
if(stored_research.discovered_mutations[path])
continue
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index c2c178a990861..c9ae6d5589f56 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -355,10 +355,6 @@
L.emote("scream")
if(!L.IsParalyzed())
L.Paralyze(60)
- else if(ismonkey(L)) //For monkeys
- L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
- if(!L.IsParalyzed())
- L.Paralyze(60)
else //for simple_animals & borgs
L.adjustBruteLoss(DOOR_CRUSH_DAMAGE)
var/turf/location = get_turf(src)
diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm
index e0790ab8cea16..1d422aedf1ea4 100644
--- a/code/game/machinery/telecomms/computers/logbrowser.dm
+++ b/code/game/machinery/telecomms/computers/logbrowser.dm
@@ -76,9 +76,6 @@
else if(ispath(mobtype, /mob/living/simple_animal/slime))
race = "Slime"
- else if(ispath(mobtype, /mob/living/carbon/monkey))
- race = "Monkey"
-
// sometimes M gets deleted prematurely for AIs... just check the job
else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == JOB_NAME_AI)
race = "Artificial Life"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 185206955f905..430cc5d8f5b77 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -219,9 +219,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/// A reagent list containing the reagents this item produces when JUICED in a grinder!
var/list/juice_results
- ///Icon for monkey
- var/icon/monkey_icon
-
var/canMouseDown = FALSE
///Icons used to show the item in vendors instead of the item's actual icon, drawn from the item's icon file (just chemical.dm for now)
@@ -740,8 +737,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
A.Grant(user)
if(item_flags & SLOWS_WHILE_IN_HAND || slowdown)
user.update_equipment_speed_mods()
- if(ismonkey(user)) //Only generate icons if we have to
- compile_monkey_icon()
log_item(user, INVESTIGATE_VERB_EQUIPPED)
if(!initial)
if(equip_sound && slot_flags)
@@ -1414,12 +1409,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(SEND_SIGNAL(src, COMSIG_ITEM_OFFER_TAKEN, offerer, taker) & COMPONENT_OFFER_INTERRUPT)
return TRUE
-/**
- * * Overridden to generate icons for monkey clothing
- */
-/obj/item/proc/compile_monkey_icon()
- return
-
/// Called on [/datum/element/openspace_item_click_handler/proc/on_afterattack]. Check the relative file for information.
/obj/item/proc/handle_openspace_click(turf/target, mob/user, proximity_flag, click_parameters)
CRASH("Undefined handle_openspace_click() behaviour. Ascertain the openspace_item_click_handler element has been attached to the right item and that its proc override doesn't call parent.")
diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm
index 994e394468adf..c6ee7f174aab9 100644
--- a/code/game/objects/items/chromosome.dm
+++ b/code/game/objects/items/chromosome.dm
@@ -13,7 +13,7 @@
var/weight = 5
-/obj/item/chromosome/proc/can_apply(datum/mutation/HM)
+/obj/item/chromosome/proc/can_apply(datum/mutation/human/HM)
if(!HM || !(HM.can_chromosome == CHROMOSOME_NONE))
return FALSE
if((stabilizer_coeff != 1) && (HM.stabilizer_coeff != -1)) //if the chromosome is 1, we dont change anything. If the mutation is -1, we cant change it. sorry
@@ -25,7 +25,7 @@
if((energy_coeff != 1) && (HM.energy_coeff != -1))
return TRUE
-/obj/item/chromosome/proc/apply(datum/mutation/HM)
+/obj/item/chromosome/proc/apply(datum/mutation/human/HM)
if(HM.stabilizer_coeff != -1)
HM.stabilizer_coeff = stabilizer_coeff
if(HM.synchronizer_coeff != -1)
@@ -82,11 +82,11 @@
icon_state = "reinforcer"
weight = 3
-/obj/item/chromosome/reinforcer/can_apply(datum/mutation/HM)
+/obj/item/chromosome/reinforcer/can_apply(datum/mutation/human/HM)
if(!HM || !(HM.can_chromosome == CHROMOSOME_NONE))
return FALSE
return !HM.mutadone_proof
-/obj/item/chromosome/reinforcer/apply(datum/mutation/HM)
+/obj/item/chromosome/reinforcer/apply(datum/mutation/human/HM)
HM.mutadone_proof = TRUE
..()
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index c108bb13bf0c3..d262bfe48529d 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -938,12 +938,12 @@ GENE SCANNER
var/list/full_list_mutations = list()
for(var/each in buffer) // get inherent mutations first
full_list_mutations[each] = FALSE
- for(var/datum/mutation/each_mutation in C.dna.mutations)
+ for(var/datum/mutation/human/each_mutation in C.dna.mutations)
if(each_mutation.type in buffer) // active inherent mutation
full_list_mutations[each_mutation.type] = "Activated"
else // active artificial mutation
full_list_mutations[each_mutation.type] = "Injected"
- for(var/datum/mutation/each_mutation in C.dna.temporary_mutations)
+ for(var/datum/mutation/human/each_mutation in C.dna.temporary_mutations)
full_list_mutations[each_mutation.type] = "Temporary"
for(var/A in full_list_mutations)
@@ -986,7 +986,7 @@ GENE SCANNER
ready = TRUE
/obj/item/sequence_scanner/proc/get_display_name(mutation, active_detail=FALSE)
- var/datum/mutation/HM = GET_INITIALIZED_MUTATION(mutation)
+ var/datum/mutation/human/HM = GET_INITIALIZED_MUTATION(mutation)
if(!HM)
return "ERROR"
if(discovered[mutation])
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index 625224cf05b48..692a2b630cacf 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -505,7 +505,7 @@
var/endtime = world.time+duration
for(var/mutation in remove_mutations)
if(mutation == RACEMUT)
- if(ishuman(M))
+ if(!ismonkey(M))
continue
M = M.dna.remove_mutation(mutation)
else
@@ -513,7 +513,7 @@
for(var/mutation in add_mutations)
if(M.dna.get_mutation(mutation))
continue //Skip permanent mutations we already have.
- if(mutation == RACEMUT && ishuman(M))
+ if(mutation == RACEMUT && !ismonkey(M))
message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(M)] with the [name] (MONKEY)")
log_msg += " (MONKEY)"
M = M.dna.add_mutation(mutation, MUT_OTHER, endtime)
@@ -565,8 +565,8 @@
M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2))
var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
for(var/mutation in add_mutations)
- var/datum/mutation/HM = mutation
- if(istype(HM, /datum/mutation))
+ var/datum/mutation/human/HM = mutation
+ if(istype(HM, /datum/mutation/human))
mutation = HM.type
if(!M.dna.activate_mutation(HM))
if(!doitanyway)
diff --git a/code/game/objects/items/food/monkeycube.dm b/code/game/objects/items/food/monkeycube.dm
index 22c431cf1a0a2..0408725f68555 100644
--- a/code/game/objects/items/food/monkeycube.dm
+++ b/code/game/objects/items/food/monkeycube.dm
@@ -11,7 +11,7 @@
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_TINY
var/faction
- var/spawned_mob = /mob/living/carbon/monkey
+ var/spawned_mob = /mob/living/carbon/human/species/monkey
/obj/item/food/monkeycube/proc/Expand()
if(GLOB.total_cube_monkeys >= CONFIG_GET(number/max_cube_monkeys))
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 8026df29df82a..dc15b46523195 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -110,7 +110,7 @@
if(2)
if(scooldown < world.time)
if(M.health >= 0)
- if(ishuman(M)||ismonkey(M))
+ if(ishuman(M))
M.electrocute_act(5, "[user]", flags = SHOCK_NOGLOVES)
user.visible_message("[user] electrocutes [M] with [user.p_their()] touch!", \
"You electrocute [M] with your touch!")
diff --git a/code/game/objects/items/stacks/sheets/mineral/glass.dm b/code/game/objects/items/stacks/sheets/mineral/glass.dm
index 80f392130647d..0c0eaf89130aa 100644
--- a/code/game/objects/items/stacks/sheets/mineral/glass.dm
+++ b/code/game/objects/items/stacks/sheets/mineral/glass.dm
@@ -265,12 +265,6 @@
if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) // golems, etc
to_chat(H, "[src] cuts into your hand!")
H.apply_damage(force*0.5, BRUTE, hit_hand)
- else if(ismonkey(user))
- var/mob/living/carbon/monkey/M = user
- if(!HAS_TRAIT(M, TRAIT_PIERCEIMMUNE))
- to_chat(M, "[src] cuts into your hand!")
- M.apply_damage(force*0.5, BRUTE, hit_hand)
-
/obj/item/shard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/lightreplacer))
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 279618bf75776..db1c3f456d0c3 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -376,7 +376,7 @@
else
playsound(M, 'sound/items/trayhit2.ogg', 50, 1)
- if(ishuman(M) || ismonkey(M))
+ if(ishuman(M))
if(prob(10))
M.Paralyze(40)
update_icon()
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index 7d3cdb082bf3f..1d9c101b8856f 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -62,38 +62,3 @@
var/custom_data = item.on_object_saved(depth++)
dat += "[custom_data ? ",\n[custom_data]" : ""]"
return dat
-
-/obj/item/storage/compile_monkey_icon()
- var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing
- //If the icon, for this type of item, is already made by something else, don't make it again
- if(GLOB.monkey_icon_cache[identity])
- monkey_icon = GLOB.monkey_icon_cache[identity]
- return
-
- //Start with two sides
- var/icon/main = icon('icons/mob/clothing/back.dmi', icon_state) //This takes the icon and uses the worn version of the icon
- var/icon/sub = icon('icons/mob/clothing/back.dmi', icon_state)
-
- //merge the sub side with the main, after masking off the middle pixel line
- var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_right") //masking
- main.AddAlphaMask(mask)
- mask = new('icons/mob/monkey.dmi', "monkey_mask_left")
- sub.AddAlphaMask(mask)
- sub.Shift(EAST, 1)
- main.Blend(sub, ICON_OVERLAY)
-
- //Shift it facing west, due to a spriting quirk
- sub = icon(main, dir = WEST)
- sub.Shift(WEST, 1)
- main.Insert(sub, dir = WEST)
-
- //Shift it down one, backpack specific quirk
- main.Shift(SOUTH, 1)
-
- //Mix in GAG color
- if(greyscale_colors)
- main.Blend(greyscale_colors, ICON_MULTIPLY)
-
- //Finished
- monkey_icon = main
- GLOB.monkey_icon_cache[identity] = icon(monkey_icon)
diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm
index 06c17e96e169d..e9fd4cbe68d00 100644
--- a/code/game/objects/structures/petrified_statue.dm
+++ b/code/game/objects/structures/petrified_statue.dm
@@ -90,14 +90,6 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/statue/petrified)
S.add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
return 1
-/mob/living/carbon/monkey/petrify(statue_timer)
- if(!isturf(loc))
- return 0
- var/obj/structure/statue/petrified/S = new(loc, src, statue_timer)
- S.name = "statue of a monkey"
- S.icon_state = "monkey"
- return 1
-
/mob/living/simple_animal/pet/dog/corgi/petrify(statue_timer)
if(!isturf(loc))
return 0
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index ac850ce157a0d..dd48ca7d09a3c 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -62,7 +62,8 @@
return TRUE
var/mob/living/living_caller = caller
- if(!living_caller.ventcrawler && living_caller.mob_size != MOB_SIZE_TINY)
+ var/ventcrawler = HAS_TRAIT(living_caller, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(living_caller, TRAIT_VENTCRAWLER_NUDE)
+ if(!ventcrawler && living_caller.mob_size != MOB_SIZE_TINY)
return FALSE
if(caller?.pulling)
@@ -95,7 +96,8 @@
if(istype(living_mover.buckled, /mob/living/simple_animal/bot/mulebot)) // mulebot passenger gets a free pass.
return TRUE
- if(living_mover.body_position == STANDING_UP && living_mover.mob_size != MOB_SIZE_TINY && !living_mover.ventcrawler) //If your not laying down, or a ventcrawler or a small creature, no pass.
+ var/ventcrawler = HAS_TRAIT(living_mover, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(living_mover, TRAIT_VENTCRAWLER_NUDE)
+ if(living_mover.body_position == STANDING_UP && !ventcrawler && living_mover.mob_size != MOB_SIZE_TINY) //If your not laying down, or a ventcrawler or a small creature, no pass.
return FALSE
/obj/structure/plasticflaps/deconstruct(disassembled = TRUE)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 544cb9177e98b..3cafca7175129 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -653,7 +653,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/table)
return FALSE
if (!patient.resting)
return FALSE
- if(ishuman(patient) || ismonkey(patient))
+ if(ishuman(patient))
return TRUE
return FALSE
diff --git a/code/game/points_of_interest.dm b/code/game/points_of_interest.dm
index baf46ebe6b407..92a8a5ae3507f 100644
--- a/code/game/points_of_interest.dm
+++ b/code/game/points_of_interest.dm
@@ -50,8 +50,6 @@
moblist.Add(M)
for(var/mob/dead/new_player/M in sortmob)
moblist.Add(M)
- for(var/mob/living/carbon/monkey/M in sortmob)
- moblist.Add(M)
for(var/mob/living/simple_animal/slime/M in sortmob)
moblist.Add(M)
for(var/mob/living/simple_animal/M in sortmob)
diff --git a/code/game/turfs/turf_integrity.dm b/code/game/turfs/turf_integrity.dm
index dc685c2952001..46f0d89fa92a2 100644
--- a/code/game/turfs/turf_integrity.dm
+++ b/code/game/turfs/turf_integrity.dm
@@ -189,7 +189,7 @@
take_damage(I.force, I.damtype, MELEE, 1)
/turf/attackby(obj/item/W, mob/user, params)
- if (!user.IsAdvancedToolUser())
+ if (!user.IsAdvancedToolUser() && !ismonkey(user))
to_chat(user, "You don't have the dexterity to do this!")
return
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 1a89b834bf8f7..86f70343010a4 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -138,7 +138,7 @@
body += "
"
//Human
- if(ishuman(M))
+ if(ishuman(M) && !ismonkey(M))
body += "Human "
else
body += "Humanize "
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 85cd57e178383..c9bccda50c727 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -536,7 +536,7 @@
if("slime")
M.change_mob_type( /mob/living/simple_animal/slime , null, null, delmob )
if("monkey")
- M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob )
+ M.change_mob_type( /mob/living/carbon/human/species/monkey , null, null, delmob )
if("robot")
M.change_mob_type( /mob/living/silicon/robot , null, null, delmob )
if("cat")
@@ -805,9 +805,9 @@
if(!check_rights(R_SPAWN))
return
- var/mob/living/carbon/monkey/Mo = locate(href_list["humanone"])
+ var/mob/living/carbon/human/species/monkey/Mo = locate(href_list["humanone"])
if(!istype(Mo))
- to_chat(usr, "This can only be used on instances of type /mob/living/carbon/monkey.")
+ to_chat(usr, "This can only be used on monkeys.")
return
log_admin("[key_name(usr)] attempting to humanize [key_name(Mo)].")
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index b4cac583e2998..ac38d772354d3 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -403,12 +403,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
//check if they were a monkey
else if(findtext(G_found.real_name,"monkey"))
if(alert("This character appears to have been a monkey. Would you like to respawn them as such?",,"Yes","No")=="Yes")
- var/mob/living/carbon/monkey/new_monkey = new
+ var/mob/living/carbon/human/species/monkey/new_monkey = new
SSjob.SendToLateJoin(new_monkey)
G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use
new_monkey.key = G_found.key
to_chat(new_monkey, "You have been fully respawned. Enjoy the game.")
- var/msg = "[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy xeno."
+ var/msg = "[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy monkey."
message_admins(msg)
admin_ticket_log(new_monkey, msg)
return //all done. The ghost is auto-deleted
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
index 219e026713e6e..3f87950d880e8 100644
--- a/code/modules/admin/view_variables/topic.dm
+++ b/code/modules/admin/view_variables/topic.dm
@@ -61,9 +61,9 @@
if(!check_rights(R_SPAWN))
return
- var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list
+ var/mob/living/carbon/human/species/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list
if(!istype(Mo))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey")
+ to_chat(usr, "This can only be done to monkeys")
return
if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm
index 403ea59a3a549..44a48a022ef2a 100644
--- a/code/modules/antagonists/abductor/equipment/gland.dm
+++ b/code/modules/antagonists/abductor/equipment/gland.dm
@@ -204,7 +204,7 @@
/obj/item/organ/heart/gland/ventcrawling/activate()
to_chat(owner, "You feel very stretchy.")
- owner.ventcrawler = VENTCRAWLER_ALWAYS
+ ADD_TRAIT(owner, TRAIT_VENTCRAWLER_ALWAYS, type)
/obj/item/organ/heart/gland/viral
true_name = "contamination incubator"
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index cff87dbf03113..79bff1d91b68b 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -106,7 +106,7 @@
chem_recharge_slowdown = initial(chem_recharge_slowdown)
/datum/antagonist/changeling/proc/remove_changeling_powers()
- if(ishuman(owner.current) || ismonkey(owner.current))
+ if(ishuman(owner.current))
reset_properties()
for(var/datum/action/changeling/p in purchasedpowers)
purchasedpowers -= p
diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm
index 70c292f826735..de4af39ae8ca5 100644
--- a/code/modules/antagonists/changeling/changeling_power.dm
+++ b/code/modules/antagonists/changeling/changeling_power.dm
@@ -54,11 +54,8 @@ the same goes for Remove(). if you override Remove(), call parent or else your p
//Fairly important to remember to return 1 on success >.<
/datum/action/changeling/proc/can_sting(mob/living/user, mob/target)
- if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards
- return 0
- if(req_human && !ishuman(user))
- to_chat(user, "We cannot do that in this form!")
- return 0
+ if(!ishuman(user)) //typecast everything from mob to carbon from this point onwards
+ return FALSE
var/datum/antagonist/changeling/c = user.mind.has_antag_datum(/datum/antagonist/changeling)
if(c.chem_charges < chemical_cost)
to_chat(user, "We require at least [chemical_cost] unit\s of chemicals to do that!")
@@ -80,7 +77,7 @@ the same goes for Remove(). if you override Remove(), call parent or else your p
/datum/action/changeling/proc/can_be_used_by(mob/user)
if(!user || QDELETED(user))
return 0
- if(!ishuman(user) && !ismonkey(user))
+ if(!ishuman(user))
return FALSE
if(req_human && !ishuman(user))
return FALSE
diff --git a/code/modules/antagonists/changeling/powers/humanform.dm b/code/modules/antagonists/changeling/powers/humanform.dm
index 0985364830789..86e36e0f87a00 100644
--- a/code/modules/antagonists/changeling/powers/humanform.dm
+++ b/code/modules/antagonists/changeling/powers/humanform.dm
@@ -25,7 +25,7 @@
..()
changeling.purchasedpowers -= src
- var/newmob = user.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
+ var/newmob = user.humanize()
changeling_transform(newmob, chosen_prof)
return TRUE
diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm
index 86efb16e33733..e222d0c5d7f1f 100644
--- a/code/modules/antagonists/changeling/powers/lesserform.dm
+++ b/code/modules/antagonists/changeling/powers/lesserform.dm
@@ -13,5 +13,5 @@
return FALSE
to_chat(user, "Our genes cry out!")
..()
- user.monkeyize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
+ user.monkeyize()
return TRUE
diff --git a/code/modules/antagonists/changeling/powers/regenerate.dm b/code/modules/antagonists/changeling/powers/regenerate.dm
index 130ced301e540..c3c56b6359e0a 100644
--- a/code/modules/antagonists/changeling/powers/regenerate.dm
+++ b/code/modules/antagonists/changeling/powers/regenerate.dm
@@ -95,7 +95,6 @@
response_disarm_simple = "shoo"
response_harm_continuous = "steps on"
response_harm_simple = "step on"
- ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
@@ -108,3 +107,7 @@
poison_per_bite = 4
poison_type = /datum/reagent/toxin/staminatoxin
discovery_points = 1000
+
+/mob/living/simple_animal/hostile/poison/limbsnake/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
diff --git a/code/modules/antagonists/changeling/powers/teratoma.dm b/code/modules/antagonists/changeling/powers/teratoma.dm
index 30da334d3aa7e..010ea59ddc243 100644
--- a/code/modules/antagonists/changeling/powers/teratoma.dm
+++ b/code/modules/antagonists/changeling/powers/teratoma.dm
@@ -28,7 +28,7 @@
to_chat(usr, "You fail at creating a tumor. Perhaps you should try again later?")
c.chem_charges += chemical_cost //If it fails we want to refund the chemicals
return FALSE
- var/mob/living/carbon/monkey/tumor/T = new /mob/living/carbon/monkey/tumor(A)
+ var/mob/living/carbon/human/species/monkey/tumor/T = new /mob/living/carbon/human/species/monkey/tumor(A)
var/mob/dead/observer/C = pick(candidates)
T.key = C.key
var/datum/antagonist/teratoma/D = new
diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm
index 44ff428fdaff9..40a9f002519cf 100644
--- a/code/modules/antagonists/changeling/powers/tiny_prick.dm
+++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm
@@ -105,14 +105,10 @@
/datum/action/changeling/sting/transformation/sting_action(mob/user, mob/target)
log_combat(user, target, "stung", "transformation sting", " new identity is '[selected_dna.dna.real_name]'")
var/datum/dna/new_dna = selected_dna.dna
- if(ismonkey(target))
- to_chat(user, "Our genes cry out as we sting [target.name]!")
var/mob/living/carbon/C = target
. = TRUE
if(istype(C))
- if(ismonkey(C))
- C = C.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPAI)
var/datum/status_effect/ling_transformation/previous_transformation = C.has_status_effect(STATUS_EFFECT_LING_TRANSFORMATION)
C.apply_status_effect(STATUS_EFFECT_LING_TRANSFORMATION, new_dna, istype(previous_transformation) ? previous_transformation.original_dna : null)
COOLDOWN_START(src, next_sting, TRANSFORM_STING_COOLDOWN)
diff --git a/code/modules/antagonists/changeling/teratoma.dm b/code/modules/antagonists/changeling/teratoma.dm
index 3e5a4c51aaf75..7dd06644f3da6 100644
--- a/code/modules/antagonists/changeling/teratoma.dm
+++ b/code/modules/antagonists/changeling/teratoma.dm
@@ -26,9 +26,9 @@
objectives -= O
/datum/antagonist/teratoma/admin_remove(mob/admin)
- var/mob/living/carbon/monkey/tumor/M = owner.current
+ var/mob/living/carbon/human/species/monkey/tumor/M = owner.current
if(alert(admin, "Humanize?", "Humanize", "Yes", "No") == "Yes")
- M.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG)
+ M.humanize()
. = ..()
/datum/antagonist/teratoma/admin_add(datum/mind/new_owner, mob/admin)
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index 703848cf0922b..cd4d339050a96 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -15,7 +15,6 @@
stop_automated_movement = 1
status_flags = CANPUSH
pass_flags = PASSTABLE
- ventcrawler = VENTCRAWLER_ALWAYS
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxHealth = 150
@@ -60,6 +59,7 @@
var/datum/action/innate/morph_stomach/stomach_action
/mob/living/simple_animal/hostile/morph/Initialize(mapload)
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
morph_stomach = new(src)
stomach_action = new(morph_stomach)
stomach_action.Grant(src)
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index abf2c51171a6d..83e9e2448a420 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -79,12 +79,18 @@
essence_drained += rand(15, 20)
to_chat(src, "You search for the soul of [target].")
if(do_after(src, rand(10, 20), target, timed_action_flags = IGNORE_HELD_ITEM)) //did they get deleted in that second?
+ //We suck upon a player
if(target.ckey)
to_chat(src, "[target.p_their(TRUE)] soul burns with intelligence.")
essence_drained += rand(20, 30)
- if(target.stat != DEAD)
+ //We suck upon a LIVING HUMAN player
+ if(target.stat != DEAD && !HAS_TRAIT(target, TRAIT_WEAK_SOUL))
to_chat(src, "[target.p_their(TRUE)] soul blazes with life!")
essence_drained += rand(40, 50)
+ //We suck upon a nonplayer thats a monkey
+ if(HAS_TRAIT(target, TRAIT_WEAK_SOUL) && !target.ckey)
+ to_chat(src, "[target.p_their(TRUE)] soul is weak and underdeveloped. They won't be worth very much.")
+ essence_drained = 5
else
to_chat(src, "[target.p_their(TRUE)] soul is weak and faltering.")
if(do_after(src, rand(15, 20), target, timed_action_flags = IGNORE_HELD_ITEM)) //did they get deleted NOW?
@@ -121,7 +127,7 @@
var/datum/beam/B = Beam(target,icon_state="drain_life")
if(do_after(src, 46, target, timed_action_flags = IGNORE_HELD_ITEM)) //As one cannot prove the existance of ghosts, ghosts cannot prove the existance of the target they were draining.
change_essence_amount(essence_drained, FALSE, target)
- if(essence_drained <= 90 && target.stat != DEAD)
+ if(essence_drained <= 90 && target.stat != DEAD && !HAS_TRAIT(target, TRAIT_WEAK_SOUL))
essence_regen_cap += 5
to_chat(src, "The absorption of [target]'s living soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap].")
if(essence_drained > 90)
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index 8c4e89b264c17..c78790695d645 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -244,7 +244,7 @@
/datum/antagonist/rev/head/equip_rev()
var/mob/living/carbon/H = owner.current
- if(!ishuman(H) && !ismonkey(H))
+ if(!ishuman(H))
return
if(remove_clumsy)
diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm
index 5e4a70d793e83..9a4fdd198837f 100644
--- a/code/modules/antagonists/swarmer/swarmer.dm
+++ b/code/modules/antagonists/swarmer/swarmer.dm
@@ -86,7 +86,6 @@
AIStatus = AI_OFF
pass_flags = PASSTABLE
mob_size = MOB_SIZE_TINY
- ventcrawler = VENTCRAWLER_ALWAYS
ranged = 1
projectiletype = /obj/projectile/beam/disabler
ranged_cooldown_time = 20
@@ -108,6 +107,7 @@
/mob/living/simple_animal/hostile/swarmer/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
remove_verb(/mob/living/verb/pulled)
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diag_hud.add_to_hud(src)
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 68aeead0da8bd..f660e5c72d478 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -47,7 +47,7 @@
. = ..()
if(is_type_in_list(src, GLOB.ventcrawl_machinery) && isliving(user))
var/mob/living/L = user
- if(L.ventcrawler)
+ if(HAS_TRAIT(L, TRAIT_VENTCRAWLER_NUDE) || HAS_TRAIT(L, TRAIT_VENTCRAWLER_ALWAYS))
. += "Alt-click to crawl through it."
/obj/machinery/atmospherics/New(loc, process = TRUE, setdir)
diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm
index 84c95fda8662c..00fd4f47d709b 100644
--- a/code/modules/client/verbs/suicide.dm
+++ b/code/modules/client/verbs/suicide.dm
@@ -136,24 +136,6 @@
death(FALSE)
ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind
-/mob/living/carbon/monkey/verb/suicide()
- set hidden = 1
- if(!canSuicide())
- return
- var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")
- if(!canSuicide())
- return
- if(confirm == "Yes")
- set_suicide(TRUE)
- visible_message("[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.", \
- "[src] is attempting to bite [p_their()] tongue. It looks like [p_theyre()] trying to commit suicide.")
-
- suicide_log()
-
- adjustOxyLoss(max(200- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
- death(FALSE)
- ghostize(FALSE,SENTIENCE_ERASE) // Disallows reentering body and disassociates mind
-
/mob/living/silicon/ai/verb/suicide()
set hidden = 1
if(!canSuicide())
diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm
index 48d68753eecb8..337bc4630ad5e 100644
--- a/code/modules/clothing/head/_head.dm
+++ b/code/modules/clothing/head/_head.dm
@@ -148,36 +148,3 @@
if(ismob(loc))
var/mob/M = loc
M.update_inv_head()
-
-/obj/item/clothing/head/compile_monkey_icon()
- var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing
- //If the icon, for this type of item, is already made by something else, don't make it again
- if(GLOB.monkey_icon_cache[identity])
- monkey_icon = GLOB.monkey_icon_cache[identity]
- return
-
- //Start with two sides for the front
- var/icon/main = icon('icons/mob/clothing/head/default.dmi', icon_state) //This takes the icon and uses the worn version of the icon
- var/icon/sub = icon('icons/mob/clothing/head/default.dmi', icon_state)
-
- //merge the sub side with the main, after masking off the middle pixel line
- var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_right") //masking
- main.AddAlphaMask(mask)
- mask = new('icons/mob/monkey.dmi', "monkey_mask_left")
- sub.AddAlphaMask(mask)
- sub.Shift(EAST, 1)
- main.Blend(sub, ICON_OVERLAY)
-
- //handle side icons
- sub = icon('icons/mob/clothing/head/default.dmi', icon_state, dir = EAST)
- main.Insert(sub, dir = EAST)
- sub.Flip(WEST)
- main.Insert(sub, dir = WEST)
-
- //Mix in GAG color
- if(greyscale_colors)
- main.Blend(greyscale_colors, ICON_MULTIPLY)
-
- //Finished
- monkey_icon = main
- GLOB.monkey_icon_cache[identity] = icon(monkey_icon)
diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm
index 0ca06931a9028..7cee16c3b37d2 100644
--- a/code/modules/clothing/head/mind_monkey_helmet.dm
+++ b/code/modules/clothing/head/mind_monkey_helmet.dm
@@ -12,7 +12,6 @@
/obj/item/clothing/head/helmet/monkey_sentience_helmet/update_icon()
. = ..()
- compile_monkey_icon()
if(ismob(loc))
var/mob/mob = loc
mob.update_inv_head()
@@ -35,7 +34,7 @@
return
INVOKE_ASYNC(src, PROC_REF(poll), user)
-/obj/item/clothing/head/helmet/monkey_sentience_helmet/proc/poll(mob/living/carbon/monkey/user) //At this point, we can assume we're given a monkey, since this'll put them in the body anyways
+/obj/item/clothing/head/helmet/monkey_sentience_helmet/proc/poll(mob/living/carbon/human/user) //At this point, we can assume we're given a monkey, since this'll put them in the body anyways
if (user.stat) //Checks if the monkey is dead.
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) //If so, buzz and do not poll ghosts
return
@@ -108,9 +107,9 @@
/obj/item/clothing/head/helmet/monkey_sentience_helmet/attack_paw(mob/user)
//Typecasting to monkey just to see if we're on the user's head
- if (!istype(user, /mob/living/carbon/monkey))
+ if (!istype(user, /mob/living/carbon/human/species/monkey))
return ..()
- var/mob/living/carbon/monkey/M = user
+ var/mob/living/carbon/human/species/monkey/M = user
if(src!=M.head)
return ..()
if(!magnification)
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index e25003b96afd4..c3d52b6629cc1 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -84,36 +84,3 @@
if(loc == user)
// Update action button icon for adjusted mask, if someone is holding it.
user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off.
-
-/obj/item/clothing/mask/compile_monkey_icon()
- var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing
- //If the icon, for this type of item, is already made by something else, don't make it again
- if(GLOB.monkey_icon_cache[identity])
- monkey_icon = GLOB.monkey_icon_cache[identity]
- return
-
- //Start with two sides
- var/icon/main = icon('icons/mob/clothing/mask.dmi', icon_state) //This takes the icon and uses the worn version of the icon
- var/icon/sub = icon('icons/mob/clothing/mask.dmi', icon_state)
-
- //merge the sub side with the main, after masking off the middle pixel line
- var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_right") //masking
- main.AddAlphaMask(mask)
- mask = new('icons/mob/monkey.dmi', "monkey_mask_left")
- sub.AddAlphaMask(mask)
- sub.Shift(EAST, 1)
- main.Blend(sub, ICON_OVERLAY)
-
- //Flip it facing west, due to a spriting quirk
- sub = icon('icons/mob/clothing/mask.dmi', icon_state, dir = EAST)
- main.Insert(sub, dir = EAST)
- sub.Flip(WEST)
- main.Insert(sub, dir = WEST)
-
- //Mix in GAG color
- if(greyscale_colors)
- main.Blend(greyscale_colors, ICON_MULTIPLY)
-
- //Finished
- monkey_icon = main
- GLOB.monkey_icon_cache[identity] = icon(monkey_icon)
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 3707e40f06c56..3f915be847f63 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -150,7 +150,7 @@
H.update_inv_w_uniform()
H.update_inv_wear_suit()
if(ismonkey(loc))
- var/mob/living/carbon/monkey/H = loc
+ var/mob/living/carbon/human/species/monkey/H = loc
H.update_inv_w_uniform()
return TRUE
@@ -174,7 +174,7 @@
H.update_inv_w_uniform()
H.update_inv_wear_suit()
if(ismonkey(loc))
- var/mob/living/carbon/monkey/H = loc
+ var/mob/living/carbon/human/species/monkey/H = loc
H.update_inv_w_uniform()
//Adds or removes mob from suit sensor global list
@@ -290,71 +290,3 @@
/obj/item/clothing/under/rank
dying_key = DYE_REGISTRY_UNDER
-
-/obj/item/clothing/under/compile_monkey_icon()
- var/identity = "[type]_[icon_state]" //Allows using multiple icon states for piece of clothing
- //If the icon, for this type of clothing, is already made by something else, don't make it again
- if(GLOB.monkey_icon_cache[identity])
- monkey_icon = GLOB.monkey_icon_cache[identity]
- return
-
- //Start with a base and align it with the mask
- var/icon/base = icon('icons/mob/clothing/under/default.dmi', icon_state, SOUTH) //This takes the icon and uses the worn version of the icon
- var/icon/back = icon('icons/mob/clothing/under/default.dmi', icon_state, NORTH) //Awkard but, we have to manually insert the back
- back.Shift(SOUTH, 2) //Allign with masks
- base.Shift(SOUTH, 2)
-
- //Break the base down into two parts and lay it on-top of the original. This helps with clothing being too small for monkeys
- var/icon/left = new(base)
- var/icon/mask = new('icons/mob/monkey.dmi', "monkey_mask_left")
- left.AddAlphaMask(mask)
-
- var/icon/right = new(base)
- mask = new('icons/mob/monkey.dmi', "monkey_mask_right")
- right.AddAlphaMask(mask)
- right.Shift(EAST, 1)
-
- var/icon/middle = new(base) //This part is used to correct a line of pixels
- mask = new('icons/mob/monkey.dmi', "monkey_mask_middle")
- middle.AddAlphaMask(mask)
- middle.Shift(EAST, 1)
-
- left.Blend(right, ICON_OVERLAY)
- left.Blend(middle, ICON_OVERLAY)
- base.Blend(left, ICON_OVERLAY)
-
- //Again for the back
- left = new(back)
- mask = new('icons/mob/monkey.dmi', "monkey_mask_left")
- left.AddAlphaMask(mask)
-
- right = new(back)
- right.Shift(EAST, 1)
- mask = new('icons/mob/monkey.dmi', "monkey_mask_right")
- right.AddAlphaMask(mask)
-
- left.Blend(right, ICON_OVERLAY)
- back.Blend(left, ICON_OVERLAY) //blend the outcome into the current to avoid a bald stripe
-
- //Now modify the left & right facing icons to better emphasize direction / volume
- left = new(base)
- left.Shift(WEST, 3)
- base.Insert(left, dir = WEST)
-
- right = new(left)
- right.Flip(EAST)
- base.Insert(right, dir = EAST)
-
- //Apply masking
- mask = new('icons/mob/monkey.dmi', "monkey_mask_cloth")//Roughly monkey shaped clothing
- base.AddAlphaMask(mask)
- back.AddAlphaMask(mask)
- base.Insert(back, dir = NORTH)//Insert faces into the base
-
- //Mix in GAG color
- if(greyscale_colors)
- base.Blend(greyscale_colors, ICON_MULTIPLY)
-
- //Finished!
- monkey_icon = base
- GLOB.monkey_icon_cache[identity] = icon(monkey_icon) //Don't create a reference to monkey icon
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 619763320be1f..a7b92e70e43d6 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -174,9 +174,7 @@
var/mob/living/carbon/C = occupant
typeofmeat = C.type_of_meat
gibtype = C.gib_type
- if(ismonkey(C))
- typeofskin = /obj/item/stack/sheet/animalhide/monkey
- else if(isalien(C))
+ if(isalien(C))
typeofskin = /obj/item/stack/sheet/animalhide/xeno
var/occupant_volume
if(occupant?.reagents)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index 70e3b864ed776..4aa4fb723c4d7 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -64,7 +64,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
if(ismonkey(target))
stuff_monkey_in(target, user)
-/obj/machinery/monkey_recycler/proc/stuff_monkey_in(mob/living/carbon/monkey/target, mob/living/user)
+/obj/machinery/monkey_recycler/proc/stuff_monkey_in(mob/living/carbon/human/species/monkey/target, mob/living/user)
if(!istype(target))
return
if(target.stat == CONSCIOUS)
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index b69ca5b25fe06..190033dd6c9d4 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -24,10 +24,10 @@
//if they are holding or wearing a card that has access, that works
if(check_access(H.get_active_held_item()) || src.check_access(H.wear_id))
return TRUE
- else if(ismonkey(accessor) || isalienadult(accessor))
- var/mob/living/carbon/george = accessor
- //they can only hold things :(
- if(check_access(george.get_active_held_item()))
+ else if(isalienadult(accessor))
+ var/mob/living/carbon/xenolady = accessor
+ //she can only hold things :(
+ if(check_access(xenolady.get_active_held_item()))
return TRUE
else if(isanimal(accessor))
var/mob/living/simple_animal/A = accessor
diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm
index add25a6e3ee06..b6153c911efd6 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -1750,6 +1750,11 @@
locked = TRUE
color_src = null
+/datum/sprite_accessory/tails/human/monkey
+ name = "Monkey"
+ icon_state = "monkey"
+ color_src = FALSE
+
/datum/sprite_accessory/snouts
icon = 'icons/mob/mutant_bodyparts.dmi'
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 7851d62ac9e6a..88dfa4fe54c55 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -107,6 +107,12 @@
/mob/proc/get_held_index_of_item(obj/item/I)
return held_items.Find(I)
+///Find number of held items, multihand compatible
+/mob/proc/get_num_held_items()
+ . = 0
+ for(var/i in 1 to held_items.len)
+ if(held_items[i])
+ .++
//Sad that this will cause some overhead, but the alias seems necessary
//*I* may be happy with a million and one references to "indexes" but others won't be
diff --git a/code/modules/mob/living/basic/vermin/cockroach.dm b/code/modules/mob/living/basic/vermin/cockroach.dm
index 47e000da38d15..91a3231a75ef2 100644
--- a/code/modules/mob/living/basic/vermin/cockroach.dm
+++ b/code/modules/mob/living/basic/vermin/cockroach.dm
@@ -11,7 +11,6 @@
speed = 1.25
gold_core_spawnable = FRIENDLY_SPAWN
pass_flags = PASSTABLE | PASSMOB
- ventcrawler = VENTCRAWLER_ALWAYS
verb_say = "chitters"
verb_ask = "chitters inquisitively"
@@ -30,6 +29,7 @@
/mob/living/basic/cockroach/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
AddElement(/datum/element/death_drops, list(/obj/effect/decal/cleanable/insectguts))
// AddElement(/datum/element/swabable, CELL_LINE_TABLE_COCKROACH, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 7) //Bee edit: No swabable elements
AddElement(/datum/element/basic_body_temp_sensetive, 270, INFINITY)
diff --git a/code/modules/mob/living/basic/vermin/mothroach.dm b/code/modules/mob/living/basic/vermin/mothroach.dm
index 2f232fc6275fd..130f9abf836f1 100644
--- a/code/modules/mob/living/basic/vermin/mothroach.dm
+++ b/code/modules/mob/living/basic/vermin/mothroach.dm
@@ -19,7 +19,6 @@
gold_core_spawnable = FRIENDLY_SPAWN
can_be_held = TRUE
worn_slot_flags = ITEM_SLOT_HEAD
- ventcrawler = VENTCRAWLER_ALWAYS
verb_say = "flutters"
verb_ask = "flutters inquisitively"
@@ -38,6 +37,7 @@
/mob/living/basic/mothroach/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
AddElement(/datum/element/pet_bonus, "squeaks happily!", emote_sound = 'sound/voice/moth/scream_moth.ogg')
/mob/living/basic/mothroach/update_resting()
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 6780a5e8c7618..2c067577ba02a 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -255,14 +255,6 @@ bleedsuppress has been replaced for is_bandaged(). Note that is_bleeding() retur
if (bleed.bleed_rate <= 0)
stop_holding_wounds()
-/mob/living/carbon/monkey/handle_blood()
- if(bodytemperature >= TCRYO && !(HAS_TRAIT(src, TRAIT_HUSK))) //cryosleep or husked people do not pump the blood.
- //Blood regeneration if there is some space
- if(blood_volume < BLOOD_VOLUME_NORMAL)
- blood_volume += 0.1 // regenerate blood VERY slowly
- if(blood_volume < BLOOD_VOLUME_OKAY)
- adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
-
// Takes care blood loss and regeneration
/mob/living/carbon/human/handle_blood()
@@ -452,10 +444,6 @@ bleedsuppress has been replaced for is_bandaged(). Note that is_bleeding() retur
if(blood_volume)
return /datum/reagent/blood
-/mob/living/carbon/monkey/get_blood_id()
- if(!(HAS_TRAIT(src, TRAIT_HUSK)))
- return /datum/reagent/blood
-
/mob/living/carbon/human/get_blood_id()
if(HAS_TRAIT(src, TRAIT_HUSK))
return
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 594fb65d2a303..371c0c718de3e 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -4,7 +4,6 @@
gender = FEMALE //All xenos are girls!!
dna = null
faction = list(FACTION_ALIEN)
- ventcrawler = VENTCRAWLER_ALWAYS
sight = SEE_MOBS
see_in_dark = 4
verb_say = "hisses"
@@ -24,6 +23,7 @@
var/move_delay_add = 0 // movement delay to add
/mob/living/carbon/alien/Initialize(mapload)
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
add_verb(/mob/living/proc/mob_sleep)
add_verb(/mob/living/proc/toggle_resting)
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 383f9afec9951..408f42fe984ec 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -50,7 +50,7 @@ In all, this is a lot like the monkey code. /N
/mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L)
return attack_alien(L)
-/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M)
+/mob/living/carbon/alien/attack_paw(mob/living/carbon/human/M)
if(!..())
return
if(stat != DEAD)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index db3d5e6dc2cb3..44a73cdbc8dd2 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -2,7 +2,6 @@
//Common stuffs for Praetorian and Queen
icon = 'icons/mob/alienqueen.dmi'
status_flags = 0
- ventcrawler = VENTCRAWLER_NONE //pull over that ass too fat
unique_name = 0
pixel_x = -16
base_pixel_x = -16
@@ -15,6 +14,11 @@
var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
var/game_end_timer
+/mob/living/carbon/alien/humanoid/royal/Initialize(mapload)
+ . = ..()
+ // as a wise man once wrote: "pull over that ass too fat"
+ REMOVE_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE)
return FALSE
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 40168e56f1f3d..83cbae7bcbfde 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -35,14 +35,6 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
-/obj/item/clothing/mask/facehugger/compile_monkey_icon()
- //If the icon, for this type of item, is already made by something else, don't make it again
- if(GLOB.monkey_icon_cache[type])
- monkey_icon = GLOB.monkey_icon_cache[type]
- return
- monkey_icon = icon('icons/obj/clothing/monkey_alt.dmi', "facehugger")
- GLOB.monkey_icon_cache[type] = icon(monkey_icon)
-
/obj/item/clothing/mask/facehugger/lamarr
name = "Lamarr"
sterile = TRUE
@@ -102,7 +94,6 @@
/obj/item/clothing/mask/facehugger/equipped(mob/M)
. = ..()
Attach(M)
- compile_monkey_icon()
/obj/item/clothing/mask/facehugger/proc/on_entered(datum/source, atom/target)
SIGNAL_HANDLER
@@ -260,9 +251,6 @@
if(!istype(M) || M.stat == DEAD || M.getorgan(/obj/item/organ/alien/hivenode))
return FALSE
- if(ismonkey(M))
- return TRUE
-
var/mob/living/carbon/C = M
if(ishuman(C) && !(ITEM_SLOT_MASK in C.dna.species.no_equip))
var/mob/living/carbon/human/H = C
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 95f8a9bcac4e9..6e6f005b03588 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1098,7 +1098,7 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon)
if(HAS_TRAIT(src, TRAIT_RADIMMUNE) || HAS_TRAIT(src, TRAIT_BADDNA))
to_chat(usr, "Mob cannot mutate")
return
- var/list/mutations = subtypesof(/datum/mutation)
+ var/list/mutations = subtypesof(/datum/mutation/human)
var/result = input(usr, "Choose the mutation to give", "Mutate") as null|anything in mutations
if(!usr)
return
@@ -1107,7 +1107,7 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon)
if(QDELETED(src))
to_chat(usr, "Mob doesn't exist anymore")
return
- var/datum/mutation/MT = result
+ var/datum/mutation/human/MT = result
if(dna.mutation_in_sequence(MT))
dna.activate_mutation(MT)
log_admin("[key_name(usr)] has activated the mutation [initial(MT.name)] in [key_name(src)]")
@@ -1132,7 +1132,7 @@ CREATION_TEST_IGNORE_SELF(/mob/living/carbon)
return
if(!result)
return
- var/datum/mutation/MT = result
+ var/datum/mutation/human/MT = result
dna.remove_mutation(MT.type)
log_admin("[key_name(usr)] has removed [MT.name] from [key_name(src)]")
message_admins("[key_name_admin(usr)] has removed [MT.name] from [key_name_admin(src)].")
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 3b46d8299efa2..18e7fa154e5c1 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -180,7 +180,7 @@
return 0
-/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M)
+/mob/living/carbon/attack_paw(mob/living/carbon/human/M)
if(can_inject(M, TRUE))
for(var/thing in diseases)
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 4b3beebc9e457..09e5449a3bd28 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -52,12 +52,6 @@
var/obj/item/organ/eyes/E = user.getorganslot(ORGAN_SLOT_EYES)
return istype(E)
-/datum/emote/living/carbon/gnarl
- key = "gnarl"
- key_third_person = "gnarls"
- message = "gnarls and shows its teeth.."
- mob_type_allowed_typecache = list(/mob/living/carbon/monkey)
-
/datum/emote/living/carbon/moan
key = "moan"
key_third_person = "moans"
@@ -69,32 +63,16 @@
key = "roll"
key_third_person = "rolls"
message = "rolls"
- mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
+ mob_type_allowed_typecache = list(/mob/living/carbon/alien)
hands_use_check = TRUE
/datum/emote/living/carbon/scratch
key = "scratch"
key_third_person = "scratches"
message = "scratches"
- mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
+ mob_type_allowed_typecache = list(/mob/living/carbon/alien)
hands_use_check = TRUE
-/datum/emote/living/carbon/screech
- key = "screech"
- key_third_person = "screeches"
- message = "screeches"
- mob_type_allowed_typecache = list(/mob/living/carbon/monkey)
- emote_type = EMOTE_AUDIBLE
-
-/datum/emote/living/carbon/screech/get_sound(mob/living/user)
- return pick('sound/creatures/monkey/monkey_screech_1.ogg',
- 'sound/creatures/monkey/monkey_screech_2.ogg',
- 'sound/creatures/monkey/monkey_screech_3.ogg',
- 'sound/creatures/monkey/monkey_screech_4.ogg',
- 'sound/creatures/monkey/monkey_screech_5.ogg',
- 'sound/creatures/monkey/monkey_screech_6.ogg',
- 'sound/creatures/monkey/monkey_screech_7.ogg')
-
/datum/emote/living/carbon/snap
emote_type = EMOTE_AUDIBLE
muzzle_ignore = TRUE
@@ -129,16 +107,11 @@
message_param = "snaps their fingers at %t thrice"
sound = 'sound/emotes/snap3.ogg'
-/datum/emote/living/carbon/screech/roar
- key = "roar"
- key_third_person = "roars"
- message = "roars"
-
/datum/emote/living/carbon/sign
key = "sign"
key_third_person = "signs"
message_param = "signs the number %t"
- mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
+ mob_type_allowed_typecache = list(/mob/living/carbon/alien)
hands_use_check = TRUE
/datum/emote/living/carbon/sign/select_param(mob/user, params)
@@ -156,7 +129,7 @@
/datum/emote/living/carbon/tail
key = "tail"
message = "waves their tail"
- mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
+ mob_type_allowed_typecache = list(/mob/living/carbon/alien)
/datum/emote/living/carbon/wink
key = "wink"
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 95b5d8cab1761..fe9d4dad6b4ef 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -4,7 +4,7 @@
return
switch(dna.species.species_gibs)
if(GIB_TYPE_HUMAN)
- new /obj/effect/temp_visual/gib_animation(loc, "gibbed-h")
+ new /obj/effect/temp_visual/gib_animation(loc, dna.species.gib_anim)
if(GIB_TYPE_ROBOTIC)
new /obj/effect/temp_visual/gib_animation(loc, "gibbed-r")
@@ -14,7 +14,7 @@
return
switch(dna.species.species_gibs)
if(GIB_TYPE_HUMAN)
- new /obj/effect/temp_visual/dust_animation(loc, "dust-h")
+ new /obj/effect/temp_visual/dust_animation(loc, dna.species.dust_anim)
if(GIB_TYPE_ROBOTIC)
new /obj/effect/temp_visual/dust_animation(loc, "dust-r")
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index d060e0982352f..280d70186a033 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -105,6 +105,23 @@ GLOBAL_LIST_EMPTY(dummy_mob_list)
/mob/living/carbon/human/dummy/remove_from_alive_mob_list()
return
+/mob/living/carbon/human/dummy/create_dna()
+ dna = new /datum/dna/dummy(src)
+ if(!dna.species)
+ var/rando_race = pick(get_selectable_species())
+ dna.species = new rando_race()
+
+/*
+ Specialized dummy DNA to remove artifacts from character preview
+*/
+/datum/dna/dummy
+
+/datum/dna/dummy/update_height_holder()
+ return
+
+/datum/dna/dummy/update_body_size(force, height)
+ return
+
/proc/create_consistent_human_dna(mob/living/carbon/human/target)
target.create_dna()
target.dna.features["body_markings"] = "None"
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 1f58b92024368..11d6fccc3a65f 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -124,6 +124,13 @@
var/mob/living/carbon/H = user
return H.dna?.species?.get_scream_sound(H)
+/datum/emote/living/carbon/human/scream/screech //If a human tries to screech it'll just scream.
+ key = "screech"
+ key_third_person = "screeches"
+ message = "screeches."
+ emote_type = EMOTE_AUDIBLE
+ vary = FALSE
+
/datum/emote/living/carbon/human/pale
key = "pale"
message = "goes pale for a second"
@@ -365,3 +372,45 @@
vary = TRUE
sound = 'sound/emotes/diona/cricket.ogg'
sound_volume = 30
+
+
+
+///Snowflake emotes only for le epic chimp
+/datum/emote/living/carbon/human/monkey
+
+/datum/emote/living/carbon/human/monkey/can_run_emote(mob/user, status_check = TRUE, intentional)
+ if(ismonkey(user))
+ return ..()
+ return FALSE
+
+/datum/emote/living/carbon/human/monkey/gnarl
+ key = "gnarl"
+ key_third_person = "gnarls"
+ message = "gnarls and shows its teeth..."
+
+/datum/emote/living/carbon/human/monkey/roll
+ key = "roll"
+ key_third_person = "rolls"
+ message = "rolls."
+ hands_use_check = TRUE
+
+/datum/emote/living/carbon/human/monkey/scratch
+ key = "scratch"
+ key_third_person = "scratches"
+ message = "scratches."
+ hands_use_check = TRUE
+
+/datum/emote/living/carbon/human/monkey/screech/roar
+ key = "roar"
+ key_third_person = "roars"
+ message = "roars."
+
+/datum/emote/living/carbon/human/monkey/tail
+ key = "tail"
+ message = "waves their tail."
+
+/datum/emote/living/carbon/human/monkeysign
+ key = "sign"
+ key_third_person = "signs"
+ message_param = "signs the number %t."
+ hands_use_check = TRUE
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index c755e27290862..c330e5fae7de7 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -6,7 +6,6 @@
var/t_him = p_them()
var/t_has = p_have()
var/t_is = p_are()
- var/t_es = p_es()
var/obscure_name
var/obscured = check_obscured_slots()
@@ -318,8 +317,9 @@
msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
if(getorgan(/obj/item/organ/brain))
if(ai_controller?.ai_status == AI_STATUS_ON)
- msg += "[t_He] do[t_es]n't appear to be [t_him]self.\n"
- if(!key)
+ if(!dna.species.ai_controlled_species)
+ msg += "[ai_controller.get_human_examine_text()]\n"
+ else if(!key)
msg += "[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.\n"
else if(!client)
msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index c475e5e3362d8..109c375e8f61c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -829,7 +829,7 @@
remove_all_embedded_objects()
set_heartattack(FALSE)
drunkenness = 0
- for(var/datum/mutation/HM as() in dna.mutations)
+ for(var/datum/mutation/human/HM as() in dna.mutations)
if(HM.quality != POSITIVE)
dna.remove_mutation(HM.name)
coretemperature = get_body_temp_normal(apply_change=FALSE)
@@ -1187,11 +1187,12 @@
src.apply_damage(power, BRUTE, def_zone = pick(BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT))
src.Paralyze(10 * power)
-/mob/living/carbon/human/monkeybrain
+/mob/living/carbon/human/species/monkeybrain
ai_controller = /datum/ai_controller/monkey
/mob/living/carbon/human/species
var/race = null
+ var/use_random_name = TRUE
CREATION_TEST_IGNORE_SUBTYPES(/mob/living/carbon/human/species)
@@ -1199,6 +1200,11 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/carbon/human/species)
. = ..()
set_species(race || specific_race)
+/mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update, pref_load)
+ . = ..()
+ if(use_random_name)
+ fully_replace_character_name(real_name, dna.species.random_name())
+
/mob/living/carbon/human/species/abductor
race = /datum/species/abductor
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index dea57476f9fa9..7e38a4ee6c028 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -233,7 +233,7 @@
var/mob/living/carbon/human/H = user
H.dna.species.spec_attack_hand(H, src)
-/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M)
+/mob/living/carbon/human/attack_paw(mob/living/carbon/human/M)
if(check_shields(M, 0, "the [M.name]", UNARMED_ATTACK))
visible_message("[M] attempts to touch [src]!", \
"[M] attempts to touch you!", "You hear a swoosh!", null, M)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 0f105db785b97..7b44fe404876a 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -57,7 +57,7 @@
var/list/datum/bioware = list()
- var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot, /mob/living/carbon/monkey))
+ var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot, /mob/living/carbon/human/species/monkey))
var/lastpuke = 0
var/last_fire_update
diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/human/monkey.dm
similarity index 65%
rename from code/modules/mob/living/carbon/monkey/punpun.dm
rename to code/modules/mob/living/carbon/human/monkey.dm
index faa5270193e61..ed6d6ce468f54 100644
--- a/code/modules/mob/living/carbon/monkey/punpun.dm
+++ b/code/modules/mob/living/carbon/human/monkey.dm
@@ -1,6 +1,23 @@
-/mob/living/carbon/monkey/punpun //except for a few special persistence features, pun pun is just a normal monkey
+/mob/living/carbon/human/species/monkey
+ icon_state = "monkey" //for mapping
+ race = /datum/species/monkey
+ ai_controller = /datum/ai_controller/monkey
+ faction = list("neutral", "monkey")
+
+/mob/living/carbon/human/species/monkey/angry
+ ai_controller = /datum/ai_controller/monkey/angry
+
+/mob/living/carbon/human/species/monkey/angry/Initialize(mapload)
+ . = ..()
+ if(prob(10))
+ var/obj/item/clothing/head/helmet/toggleable/justice/escape/helmet = new(src)
+ equip_to_slot_or_del(helmet,ITEM_SLOT_HEAD)
+ helmet.attack_self(src) // todo encapsulate toggle
+
+/mob/living/carbon/human/species/monkey/punpun //except for a few special persistence features, pun pun is just a normal monkey
name = "Pun Pun" //C A N O N
- unique_name = 0
+ unique_name = FALSE
+ use_random_name = FALSE
var/ancestor_name
var/ancestor_chain = 1
var/relic_hat //Note: relic_hat and relic_mask are paths
@@ -9,23 +26,28 @@
var/relic_mask_blacklist
var/memory_saved = FALSE
-/mob/living/carbon/monkey/punpun/Initialize(mapload)
+/mob/living/carbon/human/species/monkey/punpun/Initialize(mapload)
// Init our blacklists.
relic_hat_blacklist = typecacheof(list(/obj/item/clothing/head/chameleon,/obj/item/clothing/head/helmet/monkey_sentience_helmet), only_root_path = TRUE)
relic_mask_blacklist = typecacheof(list(/obj/item/clothing/mask/facehugger, /obj/item/clothing/mask/chameleon), only_root_path = TRUE)
// Read memory
Read_Memory()
+
+ var/name_to_use = name
+
if(ancestor_name)
- name = ancestor_name
+ name_to_use = ancestor_name
if(ancestor_chain > 1)
- name += " \Roman[ancestor_chain]"
+ name_to_use += " \Roman[ancestor_chain]"
else if(prob(10))
- name = pick(list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky"))
- if(name == "Furious George")
+ name_to_use = pick(list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky"))
+ if(name_to_use == "Furious George")
ai_controller = /datum/ai_controller/monkey/angry //hes always mad
. = ..()
+ fully_replace_character_name(real_name, name_to_use)
+
//These have to be after the parent new to ensure that the monkey
//bodyparts are actually created before we try to equip things to
//those slots
@@ -34,18 +56,18 @@
if(relic_mask && !is_type_in_typecache(relic_mask, relic_mask_blacklist))
equip_to_slot_or_del(new relic_mask, ITEM_SLOT_MASK)
-/mob/living/carbon/monkey/punpun/Life()
+/mob/living/carbon/human/species/monkey/punpun/Life()
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
Write_Memory(FALSE, FALSE)
memory_saved = TRUE
..()
-/mob/living/carbon/monkey/punpun/death(gibbed)
+/mob/living/carbon/human/species/monkey/punpun/death(gibbed)
if(!memory_saved)
Write_Memory(TRUE, gibbed)
..()
-/mob/living/carbon/monkey/punpun/proc/Read_Memory()
+/mob/living/carbon/human/species/monkey/punpun/proc/Read_Memory()
if(fexists("data/npc_saves/Punpun.sav")) //legacy compatability to convert old format to new
var/savefile/S = new /savefile("data/npc_saves/Punpun.sav")
S["ancestor_name"] >> ancestor_name
@@ -65,7 +87,7 @@
relic_hat = text2path(json["relic_hat"]) // We convert these to paths for type checking
relic_mask = text2path(json["relic_mask"])
-/mob/living/carbon/monkey/punpun/proc/Write_Memory(dead, gibbed)
+/mob/living/carbon/human/species/monkey/punpun/proc/Write_Memory(dead, gibbed)
var/json_file = file("data/npc_saves/Punpun.json")
var/list/file_data = list()
if(gibbed)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 906261228a0c9..70134cd94437f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -98,6 +98,11 @@ GLOBAL_LIST_EMPTY(features_by_species)
//Breathing! Most changes are in mutantlungs, though
var/breathid = "o2"
+ ///What anim to use for dusting
+ var/dust_anim = "dust-h"
+ ///What anim to use for gibbing
+ var/gib_anim = "gibbed-h"
+
//Blank list. As it runs through regenerate_organs, organs that are missing are added in sequential order to the list
//List is called in health analyzer and displays all missing organs
var/list/required_organs = list()
@@ -156,6 +161,12 @@ GLOBAL_LIST_EMPTY(features_by_species)
// Species specific bitflags. Used for things like if the race is unable to become a changeling.
var/species_bitflags = NONE
+ ///List of results you get from knife-butchering. null means you cant butcher it. Associated by resulting type - value of amount
+ var/list/knife_butcher_results
+
+ /// This supresses the "dosen't appear to be himself" examine text for if the mob is run by an AI controller. Should be used on any NPC human subtypes. Monkeys are the prime example.
+ var/ai_controlled_species = FALSE
+
///////////
// PROCS //
///////////
@@ -840,7 +851,6 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
bodyparts_to_add -= "tail_human"
-
if(mutant_bodyparts["waggingtail_human"])
if(H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
bodyparts_to_add -= "waggingtail_human"
@@ -1647,6 +1657,11 @@ GLOBAL_LIST_EMPTY(features_by_species)
user.do_attack_animation(target, ATTACK_EFFECT_CLAW)
if(ATTACK_EFFECT_SMASH)
user.do_attack_animation(target, ATTACK_EFFECT_SMASH)
+ if(ATTACK_EFFECT_BITE)
+ if(user.is_mouth_covered(FALSE, TRUE))
+ to_chat(user, "You can't bite with your mouth covered!")
+ return FALSE
+ user.do_attack_animation(target, ATTACK_EFFECT_BITE)
else
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
@@ -2939,3 +2954,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
//Use this to return dynamic heights, such as making felinids shorter on halloween or something
/datum/species/proc/get_species_height()
return species_height
+
+/datum/species/proc/get_species_height_map()
+ return icon('icons/effects/64x64.dmi', "height_displacement")
+
+///Species override for unarmed attacks because the attack_hand proc was made by a mouth-breathing troglodyte on a tricycle. Also to whoever thought it would be a good idea to make it so the original spec_unarmedattack was not actually linked to unarmed attack needs to be checked by a doctor because they clearly have a vast empty space in their head.
+/datum/species/proc/spec_unarmedattack(mob/living/carbon/human/user, atom/target)
+ return FALSE
diff --git a/code/modules/mob/living/carbon/human/species_types/IPC.dm b/code/modules/mob/living/carbon/human/species_types/IPC.dm
index 90696ecee5f1c..36746a4a50eaf 100644
--- a/code/modules/mob/living/carbon/human/species_types/IPC.dm
+++ b/code/modules/mob/living/carbon/human/species_types/IPC.dm
@@ -4,8 +4,28 @@
id = SPECIES_IPC
bodyflag = FLAG_IPC
sexes = FALSE
- species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,NOZOMBIE,MUTCOLORS,REVIVESBYHEALING,NOHUSK,NOMOUTH, MUTCOLORS)
- inherent_traits = list(TRAIT_BLOOD_COOLANT,TRAIT_RESISTCOLD,TRAIT_NOBREATH,TRAIT_RADIMMUNE,TRAIT_LIMBATTACHMENT,TRAIT_EASYDISMEMBER,TRAIT_POWERHUNGRY,TRAIT_XENO_IMMUNE, TRAIT_TOXIMMUNE)
+ species_traits = list(
+ NOTRANSSTING,
+ NOEYESPRITES,
+ NO_DNA_COPY,
+ NOZOMBIE,
+ MUTCOLORS,
+ REVIVESBYHEALING,
+ NOHUSK,
+ NOMOUTH,
+ MUTCOLORS
+ )
+ inherent_traits = list(
+ TRAIT_BLOOD_COOLANT,
+ TRAIT_RESISTCOLD,
+ TRAIT_NOBREATH,
+ TRAIT_RADIMMUNE,
+ TRAIT_LIMBATTACHMENT,
+ TRAIT_EASYDISMEMBER,
+ TRAIT_POWERHUNGRY,
+ TRAIT_XENO_IMMUNE,
+ TRAIT_TOXIMMUNE
+ )
inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID)
mutantbrain = /obj/item/organ/brain/positron
mutanteyes = /obj/item/organ/eyes/robotic
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 76842c3af6aee..3471662b546dd 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -919,19 +919,25 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cloth_pile)
/datum/species/golem/plastic
name = "Plastic Golem"
id = SPECIES_GOLEM_PLASTIC
+ inherent_traits = list(
+ TRAIT_RESISTHEAT,
+ TRAIT_NOBREATH,
+ TRAIT_RESISTCOLD,
+ TRAIT_RESISTHIGHPRESSURE,
+ TRAIT_RESISTLOWPRESSURE,
+ TRAIT_NOFIRE,
+ TRAIT_NOGUNS,
+ TRAIT_RADIMMUNE,
+ TRAIT_PIERCEIMMUNE,
+ TRAIT_NODISMEMBER,
+ TRAIT_NONECRODISEASE,
+ TRAIT_VENTCRAWLER_NUDE,
+ )
prefix = "Plastic"
special_names = list("Sheet", "Bag", "Bottle")
fixed_mut_color = "fffa"
info_text = "As a Plastic Golem, you are capable of ventcrawling and passing through plastic flaps as long as you are naked."
-/datum/species/golem/plastic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
- . = ..()
- C.ventcrawler = VENTCRAWLER_NUDE
-
-/datum/species/golem/plastic/on_species_loss(mob/living/carbon/C)
- . = ..()
- C.ventcrawler = initial(C.ventcrawler)
-
/datum/species/golem/bronze
name = "Bronze Golem"
id = SPECIES_GOLEM_BRONZE
diff --git a/code/modules/mob/living/carbon/human/species_types/monkey.dm b/code/modules/mob/living/carbon/human/species_types/monkey.dm
deleted file mode 100644
index 349806028e497..0000000000000
--- a/code/modules/mob/living/carbon/human/species_types/monkey.dm
+++ /dev/null
@@ -1,74 +0,0 @@
-///DO NOT USE set_species(/datum/species/monkey)
-///USE monkeyize() INSTEAD
-/datum/species/monkey
- name = "\improper Monkey"
- id = SPECIES_MONKEY
- skinned_type = /obj/item/stack/sheet/animalhide/
- changesource_flags = MIRROR_BADMIN
- offset_features = list(
- OFFSET_HEAD = list(0,-3),
- OFFSET_FACEMASK = list(0,-3)
- )
-
- species_chest = /obj/item/bodypart/chest/monkey
- species_head = /obj/item/bodypart/head/monkey
- species_l_arm = /obj/item/bodypart/l_arm/monkey
- species_r_arm = /obj/item/bodypart/r_arm/monkey
- species_l_leg = /obj/item/bodypart/l_leg/monkey
- species_r_leg = /obj/item/bodypart/r_leg/monkey
-
-/datum/species/monkey/get_species_description()
- return "Monkeys are a type of primate that exist between humans and animals on the evolutionary chain. \
- Every year, on Monkey Day, Nanotrasen shows their respect for the little guys by allowing them to roam the station freely."
-
-/datum/species/monkey/get_species_lore()
- return list(
- "Monkeys are commonly used as test subjects on board Space Station 13. \
- But what if... for one day... the Monkeys were allowed to be the scientists? \
- What experiments would they come up with? Would they (stereotypically) be related to bananas somehow? \
- There's only one way to find out.",
- )
-
-/datum/species/monkey/create_pref_unique_perks()
- var/list/to_add = list()
-
- to_add += list(
- list(
- SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK,
- SPECIES_PERK_ICON = "spider",
- SPECIES_PERK_NAME = "Vent Crawling",
- SPECIES_PERK_DESC = "Monkeys can crawl through the vent and scrubber networks while wearing no clothing. \
- Stay out of the kitchen!",
- ),
- list(
- SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
- SPECIES_PERK_ICON = "paw",
- SPECIES_PERK_NAME = "Primal Primate",
- SPECIES_PERK_DESC = "Monkeys are primitive humans, and can't do most things a human can do. Computers are impossible, \
- complex machines are right out, and most clothes don't fit your smaller form.",
- ),
- list(
- SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
- SPECIES_PERK_ICON = "capsules",
- SPECIES_PERK_NAME = "Mutadone Averse",
- SPECIES_PERK_DESC = "Monkeys are reverted into normal humans upon being exposed to Mutadone.",
- ),
- )
-
- return to_add
-
-/datum/species/monkey/create_pref_language_perk()
- var/list/to_add = list()
- // Holding these variables so we can grab the exact names for our perk.
- var/datum/language/common_language = /datum/language/common
- var/datum/language/monkey_language = /datum/language/monkey
-
- to_add += list(list(
- SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
- SPECIES_PERK_ICON = "comment",
- SPECIES_PERK_NAME = "Primitive Tongue",
- SPECIES_PERK_DESC = "You may be able to understand [initial(common_language.name)], but you can't speak it. \
- You can only speak [initial(monkey_language.name)].",
- ))
-
- return to_add
diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
new file mode 100644
index 0000000000000..056fd3555ea16
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
@@ -0,0 +1,233 @@
+/datum/species/monkey
+ name = "Monkey"
+ id = SPECIES_MONKEY
+ skinned_type = /obj/item/stack/sheet/animalhide/
+ changesource_flags = MIRROR_BADMIN
+ mutanttongue = /obj/item/organ/tongue/monkey
+ skinned_type = /obj/item/stack/sheet/animalhide/monkey
+ meat = /obj/item/food/meat/slab/monkey
+ knife_butcher_results = list(/obj/item/food/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
+ species_traits = list(
+ NO_UNDERWEAR,
+ NOTRANSSTING,
+ EYECOLOR
+ )
+ inherent_traits = list(
+ TRAIT_DISCOORDINATED,
+ TRAIT_VENTCRAWLER_NUDE,
+ TRAIT_PRIMITIVE,
+ TRAIT_INFERIORFORM,
+ TRAIT_WEAK_SOUL,
+ )
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN | SLIME_EXTRACT
+ inherent_factions = list("monkey")
+ sexes = TRUE
+ species_language_holder = /datum/language_holder/monkey
+
+ mutant_organs = list(/obj/item/organ/tail/monkey)
+ species_l_arm = /obj/item/bodypart/l_arm/monkey
+ species_r_arm = /obj/item/bodypart/r_arm/monkey
+ species_head = /obj/item/bodypart/head/monkey
+ species_l_leg = /obj/item/bodypart/l_leg/monkey
+ species_r_leg = /obj/item/bodypart/r_leg/monkey
+ species_chest = /obj/item/bodypart/chest/monkey
+
+ dust_anim = "dust-m"
+ gib_anim = "gibbed-m"
+
+ ai_controlled_species = TRUE
+
+ species_height = SPECIES_HEIGHTS(8, 8, 8)
+
+ //payday_modifier = 1.5
+
+/datum/species/monkey/random_name(gender,unique,lastname)
+ var/randname = "monkey ([rand(1,999)])"
+
+ return randname
+
+/datum/species/monkey/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
+ . = ..()
+ H.pass_flags |= PASSTABLE
+ H.butcher_results = knife_butcher_results
+ if(!H.dna.features["tail_human"] || H.dna.features["tail_human"] == "None")
+ H.dna.features["tail_human"] = "Monkey"
+ handle_mutant_bodyparts(H)
+
+ H.dna.add_mutation(RACEMUT, MUT_NORMAL)
+ H.dna.activate_mutation(RACEMUT)
+
+
+/datum/species/monkey/on_species_loss(mob/living/carbon/C)
+ . = ..()
+ C.pass_flags = initial(C.pass_flags)
+ C.butcher_results = null
+ C.dna.remove_mutation(RACEMUT)
+
+/datum/species/monkey/spec_unarmedattack(mob/living/carbon/human/user, atom/target)
+ . = ..()
+ if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
+ if(!iscarbon(target))
+ return TRUE
+ var/mob/living/carbon/victim = target
+ if(user.a_intent != INTENT_HARM || user.is_muzzled())
+ return TRUE
+ var/obj/item/bodypart/affecting = null
+ if(ishuman(victim))
+ var/mob/living/carbon/human/human_victim = victim
+ affecting = human_victim.get_bodypart(pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ var/armor = victim.run_armor_check(affecting, MELEE)
+ if(prob(25))
+ victim.visible_message("[user]'s bite misses [victim]!",
+ "You avoid [user]'s bite!", "You hear jaws snapping shut!", COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, "Your bite misses [victim]!")
+ return TRUE
+ ///Monkeys are of a few mobs remaining in beecode that use randomized damage apply_damage(rand()) for some attacks.
+ ///It was the perogative a few years ago to standardize most attack procs to the same consistent damage everytime, but we are not the same codebase as then.
+ ///If someone wants to change this status quo by either reintroducing RNG attacks, or killing them entirely, that should be its own pr and include every remaining case.
+ victim.apply_damage(rand(1, 3), BRUTE, affecting, armor)
+ victim.visible_message("[name] bites [victim]!",
+ "[name] bites you!", "You hear a chomp!", COMBAT_MESSAGE_RANGE, name)
+ to_chat(user, "You bite [victim]!")
+ if(armor >= 2)
+ return TRUE
+ for(var/d in user.diseases)
+ var/datum/disease/bite_infection = d
+ victim.ForceContractDisease(bite_infection)
+ return TRUE
+ target.attack_paw(user)
+ return TRUE
+
+/datum/species/monkey/handle_mutations_and_radiation(mob/living/carbon/human/H)
+ . = ..()
+ if(H.radiation > RAD_MOB_MUTATE * 2 && prob(50))
+ H.gorillize()
+ return
+
+/datum/species/monkey/get_scream_sound(mob/living/carbon/human/monkey)
+ return pick(
+ 'sound/creatures/monkey/monkey_screech_1.ogg',
+ 'sound/creatures/monkey/monkey_screech_2.ogg',
+ 'sound/creatures/monkey/monkey_screech_3.ogg',
+ 'sound/creatures/monkey/monkey_screech_4.ogg',
+ 'sound/creatures/monkey/monkey_screech_5.ogg',
+ 'sound/creatures/monkey/monkey_screech_6.ogg',
+ 'sound/creatures/monkey/monkey_screech_7.ogg',
+ )
+
+/datum/species/monkey/get_species_description()
+ return "Monkeys are a type of primate that exist between humans and animals on the evolutionary chain. \
+ Every year, on Monkey Day, Nanotrasen shows their respect for the little guys by allowing them to roam the station freely."
+
+/datum/species/monkey/get_species_lore()
+ return list(
+ "Monkeys are commonly used as test subjects on board Space Station 13. \
+ But what if... for one day... the Monkeys were allowed to be the scientists? \
+ What experiments would they come up with? Would they (stereotypically) be related to bananas somehow? \
+ There's only one way to find out.",
+ )
+
+/datum/species/monkey/create_pref_unique_perks()
+ var/list/to_add = list()
+
+ to_add += list(
+ list(
+ SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK,
+ SPECIES_PERK_ICON = "spider",
+ SPECIES_PERK_NAME = "Vent Crawling",
+ SPECIES_PERK_DESC = "Monkeys can crawl through the vent and scrubber networks while wearing no clothing. \
+ Stay out of the kitchen!",
+ ),
+ list(
+ SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
+ SPECIES_PERK_ICON = "paw",
+ SPECIES_PERK_NAME = "Primal Primate",
+ SPECIES_PERK_DESC = "Monkeys are primitive humans, and can't do most things a human can do. Computers are impossible, \
+ complex machines are right out, and most clothes don't fit your smaller form.",
+ ),
+ list(
+ SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
+ SPECIES_PERK_ICON = "capsules",
+ SPECIES_PERK_NAME = "Mutadone Averse",
+ SPECIES_PERK_DESC = "Monkeys are reverted into normal humans upon being exposed to Mutadone.",
+ ),
+ )
+
+ return to_add
+
+/datum/species/monkey/create_pref_language_perk()
+ var/list/to_add = list()
+ // Holding these variables so we can grab the exact names for our perk.
+ var/datum/language/common_language = /datum/language/common
+ var/datum/language/monkey_language = /datum/language/monkey
+
+ to_add += list(list(
+ SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK,
+ SPECIES_PERK_ICON = "comment",
+ SPECIES_PERK_NAME = "Primitive Tongue",
+ SPECIES_PERK_DESC = "You may be able to understand [initial(common_language.name)], but you can't speak it. \
+ You can only speak [initial(monkey_language.name)].",
+ ))
+
+ return to_add
+
+/datum/species/monkey/get_species_height_map()
+ return icon('icons/effects/64x64.dmi', "height_displacement_monkey")
+
+/datum/dna/tumor
+ species = new /datum/species/monkey/teratoma
+
+/datum/species/monkey/teratoma
+ name = "Teratoma"
+ id = "teratoma"
+ species_traits = list(
+ NOTRANSSTING,
+ NO_DNA_COPY,
+ NOEYESPRITES, //teratomas already have eyes baked-in
+ NO_UNDERWEAR,
+ HAIR,
+ FACEHAIR,
+ LIPS,
+ )
+ inherent_traits = list(
+ TRAIT_NOHUNGER,
+ TRAIT_RADIMMUNE,
+ TRAIT_BADDNA, //Made of mutated cells
+ TRAIT_NOGUNS,
+ TRAIT_NONECRODISEASE,
+ )
+ use_skintones = FALSE
+ skinned_type = /obj/item/stack/sheet/animalhide/monkey
+ changesource_flags = MIRROR_BADMIN
+ mutantbrain = /obj/item/organ/brain/tumor
+ mutanttongue = /obj/item/organ/tongue/teratoma
+
+ species_chest = /obj/item/bodypart/chest/monkey/teratoma
+ species_head = /obj/item/bodypart/head/monkey/teratoma
+ species_l_arm = /obj/item/bodypart/l_arm/monkey/teratoma
+ species_r_arm = /obj/item/bodypart/r_arm/monkey/teratoma
+ species_l_leg = /obj/item/bodypart/l_leg/monkey/teratoma
+ species_r_leg = /obj/item/bodypart/r_leg/monkey/teratoma
+
+/obj/item/organ/brain/tumor
+ name = "teratoma brain"
+
+/obj/item/organ/brain/tumor/Remove(mob/living/carbon/C, special, no_id_transfer, pref_load = FALSE)
+ . = ..()
+ //Removing it deletes it
+ if(!QDELETED(src))
+ qdel(src)
+
+/mob/living/carbon/human/species/monkey/tumor/handle_mutations_and_radiation()
+ return
+
+/mob/living/carbon/human/species/monkey/tumor/has_dna()
+ return FALSE
+
+/mob/living/carbon/human/species/monkey/tumor/create_dna()
+ dna = new /datum/dna/tumor(src)
+ //Give us the juicy mutant organs
+ dna.species.on_species_gain(src, null, FALSE)
+ dna.species.regenerate_organs(src, replace_current = TRUE)
+ //Fix initial DNA not properly handling our height
+ dna.update_body_size(height = pick(dna.species.get_species_height()))
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index 8dfbd2ac4a660..ee03f35780c22 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -140,7 +140,7 @@
var/obj/item/organ/wings/moth/W = H.getorgan(/obj/item/organ/wings/moth)
if(W)
W.flight_level = WINGS_FLIGHTLESS//The check for wings getting burned makes them cosmetic, so this allows the burned off effect to be applied again
- if(locate(/datum/mutation/strongwings) in H.dna.mutations)
+ if(locate(/datum/mutation/human/strongwings) in H.dna.mutations)
W.flight_level = WINGS_FLYING
H.dna.species.handle_mutant_bodyparts(H)
H.dna.species.handle_body(H)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 9cd3a1486c1ba..493fe74d0bb62 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -214,7 +214,7 @@ There are several things that need to be remembered:
var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]
inv.update_icon()
- if(!gloves && blood_in_hands)
+ if(!gloves && blood_in_hands && !(NOBLOODOVERLAY in dna.species.species_traits))
var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER)
if(num_hands < 2)
if(has_left_hand(FALSE))
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index e2c54e8c6499c..91152d353fdf6 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -35,7 +35,7 @@
BT.on_life()
if(stat != DEAD && has_dna())
- for(var/datum/mutation/HM as() in dna.mutations)
+ for(var/datum/mutation/human/HM as() in dna.mutations)
HM.on_life()
else
@@ -356,7 +356,7 @@
dna.previous.Remove("blood_type")
dna.temporary_mutations.Remove(mut)
continue
- for(var/datum/mutation/HM as() in dna.mutations)
+ for(var/datum/mutation/human/HM as() in dna.mutations)
if(HM?.timed)
dna.remove_mutation(HM.type)
diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm
deleted file mode 100644
index b1fe94a97ccdf..0000000000000
--- a/code/modules/mob/living/carbon/monkey/death.dm
+++ /dev/null
@@ -1,9 +0,0 @@
-/mob/living/carbon/monkey/gib_animation()
- new /obj/effect/temp_visual/gib_animation(loc, "gibbed-m")
-
-/mob/living/carbon/monkey/dust_animation()
- new /obj/effect/temp_visual/dust_animation(loc, "dust-m")
-
-/mob/living/carbon/monkey/death(gibbed)
- SSmove_manager.stop_looping(src) // Stops dead monkeys from fleeing their attacker or climbing out from inside His Grace
- . = ..()
diff --git a/code/modules/mob/living/carbon/monkey/inventory.dm b/code/modules/mob/living/carbon/monkey/inventory.dm
deleted file mode 100644
index 53713c8008f6c..0000000000000
--- a/code/modules/mob/living/carbon/monkey/inventory.dm
+++ /dev/null
@@ -1,81 +0,0 @@
-/mob/living/carbon/monkey/can_equip(obj/item/I, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
- switch(slot)
- if(ITEM_SLOT_HANDS)
- if(get_empty_held_indexes())
- return TRUE
- return FALSE
- if(ITEM_SLOT_MASK)
- if(wear_mask)
- return FALSE
- if( !(I.slot_flags & ITEM_SLOT_MASK) )
- return FALSE
- return TRUE
- if(ITEM_SLOT_NECK)
- if(wear_neck)
- return FALSE
- if( !(I.slot_flags & ITEM_SLOT_NECK) )
- return FALSE
- return TRUE
- if(ITEM_SLOT_HEAD)
- if(head)
- return FALSE
- if( !(I.slot_flags & ITEM_SLOT_HEAD) )
- return FALSE
- return TRUE
- if(ITEM_SLOT_BACK)
- if(back)
- return FALSE
- if( !(I.slot_flags & ITEM_SLOT_BACK) )
- return FALSE
- return TRUE
- if(ITEM_SLOT_ICLOTHING)
- if(w_uniform)
- return FALSE
- if( !(I.slot_flags & ITEM_SLOT_ICLOTHING) )
- return FALSE
- return TRUE
- return FALSE //Unsupported slot
-
-/mob/living/carbon/monkey/equip_to_slot(obj/item/I, slot)
- if(!..()) //a check failed or the item has already found its slot
- return
-
- var/not_handled = FALSE //Added in case we make this type path deeper one day
- switch(slot)
- if(ITEM_SLOT_ICLOTHING)
- w_uniform = I
- update_suit_sensors()
- update_inv_w_uniform()
- else
- to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!")
-
- //Item is handled and in slot, valid to call callback, for this proc should always be true
- if(!not_handled)
- I.equipped(src, slot)
-
- return not_handled //For future deeper overrides
-
-/mob/living/carbon/monkey/get_equipped_items(include_pockets = FALSE)
- var/list/items = ..()
- if(ears)
- items += ears
- if(glasses)
- items += glasses
- if(gloves)
- items += gloves
- if(shoes)
- items += shoes
- if(w_uniform)
- items += w_uniform
- return items
-
-//Hopefully this doesn't fuck with anything
-/mob/living/carbon/monkey/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE, was_thrown = FALSE, silent = FALSE)
- . = ..()
- if(!. || !I) //We don't want to set anything to null if the parent returned 0.
- return
-
- if(I == w_uniform)
- w_uniform = null
- if(!QDELETED(src))
- update_inv_w_uniform()
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
deleted file mode 100644
index 752f12d8cfb1c..0000000000000
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ /dev/null
@@ -1,156 +0,0 @@
-/mob/living/carbon/monkey
-
-/mob/living/carbon/monkey/handle_mutations_and_radiation()
- if(radiation)
- if(radiation > RAD_MOB_KNOCKDOWN && prob(RAD_MOB_KNOCKDOWN_PROB))
- if(!IsParalyzed())
- emote("collapse")
- Paralyze(RAD_MOB_KNOCKDOWN_AMOUNT)
- to_chat(src, "You feel weak.")
- if(radiation > RAD_MOB_MUTATE)
- if(prob(2))
- to_chat(src, "You mutate!")
- easy_randmut(NEGATIVE+MINOR_NEGATIVE)
- emote("gasp")
- domutcheck()
-
- if(radiation > RAD_MOB_MUTATE * 1.5)
- switch(rand(1, 3))
- if(1)
- gorillize()
- if(2)
- humanize(TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPDAMAGE | TR_KEEPORGANS)
- if(3)
- var/obj/item/bodypart/BP = pick(bodyparts)
- if(BP.body_part != HEAD && BP.body_part != CHEST)
- if(BP.dismemberable)
- BP.dismember()
- take_bodypart_damage(100, 0, 0)
- return
- if(radiation > RAD_MOB_VOMIT && prob(RAD_MOB_VOMIT_PROB))
- vomit(10, TRUE)
- return ..()
-
-/mob/living/carbon/monkey/handle_breath_temperature(datum/gas_mixture/breath)
- if(abs(get_body_temp_normal() - breath.return_temperature()) > 50)
- switch(breath.return_temperature())
- if(-INFINITY to 120)
- adjustFireLoss(3)
- if(120 to 200)
- adjustFireLoss(1.5)
- if(200 to 260)
- adjustFireLoss(0.5)
- if(360 to 400)
- adjustFireLoss(2)
- if(400 to 1000)
- adjustFireLoss(3)
- if(1000 to INFINITY)
- adjustFireLoss(8)
-
- . = ..() // interact with body heat after dealing with the hot air
-
-/mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment)
- // Run base mob body temperature proc before taking damage
- // this balances body temp to the enviroment and natural stabilization
- . = ..()
-
- if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT))
- remove_movespeed_modifier(/datum/movespeed_modifier/monkey_temperature_speedmod)
- switch(bodytemperature)
- if(360 to 400)
- throw_alert("temp", /atom/movable/screen/alert/hot, 1)
- apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
- if(400 to 460)
- throw_alert("temp", /atom/movable/screen/alert/hot, 2)
- apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
- if(460 to INFINITY)
- throw_alert("temp", /atom/movable/screen/alert/hot, 3)
- if(on_fire)
- apply_damage(HEAT_DAMAGE_LEVEL_3, BURN)
- else
- apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
-
- else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTCOLD))
- if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
- add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_temperature_speedmod, multiplicative_slowdown = ((BODYTEMP_COLD_DAMAGE_LIMIT - bodytemperature) / COLD_SLOWDOWN_FACTOR))
- switch(bodytemperature)
- if(200 to BODYTEMP_COLD_DAMAGE_LIMIT)
- throw_alert("temp", /atom/movable/screen/alert/cold, 1)
- apply_damage(COLD_DAMAGE_LEVEL_1, BURN)
- if(120 to 200)
- throw_alert("temp", /atom/movable/screen/alert/cold, 2)
- apply_damage(COLD_DAMAGE_LEVEL_2, BURN)
- if(-INFINITY to 120)
- throw_alert("temp", /atom/movable/screen/alert/cold, 3)
- apply_damage(COLD_DAMAGE_LEVEL_3, BURN)
- else
- clear_alert("temp")
-
- else
- remove_movespeed_modifier(/datum/movespeed_modifier/monkey_temperature_speedmod)
- clear_alert("temp")
-
- //Account for massive pressure differences
-
- var/pressure = environment.return_pressure()
- var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
- switch(adjusted_pressure)
- if(HAZARD_HIGH_PRESSURE to INFINITY)
- adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
- throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2)
- if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
- throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1)
- if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
- clear_alert("pressure")
- if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
- throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1)
- else
- if(HAS_TRAIT(src, TRAIT_RESISTLOWPRESSURE))
- clear_alert("pressure")
- else
- adjustBruteLoss( LOW_PRESSURE_DAMAGE )
- throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 2)
-
- return
-
-/mob/living/carbon/monkey/calculate_affecting_pressure(pressure)
- if (head && isclothing(head))
- var/obj/item/clothing/CH = head
- if (CH.clothing_flags & STOPSPRESSUREDAMAGE)
- return ONE_ATMOSPHERE
- return pressure
-
-/mob/living/carbon/monkey/handle_random_events()
- if (prob(1) && prob(2))
- emote("scratch")
-
-/mob/living/carbon/monkey/has_smoke_protection()
- if(wear_mask)
- if(wear_mask.clothing_flags & BLOCK_GAS_SMOKE_EFFECT)
- return 1
-
-/mob/living/carbon/monkey/handle_fire()
- . = ..()
- if(.) //if the mob isn't on fire anymore
- return
-
- //the fire tries to damage the exposed clothes and items
- var/list/burning_items = list()
- //HEAD//
- var/obscured = check_obscured_slots(TRUE)
- if(wear_mask && !(obscured & ITEM_SLOT_MASK))
- burning_items += wear_mask
- if(wear_neck && !(obscured & ITEM_SLOT_NECK))
- burning_items += wear_neck
- if(head)
- burning_items += head
-
- if(back)
- burning_items += back
-
- for(var/obj/item/I as() in burning_items)
- I.fire_act((fire_stacks * 50)) //damage taken is reduced to 2% of this value by fire_act()
-
- if(!head?.max_heat_protection_temperature || head.max_heat_protection_temperature < FIRE_IMMUNITY_MAX_TEMP_PROTECT)
- adjust_bodytemperature(BODYTEMP_HEATING_MAX)
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "on_fire", /datum/mood_event/on_fire)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
deleted file mode 100644
index ce45170756a7e..0000000000000
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ /dev/null
@@ -1,278 +0,0 @@
-/mob/living/carbon/monkey
- name = "monkey"
- verb_say = "chimpers"
- initial_language_holder = /datum/language_holder/monkey
- possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_HARM)
- icon = 'icons/mob/monkey.dmi'
- icon_state = null
- gender = NEUTER
- pass_flags = PASSTABLE
- ventcrawler = VENTCRAWLER_NUDE
- mob_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
- butcher_results = list(/obj/item/food/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
- type_of_meat = /obj/item/food/meat/slab/monkey
- gib_type = /obj/effect/decal/cleanable/blood/gibs
- unique_name = TRUE
- blocks_emissive = EMISSIVE_BLOCK_UNIQUE
- bodyparts = list(
- /obj/item/bodypart/chest/monkey,
- /obj/item/bodypart/head/monkey,
- /obj/item/bodypart/l_arm/monkey,
- /obj/item/bodypart/r_arm/monkey,
- /obj/item/bodypart/r_leg/monkey,
- /obj/item/bodypart/l_leg/monkey
- )
- hud_type = /datum/hud/monkey
- mobchatspan = "monkeyhive"
- ai_controller = /datum/ai_controller/monkey
- faction = list("neutral", "monkey")
- /// Whether it can be made into a human with mutadone
- var/natural = TRUE
- ///Item reference for jumpsuit
- var/obj/item/clothing/w_uniform = null
-
-GLOBAL_LIST_INIT(strippable_monkey_items, create_strippable_list(list(
- /datum/strippable_item/hand/left,
- /datum/strippable_item/hand/right,
- /datum/strippable_item/mob_item_slot/handcuffs,
- /datum/strippable_item/mob_item_slot/legcuffs,
- /datum/strippable_item/mob_item_slot/head,
- /datum/strippable_item/mob_item_slot/back,
- /datum/strippable_item/mob_item_slot/jumpsuit,
- /datum/strippable_item/mob_item_slot/mask,
- /datum/strippable_item/mob_item_slot/neck
-)))
-
-CREATION_TEST_IGNORE_SUBTYPES(/mob/living/carbon/monkey)
-
-/mob/living/carbon/monkey/Initialize(mapload, cubespawned=FALSE, mob/spawner)
- add_verb(/mob/living/proc/mob_sleep)
- add_verb(/mob/living/proc/toggle_resting)
-
- icon_state = null
-
- if(unique_name) //used to exclude pun pun
- gender = pick(MALE, FEMALE)
- real_name = name
-
- //initialize limbs
- create_bodyparts()
- create_internal_organs()
-
- . = ..()
-
- if (cubespawned)
- var/cap = CONFIG_GET(number/max_cube_monkeys)
- if (LAZYLEN(SSmobs.cubemonkeys) > cap)
- if (spawner)
- to_chat(spawner, "Bluespace harmonics prevent the spawning of more than [cap] monkeys on the station at one time!")
- return INITIALIZE_HINT_QDEL
- SSmobs.cubemonkeys += src
-
- create_dna()
- dna.initialize_dna(random_blood_type())
- AddComponent(/datum/component/bloodysoles/feet)
- //Set offsets here, DONT mess with monkey species, we use human anyway.
- dna.species.offset_features = list(OFFSET_UNIFORM = list(0,0), OFFSET_ID = list(0,0), OFFSET_GLOVES = list(0,0), OFFSET_GLASSES = list(0,0), OFFSET_EARS = list(0,0), OFFSET_SHOES = list(0,0), OFFSET_S_STORE = list(0,0), OFFSET_FACEMASK = list(0,-4), OFFSET_HEAD = list(0,-4), OFFSET_FACE = list(0,0), OFFSET_BELT = list(0,0), OFFSET_BACK = list(0,0), OFFSET_SUIT = list(0,0), OFFSET_NECK = list(0,0), OFFSET_RIGHT_HAND = list(0,0), OFFSET_LEFT_HAND = list(0,0))
- check_if_natural()
- AddElement(/datum/element/strippable, GLOB.strippable_monkey_items)
- AddElement(/datum/element/footstep, FOOTSTEP_MOB_BAREFOOT, 1, 2)
-
- // Give random dormant diseases to roundstart monkeys.
- if(mapload)
- give_random_dormant_disease(30, min_symptoms = 1, max_symptoms = 3)
-
-/mob/living/carbon/monkey/proc/check_if_natural()
- for(var/datum/mutation/race/monke in dna.mutations)
- if(natural)
- monke.mutadone_proof = TRUE
- else
- monke.mutadone_proof = FALSE
-
-/mob/living/carbon/monkey/Destroy()
- SSmobs.cubemonkeys -= src
- return ..()
-
-/mob/living/carbon/monkey/create_internal_organs()
- internal_organs += new /obj/item/organ/appendix
- internal_organs += new /obj/item/organ/lungs
- internal_organs += new /obj/item/organ/heart
- internal_organs += new /obj/item/organ/brain
- internal_organs += new /obj/item/organ/tongue
- internal_organs += new /obj/item/organ/eyes
- internal_organs += new /obj/item/organ/ears
- internal_organs += new /obj/item/organ/liver
- internal_organs += new /obj/item/organ/stomach
- ..()
-
-/mob/living/carbon/monkey/on_reagent_change()
- . = ..()
- var/amount
- if(reagents.has_reagent(/datum/reagent/medicine/morphine))
- amount = -1
- if(reagents.has_reagent(/datum/reagent/consumable/nuka_cola))
- amount = -1
- if(amount)
- add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_reagent_speedmod, TRUE, amount)
-
-/mob/living/carbon/monkey/updatehealth()
- . = ..()
- var/slow = 0
- if(!HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
- var/health_deficiency = (maxHealth - health)
- if(health_deficiency >= 45)
- slow += (health_deficiency / 25)
- add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/monkey_health_speedmod, TRUE, slow)
-
-/mob/living/carbon/monkey/get_stat_tab_status()
- var/list/tab_data = ..()
- if(client && mind)
- var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- tab_data["Chemical Storage"] = GENERATE_STAT_TEXT("[changeling.chem_charges]/[changeling.chem_storage]")
- tab_data["Absorbed DNA"] = GENERATE_STAT_TEXT("[changeling.absorbedcount]")
- return tab_data
-
-
-/mob/living/carbon/monkey/verb/removeinternal()
- set name = "Remove Internals"
- set category = "IC"
- internal = null
- return
-
-/mob/living/carbon/monkey/reagent_check(datum/reagent/R) //can metabolize all reagents
- return FALSE
-
-/mob/living/carbon/monkey/canBeHandcuffed()
- if(num_hands < 2)
- return FALSE
- return TRUE
-
-/mob/living/carbon/monkey/assess_threat(judgment_criteria, lasercolor = "", datum/callback/weaponcheck=null)
- if(judgment_criteria & JUDGE_EMAGGED)
- return 10 //Everyone is a criminal!
-
- var/threatcount = 0
-
- //Securitrons can't identify monkeys
- if( !(judgment_criteria & JUDGE_IGNOREMONKEYS) && (judgment_criteria & JUDGE_IDCHECK) )
- threatcount += 4
-
- //Lasertag bullshit
- if(lasercolor)
- if(lasercolor == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve
- if(is_holding_item_of_type(/obj/item/gun/energy/laser/redtag))
- threatcount += 4
-
- if(lasercolor == "r")
- if(is_holding_item_of_type(/obj/item/gun/energy/laser/bluetag))
- threatcount += 4
-
- return threatcount
-
- //Check for weapons
- if( (judgment_criteria & JUDGE_WEAPONCHECK) && weaponcheck )
- for(var/obj/item/I in held_items) //if they're holding a gun
- if(weaponcheck.Invoke(I))
- threatcount += 4
- if(weaponcheck.Invoke(back)) //if a weapon is present in the back slot
- threatcount += 4 //trigger look_for_perp() since they're nonhuman and very likely hostile
-
- //mindshield implants imply trustworthyness
- if(has_mindshield_hud_icon())
- threatcount -= 1
-
- return threatcount
-
-/mob/living/carbon/monkey/IsVocal()
- if(!getorganslot(ORGAN_SLOT_LUNGS))
- return 0
- return 1
-
-/mob/living/carbon/monkey/can_use_guns(obj/item/G)
- return TRUE
-
-/mob/living/carbon/monkey/IsAdvancedToolUser()
- if(HAS_TRAIT(src, TRAIT_DISCOORDINATED)) //Obtainable with Brain trauma
- return FALSE
- return TRUE //Something about an infinite amount of monkeys on typewriters writing Shakespeare...
-
-/mob/living/carbon/monkey/angry
- ai_controller = /datum/ai_controller/monkey/angry
-
-/mob/living/carbon/monkey/angry/Initialize(mapload)
- . = ..()
- if(prob(10))
- var/obj/item/clothing/head/helmet/toggleable/justice/escape/helmet = new(src)
- equip_to_slot_or_del(helmet,ITEM_SLOT_HEAD)
- helmet.attack_self(src) // todo encapsulate toggle
-
-
-//Special monkeycube subtype to track the number of them and prevent spam
-/mob/living/carbon/monkey/cube/Initialize(mapload)
- . = ..()
- GLOB.total_cube_monkeys++
-
-/mob/living/carbon/monkey/cube/death(gibbed)
- GLOB.total_cube_monkeys--
- ..()
-
-//In case admins delete them before they die
-/mob/living/carbon/monkey/cube/Destroy()
- if(stat != DEAD)
- GLOB.total_cube_monkeys--
- return ..()
-
-/mob/living/carbon/monkey/tumor
- name = "living teratoma"
- verb_say = "blabbers"
- initial_language_holder = /datum/language_holder/monkey
- icon = 'icons/mob/monkey.dmi'
- icon_state = null
- butcher_results = list(/obj/effect/spawner/lootdrop/teratoma/minor = 5, /obj/effect/spawner/lootdrop/teratoma/major = 1)
- type_of_meat = /obj/effect/spawner/lootdrop/teratoma/minor
- bodyparts = list(/obj/item/bodypart/chest/monkey/teratoma, /obj/item/bodypart/head/monkey/teratoma, /obj/item/bodypart/l_arm/monkey/teratoma,
- /obj/item/bodypart/r_arm/monkey/teratoma, /obj/item/bodypart/r_leg/monkey/teratoma, /obj/item/bodypart/l_leg/monkey/teratoma)
- ai_controller = null
-
-/datum/dna/tumor
- species = new /datum/species/teratoma
-
-/datum/species/teratoma
- name = "Teratoma"
- id = "teratoma"
- species_traits = list(NOTRANSSTING, NO_DNA_COPY, EYECOLOR, HAIR, FACEHAIR, LIPS)
- inherent_traits = list(TRAIT_NOHUNGER, TRAIT_RADIMMUNE, TRAIT_BADDNA, TRAIT_NOGUNS, TRAIT_NONECRODISEASE) //Made of mutated cells
- use_skintones = FALSE
- skinned_type = /obj/item/stack/sheet/animalhide/monkey
- changesource_flags = MIRROR_BADMIN
- mutantbrain = /obj/item/organ/brain/tumor
- mutanttongue = /obj/item/organ/tongue/teratoma
-
- species_chest = /obj/item/bodypart/chest/monkey/teratoma
- species_head = /obj/item/bodypart/head/monkey/teratoma
- species_l_arm = /obj/item/bodypart/l_arm/monkey/teratoma
- species_r_arm = /obj/item/bodypart/r_arm/monkey/teratoma
- species_l_leg = /obj/item/bodypart/l_leg/monkey/teratoma
- species_r_leg = /obj/item/bodypart/r_leg/monkey/teratoma
-
-/obj/item/organ/brain/tumor
- name = "teratoma brain"
-
-/obj/item/organ/brain/tumor/Remove(mob/living/carbon/C, special, no_id_transfer, pref_load = FALSE)
- . = ..()
- //Removing it deletes it
- if(!QDELETED(src))
- qdel(src)
-
-/mob/living/carbon/monkey/tumor/handle_mutations_and_radiation()
- return
-
-/mob/living/carbon/monkey/tumor/has_dna()
- return FALSE
-
-/mob/living/carbon/monkey/tumor/create_dna()
- dna = new /datum/dna/tumor(src)
- //Give us the juicy mutant organs
- dna.species.on_species_gain(src, null, FALSE)
- dna.species.regenerate_organs(src, replace_current = TRUE)
diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
deleted file mode 100644
index 7355cac739930..0000000000000
--- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm
+++ /dev/null
@@ -1,185 +0,0 @@
-/mob/living/carbon/monkey/help_shake_act(mob/living/carbon/M)
- if(health < 0 && ishuman(M))
- var/mob/living/carbon/human/H = M
- H.do_cpr(src)
- else
- ..()
-
-/mob/living/carbon/monkey/attack_paw(mob/living/M)
- if(..()) //successful monkey bite.
- var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- if(M.limb_destroyer)
- dismembering_strike(M, affecting.body_zone)
- if(stat != DEAD)
- var/dmg = rand(1, 5)
- apply_damage(dmg, BRUTE, affecting)
-
-/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
- if(..()) //successful larva bite.
- var/damage = rand(1, 3)
- if(stat != DEAD)
- L.amount_grown = min(L.amount_grown + damage, L.max_grown)
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.get_combat_bodyzone(src)))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- apply_damage(damage, BRUTE, affecting)
-
-/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M)
- if(..()) //To allow surgery to return properly.
- return
-
- switch(M.a_intent)
- if("help")
- help_shake_act(M)
- if("grab")
- grabbedby(M)
- if("harm")
- M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
- visible_message("[M] punches [name]!", \
- "[M] punches you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M)
- to_chat(M, "You punch [name]!")
- playsound(loc, "punch", 25, 1, -1)
- var/damage = M.dna.species.punchdamage
- var/obj/item/bodypart/affecting = get_bodypart(check_zone(M.get_combat_bodyzone(src)))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- apply_damage(damage, BRUTE, affecting)
- log_combat(M, src, "attacked", "harm")
- if("disarm")
- if(stat < UNCONSCIOUS)
- M.disarm(src)
-
-/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(..()) //if harm or disarm intent.
- if (M.a_intent == INTENT_HARM)
- if ((prob(95) && health > 0))
- playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
- var/damage = rand(15, 30)
- if (damage >= 25)
- damage = rand(20, 40)
- if(AmountUnconscious() < 300)
- Unconscious(rand(200, 300))
- visible_message("[M] wounds [name]!", \
- "[M] wounds you!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, M)
- to_chat(M, "You wound [name]!")
- else
- visible_message("[M] slashes [name]!", \
- "[M] slashes you!", "You hear a sickening sound of a slice!", COMBAT_MESSAGE_RANGE, M)
- to_chat(M, "You slash [name]!")
-
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.get_combat_bodyzone(src)))
- log_combat(M, src, "attacked", M)
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful
- return 1
- apply_damage(damage, BRUTE, affecting)
-
- else
- playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
- visible_message("[M]'s lunge misses [name]!", \
- "You avoid [M]'s lunge!", "You hear a swoosh!", COMBAT_MESSAGE_RANGE, M)
- to_chat(M, "Your lunge misses [name]!")
-
- if (M.a_intent == INTENT_DISARM)
- var/obj/item/I = null
- playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
- if(prob(95))
- Paralyze(20)
- visible_message("[M] tackles [name] down!", \
- "[M] tackles you down!", "You hear aggressive shuffling followed by a loud thud!", COMBAT_MESSAGE_RANGE, M)
- to_chat(M, "You tackle [name] down!")
- else
- I = get_active_held_item()
- if(dropItemToGround(I))
- visible_message("[M] disarms [name]!", \
- "[M] disarms you!", "You hear aggressive shuffling!", COMBAT_MESSAGE_RANGE, M)
- to_chat(M, "You disarm [name]!")
- else
- I = null
- log_combat(M, src, "disarmed", null, "[I ? " removing \the [I]" : ""]", important = FALSE)
- updatehealth()
-
-
-/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M)
- . = ..()
- if(.)
- var/damage = M.melee_damage
- var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
- if(!dam_zone) //Dismemberment successful
- return TRUE
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- apply_damage(damage, M.melee_damage_type, affecting)
-
-/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime attack
- var/damage = 20
- if(M.is_adult)
- damage = 30
- if(M.transformeffects & SLIME_EFFECT_RED)
- damage *= 1.1
- var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
- if(!dam_zone) //Dismemberment successful
- return 1
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- apply_damage(damage, BRUTE, affecting)
-
-/mob/living/carbon/monkey/acid_act(acidpwr, acid_volume, bodyzone_hit)
- . = 1
- if(!bodyzone_hit || bodyzone_hit == BODY_ZONE_HEAD)
- if(wear_mask)
- if(!(wear_mask.resistance_flags & (UNACIDABLE | INDESTRUCTIBLE)))
- wear_mask.acid_act(acidpwr, acid_volume)
- else
- to_chat(src, "Your mask protects you from the acid.")
- return
- if(head)
- if(!(head.resistance_flags & (UNACIDABLE | INDESTRUCTIBLE)))
- head.acid_act(acidpwr, acid_volume)
- else
- to_chat(src, "Your hat protects you from the acid.")
- return
- take_bodypart_damage(acidpwr * min(0.6, acid_volume*0.1))
-
-
-/mob/living/carbon/monkey/ex_act(severity, target, origin)
- if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
- return
- ..()
- if(QDELETED(src))
- return
- switch (severity)
- if (EXPLODE_DEVASTATE)
- gib()
- return
-
- if (EXPLODE_HEAVY)
- take_overall_damage(60, 60)
- damage_clothes(200, BRUTE, BOMB)
- adjustEarDamage(30, 120)
- Unconscious(200)
-
- if(EXPLODE_LIGHT)
- take_overall_damage(30, 0)
- damage_clothes(50, BRUTE, BOMB)
- adjustEarDamage(15,60)
- Unconscious(160)
-
-
- //attempt to dismember bodyparts
- if(severity <= 2)
- var/max_limb_loss = round(4/severity) //so you don't lose four limbs at severity 3.
- for(var/obj/item/bodypart/BP as() in bodyparts)
- if(prob(50/severity) && BP.body_zone != BODY_ZONE_CHEST)
- BP.brute_dam = BP.max_damage
- BP.dismember()
- max_limb_loss--
- if(!max_limb_loss)
- break
diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm
deleted file mode 100644
index 04f3d6954a6a5..0000000000000
--- a/code/modules/mob/living/carbon/monkey/update_icons.dm
+++ /dev/null
@@ -1,139 +0,0 @@
-
-/mob/living/carbon/monkey/regenerate_icons()
- if(!..())
- update_body_parts(TRUE)
- update_hair()
- update_inv_wear_mask()
- update_inv_head()
- update_inv_back()
- update_transform()
- update_inv_w_uniform()
-
-////////
-
-
-/mob/living/carbon/monkey/update_hair()
- remove_overlay(HAIR_LAYER)
-
- var/obj/item/bodypart/head/HD = get_bodypart(BODY_ZONE_HEAD)
- if(!HD) //Decapitated
- return
-
- if(HAS_TRAIT(src, TRAIT_HUSK))
- return
-
- var/hair_hidden = 0
-
- if(head)
- var/obj/item/I = head
- if(I.flags_inv & HIDEHAIR)
- hair_hidden = 1
- if(wear_mask)
- var/obj/item/clothing/mask/M = wear_mask
- if(M.flags_inv & HIDEHAIR)
- hair_hidden = 1
- if(!hair_hidden)
- if(!getorgan(/obj/item/organ/brain)) //Applies the debrained overlay if there is no brain
- overlays_standing[HAIR_LAYER] = mutable_appearance('icons/mob/human_face.dmi', "debrained", CALCULATE_MOB_OVERLAY_LAYER(HAIR_LAYER))
- apply_overlay(HAIR_LAYER)
-
-
-/mob/living/carbon/monkey/update_fire()
- ..("Monkey_burning")
-
-/mob/living/carbon/monkey/update_inv_legcuffed()
- remove_overlay(LEGCUFF_LAYER)
- if(legcuffed)
- var/mutable_appearance/legcuff_overlay = mutable_appearance('icons/mob/mob.dmi', "legcuff1", CALCULATE_MOB_OVERLAY_LAYER(LEGCUFF_LAYER))
- legcuff_overlay.pixel_y = 8
- overlays_standing[LEGCUFF_LAYER] = legcuff_overlay
- apply_overlay(LEGCUFF_LAYER)
-
-
-//monkey HUD updates for items in our inventory
-
-//update whether our head item appears on our hud.
-/mob/living/carbon/monkey/update_hud_head(obj/item/I)
- if(client && hud_used && hud_used.hud_shown)
- I.screen_loc = ui_monkey_head
- client.screen += I
-
-//update whether our mask item appears on our hud.
-/mob/living/carbon/monkey/update_hud_wear_mask(obj/item/I)
- if(client && hud_used && hud_used.hud_shown)
- I.screen_loc = ui_monkey_mask
- client.screen += I
-
-//update whether our neck item appears on our hud.
-/mob/living/carbon/monkey/update_hud_neck(obj/item/I)
- if(client && hud_used && hud_used.hud_shown)
- I.screen_loc = ui_monkey_neck
- client.screen += I
-
-//update whether our back item appears on our hud.
-/mob/living/carbon/monkey/update_hud_back(obj/item/I)
- if(client && hud_used && hud_used.hud_shown)
- I.screen_loc = ui_monkey_back
- client.screen += I
-
-//Update uniform in compliance with monkey icons
-/mob/living/carbon/monkey/update_inv_w_uniform()
- update_clothing_icons(UNIFORM_LAYER)
-
-/mob/living/carbon/monkey/update_inv_head()
- update_clothing_icons(HEAD_LAYER)
-
-/mob/living/carbon/monkey/update_inv_back()
- update_clothing_icons(BACK_LAYER)
-
-/mob/living/carbon/monkey/update_inv_wear_mask()
- update_clothing_icons(FACEMASK_LAYER)
-
-//used to handle monkey clothing
-/mob/living/carbon/monkey/proc/update_clothing_icons(c_layer)
- ///Item slot
- var/slot
- ///Species offset feature
- var/offset
- ///Actual item being worn
- var/obj/item/U
- //UI location
- var/ui
- switch(c_layer)
- if(FACEMASK_LAYER)
- slot = ITEM_SLOT_MASK
- offset = OFFSET_FACEMASK
- U = wear_mask
- ui = ui_monkey_mask
- if(BACK_LAYER)
- slot = ITEM_SLOT_BACK
- offset = OFFSET_BACK
- U = back
- ui = ui_monkey_back
- if(HEAD_LAYER)
- slot = ITEM_SLOT_HEAD
- offset = OFFSET_HEAD
- U = head
- ui = ui_monkey_head
- if(UNIFORM_LAYER)
- slot = ITEM_SLOT_ICLOTHING
- offset = OFFSET_UNIFORM
- U = w_uniform
- ui = ui_monkey_body
-
- remove_overlay(c_layer)
-
- if(client && hud_used.hud_shown)
- var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(slot) + 1]
- inv.update_icon()
- client.screen += U
-
- if(U)
- U.screen_loc = ui
- var/mutable_appearance/cloth_overlay = mutable_appearance(U.monkey_icon, layer = -c_layer)
- if(offset in dna.species.offset_features)
- cloth_overlay.pixel_x += dna.species.offset_features[offset][1]
- cloth_overlay.pixel_y += dna.species.offset_features[offset][2]
- overlays_standing[c_layer] = cloth_overlay
-
- apply_overlay(c_layer)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 4b9ced389f48a..06583696f2191 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1117,7 +1117,7 @@
/mob/living/proc/can_use_guns(obj/item/G)//actually used for more than guns!
if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
- to_chat(src, "You don't have the dexterity to do this!")
+ to_chat(src, "You try to fire [G], but can't use the trigger!")
return FALSE
return TRUE
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3e02d5a4e4875..76da4e73d6e46 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -274,7 +274,7 @@
return TRUE
-/mob/living/attack_paw(mob/living/carbon/monkey/M)
+/mob/living/attack_paw(mob/living/carbon/human/M)
if(isturf(loc) && istype(loc.loc, /area/start))
to_chat(M, "No attacking people at spawn, you jackass.")
return FALSE
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 7e5917bde22ba..f0f705c28bd67 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -63,7 +63,6 @@
var/bloodcrawl = 0 //0 No blood crawling, BLOODCRAWL for bloodcrawling, BLOODCRAWL_EAT for crawling+mob devour
var/holder = null //The holder for blood crawling
- var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
var/limb_destroyer = FALSE //1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack.
var/mob_size = MOB_SIZE_HUMAN
@@ -93,7 +92,7 @@
var/bubble_icon = "default" //what icon the mob uses for speechbubbles
var/last_bumped = 0
- var/unique_name = 0 //if a mob's name should be appended with an id when created e.g. Mob (666)
+ var/unique_name = FALSE//if a mob's name should be appended with an id when created e.g. Mob (666)
var/list/butcher_results = null //these will be yielded from butchering with a probability chance equal to the butcher item's effectiveness
var/list/guaranteed_butcher_results = null //these will always be yielded from butchering
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index a3d1f2fda902c..85cb91fbc9370 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -21,6 +21,7 @@
update_z(T.z)
//Vents
+ var/ventcrawler = HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE)
if(ventcrawler)
to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 659ad5d21bac9..f100aa9974d73 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -594,8 +594,8 @@
//if they are holding or wearing a card that has access, that works
if(check_access(H.get_active_held_item()) || check_access(H.wear_id))
return 1
- else if(ismonkey(M))
- var/mob/living/carbon/monkey/george = M
+ else if(isalien(M))
+ var/mob/living/carbon/george = M
//they can only hold things :(
if(isitem(george.get_active_held_item()))
return check_access(george.get_active_held_item())
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index b396e9d2508b2..6bd63ad1f690f 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -56,7 +56,7 @@
adjustBruteLoss(15)
return TRUE
-/mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M)
+/mob/living/simple_animal/attack_paw(mob/living/carbon/human/M)
if(..()) //successful monkey bite.
if(stat != DEAD)
var/damage = rand(1, 3)
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index 841c87de1c948..e9946788c4b2d 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -19,7 +19,6 @@
density = FALSE
is_flying_animal = TRUE
pass_flags = PASSTABLE | PASSMOB
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = list(MOB_ORGANIC, MOB_BUG)
gold_core_spawnable = FRIENDLY_SPAWN
@@ -30,6 +29,7 @@
/mob/living/simple_animal/butterfly/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
chat_color = newcolor
add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 629b172c153a5..7f5b9393b5131 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -15,7 +15,6 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE
mob_size = MOB_SIZE_SMALL
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
@@ -44,6 +43,7 @@
/mob/living/simple_animal/pet/cat/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
add_verb(/mob/living/proc/toggle_resting)
/mob/living/simple_animal/pet/cat/space
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index adf05dac71918..ebf9138c78747 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -20,7 +20,6 @@
stop_automated_movement = 1
friendly_verb_continuous = "pinches"
friendly_verb_simple = "pinch"
- ventcrawler = VENTCRAWLER_ALWAYS
var/obj/item/inventory_head
var/obj/item/inventory_mask
gold_core_spawnable = FRIENDLY_SPAWN
@@ -32,6 +31,10 @@
head_icon = 'icons/mob/pets_held.dmi'
held_state = "crab"
+/mob/living/simple_animal/crab/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/crab/Life()
..()
//CRAB movement
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 56faa85c449d3..be86bc94c1cc4 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -27,7 +27,6 @@
unsuitable_atmos_damage = 0
wander = FALSE
speed = 0
- ventcrawler = VENTCRAWLER_ALWAYS
healable = 0
density = FALSE
pass_flags = PASSTABLE | PASSMOB
@@ -85,6 +84,7 @@
/mob/living/simple_animal/drone/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
GLOB.drones_list += src
access_card = new /obj/item/card/id(src)
access_card.access = get_all_accesses()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index 65ff5920b29f5..10f690da08a7c 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -134,7 +134,7 @@
to_chat(src, "Your onboard antivirus has initiated lockdown. Motor servos are impaired, ventilation access is denied, and your display reports that you are hacked to all nearby.")
hacked = TRUE
mind.special_role = "hacked drone"
- ventcrawler = VENTCRAWLER_NONE //Again, balance
+ REMOVE_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) //Again, balance
speed = 1 //gotta go slow
message_admins("[ADMIN_LOOKUPFLW(src)] became a hacked drone hellbent on [clockwork ? "serving Ratvar" : "destroying the station"]!")
else
@@ -149,7 +149,7 @@
to_chat(src, "Having been restored, your onboard antivirus reports the all-clear and you are able to perform all actions again.")
hacked = FALSE
mind.special_role = null
- ventcrawler = initial(ventcrawler)
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
speed = initial(speed)
message_admins("[ADMIN_LOOKUPFLW(src)], a hacked drone, was restored to factory defaults!")
update_drone_icon()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 3be955412f16c..ad06a502e68cc 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -198,7 +198,6 @@
attack_verb_simple = "kick"
health = 3
maxHealth = 3
- ventcrawler = VENTCRAWLER_ALWAYS
var/amount_grown = 0
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_TINY
@@ -209,6 +208,7 @@
/mob/living/simple_animal/chick/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
pixel_x = base_pixel_x + rand(-6, 6)
pixel_y = base_pixel_y + rand(0, 10)
GLOB.total_chickens++
@@ -265,7 +265,6 @@
attack_verb_simple = "kick"
health = 15
maxHealth = 15
- ventcrawler = VENTCRAWLER_ALWAYS
var/eggsleft = 0
var/eggsFertile = TRUE
var/body_color
@@ -286,6 +285,7 @@
/mob/living/simple_animal/chicken/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
if(!body_color)
body_color = pick(validColors)
icon_state = "[icon_prefix]_[body_color]"
@@ -362,9 +362,13 @@
attack_verb_continuous = "pecks"
attack_verb_simple = "peck"
attack_sound = 'sound/creatures/turkey.ogg'
- ventcrawler = VENTCRAWLER_ALWAYS
icon_prefix = "turkey"
feedMessages = list("It gobbles up the food voraciously.","It clucks happily.")
validColors = list("plain")
gold_core_spawnable = FRIENDLY_SPAWN
chat_color = "#FFDC9B"
+
+/mob/living/simple_animal/chicken/turkey/Initialize(mapload)
+ . = ..()
+
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
diff --git a/code/modules/mob/living/simple_animal/friendly/hamster.dm b/code/modules/mob/living/simple_animal/friendly/hamster.dm
index 6c6518794121a..034ce477a1376 100644
--- a/code/modules/mob/living/simple_animal/friendly/hamster.dm
+++ b/code/modules/mob/living/simple_animal/friendly/hamster.dm
@@ -20,7 +20,6 @@
density = FALSE
pass_flags = PASSMOB
mob_size = MOB_SIZE_SMALL
- ventcrawler = VENTCRAWLER_ALWAYS
name = "\improper hamster"
real_name = "hamster"
@@ -37,6 +36,10 @@
worn_slot_flags = ITEM_SLOT_HEAD
chat_color = "#D3B277"
+/mob/living/simple_animal/pet/hamster/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/pet/hamster/vector //now also viro's source of a solitary, shitty starter disease
name = "Vector"
desc = "It's Vector the hamster. Definitely not a source of deadly diseases."
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index 5cf72cd461693..9bf23491fefd4 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -17,7 +17,6 @@
response_disarm_simple = "shoo"
response_harm_continuous = "stomps on"
response_harm_simple = "stomp on"
- ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
@@ -28,6 +27,10 @@
var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/basic/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.
chat_color = "#64F88A"
+/mob/living/simple_animal/hostile/lizard/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target?
if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
return FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index f00050181adf6..6c09c18d492e8 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -22,7 +22,6 @@
response_harm_continuous = "stomps on"
response_harm_simple = "stomp on"
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_TINY
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
@@ -37,6 +36,7 @@
/mob/living/simple_animal/mouse/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100)
if(!body_color)
body_color = pick( list("brown","gray","white") )
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index f5661462301aa..f678b54727968 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -28,7 +28,6 @@
response_harm_continuous = "steps on"
response_harm_simple = "step on"
faction = list("hostile")
- ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
@@ -47,6 +46,7 @@
/mob/living/simple_animal/hostile/retaliate/poison/snake/Initialize(mapload)
AddComponent(/datum/component/udder, /obj/item/udder/venom, reagent_produced_typepath = /datum/reagent/toxin/venom)
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index d76476a02d804..28c21cf454c02 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -37,7 +37,6 @@
faction = list("hostile")
move_to_delay = 0
obj_damage = 0
- ventcrawler = VENTCRAWLER_ALWAYS
environment_smash = ENVIRONMENT_SMASH_NONE
mouse_opacity = MOUSE_OPACITY_OPAQUE
pass_flags = PASSTABLE | PASSMOB
@@ -48,7 +47,6 @@
no_flying_animation = TRUE
gold_core_spawnable = HOSTILE_SPAWN
search_objects = 1 //have to find those plant trays!
- ventcrawler = VENTCRAWLER_ALWAYS
//Spaceborn beings don't get hurt by space
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
@@ -65,6 +63,7 @@
/mob/living/simple_animal/hostile/poison/bees/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
generate_bee_visuals()
AddComponent(/datum/component/swarming)
diff --git a/code/modules/mob/living/simple_animal/hostile/bread.dm b/code/modules/mob/living/simple_animal/hostile/bread.dm
index 7e62adfd45951..a6892ef09a612 100644
--- a/code/modules/mob/living/simple_animal/hostile/bread.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bread.dm
@@ -14,7 +14,6 @@
butcher_results = list(/obj/item/food/breadslice/plain = 2)
melee_damage = 10
attack_sound = 'sound/weapons/bite.ogg'
- ventcrawler = VENTCRAWLER_ALWAYS
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 150
maxbodytemp = 500
@@ -26,6 +25,10 @@
chat_color = "#CAA25B"
mobchatspan = "blob"
+/mob/living/simple_animal/hostile/breadloaf/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/hostile/breadloaf/teleport_act()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index bb6896759e69c..12944ba43d41c 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -45,7 +45,6 @@
faction = list("spiders")
pass_flags = PASSTABLE
move_to_delay = 4
- ventcrawler = VENTCRAWLER_ALWAYS
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
@@ -76,6 +75,7 @@
/mob/living/simple_animal/hostile/poison/giant_spider/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
lay_web = new
lay_web.Grant(src)
lesserwrap = new
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index 7afed8464c16c..5cced8068feb8 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -80,7 +80,7 @@
/mob/living/simple_animal/hostile/gorilla/CanAttack(atom/the_target)
var/list/parts = target_bodyparts(target)
- return ..() && !istype(the_target, /mob/living/carbon/monkey) && (!parts || parts.len > 3)
+ return ..() && !ismonkey(the_target) && (!parts || parts.len > 3)
/mob/living/simple_animal/hostile/gorilla/CanSmashTurfs(turf/T)
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 55bd35b8cb3b1..d583df943d9f3 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -19,11 +19,14 @@
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
speak_emote = list("squeaks")
- ventcrawler = VENTCRAWLER_ALWAYS
var/datum/mind/origin
var/egg_lain = 0
discovery_points = 2000
+/mob/living/simple_animal/hostile/headcrab/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
var/obj/item/organ/body_egg/changeling_egg/egg = new(victim)
egg.Insert(victim)
@@ -65,7 +68,7 @@
qdel(src)
/obj/item/organ/body_egg/changeling_egg/proc/Pop()
- var/mob/living/carbon/monkey/M = new(owner)
+ var/mob/living/carbon/human/species/monkey/M = new(owner)
for(var/obj/item/organ/I in src)
I.Insert(M, 1)
diff --git a/code/modules/mob/living/simple_animal/hostile/heart.dm b/code/modules/mob/living/simple_animal/hostile/heart.dm
index 2dcfe10d9db45..e9fb605fe0db7 100644
--- a/code/modules/mob/living/simple_animal/hostile/heart.dm
+++ b/code/modules/mob/living/simple_animal/hostile/heart.dm
@@ -23,7 +23,6 @@
density = FALSE
attack_verb_continuous = "beats"
attack_verb_simple = "beat"
- ventcrawler = VENTCRAWLER_ALWAYS
attack_sound = 'sound/effects/singlebeat.ogg'
stat_attack = HARD_CRIT
attack_same = 1
@@ -35,3 +34,7 @@
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 150
maxbodytemp = 500
+
+/mob/living/simple_animal/hostile/heart/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index dcf63397fbf69..c21da7e670c2d 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -21,7 +21,6 @@
attack_verb_continuous = "slams"
attack_verb_simple = "slam"
attack_sound = 'sound/weapons/punch1.ogg'
- ventcrawler = VENTCRAWLER_ALWAYS
faction = list("plants")
mobchatspan = "headofsecurity"
@@ -33,6 +32,10 @@
gold_core_spawnable = HOSTILE_SPAWN
var/frenzythreshold = 5 //how many tomatoes can this tomato see on screen before going berserk
+/mob/living/simple_animal/hostile/killertomato/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/hostile/killertomato/CanAttack(atom/the_target)
var/tomatosseen = 0
for(var/mob/living/simple_animal/hostile/killertomato/T in oview(7, src))
diff --git a/code/modules/mob/living/simple_animal/hostile/macrophage.dm b/code/modules/mob/living/simple_animal/hostile/macrophage.dm
index 5fc9c9abb0239..2b60d822151a0 100644
--- a/code/modules/mob/living/simple_animal/hostile/macrophage.dm
+++ b/code/modules/mob/living/simple_animal/hostile/macrophage.dm
@@ -24,7 +24,6 @@
density = FALSE
mob_size = MOB_SIZE_TINY
mob_biotypes = list(MOB_ORGANIC, MOB_BUG)
- ventcrawler = VENTCRAWLER_ALWAYS
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
del_on_death = TRUE
@@ -33,6 +32,10 @@
var/list/infections = list()
discovery_points = 2000
+/mob/living/simple_animal/hostile/macrophage/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/hostile/macrophage/CanAttack(atom/the_target)
. = ..()
if(!.)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 225bf40f36e9c..8527b03702d8b 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -580,7 +580,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
NewTerrainChairs = /obj/structure/chair/wood
NewTerrainTables = /obj/structure/table/wood
NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush,
- /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/monkey)
+ /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/species/monkey)
florachance = 20
if("ayy lmao") //Beneficial, turns stuff into alien alloy which is useful to cargo and research. Also repairs atmos.
NewTerrainFloors = /turf/open/floor/plating/abductor
@@ -718,7 +718,6 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
density = FALSE
is_flying_animal = TRUE
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
gold_core_spawnable = HOSTILE_SPAWN
verb_say = "warps"
@@ -741,6 +740,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box)
/mob/living/simple_animal/hostile/lightgeist/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
remove_verb(/mob/living/verb/pulled)
remove_verb(/mob/verb/me_verb)
var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
diff --git a/code/modules/mob/living/simple_animal/hostile/mimite.dm b/code/modules/mob/living/simple_animal/hostile/mimite.dm
index 32cdcec0884fc..5ec5da1b48555 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimite.dm
@@ -9,7 +9,6 @@
icon_state = "mimite"
icon_living = "mimite"
pass_flags = PASSTABLE
- ventcrawler = VENTCRAWLER_ALWAYS
a_intent = INTENT_HARM
melee_damage = 10
see_in_dark = 8
@@ -72,6 +71,7 @@
/mob/living/simple_animal/hostile/mimite/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
AddElement(/datum/element/point_of_interest)
GLOB.all_mimites += src
var/image/I = image(icon = 'icons/mob/hud.dmi', icon_state = "hudcultist", layer = DATA_HUD_PLANE, loc = src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
index 8dab57a6c1b09..b95dc70dfc7aa 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm
@@ -27,7 +27,6 @@
friendly_verb_continuous = "pinches"
friendly_verb_simple = "pinch"
a_intent = INTENT_HELP
- ventcrawler = VENTCRAWLER_ALWAYS
gold_core_spawnable = FRIENDLY_SPAWN
stat_attack = HARD_CRIT
gender = NEUTER
@@ -47,6 +46,7 @@
/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
if(wanted_objects.len)
AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, PROC_REF(regenerate_icons)), CALLBACK(src, PROC_REF(regenerate_icons)))
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 3fee8d2e257d3..8094ed0fa26d9 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -26,7 +26,6 @@
stat_attack = DEAD
mouse_opacity = MOUSE_OPACITY_ICON
speed = 1
- ventcrawler = VENTCRAWLER_ALWAYS
robust_searching = 1
unique_name = 1
speak_emote = list("squeaks")
@@ -52,6 +51,7 @@
adjustBruteLoss(-2)
/mob/living/simple_animal/hostile/mushroom/Initialize(mapload)//Makes every shroom a little unique
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
melee_damage += rand(1,15)
maxHealth += rand(40,60)
move_to_delay = rand(3,11)
diff --git a/code/modules/mob/living/simple_animal/hostile/redgrub.dm b/code/modules/mob/living/simple_animal/hostile/redgrub.dm
index 837522b0f9c59..ff65302c86556 100644
--- a/code/modules/mob/living/simple_animal/hostile/redgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/redgrub.dm
@@ -21,7 +21,6 @@
response_harm_continuous = "squishes"
response_harm_simple = "squish"
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
faction = list("hostile")
attack_sound = 'sound/effects/blobattack.ogg'
pass_flags = PASSTABLE | PASSMOB
@@ -51,6 +50,7 @@
/mob/living/simple_animal/hostile/redgrub/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
grub_diseases += new /datum/disease/advance/random(rand(3, 6), 9, rand(3, 4), guaranteed_symptoms = list(/datum/symptom/parasite))
food = rand(15, 50)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index eb9b4b54450d8..27693e43f184a 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -25,7 +25,6 @@
attack_sound = 'sound/weapons/bite.ogg'
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
is_flying_animal = TRUE
no_flying_animation = TRUE
@@ -34,6 +33,10 @@
var/min_oxy = 0
var/max_tox = 0
+/mob/living/simple_animal/hostile/retaliate/bat/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
//Space bats need no air to fly in.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index 22ee2359b6f9c..e45ca98c13e67 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -134,7 +134,6 @@
emote_see = list("honks", "sweats", "jiggles", "contemplates its existence")
speak_chance = 5
dextrous = TRUE
- ventcrawler = VENTCRAWLER_ALWAYS
maxHealth = 140
health = 140
speed = -5
@@ -144,6 +143,10 @@
obj_damage = 5
loot = list(/obj/item/clothing/suit/hooded/bloated_human, /obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/item/soap)
+/mob/living/simple_animal/hostile/retaliate/clown/fleshclown/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/hostile/retaliate/clown/longface
name = "Longface"
desc = "Often found walking into the bar."
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
index 718e394d85a9b..2a6d984aa4a2e 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
@@ -22,7 +22,6 @@
response_harm_continuous = "splats"
response_harm_simple = "splat"
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
faction = list("hostile")
attack_sound = 'sound/effects/reee.ogg'
butcher_results = list(/obj/item/food/nugget = 1)
@@ -33,6 +32,7 @@
/mob/living/simple_animal/hostile/retaliate/frog/Initialize(mapload)
. = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
if(prob(1))
name = "rare frog"
desc = "It seems a little smug."
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm
index 6ed5076220c3b..e738f1debfb87 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/nymph.dm
@@ -10,7 +10,6 @@
faction = list("diona")
gender = NEUTER
gold_core_spawnable = FRIENDLY_SPAWN
- ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSMOB
density = FALSE
mob_size = MOB_SIZE_SMALL
@@ -60,6 +59,7 @@
name = "[initial(name)] ([instance_num])"
real_name = name
regenerate_icons()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
ADD_TRAIT(src, TRAIT_MUTE, "nymph")
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
diff --git a/code/modules/mob/living/simple_animal/kalo.dm b/code/modules/mob/living/simple_animal/kalo.dm
index 945c947ffc3b9..7733a70703980 100644
--- a/code/modules/mob/living/simple_animal/kalo.dm
+++ b/code/modules/mob/living/simple_animal/kalo.dm
@@ -12,7 +12,6 @@
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST, MOB_REPTILE)
mob_size = MOB_SIZE_SMALL
pass_flags = PASSTABLE | PASSMOB
- ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
see_in_dark = 5
speak_chance = 1
@@ -37,11 +36,15 @@
var/obj/item/food/movement_target
mobchatspan = "centcom"
+/mob/living/simple_animal/kalo/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
+
/mob/living/simple_animal/kalo/Destroy()
movement_target = null
return ..()
-/mob/living/simple_animal/kalo/Life() //This code is absolute trash but I'm too sleepy to rewrite it.
+/mob/living/simple_animal/kalo/Life() //This code is absolute trash but I'm too sleepy to rewrite it. ///Uhhh its literally a copy of ian. Why didnt you just make him a corgi subtype at this point lmfao
..()
if(!stat && !resting && !buckled)
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 7d967c82e4946..c405706ccc722 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -311,7 +311,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
handle_automated_speech(1) //assured speak/emote
return
-/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/monkey/M)
+/mob/living/simple_animal/parrot/attack_paw(mob/living/carbon/human/M)
return attack_hand(M)
/mob/living/simple_animal/parrot/attack_alien(mob/living/carbon/alien/M)
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index ac1d6abcc3476..53de1616d8fe4 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -4,7 +4,6 @@
icon = 'icons/mob/slimes.dmi'
icon_state = "grey baby slime"
pass_flags = PASSTABLE | PASSGRILLE
- ventcrawler = VENTCRAWLER_ALWAYS
gender = NEUTER
var/is_adult = 0
var/docile = 0
@@ -99,6 +98,7 @@
CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/slime)
/mob/living/simple_animal/slime/Initialize(mapload, new_colour="grey", new_is_adult=FALSE)
+ ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
GLOB.total_slimes++
var/datum/action/innate/slime/feed/F = new
F.Grant(src)
@@ -321,7 +321,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/mob/living/simple_animal/slime)
attacked += 10
-/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M)
+/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/human/M)
if(..()) //successful monkey bite.
attacked += 10
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index 34a30f59b160a..45ec022128729 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -7,7 +7,11 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
//VENTCRAWLING
/mob/living/proc/handle_ventcrawl(atom/A)
- if(!ventcrawler || !Adjacent(A))
+ // Being able to always ventcrawl trumps being only able to ventcrawl when wearing nothing
+ var/required_nudity = HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE) && !HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS)
+ if(!Adjacent(A))
+ return
+ if(!HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE) && !HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS))
return
if(stat)
to_chat(src, "You must be conscious to do this!")
@@ -57,15 +61,8 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
if(!client)
return
- if(iscarbon(src) && ventcrawler < 2)//It must have atleast been 1 to get this far
- var/failed = 0
- var/list/items_list = get_equipped_items(include_pockets = TRUE)
- if(items_list.len)
- failed = 1
- for(var/obj/item/I in held_items)
- failed = 1
- break
- if(failed)
+ if(iscarbon(src) && required_nudity)
+ if(length(get_equipped_items(include_pockets = TRUE)) || get_num_held_items())
to_chat(src, "You can't crawl around in the ventilation ducts with items!")
return
@@ -78,7 +75,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
if(buckled)
to_chat(src, "I can't vent crawl while feeding...")
return
- ..()
+ return ..()
/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 69bd4086c1916..c8643f70722f0 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -1,178 +1,11 @@
#define TRANSFORMATION_DURATION 22
-/mob/living/carbon/proc/monkeyize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPAI), skip_animation = FALSE, keep_original_species = FALSE)
+/mob/living/carbon/proc/monkeyize()
if (notransform || transformation_timer)
return
- var/list/missing_bodyparts_zones = get_missing_limbs()
- var/list/int_organs = list()
- var/obj/item/cavity_object
-
- var/obj/item/bodypart/chest/CH = get_bodypart(BODY_ZONE_CHEST)
- if(CH.cavity_item)
- cavity_object = CH.cavity_item
- CH.cavity_item = null
-
- if(tr_flags & TR_KEEPITEMS)
- unequip_everything()
-
- //Make mob invisible and spawn animation
- notransform = TRUE
- Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
- icon = null
- cut_overlays()
- invisibility = INVISIBILITY_MAXIMUM
-
- if(!skip_animation)
- new /obj/effect/temp_visual/monkeyify(loc)
-
- transformation_timer = TRUE
- sleep(TRANSFORMATION_DURATION)
- transformation_timer = FALSE
-
- var/mob/living/carbon/monkey/O = new /mob/living/carbon/monkey( loc )
-
- // Make it be able to be turned back into a human with mutadone
- O.natural = FALSE
- O.check_if_natural()
- // hash the original name?
- if(tr_flags & TR_HASHNAME)
- O.name = "monkey ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])"
- O.real_name = "monkey ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])"
-
- //handle DNA and other attributes
- dna.transfer_identity(O, tr_flags & TR_KEEPSE)
- O.set_species(/datum/species/monkey)
- O.dna.set_se(TRUE, GET_INITIALIZED_MUTATION(RACEMUT))
- O.updateappearance(icon_update=0)
-
- //store original species
- if(keep_original_species)
- for(var/datum/mutation/race/M in O.dna.mutations)
- if(!isnull(dna.species))
- M.original_species = dna.species.type
- break //Can't be more than one monkified in a DNA set so, no need to continue the loop
-
- if(suiciding)
- O.set_suicide(suiciding)
- O.a_intent = INTENT_HARM
-
- //keep viruses?
- if (tr_flags & TR_KEEPVIRUS)
- O.diseases = diseases
- diseases = list()
- for(var/thing in O.diseases)
- var/datum/disease/D = thing
- D.affected_mob = O
-
- //keep damage?
- if (tr_flags & TR_KEEPDAMAGE)
- O.setToxLoss(getToxLoss(), 0)
- O.adjustBruteLoss(getBruteLoss(), 0)
- O.setOxyLoss(getOxyLoss(), 0)
- O.setCloneLoss(getCloneLoss(), 0)
- O.adjustFireLoss(getFireLoss(), 0)
- O.setOrganLoss(ORGAN_SLOT_BRAIN, getOrganLoss(ORGAN_SLOT_BRAIN))
- O.updatehealth()
- O.radiation = radiation
-
- //move implants to new mob
- if(tr_flags & TR_KEEPIMPLANTS)
- for(var/obj/item/implant/IMP as anything in implants)
- IMP.transfer_implant(src, O)
-
- //re-add organs to new mob. this order prevents moving the mind to a brain at any point
- if(tr_flags & TR_KEEPORGANS)
- for(var/X in O.internal_organs)
- var/obj/item/organ/I = X
- I.Remove(O, 1)
-
- if(mind)
- mind.transfer_to(O)
- var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- var/datum/action/changeling/humanform/hf = new
- changeling.purchasedpowers += hf
- changeling.regain_powers()
-
- for(var/X in internal_organs)
- var/obj/item/organ/I = X
- int_organs += I
- I.Remove(src, 1)
-
- for(var/X in int_organs)
- var/obj/item/organ/I = X
- I.Insert(O, 1)
-
- var/obj/item/bodypart/chest/torso = O.get_bodypart(BODY_ZONE_CHEST)
- if(cavity_object)
- torso.cavity_item = cavity_object //cavity item is given to the new chest
- cavity_object.forceMove(O)
-
- for(var/missing_zone in missing_bodyparts_zones)
- var/obj/item/bodypart/BP = O.get_bodypart(missing_zone)
- BP.drop_limb(1)
- if(!(tr_flags & TR_KEEPORGANS)) //we didn't already get rid of the organs of the newly spawned mob
- for(var/X in O.internal_organs)
- var/obj/item/organ/G = X
- if(BP.body_zone == check_zone(G.zone))
- if(mind && mind.has_antag_datum(/datum/antagonist/changeling) && istype(G, /obj/item/organ/brain))
- continue //so headless changelings don't lose their brain when transforming
- qdel(G) //we lose the organs in the missing limbs
- qdel(BP)
-
- //transfer mind if we didn't yet
- if(mind)
- mind.transfer_to(O)
- var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- var/datum/action/changeling/humanform/hf = new
- changeling.purchasedpowers += hf
- changeling.regain_powers()
-
-
- //if we have an AI, transfer it; if we don't, make sure the new thing doesn't either
- if(tr_flags & TR_KEEPAI)
- if(ai_controller)
- ai_controller.PossessPawn(O)
- else if(O.ai_controller)
- QDEL_NULL(O.ai_controller)
-
- if (tr_flags & TR_DEFAULTMSG)
- to_chat(O, "You are now a monkey.")
- SEND_SIGNAL(src, COMSIG_CARBON_TRANSFORMED, O)
-
- for(var/A in loc.vars)
- if(loc.vars[A] == src)
- loc.vars[A] = O
-
- O.update_sight()
- transfer_observers_to(O, TRUE)
-
- . = O
-
- qdel(src)
-
-//Mostly same as monkey but turns target into teratoma
-
-/mob/living/carbon/proc/teratomize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG))
- if (notransform || transformation_timer)
+ if(ismonkey(src))
return
- //Handle items on mob
-
- //first organs
- var/list/int_organs = list()
- var/list/missing_bodyparts_zones = get_missing_limbs()
-
- var/obj/item/cavity_object
-
- var/obj/item/bodypart/chest/CH = get_bodypart(BODY_ZONE_CHEST)
- if(CH.cavity_item)
- cavity_object = CH.cavity_item
- CH.cavity_item = null
-
- if(tr_flags & TR_KEEPITEMS)
- unequip_everything()
//Make mob invisible and spawn animation
notransform = TRUE
@@ -182,289 +15,49 @@
invisibility = INVISIBILITY_MAXIMUM
new /obj/effect/temp_visual/monkeyify(loc)
-
- transformation_timer = TRUE
- sleep(TRANSFORMATION_DURATION)
- transformation_timer = FALSE
-
- var/mob/living/carbon/monkey/tumor/O = new /mob/living/carbon/monkey/tumor( loc )
-
- // hash the original name?
- if(tr_flags & TR_HASHNAME)
- O.name = "living teratoma ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])"
- O.real_name = "living teratoma ([copytext_char(rustg_hash_string(RUSTG_HASH_MD5, real_name), 2, 6)])"
-
- //handle DNA and other attributes
- dna.transfer_identity(O)
- O.dna.species.species_traits += NOTRANSSTING
- O.updateappearance(icon_update=0)
-
- if(tr_flags & TR_KEEPSE)
- O.dna.mutation_index = dna.mutation_index
- O.dna.set_se(1, GET_INITIALIZED_MUTATION(RACEMUT))
-
- if(suiciding)
- O.set_suicide(suiciding)
- O.a_intent = INTENT_HARM
-
- //keep viruses?
- if (tr_flags & TR_KEEPVIRUS)
- O.diseases = diseases
- diseases = list()
- for(var/thing in O.diseases)
- var/datum/disease/D = thing
- D.affected_mob = O
-
- //keep damage?
- if (tr_flags & TR_KEEPDAMAGE)
- O.setToxLoss(getToxLoss(), 0)
- O.adjustBruteLoss(getBruteLoss(), 0)
- O.setOxyLoss(getOxyLoss(), 0)
- O.setCloneLoss(getCloneLoss(), 0)
- O.adjustFireLoss(getFireLoss(), 0)
- O.setOrganLoss(ORGAN_SLOT_BRAIN, getOrganLoss(ORGAN_SLOT_BRAIN))
- O.updatehealth()
- O.radiation = radiation
-
- //move implants to new mob
- if(tr_flags & TR_KEEPIMPLANTS)
- for(var/obj/item/implant/IMP as anything in implants)
- IMP.transfer_implant(src, O)
-
- //re-add organs to new mob. this order prevents moving the mind to a brain at any point
- if(tr_flags & TR_KEEPORGANS)
- for(var/X in O.internal_organs)
- var/obj/item/organ/I = X
- I.Remove(O, 1)
-
- if(mind)
- mind.transfer_to(O)
- var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- var/datum/action/changeling/humanform/hf = new
- changeling.purchasedpowers += hf
- changeling.regain_powers()
-
- for(var/X in internal_organs)
- var/obj/item/organ/I = X
- int_organs += I
- I.Remove(src, 1)
-
- for(var/X in int_organs)
- var/obj/item/organ/I = X
- I.Insert(O, 1)
-
- var/obj/item/bodypart/chest/torso = O.get_bodypart(BODY_ZONE_CHEST)
- if(cavity_object)
- torso.cavity_item = cavity_object //cavity item is given to the new chest
- cavity_object.forceMove(O)
-
- for(var/missing_zone in missing_bodyparts_zones)
- var/obj/item/bodypart/BP = O.get_bodypart(missing_zone)
- BP.drop_limb(1)
- if(!(tr_flags & TR_KEEPORGANS)) //we didn't already get rid of the organs of the newly spawned mob
- for(var/X in O.internal_organs)
- var/obj/item/organ/G = X
- if(BP.body_zone == check_zone(G.zone))
- if(mind && mind.has_antag_datum(/datum/antagonist/changeling) && istype(G, /obj/item/organ/brain))
- continue //so headless changelings don't lose their brain when transforming
- qdel(G) //we lose the organs in the missing limbs
- qdel(BP)
-
- //transfer mind if we didn't yet
- if(mind)
- mind.transfer_to(O)
- var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- var/datum/action/changeling/humanform/hf = new
- changeling.purchasedpowers += hf
- changeling.regain_powers()
-
-
- if (tr_flags & TR_DEFAULTMSG)
- to_chat(O, "You are now a living teratoma.")
-
- SEND_SIGNAL(src, COMSIG_CARBON_TRANSFORMED, O)
-
- for(var/A in loc.vars)
- if(loc.vars[A] == src)
- loc.vars[A] = O
-
- transfer_observers_to(O, TRUE)
-
- . = O
-
- qdel(src)
+ transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_monkeyize)), TRANSFORMATION_DURATION, TIMER_UNIQUE)
+
+/mob/living/carbon/proc/finish_monkeyize()
+ transformation_timer = null
+ to_chat(src, "You are now a monkey.")
+ notransform = FALSE
+ icon = initial(icon)
+ invisibility = 0
+ set_species(/datum/species/monkey)
+ uncuff()
+ regenerate_icons()
+ return src
////////////////////////// Humanize //////////////////////////////
//Could probably be merged with monkeyize but other transformations got their own procs, too
-/mob/living/carbon/proc/humanize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG | TR_KEEPAI), keep_original_species = FALSE, var/datum/species/original_species)
+/mob/living/carbon/proc/humanize(species = /datum/species/human)
if (notransform || transformation_timer)
return
- var/list/int_organs = list()
-
- var/list/missing_bodyparts_zones = get_missing_limbs()
-
- var/obj/item/cavity_object
-
- var/obj/item/bodypart/chest/CH = get_bodypart(BODY_ZONE_CHEST)
- if(CH.cavity_item)
- cavity_object = CH.cavity_item
- CH.cavity_item = null
-
- //now the rest
- if (tr_flags & TR_KEEPITEMS)
- unequip_everything()
+ if(!ismonkey(src))
+ return
//Make mob invisible and spawn animation
notransform = TRUE
Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
-
icon = null
cut_overlays()
invisibility = INVISIBILITY_MAXIMUM
- new /obj/effect/temp_visual/monkeyify/humanify(loc)
-
- transformation_timer = TRUE
- sleep(TRANSFORMATION_DURATION)
- transformation_timer = FALSE
-
- var/mob/living/carbon/human/O = new( loc )
- for(var/obj/item/C in O.loc)
- if(C.anchored)
- continue
- O.equip_to_appropriate_slot(C)
-
- dna.transfer_identity(O, tr_flags & TR_KEEPSE)
- O.dna.set_se(FALSE, GET_INITIALIZED_MUTATION(RACEMUT))
- //Reset offsets to match human settings, in-case they have been changed
- O.dna.species.offset_features = list(OFFSET_UNIFORM = list(0,0), OFFSET_ID = list(0,0), OFFSET_GLOVES = list(0,0), OFFSET_GLASSES = list(0,0), OFFSET_EARS = list(0,0), OFFSET_SHOES = list(0,0), OFFSET_S_STORE = list(0,0), OFFSET_FACEMASK = list(0,0), OFFSET_HEAD = list(0,0), OFFSET_FACE = list(0,0), OFFSET_BELT = list(0,0), OFFSET_BACK = list(0,0), OFFSET_SUIT = list(0,0), OFFSET_NECK = list(0,0), OFFSET_RIGHT_HAND = list(0,0), OFFSET_LEFT_HAND = list(0,0))
- O.updateappearance(mutcolor_update=1)
-
- if(findtext(O.dna.real_name, "monkey", 1, 7)) //7 == length("monkey") + 1
- O.real_name = random_unique_name(O.gender)
- O.dna.generate_unique_enzymes(O)
- else
- O.real_name = O.dna.real_name
- O.name = O.real_name
-
- if(suiciding)
- O.set_suicide(suiciding)
-
- //keep viruses?
- if (tr_flags & TR_KEEPVIRUS)
- O.diseases = diseases
- diseases = list()
- for(var/thing in O.diseases)
- var/datum/disease/D = thing
- D.affected_mob = O
- O.med_hud_set_status()
-
- //keep damage?
- if (tr_flags & TR_KEEPDAMAGE)
- O.setToxLoss(getToxLoss(), 0)
- O.adjustBruteLoss(getBruteLoss(), 0)
- O.setOxyLoss(getOxyLoss(), 0)
- O.setCloneLoss(getCloneLoss(), 0)
- O.adjustFireLoss(getFireLoss(), 0)
- O.adjustOrganLoss(ORGAN_SLOT_BRAIN, getOrganLoss(ORGAN_SLOT_BRAIN))
- O.updatehealth()
- O.radiation = radiation
-
- //move implants to new mob
- if(tr_flags & TR_KEEPIMPLANTS)
- for(var/obj/item/implant/IMP as anything in implants)
- IMP.transfer_implant(src, O)
-
- if(tr_flags & TR_KEEPORGANS)
- for(var/X in O.internal_organs)
- var/obj/item/organ/I = X
- I.Remove(O, 1)
-
- if(mind)
- mind.transfer_to(O)
- var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- for(var/datum/action/changeling/humanform/HF in changeling.purchasedpowers)
- changeling.purchasedpowers -= HF
- changeling.regain_powers()
-
- for(var/X in internal_organs)
- var/obj/item/organ/I = X
- int_organs += I
- I.Remove(src, 1)
-
- for(var/X in int_organs)
- var/obj/item/organ/I = X
- I.Insert(O, 1)
-
-
- var/obj/item/bodypart/chest/torso = get_bodypart(BODY_ZONE_CHEST)
- if(cavity_object)
- torso.cavity_item = cavity_object //cavity item is given to the new chest
- cavity_object.forceMove(O)
-
- for(var/missing_zone in missing_bodyparts_zones)
- var/obj/item/bodypart/BP = O.get_bodypart(missing_zone)
- BP.drop_limb(1)
- if(!(tr_flags & TR_KEEPORGANS)) //we didn't already get rid of the organs of the newly spawned mob
- for(var/X in O.internal_organs)
- var/obj/item/organ/G = X
- if(BP.body_zone == check_zone(G.zone))
- if(mind && mind.has_antag_datum(/datum/antagonist/changeling) && istype(G, /obj/item/organ/brain))
- continue //so headless changelings don't lose their brain when transforming
- qdel(G) //we lose the organs in the missing limbs
- qdel(BP)
-
- if(mind)
- mind.transfer_to(O)
- var/datum/antagonist/changeling/changeling = O.mind.has_antag_datum(/datum/antagonist/changeling)
- if(changeling)
- for(var/datum/action/changeling/humanform/HF in changeling.purchasedpowers)
- changeling.purchasedpowers -= HF
- changeling.regain_powers()
-
- //if we have an AI, transfer it; if we don't, make sure the new thing doesn't either
- if(tr_flags & TR_KEEPAI)
- if(ai_controller)
- ai_controller.PossessPawn(O)
- else if(O.ai_controller)
- QDEL_NULL(O.ai_controller)
-
- if(keep_original_species && isnull(original_species))
- original_species = /datum/species/human
-
- if(O.dna.species && !istype(O.dna.species, /datum/species/monkey))
- if(isnull(O.dna.species))
- O.set_species(/datum/species/human)
- else
- O.set_species(O.dna.species)
- else
- if(keep_original_species)
- if(isnull(original_species) || !ispath(original_species, /datum/species))
- O.set_species(/datum/species/human)
- else
- O.set_species(original_species)
- else
- O.set_species(/datum/species/human)
-
- O.a_intent = INTENT_HELP
- if (tr_flags & TR_DEFAULTMSG)
- to_chat(O, "You are now \a [O.dna.species]].")
-
- SEND_SIGNAL(src, COMSIG_CARBON_TRANSFORMED, O)
-
- transfer_observers_to(O, TRUE)
-
- . = O
-
- for(var/A in loc.vars)
- if(loc.vars[A] == src)
- loc.vars[A] = O
- qdel(src)
+ new /obj/effect/temp_visual/monkeyify/humanify(loc)
+ transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_humanize), species), TRANSFORMATION_DURATION, TIMER_UNIQUE)
+
+/mob/living/carbon/proc/finish_humanize(species = /datum/species/human)
+ transformation_timer = null
+ to_chat(src, "You are now a human.")
+ notransform = FALSE
+ icon = initial(icon)
+ invisibility = 0
+ set_species(species)
+ dna.update_body_size(TRUE, height = dna.species?.get_species_height())
+ regenerate_icons()
+ return src
//A common proc to start an -ize transformation
/mob/living/carbon/proc/pre_transform(delete_items = FALSE)
@@ -484,6 +77,35 @@
icon = null
invisibility = INVISIBILITY_MAXIMUM
+/mob/living/carbon/proc/teratomize()
+ if (notransform || transformation_timer)
+ return
+
+ if(isteratoma(src))
+ return
+
+ //Make mob invisible and spawn animation
+ notransform = TRUE
+ Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
+ icon = null
+ cut_overlays()
+ invisibility = INVISIBILITY_MAXIMUM
+
+ new /obj/effect/temp_visual/monkeyify(loc)
+
+ transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_teratomize)), TRANSFORMATION_DURATION, TIMER_UNIQUE)
+
+/mob/living/carbon/proc/finish_teratomize()
+ transformation_timer = null
+ to_chat(src, "You are now a disgusting little cancer baby.")
+ notransform = FALSE
+ icon = initial(icon)
+ invisibility = 0
+ set_species(/datum/species/monkey/teratoma)
+ uncuff()
+ regenerate_icons()
+ return src
+
/mob/living/carbon/AIize(transfer_after = TRUE, client/preference_source)
return pre_transform() ? null : ..()
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 1556116350ace..27c4a76406c3c 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -187,7 +187,7 @@
var/randomize = pick("monkey","robot","slime","xeno","humanoid","animal")
switch(randomize)
if("monkey")
- new_mob = new /mob/living/carbon/monkey(M.loc)
+ new_mob = new /mob/living/carbon/human/species/monkey(M.loc)
if("robot")
var/robot = pick(200;/mob/living/silicon/robot,
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 345901695efff..d91ac483dc7b6 100755
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -309,7 +309,7 @@
taste_description = "scorching agony"
/datum/reagent/consumable/condensedcapsaicin/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
- if(!ishuman(M) && !ismonkey(M))
+ if(!ishuman(M))
return
var/mob/living/carbon/victim = M
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index add12c80b80ba..311786ee14658 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1965,7 +1965,7 @@
/datum/reagent/magillitis/on_mob_life(mob/living/carbon/M)
..()
- if((ismonkey(M) || ishuman(M)) && current_cycle >= 10)
+ if(ishuman(M) && current_cycle >= 10)
M.gorillize()
/datum/reagent/growthserum
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 41809a81de167..cbad751f7baaf 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -111,7 +111,8 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/machinery/disposal)
stuff_mob_in(target, user)
/obj/machinery/disposal/proc/stuff_mob_in(mob/living/target, mob/living/user)
- if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
+ var/ventcrawler = HAS_TRAIT(user, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(user, TRAIT_VENTCRAWLER_NUDE)
+ if(!iscarbon(user) && !ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
if (iscyborg(user))
var/mob/living/silicon/robot/borg = user
if (!borg.module || !borg.module.canDispose)
diff --git a/code/modules/research/xenobiology/crossbreeding/_structures.dm b/code/modules/research/xenobiology/crossbreeding/_structures.dm
index f54a072c32e76..3141638979dea 100644
--- a/code/modules/research/xenobiology/crossbreeding/_structures.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_structures.dm
@@ -488,7 +488,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cerulean_slime_crystal)
/obj/structure/slime_crystal/green
colour = "green"
- var/datum/mutation/stored_mutation
+ var/datum/mutation/human/stored_mutation
/obj/structure/slime_crystal/green/examine(mob/user)
. = ..()
@@ -521,10 +521,10 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/structure/cerulean_slime_crystal)
for(var/X in mut_list)
if(istype(X,stored_mutation))
continue
- var/datum/mutation/t_mutation = X
+ var/datum/mutation/human/t_mutation = X
secondary_list += t_mutation.type
- var/datum/mutation/mutation = pick(secondary_list)
+ var/datum/mutation/human/mutation = pick(secondary_list)
carbon_mob.dna.remove_mutation(mutation)
/obj/structure/slime_crystal/green/on_mob_leave(mob/living/affected_mob)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 4d8bbe72d3fb4..8e739e9b86c3e 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -118,12 +118,10 @@
hotkey_help.Grant(user)
actions += hotkey_help
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl))
+ RegisterSignal(user, COMSIG_MOB_CTRL_CLICKED, PROC_REF(on_ctrl_click))
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt))
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift))
RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift))
- RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl))
- RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl))
//Checks for recycler on every interact, prevents issues with load order on certain maps.
if(!connected_recycler)
@@ -133,12 +131,10 @@
connected_recycler.connected += src
/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL)
+ UnregisterSignal(user, COMSIG_MOB_CTRL_CLICKED)
UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT)
UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT)
UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT)
- UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL)
- UnregisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL)
..()
/obj/machinery/computer/camera_advanced/xenobio/proc/on_contents_del(datum/source, atom/deleted)
@@ -248,7 +244,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
if(X.monkeys >= 1)
- var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc, TRUE, owner)
+ var/mob/living/carbon/human/species/monkey/food = new /mob/living/carbon/human/species/monkey(remote_eye.loc, TRUE, owner)
if (!QDELETED(food))
X.monkeys--
X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
@@ -276,7 +272,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
to_chat(owner, "There is no connected monkey recycler. Use a multitool to link one.")
return
if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
- for(var/mob/living/carbon/monkey/M in remote_eye.loc)
+ for(var/mob/living/carbon/human/species/monkey/M in remote_eye.loc)
if(M.stat)
M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!")
recycler.use_power(500)
@@ -345,11 +341,6 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
//
// Alternate clicks for slime, monkey and open turf if using a xenobio console
-// Scans slime
-/mob/living/simple_animal/slime/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_CTRL, src)
- ..()
-
//Feeds a potion to slime
/mob/living/simple_animal/slime/AltClick(mob/user)
SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_ALT, src)
@@ -365,15 +356,14 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_SHIFT, src)
..()
-//Place monkey
-/turf/open/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_TURF_CLICK_CTRL, src)
- ..()
-
-//Pick up monkey
-/mob/living/carbon/monkey/CtrlClick(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_MONKEY_CLICK_CTRL, src)
- ..()
+/obj/machinery/computer/camera_advanced/xenobio/proc/on_ctrl_click(datum/source, atom/clicked_atom)
+ SIGNAL_HANDLER
+ if(ismonkey(clicked_atom))
+ XenoMonkeyClickCtrl(source, clicked_atom)
+ if(isopenturf(clicked_atom))
+ XenoTurfClickCtrl(source, clicked_atom)
+ if(isslime(clicked_atom))
+ XenoSlimeClickCtrl(source, clicked_atom)
// Scans slime
/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickCtrl(mob/living/user, mob/living/simple_animal/slime/S)
@@ -459,7 +449,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
var/area/turfarea = get_area(T)
if(turfarea.name == E.allowed_area || (turfarea.area_flags & XENOBIOLOGY_COMPATIBLE))
if(X.monkeys >= 1)
- var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(T, TRUE, C)
+ var/mob/living/carbon/human/species/monkey/food = new /mob/living/carbon/human/species/monkey(T, TRUE, C)
if (!QDELETED(food))
X.monkeys--
X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors
@@ -468,10 +458,12 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/camera_advanced/xenobio)
to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.")
//Pick up monkey
-/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/monkey/M)
+/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/human/M)
SIGNAL_HANDLER
- if(!GLOB.cameranet.checkTurfVis(M.loc))
+ if(!ismonkey(M))
+ return
+ if(!isturf(M.loc) || !GLOB.cameranet.checkTurfVis(M.loc))
to_chat(user, "Target is not near a camera. Cannot proceed.")
return
var/mob/living/C = user
diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm
index b9b8605517ea4..cee1809378e5e 100644
--- a/code/modules/spells/spell_types/barnyard.dm
+++ b/code/modules/spells/spell_types/barnyard.dm
@@ -11,7 +11,7 @@
range = 7
cooldown_min = 30
selection_type = "range"
- var/static/list/compatible_mobs_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/carbon/monkey))
+ var/static/list/compatible_mobs_typecache = typecacheof(list(/mob/living/carbon/human))
action_icon_state = "barn"
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index e796bdc959a81..aeaf2f75a7e50 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -197,7 +197,7 @@ CREATION_TEST_IGNORE_SUBTYPES(/obj/item/melee/touch_attack)
/obj/item/melee/touch_attack/mutation
catchphrase = null
- var/datum/mutation/parent_mutation
+ var/datum/mutation/human/parent_mutation
CREATION_TEST_IGNORE_SUBTYPES(/obj/item/melee/touch_attack/mutation)
diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm
index 1fb384d21c070..0ceaa6c9203f2 100644
--- a/code/modules/spells/spell_types/touch_attacks.dm
+++ b/code/modules/spells/spell_types/touch_attacks.dm
@@ -87,7 +87,7 @@
/obj/effect/proc_holder/spell/targeted/touch/mutation
clothes_req = FALSE
- var/datum/mutation/parent_mutation
+ var/datum/mutation/human/parent_mutation
CREATION_TEST_IGNORE_SUBTYPES(/obj/effect/proc_holder/spell/targeted/touch/mutation)
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 90dffe1eb6a6d..b4d5c2cdd9e47 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -98,8 +98,8 @@
to_chat(user, "Plant data added to local storage.")
//animals
- var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey, /mob/living/carbon/alien))
- if(isanimal(target) || is_type_in_typecache(target,non_simple_animals))
+ var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/alien))
+ if(isanimal(target) || is_type_in_typecache(target,non_simple_animals) || ismonkey(target))
if(isanimal(target))
var/mob/living/simple_animal/A = target
if(!A.healable || (A.flags_1 & HOLOGRAM_1)) //simple approximation of being animal not a robot or similar. Also checking if holographic
diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm
index cb041d55f3413..471c6c02a5a36 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -9,7 +9,7 @@
/datum/surgery_step/lobotomize,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_HEAD)
requires_bodypart_type = 0
diff --git a/code/modules/surgery/advanced/pacification.dm b/code/modules/surgery/advanced/pacification.dm
index 5a98e32083430..7130e59027be5 100644
--- a/code/modules/surgery/advanced/pacification.dm
+++ b/code/modules/surgery/advanced/pacification.dm
@@ -8,7 +8,7 @@
/datum/surgery_step/pacify,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_HEAD)
requires_bodypart_type = 0
diff --git a/code/modules/surgery/advanced/revival.dm b/code/modules/surgery/advanced/revival.dm
index b5ae8bce78b33..d61cfc1da161a 100644
--- a/code/modules/surgery/advanced/revival.dm
+++ b/code/modules/surgery/advanced/revival.dm
@@ -9,7 +9,7 @@
/datum/surgery_step/revive,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_HEAD)
requires_bodypart_type = 0
diff --git a/code/modules/surgery/advanced/viral_bonding.dm b/code/modules/surgery/advanced/viral_bonding.dm
index 53017cf892618..83dbe552f1572 100644
--- a/code/modules/surgery/advanced/viral_bonding.dm
+++ b/code/modules/surgery/advanced/viral_bonding.dm
@@ -8,7 +8,7 @@
/datum/surgery_step/viral_bond,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST)
self_operable = TRUE
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
index fbf0caf06ce78..9ffc93497f8ee 100644
--- a/code/modules/surgery/amputation.dm
+++ b/code/modules/surgery/amputation.dm
@@ -2,7 +2,7 @@
/datum/surgery/amputation
name = "amputation"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/sever_limb)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD)
requires_bodypart_type = 0
self_operable = TRUE
diff --git a/code/modules/surgery/blood_filter.dm b/code/modules/surgery/blood_filter.dm
index 0027a851bfc1a..b920734350fae 100644
--- a/code/modules/surgery/blood_filter.dm
+++ b/code/modules/surgery/blood_filter.dm
@@ -7,7 +7,7 @@
/datum/surgery_step/filter_blood,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST)
requires_bodypart_type = TRUE
ignore_clothes = FALSE
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index d4ec2353a5462..d864ed2c5a8a5 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -676,9 +676,8 @@
/obj/item/bodypart/chest/monkey
icon = 'icons/mob/animal_parts.dmi'
- icon_state = "default_monkey_chest"
limb_id = SPECIES_MONKEY
- animal_origin = MONKEY_BODYPART
+ is_dimorphic = TRUE
/obj/item/bodypart/chest/monkey/teratoma
icon_state = "teratoma_chest"
@@ -1112,3 +1111,11 @@
can_be_disabled = FALSE
max_damage = 5000
animal_origin = DEVIL_BODYPART
+
+///Proc to turn bodypart into another.
+/obj/item/bodypart/proc/change_bodypart(obj/item/bodypart/new_type)
+ var/mob/living/carbon/our_owner = owner //dropping nulls the limb
+ drop_limb(TRUE)
+ var/obj/item/bodypart/new_part = new new_type()
+ new_part.attach_limb(our_owner, TRUE)
+ qdel(src)
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 3f8bdf4d2e7ac..1cf7fdc83e664 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -107,7 +107,7 @@
if(!special)
if(C.dna)
- for(var/datum/mutation/MT as() in C.dna.mutations) //some mutations require having specific limbs to be kept.
+ for(var/datum/mutation/human/MT as() in C.dna.mutations) //some mutations require having specific limbs to be kept.
if(MT.limb_req && MT.limb_req == body_zone)
C.dna.force_lose(MT)
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index 7dc048255c424..ac6032ee14201 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -136,27 +136,6 @@
L = new dna.species.species_chest()
. = L
-/mob/living/carbon/monkey/newBodyPart(zone, robotic, fixed_icon)
- var/obj/item/bodypart/L
- switch(zone)
- if(BODY_ZONE_L_ARM)
- L = new /obj/item/bodypart/l_arm/monkey()
- if(BODY_ZONE_R_ARM)
- L = new /obj/item/bodypart/r_arm/monkey()
- if(BODY_ZONE_HEAD)
- L = new /obj/item/bodypart/head/monkey()
- if(BODY_ZONE_L_LEG)
- L = new /obj/item/bodypart/l_leg/monkey()
- if(BODY_ZONE_R_LEG)
- L = new /obj/item/bodypart/r_leg/monkey()
- if(BODY_ZONE_CHEST)
- L = new /obj/item/bodypart/chest/monkey()
- if(L)
- L.update_limb(fixed_icon, src)
- if(robotic)
- L.change_bodypart_status(BODYTYPE_ROBOTIC)
- . = L
-
/mob/living/carbon/alien/larva/newBodyPart(zone, robotic, fixed_icon)
var/obj/item/bodypart/L
switch(zone)
diff --git a/code/modules/surgery/brain_recalibration.dm b/code/modules/surgery/brain_recalibration.dm
index 46cb89dc73c0d..d48ea8e8e2233 100644
--- a/code/modules/surgery/brain_recalibration.dm
+++ b/code/modules/surgery/brain_recalibration.dm
@@ -8,7 +8,7 @@
/datum/surgery_step/fix_brain,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_HEAD)
requires_bodypart_type = 0
diff --git a/code/modules/surgery/cauterize.dm b/code/modules/surgery/cauterize.dm
index b5ff8d7d3a854..94885f1788b8b 100644
--- a/code/modules/surgery/cauterize.dm
+++ b/code/modules/surgery/cauterize.dm
@@ -3,7 +3,7 @@
/datum/surgery_step/retract_skin,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_R_ARM,BODY_ZONE_L_ARM,BODY_ZONE_R_LEG,BODY_ZONE_L_LEG,BODY_ZONE_CHEST,BODY_ZONE_HEAD)
requires_bodypart_type = FALSE
replaced_by = /datum/surgery
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 4a9350a9061d8..34da51fd8d666 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -1,7 +1,7 @@
/datum/surgery/cavity_implant
name = "cavity implant"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/incise, /datum/surgery_step/handle_cavity, /datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST)
self_operable = TRUE
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 3a29baf23acb1..4025f60451472 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -1,7 +1,7 @@
/datum/surgery/eye_surgery
name = "eye surgery"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/fix_eyes, /datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_PRECISE_EYES)
requires_bodypart_type = 0
diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
index e766b30cd1e81..b66e96844bcd6 100644
--- a/code/modules/surgery/gastrectomy.dm
+++ b/code/modules/surgery/gastrectomy.dm
@@ -1,6 +1,6 @@
/datum/surgery/gastrectomy
name = "Gastrectomy"
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST)
requires_real_bodypart = TRUE
steps = list(/datum/surgery_step/incise,
diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm
index d6cfaf7b0cb47..fcd39498439de 100644
--- a/code/modules/surgery/healing.dm
+++ b/code/modules/surgery/healing.dm
@@ -6,7 +6,7 @@
/datum/surgery_step/heal,
/datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST)
requires_bodypart_type = FALSE
replaced_by = /datum/surgery
diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
index 87ab3c1444246..fc28ded64f99c 100644
--- a/code/modules/surgery/hepatectomy.dm
+++ b/code/modules/surgery/hepatectomy.dm
@@ -1,6 +1,6 @@
/datum/surgery/hepatectomy
name = "Hepatectomy"
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST)
requires_real_bodypart = TRUE
steps = list(/datum/surgery_step/incise,
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index 8d72ceac92a01..2ce47ed4bee49 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -1,7 +1,7 @@
/datum/surgery/implant_removal
name = "Implant removal"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/extract_implant, /datum/surgery_step/close)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST)
//extract implant
diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index 20430836f2ac9..df406f8d8d8fb 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -12,6 +12,9 @@
/datum/surgery_step/replace_limb/preop(mob/user, mob/living/carbon/target, obj/item/tool, datum/surgery/surgery)
+ if(NOAUGMENTS in target.dna.species.species_traits)
+ to_chat(user, "[target] cannot be augmented!")
+ return -1
if(istype(tool, /obj/item/organ_storage) && istype(tool.contents[1], /obj/item/bodypart))
tool = tool.contents[1]
var/obj/item/bodypart/aug = tool
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index f4ecca1455928..538ec3726e8cc 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -1,6 +1,6 @@
/datum/surgery/organ_manipulation
name = "organ manipulation"
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD)
requires_real_bodypart = 1
steps = list(
diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm
index 445752fefd923..97064b303743d 100644
--- a/code/modules/surgery/organs/tails.dm
+++ b/code/modules/surgery/organs/tails.dm
@@ -4,8 +4,10 @@
name = "tail"
desc = "A severed tail. What did you cut this off of?"
icon_state = "severedtail"
+
zone = BODY_ZONE_PRECISE_GROIN
slot = ORGAN_SLOT_TAIL
+
var/tail_type = "None"
/obj/item/organ/tail/proc/is_wagging(mob/living/carbon/human/H)
@@ -150,3 +152,24 @@
"spines" = species.mutant_bodyparts["waggingspines"])
species.mutant_bodyparts -= list("waggingtail_lizard", "waggingspines")
H.update_body()
+
+/obj/item/organ/tail/monkey
+ name = "monkey tail"
+ desc = "A severed monkey tail. Does not look like a banana."
+ tail_type = "Monkey"
+ icon_state = "severedmonkeytail"
+
+/obj/item/organ/tail/monkey/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE, pref_load = FALSE)
+ ..()
+ if(istype(H))
+ if(!("tail_human" in H.dna.species.mutant_bodyparts))
+ H.dna.species.mutant_bodyparts |= "tail_human"
+ H.dna.features["tail_human"] = tail_type
+ H.update_body()
+
+/obj/item/organ/tail/monkey/Remove(mob/living/carbon/human/H, special = 0, pref_load = FALSE)
+ ..()
+ if(istype(H))
+ H.dna.features["tail_human"] = "None"
+ H.dna.species.mutant_bodyparts -= "tail_human"
+ H.update_body()
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index b1cead0edcf8f..71a747c58559e 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -397,3 +397,10 @@
color = "#1b1b1b"
liked_food = RAW | GROSS
disliked_food = DAIRY
+
+/obj/item/organ/tongue/monkey
+ name = "primitive tongue"
+ desc = "For aggressively chimpering. And consuming bananas."
+ say_mod = "chimpers"
+ liked_food = MEAT | FRUIT
+ disliked_food = CLOTH
diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm
index b6ba55fb11304..b9e9a9212a3c5 100644
--- a/code/modules/surgery/prosthetic_replacement.dm
+++ b/code/modules/surgery/prosthetic_replacement.dm
@@ -1,7 +1,7 @@
/datum/surgery/prosthetic_replacement
name = "prosthetic replacement"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/add_prosthetic)
- target_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ target_mobtypes = list(/mob/living/carbon/human)
possible_locs = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_HEAD)
requires_bodypart = FALSE //need a missing limb
requires_bodypart_type = 0
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index 601b44e634860..606869623711a 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -905,6 +905,9 @@
/obj/vehicle/sealed/mecha/mob_try_enter(mob/M)
if(!ishuman(M)) // no silicons or drones in mechas.
return
+ if(HAS_TRAIT(M, TRAIT_PRIMITIVE)) //lavalanders & monkeys beware
+ to_chat(M, "The knowledge to use this device eludes you!")
+ return
log_message("[M] tries to move into [src].", LOG_MECHA)
if(!operation_allowed(M))
to_chat(M, "Access denied. Insufficient operation keycodes.")
diff --git a/config/dbconfig.txt b/config/dbconfig.txt
index ffcbe885689dd..b95ba63bb7e3c 100644
--- a/config/dbconfig.txt
+++ b/config/dbconfig.txt
@@ -3,11 +3,11 @@
## administration, and the in game library.
## Should SQL be enabled? Uncomment to enable
-#SQL_ENABLED
+SQL_ENABLED
## Server the MySQL database can be found at.
## Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
-ADDRESS localhost
+ADDRESS 127.0.0.1
## MySQL server port (default is 3306).
PORT 3306
diff --git a/config/game_options.txt b/config/game_options.txt
index d6640f5e05b08..4ff016987a2e7 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -49,7 +49,6 @@ WALK_DELAY 3.5
## /mob/living/carbon/human on the last entry, the last entry will override the first.
##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 0
##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0
-##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/monkey 0
##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0
##MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal/slime 0
MULTIPLICATIVE_MOVESPEED /mob/living/simple_animal 1
diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi
index 133de0dbe46b5..5588c2636e2c5 100644
Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ
diff --git a/icons/mob/animal_parts.dmi b/icons/mob/animal_parts.dmi
index 3d338868f7d31..019d5e203c241 100644
Binary files a/icons/mob/animal_parts.dmi and b/icons/mob/animal_parts.dmi differ
diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi
index aebaace8d8fe8..4f83aabdfbaa6 100644
Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 91da670af4212..f8eedaa84ba61 100755
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/tools/Runtime Condenser/Output.txt b/tools/Runtime Condenser/Output.txt
index e349edb7db7ab..c53cf20c1d367 100644
--- a/tools/Runtime Condenser/Output.txt
+++ b/tools/Runtime Condenser/Output.txt
@@ -87,7 +87,7 @@ The following runtime has occurred 9 time(s).
runtime error: Cannot read null.thrownby
proc name: hitby (/mob/living/carbon/human/hitby)
source file: human_defense.dm,353
- usr: the monkey (662) (/mob/living/carbon/monkey)
+ usr: the monkey (662) (/mob/living/carbon/human/species/monkey)
src: Sydney Hujsak (/mob/living/carbon/human)
@@ -190,7 +190,7 @@ runtime error: Cannot read null.pipe_vision_img
proc name: add ventcrawl (/mob/living/proc/add_ventcrawl)
source file: ventcrawling.dm,94
usr: (src)
- src: the monkey (809) (/mob/living/carbon/monkey)
+ src: the monkey (809) (/mob/living/carbon/human/species/monkey)
src.loc: the Cloning Lab vent pump #1 (/obj/machinery/atmospherics/components/unary/vent_pump)
diff --git a/tools/UpdatePaths/Scripts/10943_replacemonkeys.txt b/tools/UpdatePaths/Scripts/10943_replacemonkeys.txt
new file mode 100644
index 0000000000000..630d446b9d363
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/10943_replacemonkeys.txt
@@ -0,0 +1,5 @@
+#comment This replaces the monkeys pre-species refactor to the monkeys post-species refactor
+
+/mob/living/carbon/monkey : /mob/living/carbon/human/species/monkey
+/mob/living/carbon/monkey/angry : /mob/living/carbon/human/species/monkey/angry
+/mob/living/carbon/monkey/punpun : /mob/living/carbon/human/species/monkey/punpun