mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
I'm a fucking moron.
Apparently that meteor gun I forgot to comment out had the wrong path in its attack_self(). Instead of the meteor gun shooting meteors, every /obj/item/weapon could shoot them when clicked on. Here's a pile of runtime fixes to go along with this. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4409 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -746,10 +746,11 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
|
||||
for(var/i = 0, i<numticks, i++)
|
||||
sleep(delayfraction)
|
||||
|
||||
if(needhand && !(user.get_active_hand() == holding)) //Sometimes you don't want the user to have to keep their active hand
|
||||
return 0
|
||||
|
||||
if(!user || user.stat || user.weakened || user.stunned || !(user.loc == T))
|
||||
return 0
|
||||
if(needhand && !(user.get_active_hand() == holding)) //Sometimes you don't want the user to have to keep their active hand
|
||||
return 0
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
@@ -332,7 +332,9 @@ var/global/datum/controller/gameticker/ticker
|
||||
world << "<b>[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:</b>"
|
||||
else
|
||||
world << "<b>[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:</b>"
|
||||
robo.laws.show_laws(world)
|
||||
|
||||
if(robo) //How the hell do we lose robo between here and the world messages directly above this?
|
||||
robo.laws.show_laws(world)
|
||||
|
||||
mode.declare_completion()//To declare normal completion.
|
||||
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
return
|
||||
..()
|
||||
|
||||
|
||||
/*
|
||||
//Testing purposes only!
|
||||
/obj/item/weapon/meteorgun
|
||||
name = "Meteor Gun"
|
||||
@@ -174,7 +174,7 @@
|
||||
icon_state = "lasercannon"
|
||||
item_state = "gun"
|
||||
|
||||
/obj/item/weapon/attack_self()
|
||||
/obj/item/weapon/meteorgun/attack_self()
|
||||
var/start_x = usr.loc.x
|
||||
var/start_y = usr.loc.y
|
||||
var/start_z = usr.loc.z
|
||||
@@ -209,4 +209,5 @@
|
||||
spawn(0)
|
||||
walk_towards(M, M.dest, 1)
|
||||
|
||||
return
|
||||
return
|
||||
*/
|
||||
@@ -222,7 +222,7 @@
|
||||
|
||||
/obj/machinery/shieldgen/process()
|
||||
if(malfunction && active)
|
||||
if(deployed_shields && prob(5))
|
||||
if(deployed_shields.len && prob(5))
|
||||
del(pick(deployed_shields))
|
||||
|
||||
return
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
if(!action_checks(target)) return
|
||||
if(isobj(target))
|
||||
var/obj/target_obj = target
|
||||
if(target_obj.unacidable) return
|
||||
if(!target_obj.vars.Find("unacidable") || target_obj.unacidable) return
|
||||
set_ready_state(0)
|
||||
chassis.use_power(energy_drain)
|
||||
chassis.visible_message("<font color='red'><b>[chassis] starts to drill [target]</b></font>", "You hear the drill.")
|
||||
|
||||
@@ -21,7 +21,7 @@ SHARDS
|
||||
src.use(1)
|
||||
user << "\blue You attach wire to the [name]."
|
||||
new /obj/item/stack/light_w(user.loc)
|
||||
if(CC.amount <= 0)
|
||||
if(CC && CC.amount <= 0) //CC may have already been deleted by 'CC.use(5)' a few lines up.
|
||||
user.u_equip(CC)
|
||||
del(CC)
|
||||
if(src.amount <= 0)
|
||||
|
||||
Reference in New Issue
Block a user