cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-13 19:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allows set_blood_type to take strings (#92242)

Browse Source
This commit is contained in:
MrMelbert
2025-07-27 22:15:07 -05:00
committed by GitHub
parent 269675871d
commit dba39d33c7
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/smites/cluwndice.dm
View File

@@ -10,5 +10,5 @@
return return
var/mob/living/carbon/carbon_target = target var/mob/living/carbon/carbon_target = target
carbon_target.set_blood_type(get_blood_type(BLOOD_TYPE_CLOWN)) carbon_target.set_blood_type(BLOOD_TYPE_CLOWN)
SEND_SOUND(carbon_target, 'sound/items/bikehorn.ogg') SEND_SOUND(carbon_target, 'sound/items/bikehorn.ogg')

2
code/modules/jobs/job_types/clown.dm
View File

@@ -43,7 +43,7 @@
spawned.apply_pref_name(/datum/preference/name/clown, player_client) spawned.apply_pref_name(/datum/preference/name/clown, player_client)
if(check_holidays(APRIL_FOOLS)) // Clown blood is real if(check_holidays(APRIL_FOOLS)) // Clown blood is real
var/mob/living/carbon/human/human_clown = spawned var/mob/living/carbon/human/human_clown = spawned
human_clown.set_blood_type(get_blood_type(BLOOD_TYPE_CLOWN)) human_clown.set_blood_type(BLOOD_TYPE_CLOWN)
return ..() return ..()

5
code/modules/mob/living/carbon/carbon.dm
View File

@@ -1323,6 +1323,11 @@
if(isnull(dna)) if(isnull(dna))
return return
if(istext(new_blood_type))
new_blood_type = get_blood_type(new_blood_type)
if(!istype(new_blood_type))
return
if(get_bloodtype() == new_blood_type) // already has this blood type, we don't need to do anything. if(get_bloodtype() == new_blood_type) // already has this blood type, we don't need to do anything.
return return

2
code/modules/mob/living/carbon/human/_species.dm
View File

@@ -388,7 +388,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(!human_who_gained_species.get_bloodtype()?.is_species_universal) // Clown blood is forever. if(!human_who_gained_species.get_bloodtype()?.is_species_universal) // Clown blood is forever.
//Assigns exotic blood type if the species has one //Assigns exotic blood type if the species has one
if(exotic_bloodtype && human_who_gained_species.get_bloodtype()?.id != exotic_bloodtype) if(exotic_bloodtype && human_who_gained_species.get_bloodtype()?.id != exotic_bloodtype)
human_who_gained_species.set_blood_type(get_blood_type(exotic_bloodtype)) human_who_gained_species.set_blood_type(exotic_bloodtype)
//Otherwise, check if the previous species had an exotic bloodtype and we do not have one and assign a random blood type //Otherwise, check if the previous species had an exotic bloodtype and we do not have one and assign a random blood type
else if(old_species.exotic_bloodtype && isnull(exotic_bloodtype)) else if(old_species.exotic_bloodtype && isnull(exotic_bloodtype))
human_who_gained_species.set_blood_type(random_human_blood_type()) human_who_gained_species.set_blood_type(random_human_blood_type())