mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
[MIRROR] Fixes teshari stomachs & Unathi Stomachs (#8640)
Co-authored-by: C.L <killer65311@gmail.com> Co-authored-by: Raeschen <rycoop29@gmail.com> Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
@@ -1283,7 +1283,7 @@
|
|||||||
vessel.maximum_volume = species.blood_volume
|
vessel.maximum_volume = species.blood_volume
|
||||||
fixblood()
|
fixblood()
|
||||||
species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup.
|
species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup.
|
||||||
species.update_vore_belly_def_variant() //CHOMPedit - Custom species post spawn logic
|
species.update_vore_belly_def_variant()
|
||||||
|
|
||||||
// Rebuild the HUD. If they aren't logged in then login() should reinstantiate it for them.
|
// Rebuild the HUD. If they aren't logged in then login() should reinstantiate it for them.
|
||||||
update_hud()
|
update_hud()
|
||||||
|
|||||||
@@ -45,6 +45,9 @@
|
|||||||
var/list/food_preference = list() //RS edit
|
var/list/food_preference = list() //RS edit
|
||||||
var/food_preference_bonus = 0
|
var/food_preference_bonus = 0
|
||||||
|
|
||||||
|
/datum/species/unathi
|
||||||
|
vore_belly_default_variant = "L"
|
||||||
|
|
||||||
/datum/species/proc/give_numbing_bite() //Holy SHIT this is hacky, but it works. Updating a mob's attacks mid game is insane.
|
/datum/species/proc/give_numbing_bite() //Holy SHIT this is hacky, but it works. Updating a mob's attacks mid game is insane.
|
||||||
unarmed_attacks = list()
|
unarmed_attacks = list()
|
||||||
unarmed_types += /datum/unarmed_attack/bite/sharp/numbing
|
unarmed_types += /datum/unarmed_attack/bite/sharp/numbing
|
||||||
@@ -116,3 +119,11 @@
|
|||||||
|
|
||||||
/datum/species/get_bodytype()
|
/datum/species/get_bodytype()
|
||||||
return base_species
|
return base_species
|
||||||
|
|
||||||
|
/datum/species/proc/update_vore_belly_def_variant()
|
||||||
|
// Determine the actual vore_belly_default_variant, if the base species in the VORE tab is set
|
||||||
|
switch (base_species)
|
||||||
|
if("Teshari")
|
||||||
|
vore_belly_default_variant = "T"
|
||||||
|
if("Unathi")
|
||||||
|
vore_belly_default_variant = "L"
|
||||||
|
|||||||
@@ -148,7 +148,7 @@
|
|||||||
revive()
|
revive()
|
||||||
mutations.Remove(HUSK)
|
mutations.Remove(HUSK)
|
||||||
setBrainLoss(braindamage)
|
setBrainLoss(braindamage)
|
||||||
species.update_vore_belly_def_variant() //CHOMPedit fixes vore sprites for teshari xenochimera
|
species.update_vore_belly_def_variant()
|
||||||
|
|
||||||
if(!uninjured)
|
if(!uninjured)
|
||||||
nutrition = old_nutrition * 0.5
|
nutrition = old_nutrition * 0.5
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
male_sneeze_sound = list('sound/effects/mob_effects/tesharisneeze.ogg','sound/effects/mob_effects/tesharisneezeb.ogg')
|
male_sneeze_sound = list('sound/effects/mob_effects/tesharisneeze.ogg','sound/effects/mob_effects/tesharisneezeb.ogg')
|
||||||
female_sneeze_sound = list('sound/effects/mob_effects/tesharisneeze.ogg','sound/effects/mob_effects/tesharisneezeb.ogg')
|
female_sneeze_sound = list('sound/effects/mob_effects/tesharisneeze.ogg','sound/effects/mob_effects/tesharisneezeb.ogg')
|
||||||
End Chomp Edit */
|
End Chomp Edit */
|
||||||
|
|
||||||
|
vore_belly_default_variant = "T" //Teshari belly sprite
|
||||||
|
|
||||||
inherent_verbs = list(
|
inherent_verbs = list(
|
||||||
/mob/living/carbon/human/proc/sonar_ping,
|
/mob/living/carbon/human/proc/sonar_ping,
|
||||||
/mob/living/proc/hide,
|
/mob/living/proc/hide,
|
||||||
|
|||||||
@@ -49,13 +49,5 @@
|
|||||||
env_trait.handle_environment_special(H)
|
env_trait.handle_environment_special(H)
|
||||||
return
|
return
|
||||||
|
|
||||||
/datum/species/proc/update_vore_belly_def_variant()
|
|
||||||
// Determine the actual vore_belly_default_variant, if the base species in the VORE tab is set
|
|
||||||
switch (base_species)
|
|
||||||
if("Teshari")
|
|
||||||
vore_belly_default_variant = "T"
|
|
||||||
if("Unathi")
|
|
||||||
vore_belly_default_variant = "L"
|
|
||||||
|
|
||||||
/datum/species/proc/update_misc_tabs(var/mob/living/carbon/human/H)
|
/datum/species/proc/update_misc_tabs(var/mob/living/carbon/human/H)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -49,8 +49,5 @@
|
|||||||
/datum/species/shapeshifter/promethean
|
/datum/species/shapeshifter/promethean
|
||||||
digi_allowed = TRUE
|
digi_allowed = TRUE
|
||||||
|
|
||||||
/datum/species/unathi
|
|
||||||
vore_belly_default_variant = "L"
|
|
||||||
|
|
||||||
/datum/species/protean
|
/datum/species/protean
|
||||||
digi_allowed = TRUE
|
digi_allowed = TRUE
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
/datum/species/teshari
|
|
||||||
vore_belly_default_variant = "T"
|
|
||||||
|
|
||||||
// allow teshari to always be scooped, as long as pref is enabled
|
// allow teshari to always be scooped, as long as pref is enabled
|
||||||
/mob/living/MouseDrop(var/atom/over_object)
|
/mob/living/MouseDrop(var/atom/over_object)
|
||||||
// make sure src (The dragged) is human
|
// make sure src (The dragged) is human
|
||||||
|
|||||||
Reference in New Issue
Block a user