cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 06:07:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR-FIX] Upstream merge 15464 (#7176)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
Selis
2023-11-07 13:33:44 +01:00
committed by GitHub
co-authored by Heroman3003
parent 58d26cc799
commit 2ba38d60af
40 changed files with 272 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/mob/living/carbon/human/human_defines.dm
-1
View File
@@ -2,7 +2,6 @@
var/gender_change_cooldown = 0 // A cooldown for gender and gender indentify changing procs to make it easy to avoid spam of gender change
var/loneliness_stage = 0
var/next_loneliness_time = 0
var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)
vore_capacity = 3
vore_capacity_ex = list("stomach" = 3, "taur belly" = 3)
vore_fullness_ex = list("stomach" = 0, "taur belly" = 0)
modular_chomp/code/modules/mob/living/carbon/human/species/species.dm
-2
View File
@@ -15,8 +15,6 @@
var/grab_power_self = 0
var/waking_speed = 1
var/mudking = FALSE
var/icodigi = 'modular_chomp/icons/mob/human_races/r_digi.dmi'
var/digi_allowed = FALSE
var/vanity_base_fit //when shapeshifting using vanity_copy_to, this allows you to have add something so they can go back to their original species fit
// Handles non-standard eyes when using a species that utilizes a custom base icon set.
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
+1
View File
@@ -12,6 +12,7 @@
selects_bodytype = SELECTS_BODYTYPE_SHAPESHIFTER
base_species = SPECIES_HUMAN
digi_allowed = TRUE
blood_color = "#505050" //This is the same as the 80,80,80 below, but in hex
flesh_color = "#505050"
modular_chomp/code/modules/mob/living/carbon/human/species/station/station.dm
-28
View File
@@ -45,39 +45,11 @@
*/
//Can use digitigrade flags
/datum/species/custom
digi_allowed = TRUE
/datum/species/shapeshifter/promethean
digi_allowed = TRUE
/datum/species/unathi
digi_allowed = TRUE
vore_belly_default_variant = "L"
/datum/species/tajaran
digi_allowed = TRUE
/datum/species/hi_zoxxen
digi_allowed = TRUE
/datum/species/sergal
digi_allowed = TRUE
/datum/species/akula
digi_allowed = TRUE
/datum/species/nevrean
digi_allowed = TRUE
/datum/species/vulpkanin
digi_allowed = TRUE
/datum/species/xenohybrid
digi_allowed = TRUE
/datum/species/xenochimera
digi_allowed = TRUE
/datum/species/protean
digi_allowed = TRUE
modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm
+4 -4
View File
@@ -53,8 +53,8 @@
/datum/species/xenomorph_hybrid
name = SPECIES_XENOMORPH_HYBRID
name_plural = "Xenomorph Hybrids"
icobase = 'modular_chomp/icons/mob/human_races/r_xenomorph_hybrid.dmi'
deform = 'modular_chomp/icons/mob/human_races/r_xenomorph_hybrid.dmi'
icobase = 'icons/mob/human_races/r_xenomorph_hybrid.dmi'
deform = 'icons/mob/human_races/r_xenomorph_hybrid.dmi'
tail = "tail"
icobase_tail = 1
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) // Innate claws and bite.
@@ -102,7 +102,7 @@
move_trail = /obj/effect/decal/cleanable/blood/tracks/claw
digi_allowed = TRUE
icodigi = 'modular_chomp/icons/mob/human_races/r_digi_xeno.dmi'
icodigi = 'icons/mob/human_races/r_digi_xeno.dmi'
species_sounds = "Xeno"
gender_specific_species_sounds = FALSE
@@ -294,4 +294,4 @@
/obj/item/organ/internal/xenos/plasmavessel/weak
name = "hybrid plasma vessel"
stored_plasma = 250 // Starts with max plasma.
max_plasma = 250 // Maximum of 250 plasma stored at any one time. Drones normally have 500.
max_plasma = 250 // Maximum of 250 plasma stored at any one time. Drones normally have 500.
modular_chomp/code/modules/mob/new_player/sprite_accessories_extra.dm
+5 -5
View File
@@ -237,14 +237,14 @@
/datum/sprite_accessory/marking/ch/xenomorph/digi_r_leg
name = "Xenomorph right leg (digitigrade)"
icon = 'icons/mob/human_races/markings_digi_ch.dmi'
icon = 'icons/mob/human_races/markings_digi.dmi'
icon_state = "xeno_digi"
digitigrade_acceptance = MARKING_DIGITIGRADE_ONLY
body_parts = list(BP_R_LEG, BP_R_FOOT)
/datum/sprite_accessory/marking/ch/xenomorph/digi_r_leg_hidden
name = "Xenomorph right leg (digitigrade, hide)"
icon = 'icons/mob/human_races/markings_digi_ch.dmi'
icon = 'icons/mob/human_races/markings_digi.dmi'
icon_state = "xeno_digi"
digitigrade_acceptance = MARKING_DIGITIGRADE_ONLY
body_parts = list(BP_R_LEG, BP_R_FOOT)
@@ -252,14 +252,14 @@
/datum/sprite_accessory/marking/ch/xenomorph/digi_l_leg
name = "Xenomorph left leg (digitigrade)"
icon = 'icons/mob/human_races/markings_digi_ch.dmi'
icon = 'icons/mob/human_races/markings_digi.dmi'
icon_state = "xeno_digi"
digitigrade_acceptance = MARKING_DIGITIGRADE_ONLY
body_parts = list(BP_L_LEG, BP_L_FOOT)
/datum/sprite_accessory/marking/ch/xenomorph/digi_l_leg_hidden
name = "Xenomorph left leg (digitigrade, hide)"
icon = 'icons/mob/human_races/markings_digi_ch.dmi'
icon = 'icons/mob/human_races/markings_digi.dmi'
icon_state = "xeno_digi"
digitigrade_acceptance = MARKING_DIGITIGRADE_ONLY
body_parts = list(BP_L_LEG, BP_L_FOOT)
@@ -302,4 +302,4 @@
name = "Xenomorph headcrest (hollywood)"
icon_state = "xeno_hollywood"
body_parts = list(BP_HEAD)
hide_body_parts = list(BP_HEAD)
hide_body_parts = list(BP_HEAD)