shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into shoelaces

Browse Source
This commit is contained in:
silicons
2020-07-23 16:23:34 -07:00
parent 484da28600 30a6ddd963
commit 1f25c7f06d
540 changed files with 11615 additions and 4656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mood_events/generic_negative_events.dm
+8 -4
View File
@@ -77,10 +77,14 @@
description = "<span class='boldwarning'>Pull it out!</span>\n"
mood_change = -7
/datum/mood_event/table
description = "<span class='warning'>Someone threw me on a table!</span>\n"
mood_change = -2
timeout = 2 MINUTES
/datum/mood_event/table_limbsmash
description = "<span class='warning'>That fucking table, man that hurts...</span>\n"
mood_change = -3
timeout = 3 MINUTES
/datum/mood_event/table_limbsmash/add_effects(obj/item/bodypart/banged_limb)
if(banged_limb)
description = "<span class='warning'>My fucking [banged_limb.name], man that hurts...</span>\n"
/datum/mood_event/table/add_effects()
if(ishuman(owner))