cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 11:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-10-03 07:05:54 -04:00
parent d9c4fe21be 7ee1cd7c06
commit 5e629dff04
517 changed files with 24339 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
+3 -5
View File
@@ -254,16 +254,14 @@
if(!weapon.use_tool(src, user, delay = 15, volume = 40))
return TRUE
var/is_chill_with_robbing = HAS_MIND_TRAIT(user, TRAIT_MORBID) || HAS_PERSONALITY(user, /datum/personality/callous) || HAS_PERSONALITY(user, /datum/personality/misanthropic)
if(opened)
dug_closed = TRUE
close(user)
else if(open(user, force = TRUE) && affect_mood)
if(HAS_MIND_TRAIT(user, TRAIT_MORBID))
user.add_mood_event("morbid_graverobbing", /datum/mood_event/morbid_graverobbing)
else
user.add_mood_event("graverobbing", /datum/mood_event/graverobbing)
user.add_mood_event("graverobbing", is_chill_with_robbing ? /datum/mood_event/morbid_graverobbing : /datum/mood_event/graverobbing)
if(lead_tomb && first_open)
if(HAS_MIND_TRAIT(user, TRAIT_MORBID))
if(is_chill_with_robbing)
to_chat(user, span_notice("Did someone say something? I'm sure it was nothing."))
else
user.gain_trauma(/datum/brain_trauma/magic/stalker)