mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
proper sanitization of cold and heat messages
This commit is contained in:
@@ -156,6 +156,7 @@
|
|||||||
pref.custom_ask = lowertext(trim(pref.custom_ask))
|
pref.custom_ask = lowertext(trim(pref.custom_ask))
|
||||||
pref.custom_exclaim = lowertext(trim(pref.custom_exclaim))
|
pref.custom_exclaim = lowertext(trim(pref.custom_exclaim))
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
if(islist(pref.custom_heat)) //don't bother checking these for actual singular message length, they should already have been checked and it'd take too long every time it's sanitized
|
if(islist(pref.custom_heat)) //don't bother checking these for actual singular message length, they should already have been checked and it'd take too long every time it's sanitized
|
||||||
if(length(pref.custom_heat) > 10)
|
if(length(pref.custom_heat) > 10)
|
||||||
pref.custom_heat.Cut(11)
|
pref.custom_heat.Cut(11)
|
||||||
@@ -167,6 +168,19 @@
|
|||||||
pref.custom_cold.Cut(11)
|
pref.custom_cold.Cut(11)
|
||||||
else
|
else
|
||||||
pref.custom_cold = list()
|
pref.custom_cold = list()
|
||||||
|
=======
|
||||||
|
if (islist(pref.custom_heat)) //don't bother checking these for actual singular message length, they should already have been checked and it'd take too long every time it's sanitized
|
||||||
|
if (length(pref.custom_heat) > 10)
|
||||||
|
pref.custom_heat.Cut(11)
|
||||||
|
else
|
||||||
|
pref.custom_heat = list()
|
||||||
|
if (islist(pref.custom_cold))
|
||||||
|
if (length(pref.custom_cold) > 10)
|
||||||
|
pref.custom_cold.Cut(11)
|
||||||
|
else
|
||||||
|
pref.custom_cold = list()
|
||||||
|
|
||||||
|
>>>>>>> c5a7f70798... Merge pull request #14459 from Seris02/coldheatruntimefix
|
||||||
|
|
||||||
/datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character)
|
/datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character)
|
||||||
character.custom_species = pref.custom_species
|
character.custom_species = pref.custom_species
|
||||||
|
|||||||
Reference in New Issue
Block a user