cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge

Browse Source
This commit is contained in:
Rob Nelson
2015-09-26 14:55:47 -07:00
parent 3bd2e32cb6 2a9a4dbb67
commit e9297fa079
122 changed files with 15808 additions and 14838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/modules/projectiles/gun.dm
View File

@@ -38,25 +38,25 @@
var/fire_delay = 2
var/last_fired = 0
proc/ready_to_fire()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\proc/ready_to_fire() called tick#: [world.time]")
if(world.time >= last_fired + fire_delay)
last_fired = world.time
return 1
else
return 0
proc/process_chambered()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\proc/process_chambered() called tick#: [world.time]")
/obj/item/weapon/gun/proc/ready_to_fire()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\proc/ready_to_fire() called tick#: [world.time]")
if(world.time >= last_fired + fire_delay)
last_fired = world.time
return 1
else
return 0
proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver.
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\proc/special_check() called tick#: [world.time]")
return 1
/obj/item/weapon/gun/proc/process_chambered()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\proc/process_chambered() called tick#: [world.time]")
return 0
emp_act(severity)
for(var/obj/O in contents)
O.emp_act(severity)
/obj/item/weapon/gun/proc/special_check(var/mob/M) //Placeholder for any special checks, like detective's revolver.
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\proc/special_check() called tick#: [world.time]")
return 1
/obj/item/weapon/gun/emp_act(severity)
for(var/obj/O in contents)
O.emp_act(severity)
/obj/item/weapon/gun/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params, struggle = 0)
if(flag) return //we're placing gun on a table or in backpack

1
code/modules/projectiles/projectile/special.dm
View File

@@ -36,6 +36,7 @@
var/obj/item/weapon/gun/energy/temperature/T = null
/obj/item/projectile/temp/OnFired()
..()
T = shot_from
temperature = T.temperature
switch(temperature)