cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 00:58:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-15-10-2025

Browse Source
This commit is contained in:
Roxy
2025-10-15 19:34:41 -04:00
parent 00716094d8 7007a304d3
commit d14e538393
656 changed files with 24772 additions and 15866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/external/_visual_organs.dm
Vendored
-7
View File
@@ -7,8 +7,6 @@ Unlike normal organs, we're actually inside a persons limbs at all times
///The overlay datum that actually draws stuff on the limb
var/datum/bodypart_overlay/mutant/bodypart_overlay
/// The savefile_key of the preference this relates to. Used for the preferences UI.
var/preference
///With what DNA block do we mutate in mutate_feature() ? For genetics
var/datum/dna_block/dna_block
@@ -109,7 +107,6 @@ Unlike normal organs, we're actually inside a persons limbs at all times
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_EXTERNAL_HORNS
preference = "feature_lizard_horns"
//dna_block = /datum/dna_block/feature/horn // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA.
restyle_flags = EXTERNAL_RESTYLE_ENAMEL
@@ -137,7 +134,6 @@ Unlike normal organs, we're actually inside a persons limbs at all times
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_EXTERNAL_FRILLS
preference = "feature_lizard_frills"
//dna_block = /datum/dna_block/feature/frill // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA.
restyle_flags = EXTERNAL_RESTYLE_FLESH
@@ -164,7 +160,6 @@ Unlike normal organs, we're actually inside a persons limbs at all times
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_EXTERNAL_SNOUT
preference = "feature_lizard_snout"
external_bodyshapes = BODYSHAPE_SNOUTED
//dna_block = /datum/dna_block/feature/snout // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA.
@@ -193,7 +188,6 @@ Unlike normal organs, we're actually inside a persons limbs at all times
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_EXTERNAL_ANTENNAE
preference = "feature_moth_antennae"
//dna_block = /datum/dna_block/feature/moth_antenna // SKYRAT EDIT REMOVAL - Customization - We have our own system to handle DNA.
restyle_flags = EXTERNAL_RESTYLE_FLESH
@@ -282,7 +276,6 @@ Unlike normal organs, we're actually inside a persons limbs at all times
zone = BODY_ZONE_HEAD
slot = ORGAN_SLOT_EXTERNAL_POD_HAIR
preference = "feature_pod_hair"
use_mob_sprite_as_obj_sprite = TRUE
//dna_block = /datum/dna_block/feature/pod_hair // BUBBER EDIT REMOVAL - We have our own system for handling DNA
code/modules/surgery/organs/external/spines.dm
Vendored
-2
View File
@@ -7,8 +7,6 @@
zone = BODY_ZONE_CHEST
slot = ORGAN_SLOT_EXTERNAL_SPINES
preference = "feature_lizard_spines"
//dna_block = /datum/dna_block/feature/spine // BUBBER EDIT REMOVAL - Customization - We have our own system to handle DNA.
restyle_flags = EXTERNAL_RESTYLE_FLESH
code/modules/surgery/organs/external/tails.dm
Vendored
+1 -4
View File
@@ -162,7 +162,6 @@
/obj/item/organ/tail/cat
name = "tail"
preference = "feature_human_tail"
bodypart_overlay = /datum/bodypart_overlay/mutant/tail/cat
restyle_flags = EXTERNAL_RESTYLE_FLESH
@@ -177,7 +176,7 @@
///Cat tail bodypart overlay
/datum/bodypart_overlay/mutant/tail/cat
feature_key = FEATURE_TAIL_GENERIC // BUBBER EDIT CHANGE - Customization - ORIGINAL: feature_key = FEATURE_TAIL
feature_key = FEATURE_TAIL_GENERIC // BUBBER EDIT CHANGE - Customization - ORIGINAL: feature_key = FEATURE_TAIL_CAT
// color_source = ORGAN_COLOR_HAIR // SKYRAT EDIT REMOVAL
/datum/bodypart_overlay/mutant/tail/cat/get_global_feature_list()
@@ -185,7 +184,6 @@
/obj/item/organ/tail/monkey
name = "monkey tail"
preference = "feature_monkey_tail"
icon_state = "severedmonkeytail"
dna_block = null
bodypart_overlay = /datum/bodypart_overlay/mutant/tail/monkey
@@ -257,7 +255,6 @@
/obj/item/organ/tail/lizard
name = "lizard tail"
desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves."
preference = "feature_lizard_tail"
bodypart_overlay = /datum/bodypart_overlay/mutant/tail/lizard
code/modules/surgery/organs/external/wings/moth_wings.dm
Vendored
-2
View File
@@ -5,8 +5,6 @@
name = "moth wings"
desc = "Spread your wings and FLOOOOAAAAAT!"
preference = "feature_moth_wings"
//dna_block = /datum/dna_block/feature/moth_wing // BUBBER EDIT REMOVAL
bodypart_overlay = /datum/bodypart_overlay/mutant/wings/moth