mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 21:48:39 +01:00
[MIRROR] This tail refactor turned into an organ refactor. Funny how that works. [MDB IGNORE] (#14017)
* This tail refactor turned into an organ refactor. Funny how that works. * Firstly, fixing all the conflicts. * Fixes all our maps (hopefully) * Actually, this should fix pod people hair :) * Almost everything is working, just two major things to fix * Fixed a certain kind of external organ * Cleaning up some more stuff * Turned tail_cat into tail because why the fuck are they separate? * Moved all the tails into tails.dmi because that was just dumb to have like 3 in a different file * Adds relevant_layers to organs to help with rendering * Makes stored_feature_id also check mutant_bodyparts * Fixes the icon_state names of ALL the tails (pain) * Fixes wagging, gotta refactor most mutant bodyparts later on * I Love Added Failures * Fixed some organs that slipped through my searches * This could possibly fix the CI for this? * It doesn't look like it did fix it * This will make it pass, even if it's ugly as sin. * Fixed Felinids having a weird ghost tail * Fixes instances of snouts and tails not being properly colored Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
co-authored by
Kapu1178
GoldenAlpharex
parent
bd588480a5
commit
0a1f06a2d1
@@ -10,7 +10,7 @@
|
||||
desc = "A component that shows an three digit counter. Requires a BCI shell."
|
||||
category = "BCI"
|
||||
|
||||
required_shells = list(/obj/item/organ/cyberimp/bci)
|
||||
required_shells = list(/obj/item/organ/internal/cyberimp/bci)
|
||||
|
||||
var/datum/port/input/counter_number
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
var/datum/port/input/signal_update
|
||||
|
||||
var/obj/item/organ/cyberimp/bci/bci
|
||||
var/obj/item/organ/internal/cyberimp/bci/bci
|
||||
var/list/numbers = list()
|
||||
var/datum/weakref/counter_appearance
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
image_pixel_y = add_input_port("Y-Axis Shift", PORT_TYPE_NUMBER)
|
||||
|
||||
/obj/item/circuit_component/counter_overlay/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/cyberimp/bci))
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed)
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
desc = "Requires a BCI shell. A component that shows an overlay on top of an object."
|
||||
category = "BCI"
|
||||
|
||||
required_shells = list(/obj/item/organ/cyberimp/bci)
|
||||
required_shells = list(/obj/item/organ/internal/cyberimp/bci)
|
||||
|
||||
var/datum/port/input/option/object_overlay_options
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
var/datum/port/input/signal_on
|
||||
var/datum/port/input/signal_off
|
||||
|
||||
var/obj/item/organ/cyberimp/bci/bci
|
||||
var/obj/item/organ/internal/cyberimp/bci/bci
|
||||
var/list/active_overlays = list()
|
||||
var/list/options_map
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
options_map = component_options
|
||||
|
||||
/obj/item/circuit_component/object_overlay/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/cyberimp/bci))
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed)
|
||||
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
desc = "Requires a BCI shell. When activated, this component will allow user to target an object using their brain and will output the reference to said object."
|
||||
category = "BCI"
|
||||
|
||||
required_shells = list(/obj/item/organ/cyberimp/bci)
|
||||
required_shells = list(/obj/item/organ/internal/cyberimp/bci)
|
||||
|
||||
var/datum/port/output/clicked_atom
|
||||
|
||||
var/obj/item/organ/cyberimp/bci/bci
|
||||
var/obj/item/organ/internal/cyberimp/bci/bci
|
||||
var/intercept_cooldown = 1 SECONDS
|
||||
|
||||
/obj/item/circuit_component/target_intercept/populate_ports()
|
||||
@@ -23,7 +23,7 @@
|
||||
clicked_atom = add_output_port("Targeted Object", PORT_TYPE_ATOM)
|
||||
|
||||
/obj/item/circuit_component/target_intercept/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/cyberimp/bci))
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed)
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
desc = "A component that allows the user to input a string using their mind. Requires a BCI shell."
|
||||
category = "BCI"
|
||||
|
||||
required_shells = list(/obj/item/organ/cyberimp/bci)
|
||||
required_shells = list(/obj/item/organ/internal/cyberimp/bci)
|
||||
|
||||
var/datum/port/input/input_name
|
||||
var/datum/port/input/input_desc
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL
|
||||
|
||||
var/obj/item/organ/cyberimp/bci/bci
|
||||
var/obj/item/organ/internal/cyberimp/bci/bci
|
||||
var/ready = TRUE
|
||||
|
||||
/obj/item/circuit_component/thought_listener/populate_ports()
|
||||
@@ -31,7 +31,7 @@
|
||||
failure = add_output_port("On Failure", PORT_TYPE_SIGNAL)
|
||||
|
||||
/obj/item/circuit_component/thought_listener/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/cyberimp/bci))
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
|
||||
/obj/item/circuit_component/thought_listener/unregister_shell(atom/movable/shell)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
desc = "A component that plays a local VOX Announcement for the user. Requires a BCI shell."
|
||||
category = "BCI"
|
||||
|
||||
required_shells = list(/obj/item/organ/cyberimp/bci)
|
||||
required_shells = list(/obj/item/organ/internal/cyberimp/bci)
|
||||
|
||||
var/datum/port/input/option/type_option
|
||||
var/current_type
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL
|
||||
|
||||
var/obj/item/organ/cyberimp/bci/bci
|
||||
var/obj/item/organ/internal/cyberimp/bci/bci
|
||||
|
||||
/obj/item/circuit_component/vox/populate_options()
|
||||
type_option = add_option_port("VOX Type", list(PORT_TYPE_LIST(PORT_TYPE_STRING), PORT_TYPE_STRING))
|
||||
@@ -28,7 +28,7 @@
|
||||
word_list = add_input_port("Word List", PORT_TYPE_LIST(PORT_TYPE_STRING))
|
||||
|
||||
/obj/item/circuit_component/vox/register_shell(atom/movable/shell)
|
||||
if(istype(shell, /obj/item/organ/cyberimp/bci))
|
||||
if(istype(shell, /obj/item/organ/internal/cyberimp/bci))
|
||||
bci = shell
|
||||
|
||||
/obj/item/circuit_component/vox/unregister_shell(atom/movable/shell)
|
||||
|
||||
Reference in New Issue
Block a user