cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Ports RS 658, 661 and some minor things (#9557)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-29 21:31:19 +01:00
committed by GitHub
co-authored by Heroman3003 Kashargul
parent 06f69815dd
commit 35bf63ec81
8 changed files with 169 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
+6
View File
@@ -13,6 +13,12 @@
if((get_area(src).flags & PHASE_SHIELDED)) //CHOMPAdd - Mapping tools to control phasing
to_chat(src,span_warning("This area is preventing you from phasing!"))
return FALSE
//RS Port #658 Start
var/area/A = get_area(src)
if(!client?.holder && A.block_phase_shift)
to_chat(src, span_warning("You can't do that here!"))
return FALSE
//RS Port #658 End
if(ability_flags & AB_PHASE_SHIFTING)
return FALSE