Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings

This commit is contained in:
ZomgPonies
2013-09-08 11:39:33 -04:00
parent ea91047ce2
commit a935863200
70 changed files with 1084 additions and 923 deletions
+2 -1
View File
@@ -467,11 +467,12 @@
return
if(stat & (BROKEN|MAINT))
return
/*
if(ishuman(user))
if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("APC",src,user:wear_suit)
return
*/
// do APC interaction
user.set_machine(src)
src.interact(user)
+2 -1
View File
@@ -68,11 +68,12 @@
return powernet
/obj/structure/cable/attack_hand(mob/user)
/*
if(ishuman(user))
if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("WIRE",src,user:wear_suit)
return
*/
/obj/structure/cable/attackby(obj/item/W, mob/user)
var/turf/T = src.loc
+3 -3
View File
@@ -62,11 +62,12 @@
/obj/item/weapon/cell/attack_self(mob/user as mob)
src.add_fingerprint(user)
/*
if(ishuman(user))
if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("CELL",src,user:wear_suit)
return
*/
/obj/item/weapon/cell/attackby(obj/item/W, mob/user)
..()
if(istype(W, /obj/item/weapon/reagent_containers/syringe))
@@ -147,8 +148,7 @@
return
/obj/item/weapon/cell/blob_act()
if(prob(75))
explode()
ex_act(1)
/obj/item/weapon/cell/proc/get_electrocute_damage()
switch (charge)
+2 -1
View File
@@ -168,11 +168,12 @@
/obj/machinery/power/smes/attack_hand(mob/user)
add_fingerprint(user)
if(stat & BROKEN) return
/*
if(ishuman(user))
if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("SMES",src,user:wear_suit)
return
*/
interact(user)