From a5c2b540b7a4c232dd1b3d8e1c90f53bf9167082 Mon Sep 17 00:00:00 2001 From: RachelDoe <81965332+RachelDoe@users.noreply.github.com> Date: Sat, 8 May 2021 09:46:05 +0200 Subject: [PATCH] Fix TRAIT_HEAT not being removed correctly I believe proc REMOVE_TRAIT wanted you to specify what kind of trait it is that you wanted to remove. Haven't checked the proc behavior yet but when investigating its use through the code it does hint strongly that this is the case. Tested it on a private server and it appears to successfully remove TRAIT_HEAT when I do a var check on a character. --- modular_citadel/code/modules/arousal/arousal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm index b581b32b..70230c7c 100644 --- a/modular_citadel/code/modules/arousal/arousal.dm +++ b/modular_citadel/code/modules/arousal/arousal.dm @@ -434,7 +434,7 @@ W.pregnant = 1 if (HAS_TRAIT(L, TRAIT_HEAT)) SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "heat", /datum/mood_event/heat) //well done you perv. - REMOVE_TRAIT(L, TRAIT_HEAT, type) //take the heat away, you satisfied it! + REMOVE_TRAIT(L, TRAIT_HEAT, ROUNDSTART_TRAIT) //take the heat away, you satisfied it! //Make breasts produce quicker. var/obj/item/organ/genital/breasts/B = L.getorganslot("breasts")