diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index 8c2dc29ae5e..6c822adb1ef 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -27,10 +27,7 @@ if(prob(1)) if (affected_mob.nutrition > 100) affected_mob.Stun(rand(4,6)) - affected_mob << "\red You throw up!" for(var/mob/O in viewers(world.view, affected_mob)) - if(O == affected_mob) - continue O.show_message(text("\red [] throws up!", affected_mob), 1) playsound(affected_mob.loc, 'splat.ogg', 50, 1) var/turf/location = affected_mob.loc diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm index e6d05dceec8..66a3b259156 100644 --- a/code/game/atom_procs.dm +++ b/code/game/atom_procs.dm @@ -1,5 +1,3 @@ - - /atom/proc/MouseDrop_T() return @@ -260,9 +258,11 @@ /atom/proc/add_vomit_floor(mob/living/carbon/M as mob, var/toxvomit = 0) if( istype(src, /turf/simulated) ) var/obj/effect/decal/cleanable/vomit/this = new /obj/effect/decal/cleanable/vomit(src) + // Make toxins vomit look different if(toxvomit) this.icon_state = "vomittox_[pick(1,4)]" + for(var/datum/disease/D in M.viruses) var/datum/disease/newDisease = new D.type this.viruses += newDisease diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index ea37af8fc56..da40b32d5b7 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -57,9 +57,10 @@ density = 1 var/lasers = 0 var/lasertype = 1 - // 1 = laser - // 2 = cannon + // 1 = lasers + // 2 = cannons // 3 = pulse + // 4 = change (HONK) var/health = 18 var/id = "" var/obj/machinery/turretcover/cover = null @@ -212,6 +213,8 @@ A = new /obj/item/projectile/beam/heavylaser( loc ) if(3) A = new /obj/item/projectile/beam/pulse( loc ) + if(4) + A = new /obj/item/projectile/change( loc ) A.original = target.loc use_power(500) else diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi index ed97da97a88..bbc19ba56bc 100644 Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 913295eaf69..3ad2e5afbc9 100755 Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index ad351e8fafb..907789f99ca 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index e247d799018..018678f6f86 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ