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

few small fixes and improvements for proteans

Browse Source
This commit is contained in:
Heroman3003
2023-01-22 11:34:03 +10:00
committed by CHOMPStation2
parent 9eb8a03eb9
commit cb32a65c87
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
View File

@@ -25,7 +25,12 @@
if(!istype(refactory))
to_chat(caller,"<span class='warning'>You don't have a working refactory module!</span>")
return
<<<<<<< HEAD:modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
var/choice = tgui_input_list(caller,"Pick the bodypart to change:", "Refactor - One Bodypart", species.has_limbs)
=======
var/choice = tgui_input_list(src,"Pick the bodypart to change:", "Refactor - One Bodypart", species.has_limbs)
>>>>>>> 465a66032f... Merge pull request #14355 from Seris02/proteanhelp:code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
if(!choice)
return
@@ -66,7 +71,7 @@
var/datum/robolimb/M = chargen_robolimbs[company]
if(!(choice in M.parts))
continue
if(impersonate_bodytype in M.species_cannot_use)
if(species?.base_species in M.species_cannot_use)
continue
if(M.whitelisted_to && !(ckey in M.whitelisted_to))
continue
@@ -127,7 +132,7 @@
var/datum/robolimb/M = chargen_robolimbs[company]
if(!(BP_TORSO in M.parts))
continue
if(impersonate_bodytype in M.species_cannot_use)
if(species?.base_species in M.species_cannot_use)
continue
if(M.whitelisted_to && !(ckey in M.whitelisted_to))
continue
@@ -283,7 +288,6 @@
var/new_species = tgui_input_list(usr, "Please select a species to emulate.", "Shapeshifter Body", GLOB.playable_species)
if(new_species)
impersonate_bodytype = new_species
species?.base_species = new_species // Really though you better have a species
regenerate_icons() //Expensive, but we need to recrunch all the icons we're wearing

12
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
View File

@@ -10,6 +10,9 @@
knockout_message = "collapses inwards, forming a disordered puddle of gray goo."
remains_type = /obj/effect/decal/cleanable/ash
selects_bodytype = SELECTS_BODYTYPE_SHAPESHIFTER
base_species = SPECIES_HUMAN
blood_color = "#505050" //This is the same as the 80,80,80 below, but in hex
flesh_color = "#505050"
base_color = "#FFFFFF" //Color mult, start out with this
@@ -126,9 +129,12 @@
saved_nif.quick_implant(H)
/datum/species/protean/get_bodytype(var/mob/living/carbon/human/H)
if(H)
return H.impersonate_bodytype || ..()
return ..()
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_bodytype(H)
/datum/species/protean/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H)
return GLOB.playable_species
/datum/species/protean/handle_post_spawn(var/mob/living/carbon/human/H)
..()