cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Handle duped reagent names more strictly (#11118)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-06-28 10:50:44 -07:00
committed by GitHub
parent fcc871ae42
commit cf730f7def
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/carbon/human/species/station/station_special_abilities_ch.dm
View File

@@ -70,6 +70,7 @@ mob/living/carbon/proc/charmed() //TODO
metabolism = REM * 0.8 metabolism = REM * 0.8
color = "#8A0829" color = "#8A0829"
scannable = 0 scannable = 0
wiki_flag = WIKI_SPOILER
/datum/reagent/succubi_aphrodisiac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/succubi_aphrodisiac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(3)) if(prob(3))

6
code/unit_tests/reagent_tests.dm
View File

@@ -28,8 +28,10 @@
log_unit_test("[Rpath]: Reagents - Reagent ID must be all lowercase.") log_unit_test("[Rpath]: Reagents - Reagent ID must be all lowercase.")
failed = TRUE failed = TRUE
if(collection_name[R.name] && !(R.wiki_flag & WIKI_SPOILER)) // If wiki hidden it's probably intentional! if(!(R.wiki_flag & WIKI_SPOILER)) // If wiki hidden then don't conflict test it against name, used for intentionally copied names like beer2's
log_unit_test("[Rpath]: Reagents - WARNING - reagent name \"[R.name]\" is not unique, used first in [collection_name[R.name]]. Is this intentional?") if(collection_name[R.name])
log_unit_test("[Rpath]: Reagents - reagent name \"[R.name]\" is not unique, used first in [collection_name[R.name]].")
failed = TRUE
collection_name[R.name] = R.type collection_name[R.name] = R.type
if(collection_id[R.id]) if(collection_id[R.id])