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

Merge pull request #4176 from BlackMajor/protean-rework

Browse Source 
Protean rework part 2 (WIP)
This commit is contained in:
Razgriz
2023-02-27 19:09:14 -07:00
committed by GitHub
parent 333428e7cc 2cf320e897
commit 84ab7c421d
51 changed files with 4821 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,8 +117,7 @@
/obj/item/organ/external/emp_act(severity)
for(var/obj/O as anything in src.contents)
O.emp_act(severity)
if(!(robotic >= ORGAN_ROBOT))
if(!(robotic >= ORGAN_ROBOT) || robotic == ORGAN_NANOFORM) //CHOMPEdit - Proteans handle EMP's differently
return
var/burn_damage = 0
for(var/i = 1; i <= robotic; i++)
@@ -1140,7 +1139,8 @@ Note that amputating the affected organ does in fact remove the infection from t
force_icon = R.icon
brute_mod *= R.robo_brute_mod
burn_mod *= R.robo_burn_mod
prosthetic_digi = R.can_be_digitigrade //CHOMPStation edit
skip_robo_icon = R.no_icon //CHOMPStation edit
digi_prosthetic = R.can_be_digitigrade //CHOMPStation edit
if(R.lifelike)
robotic = ORGAN_LIFELIKE
name = "[initial(name)]"

19
code/modules/organs/robolimbs_ch.dm
View File

@@ -1,5 +1,10 @@
GLOBAL_LIST_INIT(dsi_to_species, list(SPECIES_TAJARAN = "DSI - Tajaran", SPECIES_UNATHI = "DSI - Lizard", SPECIES_SERGAL = "DSI - Sergal", SPECIES_NEVREAN = "DSI - Nevrean", \
SPECIES_VULPKANIN = "DSI - Vulpkanin", SPECIES_AKULA = "DSI - Akula", SPECIES_VASILISSAN = "DSI - Vasilissan", SPECIES_ZORREN = "DSI - Zorren",\
SPECIES_TESHARI = "DSI - Teshari", SPECIES_FENNEC = "DSI - Fennec"))
/datum/robolimb
var/can_be_digitigrade = FALSE //maybe move this over into more of a "does this have a custom digitigrade sprite, and if so, what is its icon file/icon name in the limb's file" when someone can be bothered making them
var/no_icon = FALSE //specifically for DSI things, makes it so it doesn't override the species icons
var/can_be_digitigrade = FALSE //used for skipping the icon if it can be digitigrade - maybe turn this into more of a 'use this icon/iconstate' instead later, when actual prosthetic digi icons get made
/datum/robolimb/valehoundhead
company = "VALE Hound- Head"
@@ -37,4 +42,14 @@
/datum/robolimb/dsi_teshari/New()
. = ..()
species_cannot_use -= SPECIES_PROTEAN
species_cannot_use -= SPECIES_PROTEAN
/datum/robolimb/dsi_other
company = "DSI - Adaptive"
desc = "This limb has a realistic design and squish. By Darkside Incorperated."
blood_color = "#ffe2ff"
lifelike = 1
unavailable_to_build = 1
skin_tone = 1
no_icon = TRUE