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

Makes smaller mobs have smaller organs

Browse Source
This commit is contained in:
HarpyEagle
2016-06-08 14:50:49 -04:00
committed by Yoshax
parent cf76d6dac4
commit f0c8e0e516
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,6 +190,7 @@
/datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs. /datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
H.mob_size = mob_size
for(var/obj/item/organ/organ in H.contents) for(var/obj/item/organ/organ in H.contents)
if((organ in H.organs) || (organ in H.internal_organs)) if((organ in H.organs) || (organ in H.internal_organs))
qdel(organ) qdel(organ)
@@ -249,7 +250,6 @@
H.mob_swap_flags = swap_flags H.mob_swap_flags = swap_flags
H.mob_push_flags = push_flags H.mob_push_flags = push_flags
H.pass_flags = pass_flags H.pass_flags = pass_flags
H.mob_size = mob_size
/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns). /datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
return return

2
code/modules/mob/mob_grab.dm
View File

@@ -372,7 +372,7 @@
//returns the number of size categories between affecting and assailant, rounded. Positive means A is larger than B //returns the number of size categories between affecting and assailant, rounded. Positive means A is larger than B
/obj/item/weapon/grab/proc/size_difference(mob/A, mob/B) /obj/item/weapon/grab/proc/size_difference(mob/A, mob/B)
return round(log(2, A.mob_size/B.mob_size), 1) return mob_size_difference(A.mob_size, B.mob_size)
/obj/item/weapon/grab /obj/item/weapon/grab
var/destroying = 0 var/destroying = 0

3
code/modules/mob/mob_helpers.dm
View File

@@ -5,6 +5,9 @@
return L.mob_size <= MOB_SMALL return L.mob_size <= MOB_SMALL
return 0 return 0
//returns the number of size categories between two mob_sizes, rounded. Positive means A is larger than B
/proc/mob_size_difference(var/mob_size_A, var/mob_size_B)
return round(log(2, mob_size_A/mob_size_B), 1)
/proc/istiny(A) /proc/istiny(A)
if(A && istype(A, /mob/living)) if(A && istype(A, /mob/living))

1
code/modules/organs/organ.dm
View File

@@ -50,6 +50,7 @@ var/list/organ_cache = list()
max_damage = min_broken_damage * 2 max_damage = min_broken_damage * 2
if(istype(holder)) if(istype(holder))
src.owner = holder src.owner = holder
src.w_class = max(src.w_class + mob_size_difference(holder.mob_size, MOB_MEDIUM), 1) //smaller mobs have smaller organs.
species = all_species["Human"] species = all_species["Human"]
if(holder.dna) if(holder.dna)
dna = holder.dna.Clone() dna = holder.dna.Clone()

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

@@ -2,6 +2,8 @@
ORGAN DEFINES ORGAN DEFINES
****************************************************/ ****************************************************/
//Make sure that w_class is set as if the parent mob was medium sized! This is because w_class is adjusted automatically for mob_size in New()
/obj/item/organ/external/chest /obj/item/organ/external/chest
name = "upper body" name = "upper body"
organ_tag = BP_TORSO organ_tag = BP_TORSO