cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

I'm a fucking moron.

Browse Source 
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:
johnsonmt88@gmail.com
2012-08-14 22:40:30 +00:00
parent 2a478fa0ff
commit aa498bd0c1
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/defines/procs/helpers.dm
View File

@@ -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++) for(var/i = 0, i<numticks, i++)
sleep(delayfraction) 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)) if(!user || user.stat || user.weakened || user.stunned || !(user.loc == T))
return 0 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 return 1

4
code/game/gamemodes/gameticker.dm
View File

@@ -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>" world << "<b>[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:</b>"
else 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>" 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. mode.declare_completion()//To declare normal completion.

7
code/game/gamemodes/meteor/meteors.dm
View File

@@ -165,7 +165,7 @@
return return
..() ..()
/*
//Testing purposes only! //Testing purposes only!
/obj/item/weapon/meteorgun /obj/item/weapon/meteorgun
name = "Meteor Gun" name = "Meteor Gun"
@@ -174,7 +174,7 @@
icon_state = "lasercannon" icon_state = "lasercannon"
item_state = "gun" item_state = "gun"
/obj/item/weapon/attack_self() /obj/item/weapon/meteorgun/attack_self()
var/start_x = usr.loc.x var/start_x = usr.loc.x
var/start_y = usr.loc.y var/start_y = usr.loc.y
var/start_z = usr.loc.z var/start_z = usr.loc.z
@@ -209,4 +209,5 @@
spawn(0) spawn(0)
walk_towards(M, M.dest, 1) walk_towards(M, M.dest, 1)
return return
*/

2
code/game/machinery/shieldgen.dm
View File

@@ -222,7 +222,7 @@
/obj/machinery/shieldgen/process() /obj/machinery/shieldgen/process()
if(malfunction && active) if(malfunction && active)
if(deployed_shields && prob(5)) if(deployed_shields.len && prob(5))
del(pick(deployed_shields)) del(pick(deployed_shields))
return return

2
code/game/mecha/equipment/tools/tools.dm
View File

@@ -75,7 +75,7 @@
if(!action_checks(target)) return if(!action_checks(target)) return
if(isobj(target)) if(isobj(target))
var/obj/target_obj = 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) set_ready_state(0)
chassis.use_power(energy_drain) chassis.use_power(energy_drain)
chassis.visible_message("<font color='red'><b>[chassis] starts to drill [target]</b></font>", "You hear the drill.") chassis.visible_message("<font color='red'><b>[chassis] starts to drill [target]</b></font>", "You hear the drill.")

2
code/game/objects/stacks/glass.dm
View File

@@ -21,7 +21,7 @@ SHARDS
src.use(1) src.use(1)
user << "\blue You attach wire to the [name]." user << "\blue You attach wire to the [name]."
new /obj/item/stack/light_w(user.loc) 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) user.u_equip(CC)
del(CC) del(CC)
if(src.amount <= 0) if(src.amount <= 0)