cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-27 06:37:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix

Browse Source 
Fix harddel issues with 515 upgrade PR
This commit is contained in:
BongaTheProto
2024-04-07 03:16:55 -05:00
committed by GitHub
parent 2709ec887c 66bd025454
commit 78d4eaeaaa
31 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/datums/interactions/lewd_interactions.dm
+1 -1
View File
@@ -487,7 +487,7 @@
user.last_lewd_datum = src
if(user.cleartimer)
deltimer(user.cleartimer)
user.cleartimer = addtimer(CALLBACK(user, /mob/living/proc/clear_lewd_datum), 300, TIMER_STOPPABLE)
user.cleartimer = addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living, clear_lewd_datum)), 300, TIMER_STOPPABLE)
return ..()
/mob/living/list_interaction_attributes(mob/living/LM)