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

[MIRROR] Have you bingled that (#10545)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-29 14:12:53 -07:00
committed by GitHub
parent 057fffd669
commit 16a213f699
386 changed files with 5637 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/internal/brain.dm
View File

@@ -4,7 +4,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
name = "brain"
health = 400 //They need to live awhile longer than other organs. Is this even used by organ code anymore?
desc = "A piece of juicy meat found in a person's head."
organ_tag = "brain"
organ_tag = O_BRAIN
parent_organ = BP_HEAD
vital = 1
icon_state = "brain2"
@@ -175,7 +175,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
/obj/item/organ/internal/brain/pariah_brain
name = "brain remnants"
desc = "Did someone tread on this? It looks useless for cloning or cyborgification."
organ_tag = "brain"
organ_tag = O_BRAIN
parent_organ = BP_HEAD
icon = 'icons/mob/alien.dmi'
icon_state = "chitin"

2
code/modules/organs/internal/liver.dm
View File

@@ -1,7 +1,7 @@
/obj/item/organ/internal/liver
name = "liver"
icon_state = "liver"
organ_tag = "liver"
organ_tag = O_LIVER
parent_organ = BP_GROIN
/obj/item/organ/internal/liver/process()

2
code/modules/organs/misc.dm
View File

@@ -3,7 +3,7 @@
name = "cortical borer"
icon = 'icons/obj/objects.dmi'
icon_state = "borer"
organ_tag = "brain"
organ_tag = O_BRAIN
desc = "A disgusting space slug."
parent_organ = BP_HEAD
vital = 1

4
code/modules/organs/organ_external.dm
View File

@@ -508,9 +508,9 @@
if(user == src.owner)
var/grasp
if(user.l_hand == tool && (src.body_part & (ARM_LEFT|HAND_LEFT)))
grasp = "l_hand"
grasp = BP_L_HAND
else if(user.r_hand == tool && (src.body_part & (ARM_RIGHT|HAND_RIGHT)))
grasp = "r_hand"
grasp = BP_R_HAND
if(grasp)
to_chat(user, span_warning("You can't reach your [src.name] while holding [tool] in your [owner.get_bodypart_name(grasp)]."))

2
code/modules/organs/subtypes/machine.dm
View File

@@ -48,7 +48,7 @@
/obj/item/organ/internal/mmi_holder/Initialize(mapload, var/internal, var/obj/item/mmi/installed)
. = ..(mapload, internal)
if(!ishuman(loc) || istype(loc, /mob/living/carbon/human/dummy/mannequin))
if(!ishuman(loc) || ismannequin(loc))
return
if(installed)
stored_mmi = installed

8
code/modules/organs/subtypes/slime.dm
View File

@@ -93,11 +93,9 @@
/obj/item/organ/internal/regennetwork/Initialize(mapload)
. = ..()
var/mob/living/carbon/human/H = null
spawn(15)
if(ishuman(owner))
H = owner
color = H.species.get_blood_colour(H)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
color = H.species.get_blood_colour(H)
/obj/item/organ/internal/regennetwork/proc/get_strain_percent(var/cost)
adjust_strain(cost)