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

Prevents using sign language in frenzy (#2453)

Browse Source 
## About The Pull Request
In terms of flavour of frenzy, you're supposed to not quite be sane
enough to do much of anything besides try to get blood, or maybe act
monstrously, that's why you are mute and deaf, but you could bypass via
sign language, so this fixes that.

## Why It's Good For The Game
It's wierd when the frenzying vampire literally starving and frenzying
can speak, even though they should be really animal-like at that point

## Proof Of Testing

<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog

🆑
fix: You can no longer use sign language while frenzying
/🆑
This commit is contained in:
Arturlang
2024-11-19 00:52:29 +00:00
committed by GitHub
parent b1e55c6958
commit 0cab26cd21
6 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~~bubber_defines/traits/declarations.dm
+1
View File
@@ -25,3 +25,4 @@
// Shows extended examine option when worn
#define TRAIT_WORN_EXAMINE "worn_examine"
#define TRAIT_SIGN_LANGUAGE_BLOCKED "sign_language_blocked"
code/_globalvars/traits/_traits.dm
+1
View File
@@ -557,6 +557,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SPEECH_BOOSTER" = TRAIT_SPEECH_BOOSTER,
"TRAIT_MINING_PARRYING" = TRAIT_MINING_PARRYING,
"TRAIT_ILLUSORY_EFFECT" = TRAIT_ILLUSORY_EFFECT,
"TRAIT_SIGN_LANGUAGE_BLOCKED" = TRAIT_SIGN_LANGUAGE_BLOCKED
),
/obj/item = list(
"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,
code/datums/components/sign_language.dm
+1 -1
View File
@@ -332,7 +332,7 @@
#undef SIGN_HANDS_FULL
#undef SIGN_ARMLESS
#undef SIGN_ARMS_DISABLED
#undef SIGN_TRAIT_BLOCKED
// #undef SIGN_TRAIT_BLOCKED BUBBER CHANGE now used out of the file
#undef SIGN_HANDS_COMPLETELY_RESTRAINED
#undef SIGN_SLOWLY_FROM_CUFFS
#undef TONE_NEUTRAL
modular_zubbers/code/datums/components/sign_language.dm
+4
View File
@@ -0,0 +1,4 @@
/datum/component/sign_language/check_signables_state()
. = ..()
if(HAS_TRAIT(parent, TRAIT_SIGN_LANGUAGE_BLOCKED)) // BUBBER CHANGE add a trait to prevent sign language usage
return SIGN_TRAIT_BLOCKED
modular_zubbers/code/modules/status_effects/buffs/frenzy.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/was_tooluser = FALSE
/// The stored Bloodsucker antag datum
var/datum/antagonist/bloodsucker/bloodsuckerdatum
var/trait_list = list(TRAIT_MUTE, TRAIT_DEAF, TRAIT_STRONG_GRABBER)
var/trait_list = list(TRAIT_MUTE, TRAIT_SIGN_LANGUAGE_BLOCKED, TRAIT_DEAF, TRAIT_STRONG_GRABBER)
/datum/status_effect/frenzy/get_examine_text()
return span_notice("They seem... inhumane, and feral!")
tgstation.dme
+1
View File
@@ -8676,6 +8676,7 @@
#include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm"
#include "modular_zubbers\code\datums\bubber_quirks\neutral.dm"
#include "modular_zubbers\code\datums\bubber_quirks\petowner.dm"
#include "modular_zubbers\code\datums\components\sign_language.dm"
#include "modular_zubbers\code\datums\components\squeak.dm"
#include "modular_zubbers\code\datums\components\crafting\furniture.dm"
#include "modular_zubbers\code\datums\components\crafting\tailoring.dm"