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

Merge pull request #3234 from KasparoVy/olly_olly_oxen_free

Browse Source 
Fixes #3192, Teshari Hiding
This commit is contained in:
Aronai Sieyes
2018-03-17 00:58:38 -04:00
committed by GitHub
parent 8081af1568 5f6db366b6
commit 3224ec6360
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+2 -3
View File
@@ -17,7 +17,6 @@
var/last_spit = 0 //Timestamp.
var/can_defib = 1 //Horrible damage (like beheadings) will prevent defibbing organics.
var/hiding = 0 // If the mob is hiding or not. Makes them appear under tables and the like.
var/active_regen = FALSE //Used for the regenerate proc in human_powers.dm
var/active_regen_delay = 300
@@ -1583,9 +1582,9 @@
equip_to_appropriate_slot(permit) // If for some reason it can't find room, it'll still be on the floor.
/mob/living/carbon/human/proc/update_icon_special() //For things such as teshari hiding and whatnot.
if(hiding) // Hiding? Carry on.
if(status_flags & HIDING) // Hiding? Carry on.
if(stat == DEAD || paralysis || weakened || stunned) //stunned/knocked down by something that isn't the rest verb? Note: This was tried with INCAPACITATION_STUNNED, but that refused to work.
hiding = FALSE //No hiding for you. Mob layer should be updated naturally, but it actually doesn't.
status_flags &= ~HIDING //No hiding for you. Mob layer should be updated naturally, but it actually isn't.
else
layer = HIDING_LAYER
code/modules/mob/living/carbon/human/human_powers.dm
+8 -8
View File
@@ -282,17 +282,17 @@
/mob/living/carbon/human/proc/hide_humanoid()
set name = "Hide"
set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
set desc = "Allows you to hide beneath tables or certain items. Toggled on or off."
set category = "Abilities"
if(stat == DEAD || paralysis || weakened || stunned) // No hiding if you're stunned!
if(stat == DEAD || paralysis || weakened || stunned || restrained()) // No hiding if you're stunned!
return
if (!hiding)
layer = 2.45 //Just above cables with their 2.44
hiding = 1
to_chat(src, "<font color='blue'>You are now hiding.</font>")
else
if(status_flags & HIDING)
layer = MOB_LAYER
hiding = 0
to_chat(src, "<font color='blue'>You have stopped hiding.</font>")
else
layer = HIDING_LAYER //Just above cables with their 2.44
to_chat(src, "<font color='blue'>You are now hiding.</font>")
status_flags ^= HIDING
code/modules/mob/living/carbon/human/species/station/station_vr.dm
+1 -1
View File
@@ -339,7 +339,7 @@
inherent_verbs = list(
/mob/living/carbon/human/proc/sonar_ping,
/mob/living/proc/hide,
/mob/living/carbon/human/proc/hide_humanoid,
/mob/living/proc/shred_limb,
/mob/living/proc/toggle_pass_table
)
code/modules/mob/living/living_powers.dm
+5 -5
View File
@@ -6,9 +6,9 @@
if(stat == DEAD || paralysis || weakened || stunned || restrained())
return
if (layer != 2.45)
layer = 2.45 //Just above cables with their 2.44
src << text("<font color='blue'>You are now hiding.</font>")
else
if(layer == HIDING_LAYER)
layer = MOB_LAYER
src << text("<font color='blue'>You have stopped hiding.</font>")
src << text("<font color='blue'>You have stopped hiding.</font>")
else
layer = HIDING_LAYER //Just above cables with their 2.44
src << text("<font color='blue'>You are now hiding.</font>")