Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed throw into grille sound and damage #546

Merged
merged 8 commits into from
Feb 13, 2017
Merged

Fixed throw into grille sound and damage #546

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57b6e7c
Now you can input oxygen tank in spacesuit slot.
nyudenkov Feb 13, 2017
8441b6a
Merge branch 'master' of https://github.com/Endless-Horizon/CEV-Eris
nyudenkov Feb 13, 2017
b90096d
Deleted uplink purchase log.
nyudenkov Feb 13, 2017
f7dffe4
Merge branch 'master' of https://github.com/Endless-Horizon/CEV-Eris
nyudenkov Feb 13, 2017
8573424
Deleted remove\insert ammo text.
nyudenkov Feb 13, 2017
8f5835b
Fixed throw into grille sound and damage, fixes #493
nyudenkov Feb 13, 2017
cafc7e7
Fixed throw into grille sound and damage, fixes #493
nyudenkov Feb 13, 2017
a0419df
Merge branch 'master' into master
fluorescent-net Feb 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion code/game/objects/structures/grille.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
flags = CONDUCT
layer = 2.9
explosion_resistance = 1
var/health = 10
var/health = 50
var/destroyed = 0


Expand Down Expand Up @@ -217,6 +217,23 @@
health -= damage
spawn(1) healthcheck()
return 1

/obj/structure/grille/hitby(AM as mob|obj)
..()
visible_message("<span class='danger'>[src] was hit by [AM].</span>")
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
var/tforce = 0
if(ismob(AM))
tforce = 10
else if(isobj(AM))
var/obj/item/I = AM
tforce = I.throwforce
health = max(0, health - tforce)
if(health <= 0)
destroyed=1
PoolOrNew(/obj/item/stack/rods, get_turf(src))
density=0
update_icon()

// Used in mapping to avoid
/obj/structure/grille/broken
Expand Down