Fixes not being able to move during jaunting if you are cuffed and pulled.

Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
This commit is contained in:
phil235
2015-10-08 00:48:00 +02:00
parent 38f5c0c85a
commit 0efb30434a
9 changed files with 54 additions and 41 deletions
+2
View File
@@ -581,6 +581,8 @@ Sorry Giacom. Please don't be mad :(
M.UpdateFeed(src)
/mob/living/proc/makeTrail(turf/T, mob/living/M)
if(!has_gravity(M))
return
if(ishuman(M))
var/mob/living/carbon/human/H = M
if((NOBLOOD in H.dna.species.specflags) || (!H.blood_max) || (H.bleedsuppress))
@@ -232,7 +232,7 @@
..()
if(istype(target, /mob/living))
src.say("[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]\
[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]")
[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]")
playsound(loc, src.attack_sound, 50, 1, 1)
playsound(loc, src.attack_sound, 50, 1, 1)
playsound(loc, src.attack_sound, 50, 1, 1)
@@ -131,6 +131,10 @@
//Dump eaten stuff
for(var/obj/O in src)
O.loc = loc
var/eject_dir = pick(alldirs)
if(step(O, eject_dir))
if(prob(50))
step(O, eject_dir)
for(var/mob/M in src)
M.loc = loc
@@ -169,12 +173,15 @@
L.loc = src
adjustBruteLoss(-50)
return
if(istype(target,/obj/item)) // Eat items just to be annoying
else if(istype(target,/obj/item)) // Eat items just to be annoying
var/obj/item/I = target
if(!I.anchored)
if(do_after(src,20, target = I))
visible_message("<span class='warning'>[src] swallows [target] whole!</span>")
I.loc = src
if(contents.len<50)
I.loc = src
else
qdel(I)
return
target.attack_animal(src)
+3
View File
@@ -38,6 +38,9 @@
/obj/item/weapon/hand_labeler/attack_self(mob/user)
if(!user.IsAdvancedToolUser())
user << "<span class='warning'>You don't have the dexterity to use [src]!</span>"
return
mode = !mode
icon_state = "labeler[mode]"
if(mode)
@@ -454,7 +454,9 @@
/datum/reagent/carbon/reaction_turf(turf/T, reac_volume)
if(!istype(T, /turf/space))
new /obj/effect/decal/cleanable/dirt(T)
var/obj/effect/decal/cleanable/dirt/D = locate() in T.contents
if(!D)
new /obj/effect/decal/cleanable/dirt(T)
/datum/reagent/chlorine
name = "Chlorine"
@@ -530,8 +532,10 @@
/datum/reagent/radium/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 3)
if(!istype(T, /turf/space))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
reagentdecal.reagents.add_reagent("radium", reac_volume)
var/obj/effect/decal/cleanable/greenglow/GG = locate() in T.contents
if(!GG)
GG = new/obj/effect/decal/cleanable/greenglow(T)
GG.reagents.add_reagent("radium", reac_volume)
/datum/reagent/sterilizine
name = "Sterilizine"
@@ -574,8 +578,10 @@
/datum/reagent/uranium/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 3)
if(!istype(T, /turf/space))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
reagentdecal.reagents.add_reagent("uranium", reac_volume)
var/obj/effect/decal/cleanable/greenglow/GG = locate() in T.contents
if(!GG)
GG = new/obj/effect/decal/cleanable/greenglow(T)
GG.reagents.add_reagent("uranium", reac_volume)
/datum/reagent/aluminium
name = "Aluminium"