diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 31b823a0ae3..ded3dcd76d2 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -38293,7 +38293,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/apc/cell_5k, -/turf/open/floor/circuit/green, +/turf/open/floor/circuit/green/telecomms/mainframe, /area/station/ai_monitored/turret_protected/ai) "nAa" = ( /obj/machinery/door/firedoor/border_only{ @@ -41520,7 +41520,7 @@ name = "AI Core Shutters" }, /obj/structure/cable, -/turf/open/floor/circuit/green, +/turf/open/floor/circuit/green/telecomms/mainframe, /area/station/ai_monitored/turret_protected/ai) "oOb" = ( /obj/effect/turf_decal/tile/neutral{ diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index a0e927c6319..d6ab89cb8a8 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -4,7 +4,7 @@ uniform = /obj/item/clothing/under/plasmaman gloves = /obj/item/clothing/gloves/color/plasmaman head = /obj/item/clothing/head/helmet/space/plasmaman - r_hand= /obj/item/tank/internals/plasmaman/belt/full + r_hand = /obj/item/tank/internals/plasmaman/belt/full internals_slot = ITEM_SLOT_HANDS /datum/outfit/plasmaman/security diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 124dfcee41c..00ee7025861 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -93,6 +93,12 @@ if(fishing_modifier) AddComponent(/datum/component/adjust_fishing_difficulty, fishing_modifier) +/obj/item/clothing/suit/space/on_outfit_equip(mob/living/carbon/human/outfit_wearer, visuals_only, item_slot) + . = ..() + if(isnull(cell)) + return + toggle_spacesuit(toggler = null, manual_toggle = FALSE) //turn on the thermal regulator by default. + /// Start Processing on the space suit when it is worn to heat the wearer /obj/item/clothing/suit/space/equipped(mob/living/user, slot) . = ..() diff --git a/code/modules/jobs/job_types/station_trait/human_ai.dm b/code/modules/jobs/job_types/station_trait/human_ai.dm index a6e77d77a51..a436454be43 100644 --- a/code/modules/jobs/job_types/station_trait/human_ai.dm +++ b/code/modules/jobs/job_types/station_trait/human_ai.dm @@ -111,6 +111,18 @@ l_hand = /obj/item/paper/default_lawset_list +/datum/outfit/job/human_ai/pre_equip(mob/living/carbon/human/equipped, visualsOnly) + . = ..() + if(visualsOnly) + return + if(is_safe_turf(equipped.loc, dense_atoms = TRUE)) //skip this if it's safe. We allow dense atoms because we spawn out of the inactive core. + return + if(isnull(equipped.dna.species.outfit_important_for_life)) //custom species stuff will handle this for us. + internals_slot = ITEM_SLOT_SUITSTORE + suit_store = /obj/item/tank/internals/oxygen + suit = /obj/item/clothing/suit/space/nasavoid + head = /obj/item/clothing/head/helmet/space/nasavoid + /datum/outfit/job/human_ai/post_equip(mob/living/carbon/human/equipped, visualsOnly) . = ..() if(visualsOnly) @@ -122,9 +134,6 @@ ADD_TRAIT(equipped, TRAIT_COMMISSIONED, INNATE_TRAIT) equipped.faction |= list(FACTION_SILICON, FACTION_TURRET) - var/static/list/allowed_areas = typecacheof(list(/area/station/ai_monitored)) - equipped.AddComponent(/datum/component/hazard_area, area_whitelist = allowed_areas) - /obj/item/paper/default_lawset_list name = "Lawset Note" desc = "A note explaining the lawset, quickly written yet everso important."