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

Mafia chaplain seance can no longer be used on living people (#77070)

Browse Source 
## About The Pull Request

Small oversight in how the use flag was checked. Also there was a
misleading code comment that I removed.
## Why It's Good For The Game

Fixes #77042
## Changelog
🆑
fix: Mafia chaplains can now only use their seances on dead people now.
/🆑
This commit is contained in:
distributivgesetz
2023-07-26 10:00:00 +02:00
committed by GitHub
parent e41d755371
commit ce2ba38d7c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mafia/_defines.dm
+1 -1
View File
@@ -68,7 +68,7 @@
#define CAN_USE_ON_OTHERS (1<<0)
///Flag that decides whether the Mafia ability can be used on themselves.
#define CAN_USE_ON_SELF (1<<1)
///Flag that decides whether the Mafia ability can be used on dead players. This overwrites the first two, and only allows for dead.
///Flag that decides whether the Mafia ability can be used on dead players.
#define CAN_USE_ON_DEAD (1<<2)
#define MAFIA_PHASE_SETUP "No Game"
code/modules/mafia/abilities/abilities.dm
+1 -1
View File
@@ -56,7 +56,7 @@
return FALSE
if(potential_target)
if(!(use_flags & CAN_USE_ON_DEAD) && (potential_target.game_status == MAFIA_DEAD))
if((use_flags & CAN_USE_ON_DEAD) && (potential_target.game_status != MAFIA_DEAD))
if(!silent)
to_chat(host_role.body, span_notice("This can only be used on dead players."))
return FALSE