bad args man

infinite loop mang
two more funtimes squashed.
This commit is contained in:
D3athrow
2015-02-23 23:27:50 -06:00
parent 1a623739b7
commit be5bff1a2a
9 changed files with 15 additions and 11 deletions

View File

@@ -644,7 +644,10 @@ Auto Patrol: []"},
src.threatlevel = src.assess_perp(C)
else if((src.idcheck) && (istype(C, /mob/living/carbon/monkey)))
src.threatlevel = 4
else
continue
else
continue
/*
else if(istype(M, /mob/living/simple_animal/hostile))
if(M.stat == DEAD)

View File

@@ -1318,8 +1318,8 @@ proc/formatLocation(location)
loc = get_turf(location)
var/area/A = get_area(location)
return "[A.name] - [loc.x],[loc.y],[loc.z]"
var/answer = "[istype(A) ? "[A.name]" : "UNKNOWN"] - [istype(loc) ? "[loc.x],[loc.y],[loc.z]" : "UNKNOWN"]"
return answer
proc/formatPlayerPanel(var/mob/U,var/text="PP")
return "<A HREF='?_src_=holder;adminplayeropts=\ref[U]'>[text]</A>"

View File

@@ -14,7 +14,7 @@
/obj/item/clothing/shoes/syndigaloshes/New()
..()
for(var/Type in typesof(/obj/item/clothing/shoes) - /obj/item/clothing/shoes)
for(var/Type in typesof(/obj/item/clothing/shoes) - list(/obj/item/clothing/shoes, /obj/item/clothing/shoes/syndigaloshes))
clothing_choices += new Type
return

View File

@@ -603,7 +603,7 @@ var/global/list/organ_damage_overlays = list(
// This was OP.
//environment.adjust(tx = environment.total_moles()*BREATH_PERCENTAGE) // About one breath's worth. (I know we aren't breathing it out, but this should be about the right amount)
if(environment)
if((environment.oxygen / environment.total_moles()) >= OXYCONCEN_PLASMEN_IGNITION) //how's the concentration doing?
if(enviroment.oxygen && enviroment.total_moles() && (environment.oxygen / environment.total_moles()) >= OXYCONCEN_PLASMEN_IGNITION) //how's the concentration doing?
if(!on_fire)
src << "<span class='warning'>Your body reacts with the atmosphere and bursts into flame!</span>"
adjust_fire_stacks(0.5)

View File

@@ -583,8 +583,9 @@ Note that amputating the affected organ does in fact remove the infection from t
organ= new /obj/item/weapon/organ/head(owner.loc, owner)
var/datum/organ/internal/brain/B = owner.internal_organs_by_name["brain"]
var/obj/item/weapon/organ/head/H = organ
H.organ_data = B
B.organ_holder = organ
if(B)
H.organ_data = B
B.organ_holder = organ
owner.internal_organs_by_name["brain"] = null
owner.internal_organs_by_name -= "brain"
owner.internal_organs -= B

View File

@@ -869,7 +869,7 @@
malfai.malfhack = src
malfai.malfhacking = 1
sleep(600)
if(src)
if(src && malfai)
if (!src.aidisabled)
malfai.malfhack = null
malfai.malfhacking = 0

View File

@@ -30,7 +30,7 @@
icon_state = "[initial(icon_state)][stored_magazine ? "-[stored_magazine.max_ammo]" : ""][chambered ? "" : "-e"]"
return
/obj/item/weapon/gun/projectile/automatic/Fire()
/obj/item/weapon/gun/projectile/automatic/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0)
if(burstfire == 1)
if(ready_to_fire())
fire_delay = 0

View File

@@ -297,7 +297,7 @@
src.updateUsrDialog()
return
/obj/item/weapon/gun/dartgun/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
/obj/item/weapon/gun/dartgun/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0)
if(cartridge)
spawn(0) fire_dart(target,user)
else

View File

@@ -47,7 +47,7 @@
/obj/item/weapon/gun/syringe/can_hit(var/mob/living/target as mob, var/mob/living/user as mob)
return 1 //SHOOT AND LET THE GOD GUIDE IT (probably will hit a wall anyway)
/obj/item/weapon/gun/syringe/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0)
/obj/item/weapon/gun/syringe/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0, struggle = 0)
if(syringes.len)
spawn(0) fire_syringe(target,user)
else