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] Changes how pronouns are selected on character setup (#10541)

Browse Source 
Co-authored-by: TheToaster98 <51209769+TheToaster98@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-28 09:29:18 -07:00
committed by GitHub
parent 30c1f4c7d8
commit af1d624a99
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modular_chomp/code/modules/organs/internal/malignant/malignant.dm
View File

@@ -22,9 +22,10 @@
while(++i < 10)
// done here, because New() does all the setup for placing the organ...
// attempt to select a valid exterior organ that isn't synthetic!
parent_organ = pick(validBPspawns)
if(isliving(owner))
var/obj/item/organ/checklimb = owner.organs_by_name[parent_organ]
if(isliving(loc))
parent_organ = pick(validBPspawns)
var/mob/living/L = loc
var/obj/item/organ/checklimb = L.organs_by_name[parent_organ]
if(checklimb)
// valid limb, check if organic!
if(checklimb.status == 0 && checklimb.robotic < ORGAN_ROBOT)
@@ -155,7 +156,7 @@
owner.AdjustWeakened(3 * base_mult)
if(prob(75))
owner.AdjustConfused(4 * base_mult)
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
var/obj/item/organ/external/O = owner.organs_by_name[parent_organ]
if(damage >= min_broken_damage)
owner.custom_pain(span_warning("You feel a painful sensation in your [O.name]."),damage,TRUE)
owner.AdjustBlinded(6 * base_mult)
@@ -303,7 +304,7 @@
owner.Confuse(30)
if(prob(2))
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
var/obj/item/organ/external/O = owner.organs_by_name[parent_organ]
if(stage_progress > 200)
owner.custom_pain(span_warning("You feel bloated. The pain in your [O.name] is agonizing."),20,TRUE)
owner.automatic_custom_emote(VISIBLE_MESSAGE, "winces slightly.", check_stat = TRUE)
@@ -455,7 +456,7 @@
supply_conversion_value = initial(supply_conversion_value) + ((thalers * SSsupply.points_per_money))
if(prob(2))
var/obj/item/organ/O = owner.organs_by_name[parent_organ]
var/obj/item/organ/external/O = owner.organs_by_name[parent_organ]
if(thalers < 100)
pass()
else if(thalers < 500)