diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index bb3a07c0ebb..3ac88ff3da1 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -67,8 +67,8 @@ temperature = 300 /turf/simulated/floor/indestructible/boss/air - oxygen = 0 - nitrogen = 0 + oxygen = MOLES_O2STANDARD + nitrogen = MOLES_N2STANDARD temperature = T20C /turf/simulated/floor/indestructible/hierophant diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 4a5d28b63b9..7fa06a31033 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -524,6 +524,18 @@ var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 5 +/obj/structure/fans/Initialize(loc) + ..() + air_update_turf(1) + +/obj/structure/fans/Destroy() + arbitraryatmosblockingvar = 0 + air_update_turf(1) + return ..() + +/obj/structure/fans/CanAtmosPass(turf/T) + return !arbitraryatmosblockingvar + /obj/structure/fans/deconstruct() if(buildstacktype) new buildstacktype(loc, buildstackamount) @@ -552,18 +564,6 @@ unacidable = TRUE invisibility = INVISIBILITY_ABSTRACT -/obj/structure/fans/Initialize(loc) - ..() - air_update_turf(1) - -/obj/structure/fans/Destroy() - arbitraryatmosblockingvar = 0 - air_update_turf(1) - return ..() - -/obj/structure/fans/CanAtmosPass(turf/T) - return !arbitraryatmosblockingvar - //Signs /obj/structure/sign/mining name = "nanotrasen mining corps sign" diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm index e4ef5aaf25a..72ee0f99cc2 100644 --- a/code/modules/mob/living/carbon/human/species/unathi.dm +++ b/code/modules/mob/living/carbon/human/species/unathi.dm @@ -112,7 +112,7 @@ blurb = "These reptillian creatures appear to be related to the Unathi, but seem significantly less evolved. \ They roam the wastes of Lavaland, worshipping a dead city and capturing unsuspecting miners." - language = null + language = "Sinta'unathi" default_language = "Sinta'unathi" slowdown = -0.80 diff --git a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm index fe8860c79e1..4e924a5424c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm @@ -5,6 +5,7 @@ icon_state = "gutlunch" icon_living = "gutlunch" icon_dead = "gutlunch" + icon_aggro = "gutlunch" speak_emote = list("warbles", "quavers") emote_hear = list("trills.") emote_see = list("sniffs.", "burps.") @@ -63,11 +64,12 @@ ..() /mob/living/simple_animal/hostile/asteroid/gutlunch/AttackingTarget() - if(is_type_in_typecache(target, wanted_objects)) //we eats + if(is_type_in_list(target, wanted_objects)) //we eats udder.generateMilk() regenerate_icons() visible_message("[src] slurps up [target].") qdel(target) + return ..() /obj/item/udder/gutlunch diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index cc866f7a2c7..e00ecf5c9fb 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -66,7 +66,7 @@ if(istype(target, type)) return - if(ismob(target) && target.reagents && reagents.total_volume) + if(user.a_intent != INTENT_HELP && ismob(target) && target.reagents && reagents.total_volume) to_chat(user, "You splash the solution onto [target].") var/mob/living/M = target