cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #916 from Aranclanos/DensityBlockingWindows

Browse Source 
Windows attacks not being blocked by grilles and other density objects fix.
This commit is contained in:
Cael Aislinn
2013-07-13 03:40:22 -07:00
parent 1120f6475c fa5049ca85
commit 722d15a43e
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
+14
View File
@@ -98,6 +98,8 @@
/obj/structure/window/attack_hand(mob/user as mob)
if(!can_be_reached(user))
return
if(HULK in user.mutations)
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
@@ -114,6 +116,8 @@
/obj/structure/window/proc/attack_generic(mob/user as mob, damage = 0) //used by attack_alien, attack_animal, and attack_slime
if(!can_be_reached(user))
return
health -= damage
if(health <= 0)
user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
@@ -142,6 +146,8 @@
/obj/structure/window/attackby(obj/item/I, mob/user)
if(!can_be_reached(user))
return 1 //returning 1 will skip the afterattack()
if(istype(I, /obj/item/weapon/screwdriver))
if(reinf && state >= 1)
state = 3 - state
@@ -173,6 +179,14 @@
..()
return
/obj/structure/window/proc/can_be_reached(mob/user)
if(!is_fulltile())
if(get_dir(user,src) & dir)
for(var/obj/O in loc)
if(!O.CanPass(user, user.loc, 1, 0))
return 0
return 1
/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
if(reinf) damage *= 0.5
health = max(0, health - damage)