Merge pull request #13609 from AnturK/runtimes

Fixes for few runtime errors
This commit is contained in:
tkdrg
2015-12-16 04:15:21 -03:00
5 changed files with 11 additions and 8 deletions
+1 -1
View File
@@ -176,7 +176,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
/obj/effect/proc_holder/spell/proc/perform(list/targets, recharge = 1, mob/user = usr) //if recharge is started is important for the trigger spells
before_cast(targets)
invocation(user)
if(user.ckey)
if(user && user.ckey)
user.attack_log += text("\[[time_stamp()]\] <span class='danger'>[user.real_name] ([user.ckey]) cast the spell [name].</span>")
spawn(0)
if(charge_type == "recharge" && recharge)
+1 -1
View File
@@ -192,7 +192,7 @@
if(khrushchev.current && khrushchev.current.client && khrushchev.current.stat != DEAD)
if(ROLE_REV in khrushchev.current.client.prefs.be_special)
promotable_revs += khrushchev
if(promotable_revs)
if(promotable_revs.len)
var/datum/mind/stalin = pick(promotable_revs)
revolutionaries -= stalin
head_revolutionaries += stalin
@@ -118,12 +118,13 @@
var/obj/mecha/working/mecha = loc
if(!mecha.occupant)
return
var/mob/pilot = mecha.occupant
var/list/occupant = list()
occupant |= mecha.occupant
mecha.occupant.sight |= SEE_TURFS
occupant |= pilot
pilot.sight |= SEE_TURFS
scanning = 1
mineral_scan_pulse(occupant,get_turf(loc))
spawn(equip_cooldown)
scanning = 0
mecha.occupant.sight -= SEE_TURFS
pilot.sight -= SEE_TURFS
+3 -2
View File
@@ -214,8 +214,9 @@
else if (istype(AM, /mob/living))
var/mob/living/L = AM
L.adjustFireLoss(20)
L.adjust_fire_stacks(20)
L.IgniteMob()
if(L) //mobs turning into object corpses could get deleted here.
L.adjust_fire_stacks(20)
L.IgniteMob()
/turf/simulated/floor/plating/lava/attackby(obj/item/C, mob/user, params) //Lava isn't a good foundation to build on
return
+2 -1
View File
@@ -198,6 +198,7 @@
t = "<font face=\"[PEN_FONT]\" color=[P.colour]>[t]</font>"
else // If it is a crayon, and he still tries to use these, make them empty!
var/obj/item/toy/crayon/C = P
t = replacetext(t, "\[*\]", "")
t = replacetext(t, "\[hr\]", "")
t = replacetext(t, "\[small\]", "")
@@ -205,7 +206,7 @@
t = replacetext(t, "\[list\]", "")
t = replacetext(t, "\[/list\]", "")
t = "<font face=\"[CRAYON_FONT]\" color=[P.colour]><b>[t]</b></font>"
t = "<font face=\"[CRAYON_FONT]\" color=[C.paint_color]><b>[t]</b></font>"
// t = replacetext(t, "#", "") // Junk converted to nothing!