cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +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
2014-04-15 22:51:10 -07:00
parent 3caf92f4eb 2a862aa68e
commit 445e7323f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/doors/door.dm
View File

@@ -267,7 +267,7 @@
update_icon()
if (!glass)
opacity = 1
src.SetOpacity(1)
// TODO: analyze this proc
update_nearby_tiles()

2
code/modules/mob/mob_grab.dm
View File

@@ -93,7 +93,7 @@
affecting.loc = assailant.loc
if(state >= GRAB_NECK)
affecting.Stun(5) //It will hamper your voice, being choked and all.
// affecting.Stun(5) //It will hamper your voice, being choked and all.
if(isliving(affecting))
var/mob/living/L = affecting
L.adjustOxyLoss(1)