Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking.

This commit is contained in:
Mark van Alphen
2019-04-03 17:24:55 +02:00
parent 6f6e9bbe75
commit 19b923c999
5 changed files with 19 additions and 17 deletions
+12 -12
View File
@@ -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"
@@ -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
@@ -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("<span class='notice'>[src] slurps up [target].</span>")
qdel(target)
return
..()
/obj/item/udder/gutlunch
@@ -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, "<span class='notice'>You splash the solution onto [target].</span>")
var/mob/living/M = target