diff --git a/code/__DEFINES/~skyrat_defines/signals.dm b/code/__DEFINES/~skyrat_defines/signals.dm index fefa7b65ed5..3283d203774 100644 --- a/code/__DEFINES/~skyrat_defines/signals.dm +++ b/code/__DEFINES/~skyrat_defines/signals.dm @@ -61,7 +61,7 @@ /// From mob/living/*/set_combat_mode(): (new_state) #define COMSIG_LIVING_COMBAT_MODE_TOGGLE "living_combat_mode_toggle" -/// From /obj/item/organ/internal/stomach/after_eat(atom/edible) +/// From /obj/item/organ/stomach/after_eat(atom/edible) #define COMSIG_STOMACH_AFTER_EAT "stomach_after_eat" /// For when a Hemophage's pulsating tumor gets added to their body. diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index 07492aeb5d7..50f1f2072d3 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -324,7 +324,7 @@ ) if (ride_check_flags & RIDING_TAUR) - var/obj/item/organ/external/taur_body/taur_body = H.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/taur_body = H.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) return taur_body.get_riding_offset(oversized = HAS_TRAIT(H, TRAIT_OVERSIZED)) //BUBBER EDIT END diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 5d4978928f4..3ae92c331f0 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -442,7 +442,7 @@ if(sacker_wing) attack_mod += 2 // BUBBER EDIT START - Taj tackle bonus - var/obj/item/organ/internal/ears/cat/tajaran/sacker_tajaran_ears = sacker.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/ears/cat/tajaran/sacker_tajaran_ears = sacker.get_organ_slot(ORGAN_SLOT_EARS) if(istype(sacker_tajaran_ears) && HAS_TRAIT(sacker, TRAIT_CATLIKE_GRACE)) attack_mod += 2 // UwU pounces on you // BUBBER EDIT END diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 50ca1a69256..a101ca70913 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -293,7 +293,7 @@ /datum/job/shaft_miner = /obj/item/organ/monster_core/rush_gland, /datum/job/station_engineer = /obj/item/organ/cyberimp/arm/toolset, /datum/job/warden = /obj/item/organ/cyberimp/eyes/hud/security, - // SKYRAT EDIT ADDITION START - MODULAR JOBS + // BUBBER EDIT ADDITION START - MODULAR JOBS /datum/job/blueshield = /obj/item/organ/cyberimp/brain/anti_stun, /datum/job/nanotrasen_consultant = /obj/item/organ/heart/cybernetic/tier3, /datum/job/barber = /obj/item/organ/ears/cybernetic/whisper, @@ -304,7 +304,7 @@ /datum/job/bouncer = /obj/item/organ/cyberimp/arm/strongarm, /datum/job/engineering_guard = /obj/item/organ/cyberimp/arm/flash, /datum/job/telecomms_specialist = /obj/item/organ/ears/cybernetic/xray, - // SKYRAT EDIT END + // BUBBER EDIT END ) /datum/station_trait/cybernetic_revolution/New() diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 2e0074e5279..b7c1216b704 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -684,7 +684,7 @@ iterated_part.emp_act(EMP_LIGHT) for (var/obj/item/organ/iterated_organ as anything in H.organs) iterated_organ.emp_act(EMP_LIGHT) - var/obj/item/organ/internal/brain/brain_organ = H.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/brain_organ = H.get_organ_slot(ORGAN_SLOT_BRAIN) if (istype(brain_organ)) var/datum/brain_trauma/trauma = brain_organ.gain_trauma_type(SYNTH_DEFIBBED_TRAUMA_SEVERITY, TRAUMA_LIMIT_BASIC) if (!QDELETED(trauma)) diff --git a/code/modules/antagonists/heretic/knowledge/general_side.dm b/code/modules/antagonists/heretic/knowledge/general_side.dm index b598834d665..f45ab5f55c7 100644 --- a/code/modules/antagonists/heretic/knowledge/general_side.dm +++ b/code/modules/antagonists/heretic/knowledge/general_side.dm @@ -6,7 +6,7 @@ to reroll your sacrifice targets." gain_text = "The heart is the principle that continues and preserves." required_atoms = list( - /obj/item/organ/internal/heart = 1, //BUBBER EDIT + /obj/item/organ/heart = 1, //BUBBER EDIT /obj/item/book = 1, /obj/item/clothing/under = 1, ) diff --git a/code/modules/client/preferences/species.dm b/code/modules/client/preferences/species.dm index 5c3f58a989f..dc053c55a5a 100644 --- a/code/modules/client/preferences/species.dm +++ b/code/modules/client/preferences/species.dm @@ -38,7 +38,7 @@ target.dna.update_body_size() for(var/organ_key in list(ORGAN_SLOT_VAGINA, ORGAN_SLOT_PENIS, ORGAN_SLOT_BREASTS, ORGAN_SLOT_ANUS)) - var/obj/item/organ/external/genital/gent = target.get_organ_slot(organ_key) + var/obj/item/organ/genital/gent = target.get_organ_slot(organ_key) if(gent) gent.aroused = prefs.arousal_preview gent.update_sprite_suffix() diff --git a/code/modules/deathmatch/deathmatch_lobby.dm b/code/modules/deathmatch/deathmatch_lobby.dm index 1d39c46741f..097f900b726 100644 --- a/code/modules/deathmatch/deathmatch_lobby.dm +++ b/code/modules/deathmatch/deathmatch_lobby.dm @@ -156,8 +156,8 @@ // BUBBER EDIT BEGIN - No more abductors talking to station! if(isabductor(new_player)) - var/obj/item/organ/internal/tongue/abductor/tongue = new_player.get_organ_slot(ORGAN_SLOT_TONGUE) - if(istype(tongue, /obj/item/organ/internal/tongue/abductor)) + var/obj/item/organ/tongue/abductor/tongue = new_player.get_organ_slot(ORGAN_SLOT_TONGUE) + if(istype(tongue, /obj/item/organ/tongue/abductor)) tongue.mothership = "deathmatch" // BUBBER EDIT END diff --git a/code/modules/lost_crew/damages/decay.dm b/code/modules/lost_crew/damages/decay.dm index 55674894474..da098808106 100644 --- a/code/modules/lost_crew/damages/decay.dm +++ b/code/modules/lost_crew/damages/decay.dm @@ -11,7 +11,7 @@ // * 0.5 because life ticks happen about every 2 seconds (we really need a way to get the current life tickspeed) var/decay_ticks = max_decay_time * severity * 0.5 - for(var/obj/item/organ/internal in body.organs) + for(var/obj/item/organ in body.organs) internal.apply_organ_damage(decay_ticks * internal.decay_factor) return TRUE diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index d97c124dafe..93abd5d5f6d 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -342,7 +342,7 @@ to_chat(helper, span_warning("[src] looks visibly upset as you pat [p_them()] on the head.")) //SKYRAT EDIT ADDITION BEGIN - EMOTES if(HAS_TRAIT(src, TRAIT_EXCITABLE)) - var/obj/item/organ/external/tail/src_tail = get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) + var/obj/item/organ/tail/src_tail = get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) if(src_tail && !(src_tail.wag_flags & WAG_WAGGING)) emote("wag") //SKYRAT EDIT ADDITION END diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 34d5a84cec5..3e64f17a8d4 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -50,10 +50,10 @@ ears.Insert(target_human, movement_flags = DELETE_IF_REPLACED) */ if(target_human.dna.features["ears"] == "Cat") - var/obj/item/organ/internal/ears/cat/ears = new + var/obj/item/organ/ears/cat/ears = new ears.Insert(target_human, movement_flags = DELETE_IF_REPLACED) else - mutantears = /obj/item/organ/internal/ears + mutantears = /obj/item/organ/ears // SKYRAT EDIT -- END return ..() diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 8fabf15a06a..3aa947a5c1c 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -362,10 +362,10 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) //Baseturf editors can only go up to ten, stop this. returnable_list += typesof(/obj/effect/baseturf_helper) // It's the abstract base type, it shouldn't be spawned. - returnable_list += /obj/item/organ/external/genital + returnable_list += /obj/item/organ/genital // These two are locked to one type only, and shouldn't be widely available, hence why they runtime otherwise. // Can't be bothered adding more to them. - returnable_list += list(/obj/item/organ/external/neck_accessory, /obj/item/organ/external/head_accessory) + returnable_list += list(/obj/item/organ/neck_accessory, /obj/item/organ/head_accessory) //SKYRAT EDIT ADDITION END return returnable_list diff --git a/modular_skyrat/master_files/code/datums/components/damage_tracker.dm b/modular_skyrat/master_files/code/datums/components/damage_tracker.dm index f35cc531f9a..fe0b1cac095 100644 --- a/modular_skyrat/master_files/code/datums/components/damage_tracker.dm +++ b/modular_skyrat/master_files/code/datums/components/damage_tracker.dm @@ -86,13 +86,13 @@ if(length(current_trauma_list)) trauma_list = current_trauma_list.Copy() - heart_damage = human_parent.check_organ_damage(/obj/item/organ/internal/heart) - liver_damage = human_parent.check_organ_damage(/obj/item/organ/internal/liver) - lung_damage = human_parent.check_organ_damage(/obj/item/organ/internal/lungs) - stomach_damage = human_parent.check_organ_damage(/obj/item/organ/internal/stomach) - brain_damage = human_parent.check_organ_damage(/obj/item/organ/internal/brain) - eye_damage = human_parent.check_organ_damage(/obj/item/organ/internal/eyes) - ear_damage = human_parent.check_organ_damage(/obj/item/organ/internal/ears) + heart_damage = human_parent.check_organ_damage(/obj/item/organ/heart) + liver_damage = human_parent.check_organ_damage(/obj/item/organ/liver) + lung_damage = human_parent.check_organ_damage(/obj/item/organ/lungs) + stomach_damage = human_parent.check_organ_damage(/obj/item/organ/stomach) + brain_damage = human_parent.check_organ_damage(/obj/item/organ/brain) + eye_damage = human_parent.check_organ_damage(/obj/item/organ/eyes) + ear_damage = human_parent.check_organ_damage(/obj/item/organ/ears) return TRUE @@ -110,7 +110,7 @@ human_parent.setOrganLoss(ORGAN_SLOT_EARS, ear_damage) human_parent.setOrganLoss(ORGAN_SLOT_BRAIN, brain_damage) - var/obj/item/organ/internal/brain/human_brain = human_parent.get_organ_by_type(/obj/item/organ/internal/brain) + var/obj/item/organ/brain/human_brain = human_parent.get_organ_by_type(/obj/item/organ/brain) if(!human_brain) return FALSE diff --git a/modular_skyrat/master_files/code/modules/cargo/bounties/medical.dm b/modular_skyrat/master_files/code/modules/cargo/bounties/medical.dm index 5b61be31b2d..cb25a54ab32 100644 --- a/modular_skyrat/master_files/code/modules/cargo/bounties/medical.dm +++ b/modular_skyrat/master_files/code/modules/cargo/bounties/medical.dm @@ -1,49 +1,49 @@ /datum/bounty/item/medical/heart wanted_types = list( - /obj/item/organ/internal/heart = TRUE, - /obj/item/organ/internal/heart/synth = FALSE, - /obj/item/organ/internal/heart/cybernetic = FALSE, - /obj/item/organ/internal/heart/cybernetic/tier2 = TRUE, - /obj/item/organ/internal/heart/cybernetic/tier3 = TRUE, + /obj/item/organ/heart = TRUE, + /obj/item/organ/heart/synth = FALSE, + /obj/item/organ/heart/cybernetic = FALSE, + /obj/item/organ/heart/cybernetic/tier2 = TRUE, + /obj/item/organ/heart/cybernetic/tier3 = TRUE, ) /datum/bounty/item/medical/lung wanted_types = list( - /obj/item/organ/internal/lungs = TRUE, - /obj/item/organ/internal/lungs/synth = FALSE, - /obj/item/organ/internal/lungs/cybernetic = FALSE, - /obj/item/organ/internal/lungs/cybernetic/tier2 = TRUE, - /obj/item/organ/internal/lungs/cybernetic/tier3 = TRUE, + /obj/item/organ/lungs = TRUE, + /obj/item/organ/lungs/synth = FALSE, + /obj/item/organ/lungs/cybernetic = FALSE, + /obj/item/organ/lungs/cybernetic/tier2 = TRUE, + /obj/item/organ/lungs/cybernetic/tier3 = TRUE, ) /datum/bounty/item/medical/ears wanted_types = list( - /obj/item/organ/internal/ears = TRUE, - /obj/item/organ/internal/ears/synth = FALSE, - /obj/item/organ/internal/ears/cybernetic = FALSE, - /obj/item/organ/internal/ears/cybernetic/upgraded = TRUE, - /obj/item/organ/internal/ears/cybernetic/whisper = TRUE, - /obj/item/organ/internal/ears/cybernetic/xray = TRUE, + /obj/item/organ/ears = TRUE, + /obj/item/organ/ears/synth = FALSE, + /obj/item/organ/ears/cybernetic = FALSE, + /obj/item/organ/ears/cybernetic/upgraded = TRUE, + /obj/item/organ/ears/cybernetic/whisper = TRUE, + /obj/item/organ/ears/cybernetic/xray = TRUE, ) /datum/bounty/item/medical/liver wanted_types = list( - /obj/item/organ/internal/liver = TRUE, - /obj/item/organ/internal/liver/synth = FALSE, - /obj/item/organ/internal/liver/cybernetic = FALSE, - /obj/item/organ/internal/liver/cybernetic/tier2 = TRUE, - /obj/item/organ/internal/liver/cybernetic/tier3 = TRUE, + /obj/item/organ/liver = TRUE, + /obj/item/organ/liver/synth = FALSE, + /obj/item/organ/liver/cybernetic = FALSE, + /obj/item/organ/liver/cybernetic/tier2 = TRUE, + /obj/item/organ/liver/cybernetic/tier3 = TRUE, ) /datum/bounty/item/medical/eye wanted_types = list( - /obj/item/organ/internal/eyes = TRUE, - /obj/item/organ/internal/eyes/robotic = FALSE, - /obj/item/organ/internal/eyes/synth = FALSE, + /obj/item/organ/eyes = TRUE, + /obj/item/organ/eyes/robotic = FALSE, + /obj/item/organ/eyes/synth = FALSE, ) /datum/bounty/item/medical/tongue wanted_types = list( - /obj/item/organ/internal/tongue = TRUE, - /obj/item/organ/internal/tongue/synth = FALSE, + /obj/item/organ/tongue = TRUE, + /obj/item/organ/tongue/synth = FALSE, ) diff --git a/modular_skyrat/master_files/code/modules/client/preferences/brain.dm b/modular_skyrat/master_files/code/modules/client/preferences/brain.dm index 5f515577c8a..3a83bd0b191 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/brain.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/brain.dm @@ -14,8 +14,8 @@ if(!issynthetic(target)) return - var/obj/item/organ/internal/brain/new_brain = target.prefs_get_brain_to_use(value) - var/obj/item/organ/internal/brain/old_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/new_brain = target.prefs_get_brain_to_use(value) + var/obj/item/organ/brain/old_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) if(!new_brain || new_brain == old_brain.type) return diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/food.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/food.dm index 55e8773e8df..c8e7a335654 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/food.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/food.dm @@ -23,7 +23,7 @@ GLOBAL_DATUM_INIT(food_prefs_menu, /datum/food_prefs_menu, new) to_chat(preferences.parent, span_announce("Your food preferences can't be set because of [fail_reason] choices! Please check your preferences!")) // Sorry, but I don't want folk sleeping on this. return - var/obj/item/organ/internal/tongue/target_tongue = target.get_organ_slot(ORGAN_SLOT_TONGUE) + var/obj/item/organ/tongue/target_tongue = target.get_organ_slot(ORGAN_SLOT_TONGUE) if(isnull(target_tongue) || !preferences.food_preferences["enabled"]) return diff --git a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm index 5727a6f51e2..177dfc0351f 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/mutant_parts.dm @@ -64,7 +64,7 @@ /datum/preference/toggle/eye_emissives/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) value = value && preferences && is_allowed(preferences) - var/obj/item/organ/internal/eyes/eyes_organ = target.get_organ_by_type(/obj/item/organ/internal/eyes) + var/obj/item/organ/eyes/eyes_organ = target.get_organ_by_type(/obj/item/organ/eyes) target.emissive_eyes = value if (istype(eyes_organ)) eyes_organ.is_emissive = value diff --git a/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm b/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm index c2b04c99382..4068d13a152 100644 --- a/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/modular_skyrat/master_files/code/modules/mob/dead/new_player/preferences_setup.dm @@ -25,18 +25,18 @@ if(PREVIEW_PREF_NAKED) mannequin.underwear_visibility = UNDERWEAR_HIDE_UNDIES | UNDERWEAR_HIDE_SHIRT | UNDERWEAR_HIDE_SOCKS | UNDERWEAR_HIDE_BRA for(var/organ_key in list(ORGAN_SLOT_VAGINA, ORGAN_SLOT_PENIS, ORGAN_SLOT_BREASTS, ORGAN_SLOT_ANUS)) - var/obj/item/organ/external/genital/gent = mannequin.get_organ_slot(organ_key) + var/obj/item/organ/genital/gent = mannequin.get_organ_slot(organ_key) if(gent) gent.aroused = AROUSAL_NONE gent.update_sprite_suffix() if(PREVIEW_PREF_NAKED_AROUSED) mannequin.underwear_visibility = UNDERWEAR_HIDE_UNDIES | UNDERWEAR_HIDE_SHIRT | UNDERWEAR_HIDE_SOCKS | UNDERWEAR_HIDE_BRA for(var/organ_key in list(ORGAN_SLOT_VAGINA, ORGAN_SLOT_PENIS, ORGAN_SLOT_BREASTS, ORGAN_SLOT_ANUS)) - var/obj/item/organ/external/genital/gent = mannequin.get_organ_slot(organ_key) + var/obj/item/organ/genital/gent = mannequin.get_organ_slot(organ_key) if(gent) gent.aroused = AROUSAL_FULL gent.update_sprite_suffix() - + // Apply visual quirks // Yes we do it every time because it needs to be done after job gear if(SSquirks?.initialized) diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm index ed5f55b7742..eeab7ddfec4 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/human/species_type/snail.dm @@ -2,8 +2,8 @@ /datum/species/snail eyes_icon = 'modular_skyrat/modules/organs/icons/snail_eyes.dmi' //This is to consolidate our icons and prevent future calamity. - mutantliver = /obj/item/organ/internal/liver/snail //This is just a better liver to deal with toxins, it's a thematic thing. - mutantheart = /obj/item/organ/internal/heart/snail //This gives them the shell buff where they take less damage from behind, and their heart's more durable. + mutantliver = /obj/item/organ/liver/snail //This is just a better liver to deal with toxins, it's a thematic thing. + mutantheart = /obj/item/organ/heart/snail //This gives them the shell buff where they take less damage from behind, and their heart's more durable. exotic_blood = null eyes_icon = 'modular_skyrat/modules/organs/icons/snail_eyes.dmi' diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/human_helpers.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/human_helpers.dm index c24108061eb..35e25bb6cb1 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/carbon/human_helpers.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/human_helpers.dm @@ -4,7 +4,7 @@ var/t_He = p_They() var/t_is = p_are() //This checks to see if the body is revivable - if((key || !get_organ_by_type(/obj/item/organ/internal/brain) || ghost?.can_reenter_corpse)) + if((key || !get_organ_by_type(/obj/item/organ/brain) || ghost?.can_reenter_corpse)) return span_deadsay("[t_He] [t_is] limp and unresponsive; they're still twitching on occasion, perhaps [p_they()] can still be saved..!") else return span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life and they've degraded beyond revival...") diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm index b49984fa55c..217cd623b8f 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm @@ -12,8 +12,8 @@ unsuitable_atmos_damage = 0.5 butcher_results = list( /obj/item/food/meat/slab = 1, - /obj/item/organ/internal/ears/cat = 1, - /obj/item/organ/external/tail/cat = 1, + /obj/item/organ/ears/cat = 1, + /obj/item/organ/tail/cat = 1, /obj/item/clothing/mask/gas/clown_hat = 1, ) @@ -66,8 +66,8 @@ unsuitable_atmos_damage = 0.5 butcher_results = list( /obj/item/food/meat/slab = 1, - /obj/item/organ/internal/ears/cat = 1, - /obj/item/organ/external/tail/cat = 1, + /obj/item/organ/ears/cat = 1, + /obj/item/organ/tail/cat = 1, /obj/item/clothing/mask/gas/mime = 1, ) @@ -99,8 +99,8 @@ unsuitable_atmos_damage = 0.5 butcher_results = list( /obj/item/food/meat/slab = 1, - /obj/item/organ/internal/ears/cat = 1, - /obj/item/organ/external/tail/cat = 1, + /obj/item/organ/ears/cat = 1, + /obj/item/organ/tail/cat = 1, /obj/item/clothing/head/pelt/tiger = 1, ) diff --git a/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm index 9a3dd0e95a3..bab02052a8f 100644 --- a/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm +++ b/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm @@ -17,7 +17,7 @@ /datum/design/tongue/snail name = "Snail Tongue" id = "snailtongue" - build_path = /obj/item/organ/internal/tongue/snail + build_path = /obj/item/organ/tongue/snail category = list( SPECIES_SNAIL, RND_CATEGORY_INITIAL, @@ -26,7 +26,7 @@ /datum/design/liver/snail name = "Snail Liver" id = "snailliver" - build_path = /obj/item/organ/internal/liver/snail + build_path = /obj/item/organ/liver/snail category = list( SPECIES_SNAIL, RND_CATEGORY_INITIAL, @@ -35,7 +35,7 @@ /datum/design/heart/snail name = "Snail Heart" id = "snailheart" - build_path = /obj/item/organ/internal/heart/snail + build_path = /obj/item/organ/heart/snail category = list( SPECIES_SNAIL, RND_CATEGORY_INITIAL, diff --git a/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm index 8665311caa1..9e58c8df97e 100644 --- a/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm +++ b/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm @@ -9,7 +9,7 @@ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2, ) - build_path = /obj/item/organ/internal/tongue/cybernetic + build_path = /obj/item/organ/tongue/cybernetic category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1, ) @@ -19,7 +19,7 @@ name = "Forked Cybernetic Tongue" desc = "A forked cybernetic tongue." id = "cybernetic_tongue_lizard" - build_path = /obj/item/organ/internal/tongue/lizard/cybernetic + build_path = /obj/item/organ/tongue/lizard/cybernetic /datum/design/cyberimp_surgical/alien name = "Alien Surgical Arm Implant" @@ -28,7 +28,7 @@ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT*10.25, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 10.5, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 10.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT * 10, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 4.5) construction_time = 2 SECONDS - build_path = /obj/item/organ/internal/cyberimp/arm/surgery/alien + build_path = /obj/item/organ/cyberimp/arm/surgery/alien category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN ) @@ -41,7 +41,7 @@ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB materials = list (/datum/material/iron =SHEET_MATERIAL_AMOUNT * 15.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*8.25, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 8.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 3, /datum/material/diamond =SHEET_MATERIAL_AMOUNT * 3) construction_time = 2 SECONDS - build_path = /obj/item/organ/internal/cyberimp/arm/toolset/alien + build_path = /obj/item/organ/cyberimp/arm/toolset/alien category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY + RND_SUBCATEGORY_TOOLS_ENGINEERING_ALIEN ) diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/_organ.dm b/modular_skyrat/master_files/code/modules/surgery/organs/_organ.dm deleted file mode 100644 index e5f45efb114..00000000000 --- a/modular_skyrat/master_files/code/modules/surgery/organs/_organ.dm +++ /dev/null @@ -1,4 +0,0 @@ -/obj/item/organ - /// Whether or not we're a species-specific organ that will override - /// the ear choice on a certain species, while still applying its visuals. - var/overrides_sprite_datum_organ_type = FALSE diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/functional_wings.dm b/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/functional_wings.dm index 49d2bf5c752..1fe2fce11f4 100644 --- a/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/functional_wings.dm +++ b/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/functional_wings.dm @@ -1,3 +1,3 @@ // No free fall softening for everyone - but functional wings get it -/obj/item/organ/external/wings/functional/can_soften_fall() +/obj/item/organ/wings/functional/can_soften_fall() return TRUE diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/wings.dm b/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/wings.dm index b975cac1d6b..0f6afee5ae9 100644 --- a/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/wings.dm +++ b/modular_skyrat/master_files/code/modules/surgery/organs/external/wings/wings.dm @@ -1,3 +1,3 @@ // No free fall softening for everyone -/obj/item/organ/external/wings/functional/can_soften_fall() +/obj/item/organ/wings/functional/can_soften_fall() return FALSE diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/internal/appendix/_appendix.dm b/modular_skyrat/master_files/code/modules/surgery/organs/internal/appendix/_appendix.dm index b3ab005d6bc..d631b1cba78 100644 --- a/modular_skyrat/master_files/code/modules/surgery/organs/internal/appendix/_appendix.dm +++ b/modular_skyrat/master_files/code/modules/surgery/organs/internal/appendix/_appendix.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/appendix/become_inflamed() +/obj/item/organ/appendix/become_inflamed() if(engaged_role_play_check(owner, station = TRUE, dorms = TRUE)) return diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm b/modular_skyrat/master_files/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm index 1901743a6c6..b4c1371282f 100644 --- a/modular_skyrat/master_files/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm +++ b/modular_skyrat/master_files/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/cyberimp/arm/toolset/alien +/obj/item/organ/cyberimp/arm/toolset/alien name = "integrated alien toolset implant" desc = "A version of the engineering toolset, designed to be installed on subject's arm. Contain abductor tools." actions_types = list(/datum/action/item_action/organ_action/toggle/toolkit) @@ -11,7 +11,7 @@ /obj/item/multitool/abductor, ) -/obj/item/organ/internal/cyberimp/arm/surgery/alien +/obj/item/organ/cyberimp/arm/surgery/alien name = "alien surgical toolset implant" desc = "A set of alien surgical tools hidden behind a concealed panel on the user's arm." actions_types = list(/datum/action/item_action/organ_action/toggle/toolkit) @@ -27,7 +27,7 @@ /obj/item/blood_filter/alien, ) -/obj/item/organ/internal/cyberimp/arm/surgery +/obj/item/organ/cyberimp/arm/surgery items_to_create = list( /obj/item/retractor/augment, /obj/item/hemostat/augment, diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/tongue.dm b/modular_skyrat/master_files/code/modules/surgery/organs/tongue.dm index 301247b5e51..b749c42433c 100644 --- a/modular_skyrat/master_files/code/modules/surgery/organs/tongue.dm +++ b/modular_skyrat/master_files/code/modules/surgery/organs/tongue.dm @@ -1,3 +1,3 @@ // Remove the could_speak_language check from the tongue code. This is a much better solution than trying to grant omnitongue on prefs load, and prevents any funny breakages. -/obj/item/organ/internal/tongue/could_speak_language(datum/language/language_path) +/obj/item/organ/tongue/could_speak_language(datum/language/language_path) return TRUE diff --git a/modular_skyrat/master_files/code/modules/wiremod/components/bci/reagent_injector_bluespace.dm b/modular_skyrat/master_files/code/modules/wiremod/components/bci/reagent_injector_bluespace.dm index 3f843ef777c..66b8877c739 100644 --- a/modular_skyrat/master_files/code/modules/wiremod/components/bci/reagent_injector_bluespace.dm +++ b/modular_skyrat/master_files/code/modules/wiremod/components/bci/reagent_injector_bluespace.dm @@ -14,7 +14,7 @@ category = "BCI" circuit_flags = CIRCUIT_NO_DUPLICATES|CIRCUIT_REAGENT_CONTAINER_TYPE - required_shells = list(/obj/item/organ/internal/cyberimp/bci) + required_shells = list(/obj/item/organ/cyberimp/bci) /// The number of units to inject per trigger var/datum/port/input/inject_amount @@ -22,7 +22,7 @@ var/datum/port/input/inject var/datum/port/output/injected - var/obj/item/organ/internal/cyberimp/bci/bci + var/obj/item/organ/cyberimp/bci/bci /obj/item/circuit_component/reagent_injector_bluespace/Initialize(mapload) . = ..() @@ -47,7 +47,7 @@ /obj/item/circuit_component/reagent_injector_bluespace/register_shell(atom/movable/shell) . = ..() - if(istype(shell, /obj/item/organ/internal/cyberimp/bci)) + if(istype(shell, /obj/item/organ/cyberimp/bci)) bci = shell bci.create_reagents(100, OPENCONTAINER) if(reagents.total_volume) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm index 0174c8fa0da..7c33b7799a3 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm @@ -3,14 +3,14 @@ //this is for revitalizing/preserving regen cores /obj/structure/lavaland/ash_walker/attackby(obj/item/attacking_item, mob/living/user, params) - if(!istype(attacking_item, /obj/item/organ/internal/monster_core/regenerative_core)) + if(!istype(attacking_item, /obj/item/organ/monster_core/regenerative_core)) return ..() if(!user.mind.has_antag_datum(/datum/antagonist/ashwalker)) balloon_alert(user, "must be an ashwalker!") return - var/obj/item/organ/internal/monster_core/regenerative_core/regen_core = attacking_item + var/obj/item/organ/monster_core/regenerative_core/regen_core = attacking_item if(!regen_core.preserve()) balloon_alert(user, "organ decayed!") diff --git a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm index 4fe43d1f82a..57ab2d3f06f 100644 --- a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm @@ -3,11 +3,11 @@ desc = "Summon a staff that is imbued with the power of the tendril. Requires permission from the mother tendril." required_components = list( "north" = /obj/item/stack/sheet/mineral/wood, - "south" = /obj/item/organ/internal/monster_core/regenerative_core, + "south" = /obj/item/organ/monster_core/regenerative_core, ) consumed_components = list( /obj/item/stack/sheet/mineral/wood, - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, ) ritual_success_items = list( /obj/item/ash_staff, @@ -18,13 +18,13 @@ desc = "Summons a necklace that imbues the wearer with the knowledge of our tongue." required_components = list( "north" = /obj/item/stack/sheet/bone, - "south" = /obj/item/organ/internal/monster_core/regenerative_core, + "south" = /obj/item/organ/monster_core/regenerative_core, "east" = /obj/item/stack/sheet/sinew, "west" = /obj/item/stack/sheet/sinew, ) consumed_components = list( /obj/item/stack/sheet/bone, - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/stack/sheet/sinew, ) ritual_success_items = list( @@ -51,13 +51,13 @@ name = "Summon Cursed Ash Knife" desc = "Summons a knife that places a tracking curse on unsuspecting miners who destroy our marked tendrils." required_components = list( - "north" = /obj/item/organ/internal/monster_core/regenerative_core, + "north" = /obj/item/organ/monster_core/regenerative_core, "south" = /obj/item/forging/reagent_weapon/dagger, "east" = /obj/item/stack/sheet/bone, "west" = /obj/item/stack/sheet/sinew, ) consumed_components = list( - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/forging/reagent_weapon/dagger, /obj/item/stack/sheet/bone, /obj/item/stack/sheet/sinew, @@ -70,13 +70,13 @@ name = "Summon Cursed Ash Carver" desc = "Summons a weapon that mimics the invader's tools, allowing us to collect trophies from the hunt." required_components = list( - "north" = /obj/item/organ/internal/monster_core/regenerative_core, + "north" = /obj/item/organ/monster_core/regenerative_core, "south" = /obj/item/cursed_dagger, "east" = /obj/item/stack/sheet/bone, "west" = /obj/item/stack/sheet/sinew, ) consumed_components = list( - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/cursed_dagger, /obj/item/stack/sheet/bone, /obj/item/stack/sheet/sinew, @@ -89,13 +89,13 @@ name = "Summon Tendril Seed" desc = "Summons a seed that, when used in the hand, will cause a tendril to come through at your location." required_components = list( - "north" = /obj/item/organ/internal/monster_core/regenerative_core, + "north" = /obj/item/organ/monster_core/regenerative_core, "south" = /obj/item/cursed_dagger, "east" = /obj/item/crusher_trophy/goliath_tentacle, "west" = /obj/item/crusher_trophy/watcher_wing, ) consumed_components = list( - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/cursed_dagger, /obj/item/crusher_trophy/goliath_tentacle, /obj/item/crusher_trophy/watcher_wing, @@ -157,13 +157,13 @@ desc = "Those who partake in the ceremony and are ready will age, increasing their value to the kin." required_components = list( "north" = /mob/living/carbon/human, - "south" = /obj/item/organ/internal/monster_core/regenerative_core, + "south" = /obj/item/organ/monster_core/regenerative_core, "east" = /obj/item/stack/sheet/bone, "west" = /obj/item/stack/sheet/sinew, ) consumed_components = list( /mob/living/carbon/human, - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/stack/sheet/bone, /obj/item/stack/sheet/sinew, ) @@ -177,13 +177,13 @@ name = "Summon Lavaland Creature" desc = "Summons a random, wild monster from another region in space." required_components = list( - "north" = /obj/item/organ/internal/monster_core/regenerative_core, + "north" = /obj/item/organ/monster_core/regenerative_core, "south" = /mob/living/basic/mining/ice_whelp, "east" = /obj/item/stack/ore/bluespace_crystal, "west" = /obj/item/stack/ore/bluespace_crystal, ) consumed_components = list( - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /mob/living/basic/mining/ice_whelp, ) @@ -202,13 +202,13 @@ name = "Summon Icemoon Creature" desc = "Summons a random, wild monster from another region in space." required_components = list( - "north" = /obj/item/organ/internal/monster_core/regenerative_core, + "north" = /obj/item/organ/monster_core/regenerative_core, "south" = /obj/item/food/grown/surik, "east" = /obj/item/stack/ore/bluespace_crystal, "west" = /obj/item/stack/ore/bluespace_crystal, ) consumed_components = list( - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/food/grown/surik, ) @@ -334,13 +334,13 @@ name = "Revive Animal" desc = "Revives a simple animal that will then become friendly." required_components = list( - "north" = /obj/item/organ/internal/monster_core/regenerative_core, - "south" = /obj/item/organ/internal/monster_core/regenerative_core, + "north" = /obj/item/organ/monster_core/regenerative_core, + "south" = /obj/item/organ/monster_core/regenerative_core, "east" = /obj/item/stack/sheet/bone, "west" = /obj/item/stack/sheet/sinew, ) consumed_components = list( - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/stack/sheet/bone, /obj/item/stack/sheet/sinew, ) diff --git a/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm b/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm index 7e41148ba11..949ce3df651 100644 --- a/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm +++ b/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm @@ -1,5 +1,5 @@ /datum/species/lizard/ashwalker - mutanteyes = /obj/item/organ/internal/eyes/night_vision/ashwalker + mutanteyes = /obj/item/organ/eyes/night_vision/ashwalker bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/lizard/ashwalker, BODY_ZONE_CHEST = /obj/item/bodypart/chest/lizard/ashwalker, diff --git a/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm b/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm index a191e8c0bc0..65974e82f6a 100644 --- a/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm +++ b/modular_skyrat/modules/assault_operatives/code/assault_operatives.dm @@ -161,7 +161,7 @@ for(var/obj/item/item in human_target.get_equipped_items(TRUE)) qdel(item) - var/obj/item/organ/internal/brain/human_brain = human_target.get_organ_slot(BRAIN) + var/obj/item/organ/brain/human_brain = human_target.get_organ_slot(BRAIN) human_brain.destroy_all_skillchips() // get rid of skillchips to prevent runtimes human_target.equipOutfit(assault_operative_default_outfit) human_target.regenerate_icons() diff --git a/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/spawners.dm b/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/spawners.dm index 24395e3e0f1..1b4f6d2c87c 100644 --- a/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/spawners.dm +++ b/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/spawners.dm @@ -41,10 +41,10 @@ /obj/effect/spawner/random/astrum/agent_loot name = "abductor agent loot" - loot = list(/obj/item/organ/internal/heart/cybernetic/tier3 = 10, + loot = list(/obj/item/organ/heart/cybernetic/tier3 = 10, /obj/item/clothing/suit/armor/abductor/astrum = 10, /obj/item/clothing/head/helmet/astrum = 10, - /obj/item/organ/internal/cyberimp/arm/armblade = 5, + /obj/item/organ/cyberimp/arm/armblade = 5, /obj/effect/gibspawner/generic = 10, - /obj/item/organ/internal/eyes/alien = 5, + /obj/item/organ/eyes/alien = 5, ) diff --git a/modular_skyrat/modules/better_vox/code/vox_species.dm b/modular_skyrat/modules/better_vox/code/vox_species.dm index 43f6cd642e1..832153356f0 100644 --- a/modular_skyrat/modules/better_vox/code/vox_species.dm +++ b/modular_skyrat/modules/better_vox/code/vox_species.dm @@ -12,12 +12,12 @@ TRAIT_MUTANT_COLORS, ) inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID - mutantlungs = /obj/item/organ/internal/lungs/nitrogen/vox - mutantbrain = /obj/item/organ/internal/brain/cybernetic/cortical/vox //BUBBER EDIT - new brain dropped + mutantlungs = /obj/item/organ/lungs/nitrogen/vox + mutantbrain = /obj/item/organ/brain/cybernetic/cortical/vox //BUBBER EDIT - new brain dropped breathid = "n2" mutant_bodyparts = list() meat = /obj/item/food/meat/slab/chicken/human //item file in teshari module - mutanttongue = /obj/item/organ/internal/tongue/vox + mutanttongue = /obj/item/organ/tongue/vox payday_modifier = 1.0 outfit_important_for_life = /datum/outfit/vox species_language_holder = /datum/language_holder/vox diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm index f65c2270ef5..f071e58d99a 100644 --- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm +++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm @@ -112,4 +112,4 @@ name = "MOD legion core dispenser module" desc = "This module can create healing legion cores at the user's liking." cooldown_time = 10 SECONDS - dispense_type = /obj/item/organ/internal/monster_core/regenerative_core/legion + dispense_type = /obj/item/organ/monster_core/regenerative_core/legion diff --git a/modular_skyrat/modules/bodyparts/code/moth_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/moth_bodyparts.dm index f954999c64a..662ca676ad5 100644 --- a/modular_skyrat/modules/bodyparts/code/moth_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/moth_bodyparts.dm @@ -13,7 +13,7 @@ icon_state = "moth_chest_m" limb_id = SPECIES_MOTH is_dimorphic = TRUE - wing_types = list(/obj/item/organ/external/wings/functional/moth/megamoth, /obj/item/organ/external/wings/functional/moth/mothra) + wing_types = list(/obj/item/organ/wings/functional/moth/megamoth, /obj/item/organ/wings/functional/moth/mothra) /obj/item/bodypart/chest/moth/get_butt_sprite() return icon('icons/mob/butts.dmi', BUTT_SPRITE_FUZZY) diff --git a/modular_skyrat/modules/cargo/code/goodies.dm b/modular_skyrat/modules/cargo/code/goodies.dm index caeb15c2668..c11c4f72b03 100644 --- a/modular_skyrat/modules/cargo/code/goodies.dm +++ b/modular_skyrat/modules/cargo/code/goodies.dm @@ -133,7 +133,7 @@ desc = "Contains a single standard NIF by itself, surgery is required." cost = CARGO_CRATE_VALUE * 15 contains = list( - /obj/item/organ/internal/cyberimp/brain/nif/standard, + /obj/item/organ/cyberimp/brain/nif/standard, ) /datum/supply_pack/goody/cheap_nif @@ -141,7 +141,7 @@ desc = "Contains a single Econo-Deck NIF by itself, surgery is required." cost = CARGO_CRATE_VALUE * 7.5 contains = list( - /obj/item/organ/internal/cyberimp/brain/nif/roleplay_model, + /obj/item/organ/cyberimp/brain/nif/roleplay_model, ) /datum/supply_pack/goody/nif_repair_kit diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm index 7dec593129a..da820eef271 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm @@ -272,19 +272,19 @@ subcategory = "Cybernetics" /datum/armament_entry/company_import/deforest/implant/surgery - item_type = /obj/item/organ/internal/cyberimp/arm/surgery + item_type = /obj/item/organ/cyberimp/arm/surgery cost = PAYCHECK_COMMAND * 5 /datum/armament_entry/company_import/deforest/implant/toolset - item_type = /obj/item/organ/internal/cyberimp/arm/toolset + item_type = /obj/item/organ/cyberimp/arm/toolset cost = PAYCHECK_COMMAND * 5 /datum/armament_entry/company_import/deforest/implant/botany - item_type = /obj/item/organ/internal/cyberimp/arm/botany + item_type = /obj/item/organ/cyberimp/arm/botany cost = PAYCHECK_COMMAND * 5 /datum/armament_entry/company_import/deforest/implant/janitor - item_type = /obj/item/organ/internal/cyberimp/arm/janitor + item_type = /obj/item/organ/cyberimp/arm/janitor cost = PAYCHECK_COMMAND * 5 // Modsuit Modules from the medical category, here instead of in Nakamura because nobody buys from this company diff --git a/modular_skyrat/modules/company_imports/code/objects/deforest/filled_organ_boxes.dm b/modular_skyrat/modules/company_imports/code/objects/deforest/filled_organ_boxes.dm index 0298696b7ef..7dfffbc3394 100644 --- a/modular_skyrat/modules/company_imports/code/objects/deforest/filled_organ_boxes.dm +++ b/modular_skyrat/modules/company_imports/code/objects/deforest/filled_organ_boxes.dm @@ -1,29 +1,29 @@ /obj/item/storage/organbox/advanced_cyber_eyes /obj/item/storage/organbox/advanced_cyber_eyes/PopulateContents() - new /obj/item/organ/internal/eyes/robotic/shield(src) + new /obj/item/organ/eyes/robotic/shield(src) /obj/item/storage/organbox/advanced_cyber_ears /obj/item/storage/organbox/advanced_cyber_ears/PopulateContents() - new /obj/item/organ/internal/ears/cybernetic/upgraded(src) + new /obj/item/organ/ears/cybernetic/upgraded(src) /obj/item/storage/organbox/advanced_cyber_heart /obj/item/storage/organbox/advanced_cyber_heart/PopulateContents() - new /obj/item/organ/internal/heart/cybernetic/tier3(src) + new /obj/item/organ/heart/cybernetic/tier3(src) /obj/item/storage/organbox/advanced_cyber_liver /obj/item/storage/organbox/advanced_cyber_liver/PopulateContents() - new /obj/item/organ/internal/liver/cybernetic/tier3(src) + new /obj/item/organ/liver/cybernetic/tier3(src) /obj/item/storage/organbox/advanced_cyber_lungs /obj/item/storage/organbox/advanced_cyber_lungs/PopulateContents() - new /obj/item/organ/internal/lungs/cybernetic/tier3(src) + new /obj/item/organ/lungs/cybernetic/tier3(src) /obj/item/storage/organbox/advanced_cyber_stomach /obj/item/storage/organbox/advanced_cyber_stomach/PopulateContents() - new /obj/item/organ/internal/stomach/cybernetic/tier3(src) + new /obj/item/organ/stomach/cybernetic/tier3(src) diff --git a/modular_skyrat/modules/cortical_borer/code/abilities/_borer_abilities.dm b/modular_skyrat/modules/cortical_borer/code/abilities/_borer_abilities.dm index d0949491317..899a4b13d95 100644 --- a/modular_skyrat/modules/cortical_borer/code/abilities/_borer_abilities.dm +++ b/modular_skyrat/modules/cortical_borer/code/abilities/_borer_abilities.dm @@ -316,7 +316,7 @@ cortical_owner.chemical_evolution -= chemical_evo_points cortical_owner.known_chemicals += reagent_choice.type cortical_owner.blood_chems_learned++ - var/obj/item/organ/internal/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) if(victim_brain) cortical_owner.human_host.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5 * cortical_owner.host_harm_multiplier) if(cortical_owner.blood_chems_learned == BLOOD_CHEM_OBJECTIVE) @@ -354,7 +354,7 @@ cortical_owner.chemical_evolution -= chemical_evo_points cortical_owner.known_chemicals += reagent_choice cortical_owner.potential_chemicals -= reagent_choice - var/obj/item/organ/internal/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) if(victim_brain) cortical_owner.human_host.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5 * cortical_owner.host_harm_multiplier) owner.balloon_alert(owner, "[initial(reagent_choice.name)] learned") @@ -386,7 +386,7 @@ cortical_owner.max_chemical_storage += cortical_owner.chem_storage_per_level cortical_owner.chemical_regen += cortical_owner.chem_regen_per_level cortical_owner.level += 1 - var/obj/item/organ/internal/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) if(victim_brain) cortical_owner.human_host.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10 * cortical_owner.host_harm_multiplier) cortical_owner.human_host.adjust_eye_blur(6 SECONDS * cortical_owner.host_harm_multiplier) //about 12 seconds' worth by default @@ -543,7 +543,7 @@ var/mob/living/carbon/human/cortical_host = cortical_owner.human_host to_chat(cortical_host, span_boldwarning("Your voice moves without your permission!")) - var/obj/item/organ/internal/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) if(victim_brain) cortical_owner.human_host.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2 * cortical_owner.host_harm_multiplier) @@ -578,7 +578,7 @@ StartCooldown() return produce_egg() - var/obj/item/organ/internal/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/victim_brain = cortical_owner.human_host.get_organ_slot(ORGAN_SLOT_BRAIN) if(victim_brain) cortical_owner.human_host.adjustOrganLoss(ORGAN_SLOT_BRAIN, 25 * cortical_owner.host_harm_multiplier) var/eggroll = rand(1,100) @@ -654,7 +654,7 @@ cortical_owner.human_host.adjustOxyLoss(-(cortical_owner.human_host.getOxyLoss()*0.5)) if(cortical_owner.human_host.blood_volume < BLOOD_VOLUME_BAD) cortical_owner.human_host.blood_volume = BLOOD_VOLUME_BAD - for(var/obj/item/organ/internal/internal_target in cortical_owner.human_host.organs) + for(var/obj/item/organ/internal_target in cortical_owner.human_host.organs) internal_target.apply_organ_damage(-internal_target.damage * 0.5) cortical_owner.human_host.revive() to_chat(cortical_owner.human_host, span_boldwarning("Your heart jumpstarts!")) @@ -752,8 +752,8 @@ cortical_owner.chemical_storage -= chemical_cost var/turf/borer_turf = get_turf(cortical_owner) var/obj/item/bodypart/chest/chest = cortical_owner.human_host.get_bodypart(BODY_ZONE_CHEST) - if((!chest || IS_ORGANIC_LIMB(chest)) && !cortical_owner.human_host.get_organ_by_type(/obj/item/organ/internal/empowered_borer_egg)) - var/obj/item/organ/internal/empowered_borer_egg/spawned_egg = new(cortical_owner.human_host) + if((!chest || IS_ORGANIC_LIMB(chest)) && !cortical_owner.human_host.get_organ_by_type(/obj/item/organ/empowered_borer_egg)) + var/obj/item/organ/empowered_borer_egg/spawned_egg = new(cortical_owner.human_host) spawned_egg.generation = (cortical_owner.generation + 1) cortical_owner.children_produced += 1 diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm index 7609fbe5d6c..fc6f01f92e1 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(cortical_borers) return FALSE //borers also create an organ, so you dont need to debrain someone -/obj/item/organ/internal/borer_body +/obj/item/organ/borer_body name = "engorged cortical borer" desc = "the body of a cortical borer, full of human viscera, blood, and more." zone = BODY_ZONE_HEAD @@ -40,18 +40,18 @@ GLOBAL_LIST_EMPTY(cortical_borers) /// Ref to the borer who this organ belongs to var/mob/living/basic/cortical_borer/borer -/obj/item/organ/internal/borer_body/Destroy() +/obj/item/organ/borer_body/Destroy() borer = null return ..() -/obj/item/organ/internal/borer_body/mob_insert(mob/living/carbon/carbon_target, special, movement_flags) +/obj/item/organ/borer_body/mob_insert(mob/living/carbon/carbon_target, special, movement_flags) . = ..() for(var/datum/borer_focus/body_focus as anything in borer.body_focuses) body_focus.on_add() carbon_target.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type) //on removal, force the borer out -/obj/item/organ/internal/borer_body/mob_remove(mob/living/carbon/carbon_target, special) +/obj/item/organ/borer_body/mob_remove(mob/living/carbon/carbon_target, special) . = ..() var/mob/living/basic/cortical_borer/cb_inside = carbon_target.has_borer() for(var/datum/borer_focus/body_focus as anything in cb_inside.body_focuses) @@ -149,7 +149,7 @@ GLOBAL_LIST_EMPTY(cortical_borers) /// The human we are hosted in var/mob/living/carbon/human/human_host /// The brain we are currently hooked to - var/obj/item/organ/internal/brain/brain_host + var/obj/item/organ/brain/brain_host //what the host gains or loses with the borer var/list/hosts_abilities = list() //just a little "timer" to compare to world.time diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer_movement.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer_movement.dm index 8e967b43e7c..929db5ecc60 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer_movement.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer_movement.dm @@ -25,7 +25,7 @@ if(get_dist(victim, src) > 1) balloon_alert(src, "too far") return FALSE - var/obj/item/organ/internal/brain/brain = victim.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/brain = victim.get_organ_slot(ORGAN_SLOT_BRAIN) if(!istype(brain)) balloon_alert(src, "no brain") return FALSE @@ -40,7 +40,7 @@ to_chat(human_host, span_notice("A chilling sensation goes down your spine...")) copy_languages(human_host) - var/obj/item/organ/internal/borer_body/borer_organ = new() + var/obj/item/organ/borer_body/borer_organ = new() borer_organ.borer = src borer_organ.Insert(human_host) @@ -73,7 +73,7 @@ ///This is the version for correctly cleaning up the borer when qdeling/moving out. Don't call this directly /mob/living/basic/cortical_borer/proc/leave_host_clean() - var/obj/item/organ/internal/borer_body/borer_organ = locate() in human_host.organs + var/obj/item/organ/borer_body/borer_organ = locate() in human_host.organs if(borer_organ) borer_organ.Remove(human_host) if(brain_host) diff --git a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm index a2c0826542b..420a890450c 100644 --- a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm +++ b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/empowered_borer_egg +/obj/item/organ/empowered_borer_egg name = "strange egg" desc = "All slimy and yuck." icon_state = "innards" // not like you'll be seeing this anyway @@ -10,26 +10,26 @@ /// What generation the egg will be var/generation = 1 -/obj/item/organ/internal/empowered_borer_egg/on_find(mob/living/finder) +/obj/item/organ/empowered_borer_egg/on_find(mob/living/finder) ..() to_chat(finder, span_warning("You found an unknown egg in [owner]'s [zone]!")) -/obj/item/organ/internal/empowered_borer_egg/Initialize(mapload) +/obj/item/organ/empowered_borer_egg/Initialize(mapload) . = ..() if(iscarbon(loc)) Insert(loc) -/obj/item/organ/internal/empowered_borer_egg/mob_insert(mob/living/carbon/M, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/empowered_borer_egg/mob_insert(mob/living/carbon/M, special = FALSE, movement_flags = DELETE_IF_REPLACED) ..() addtimer(CALLBACK(src, PROC_REF(try_burst)), burst_time) -/obj/item/organ/internal/empowered_borer_egg/mob_remove(mob/living/carbon/M, special = FALSE) +/obj/item/organ/empowered_borer_egg/mob_remove(mob/living/carbon/M, special = FALSE) . = ..() visible_message(span_warning(span_italics("As [src] is cut out of [M], it quickly vibrates and shatters, leaving nothing but some goop!"))) new/obj/effect/decal/cleanable/food/egg_smudge(get_turf(src)) qdel(src) -/obj/item/organ/internal/empowered_borer_egg/proc/try_burst() +/obj/item/organ/empowered_borer_egg/proc/try_burst() if(!owner) qdel(src) return diff --git a/modular_skyrat/modules/cryosleep/code/cryopod.dm b/modular_skyrat/modules/cryosleep/code/cryopod.dm index 6da1a207057..5d80b7bb1b8 100644 --- a/modular_skyrat/modules/cryosleep/code/cryopod.dm +++ b/modular_skyrat/modules/cryosleep/code/cryopod.dm @@ -441,7 +441,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod, 32) // Allows players to cryo others. Checks if they have been AFK for 30 minutes. if(target.key && user != target) - if (target.get_organ_by_type(/obj/item/organ/internal/brain) ) //Target the Brain + if (target.get_organ_by_type(/obj/item/organ/brain) ) //Target the Brain if(!target.mind || target.ssd_indicator ) // Is the character empty / AI Controlled if(target.lastclienttime + ssd_time >= world.time) to_chat(user, span_notice("You can't put [target] into [src] for another [round(((ssd_time - (world.time - target.lastclienttime)) / (1 MINUTES)), 1)] minutes.")) diff --git a/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm b/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm index 9d88e61442a..fcc9f2665c2 100644 --- a/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm +++ b/modular_skyrat/modules/customization/datums/components/crafting/recipes.dm @@ -1,10 +1,10 @@ /datum/crafting_recipe/food/haggis name = "Haggis" reqs = list( - /obj/item/organ/internal/heart = 1, - /obj/item/organ/internal/liver = 1, - /obj/item/organ/internal/lungs = 1, - /obj/item/organ/internal/stomach = 1, + /obj/item/organ/heart = 1, + /obj/item/organ/liver = 1, + /obj/item/organ/lungs = 1, + /obj/item/organ/stomach = 1, /obj/item/food/grown/onion = 1, /obj/item/food/grown/oat = 1, /datum/reagent/consumable/salt = 1, diff --git a/modular_skyrat/modules/customization/datums/dna.dm b/modular_skyrat/modules/customization/datums/dna.dm index f504fa1ced6..176443dde3b 100644 --- a/modular_skyrat/modules/customization/datums/dna.dm +++ b/modular_skyrat/modules/customization/datums/dna.dm @@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(total_uf_len_by_block) set_facial_haircolor(sanitize_hexcolor(get_uni_identity_block(structure, DNA_FACIAL_HAIR_COLOR_BLOCK)), update = FALSE) if(eyeorgancolor_update) - var/obj/item/organ/internal/eyes/eye_organ = get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/eye_organ = get_organ_slot(ORGAN_SLOT_EYES) eye_organ.eye_color_left = eye_color_left eye_organ.eye_color_right = eye_color_right eye_organ.old_eye_color_left = eye_color_left diff --git a/modular_skyrat/modules/customization/modules/client/augment/implants.dm b/modular_skyrat/modules/customization/modules/client/augment/implants.dm index 9abdce1a5db..e6a45ce1615 100644 --- a/modular_skyrat/modules/customization/modules/client/augment/implants.dm +++ b/modular_skyrat/modules/customization/modules/client/augment/implants.dm @@ -22,7 +22,7 @@ /datum/augment_item/implant/l_arm/razor_claws name = "Left Razor Claws" cost = 4 - path = /obj/item/organ/internal/cyberimp/arm/razor_claws/left_arm + path = /obj/item/organ/cyberimp/arm/razor_claws/left_arm //RIGHT ARM IMPLANTS /datum/augment_item/implant/r_arm @@ -31,7 +31,7 @@ /datum/augment_item/implant/r_arm/razor_claws name = "Right Razor Claws" cost = 4 - path = /obj/item/organ/internal/cyberimp/arm/razor_claws/right_arm + path = /obj/item/organ/cyberimp/arm/razor_claws/right_arm //EYES IMPLANTS /datum/augment_item/implant/eyes @@ -44,4 +44,4 @@ /datum/augment_item/implant/mouth/breathing_tube name = "Breathing Tube" cost = 2 - path = /obj/item/organ/internal/cyberimp/mouth/breathing_tube + path = /obj/item/organ/cyberimp/mouth/breathing_tube diff --git a/modular_skyrat/modules/customization/modules/client/augment/organs.dm b/modular_skyrat/modules/customization/modules/client/augment/organs.dm index ffc4e8b1263..60655e8e65d 100644 --- a/modular_skyrat/modules/customization/modules/client/augment/organs.dm +++ b/modular_skyrat/modules/customization/modules/client/augment/organs.dm @@ -6,28 +6,28 @@ return var/obj/item/organ/organ_path = path // cast this to an organ so we can get the slot from it using initial() - + if(slot == AUGMENT_SLOT_BRAIN) - var/obj/item/organ/internal/brain/old_brain = human_holder.get_organ_slot(ORGAN_SLOT_BRAIN) - var/obj/item/organ/internal/brain/new_brain = new organ_path() + var/obj/item/organ/brain/old_brain = human_holder.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/new_brain = new organ_path() var/datum/mind/holder_mind = human_holder.mind new_brain.modular_persistence = old_brain.modular_persistence old_brain.modular_persistence = null - + new_brain.copy_traits_from(old_brain) new_brain.Insert(human_holder, special = TRUE) old_brain.moveToNullspace() //for some reason it doesn't want to be deleted. So I'm using this hack method until it can be figured out why. But, it works! STOP_PROCESSING(SSobj, old_brain) - + if(!holder_mind) return - + holder_mind.transfer_to(human_holder, TRUE) else var/obj/item/organ/new_organ = new path() - + new_organ.copy_traits_from(human_holder.get_organ_slot(initial(organ_path.slot))) new_organ.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED) @@ -39,7 +39,7 @@ /datum/augment_item/organ/brain/cortical name = "Cortically-Augmented Brain" slot = AUGMENT_SLOT_BRAIN - path = /obj/item/organ/internal/brain/cybernetic/cortical + path = /obj/item/organ/brain/cybernetic/cortical //EDIT END //HEARTS @@ -48,7 +48,7 @@ /datum/augment_item/organ/heart/cybernetic name = "Cybernetic heart" - path = /obj/item/organ/internal/heart/cybernetic + path = /obj/item/organ/heart/cybernetic //LUNGS /datum/augment_item/organ/lungs @@ -57,27 +57,27 @@ /datum/augment_item/organ/lungs/hot name = "Heat-Adapted Lungs" slot = AUGMENT_SLOT_LUNGS - path = /obj/item/organ/internal/lungs/adaptive/hot + path = /obj/item/organ/lungs/adaptive/hot cost = 1 /datum/augment_item/organ/lungs/cold name = "Cold-Adapted Lungs" slot = AUGMENT_SLOT_LUNGS - path = /obj/item/organ/internal/lungs/adaptive/cold + path = /obj/item/organ/lungs/adaptive/cold cost = 1 /datum/augment_item/organ/lungs/toxin name = "Toxins-Adapted Lungs" slot = AUGMENT_SLOT_LUNGS - path = /obj/item/organ/internal/lungs/toxin + path = /obj/item/organ/lungs/toxin cost = 1 /datum/augment_item/organ/lungs/oxy name = "Low Oxygen-Adapted Lungs" slot = AUGMENT_SLOT_LUNGS - path = /obj/item/organ/internal/lungs/oxy + path = /obj/item/organ/lungs/oxy cost = 1 /datum/augment_item/organ/lungs/cybernetic name = "Cybernetic lungs" - path = /obj/item/organ/internal/lungs/cybernetic + path = /obj/item/organ/lungs/cybernetic //LIVERS /datum/augment_item/organ/liver @@ -85,7 +85,7 @@ /datum/augment_item/organ/liver/cybernetic name = "Cybernetic liver" - path = /obj/item/organ/internal/liver/cybernetic + path = /obj/item/organ/liver/cybernetic //STOMACHES /datum/augment_item/organ/stomach @@ -93,7 +93,7 @@ /datum/augment_item/organ/stomach/cybernetic name = "Cybernetic stomach" - path = /obj/item/organ/internal/stomach/cybernetic + path = /obj/item/organ/stomach/cybernetic //EYES /datum/augment_item/organ/eyes @@ -101,21 +101,21 @@ /datum/augment_item/organ/eyes/cybernetic name = "Cybernetic eyes" - path = /obj/item/organ/internal/eyes/robotic + path = /obj/item/organ/eyes/robotic /datum/augment_item/organ/eyes/cybernetic/moth name = "Cybernetic moth eyes" - path = /obj/item/organ/internal/eyes/robotic/moth + path = /obj/item/organ/eyes/robotic/moth /datum/augment_item/organ/eyes/highlumi name = "High-luminosity eyes" - path = /obj/item/organ/internal/eyes/robotic/glow + path = /obj/item/organ/eyes/robotic/glow allowed_biotypes = MOB_ORGANIC|MOB_ROBOTIC cost = 1 /datum/augment_item/organ/eyes/highlumi/moth name = "High Luminosity Moth Eyes" - path = /obj/item/organ/internal/eyes/robotic/glow/moth + path = /obj/item/organ/eyes/robotic/glow/moth allowed_biotypes = MOB_ORGANIC|MOB_ROBOTIC cost = 1 @@ -125,24 +125,24 @@ /datum/augment_item/organ/tongue/normal name = "Organic tongue" - path = /obj/item/organ/internal/tongue/human + path = /obj/item/organ/tongue/human /datum/augment_item/organ/tongue/robo name = "Robotic voicebox" - path = /obj/item/organ/internal/tongue/robot + path = /obj/item/organ/tongue/robot /datum/augment_item/organ/tongue/robo/forked name = "Robotic lizard voicebox" - path = /obj/item/organ/internal/tongue/lizard/robot + path = /obj/item/organ/tongue/lizard/robot /datum/augment_item/organ/tongue/cybernetic name = "Cybernetic tongue" - path = /obj/item/organ/internal/tongue/cybernetic + path = /obj/item/organ/tongue/cybernetic /datum/augment_item/organ/tongue/cybernetic/forked name = "Forked cybernetic tongue" - path = /obj/item/organ/internal/tongue/lizard/cybernetic + path = /obj/item/organ/tongue/lizard/cybernetic /datum/augment_item/organ/tongue/forked name = "Forked tongue" - path = /obj/item/organ/internal/tongue/lizard + path = /obj/item/organ/tongue/lizard diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index e00f0eec0e4..5144349da6d 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm @@ -120,7 +120,7 @@ /datum/sprite_accessory/moth_markings key = "moth_markings" generic = "Moth markings" - // organ_type = /obj/item/organ/external/moth_markings // UNCOMMENT THIS IF THEY EVER FIX IT UPSTREAM, CAN'T BE BOTHERED TO FIX IT MYSELF + // organ_type = /obj/item/organ/moth_markings // UNCOMMENT THIS IF THEY EVER FIX IT UPSTREAM, CAN'T BE BOTHERED TO FIX IT MYSELF /datum/sprite_accessory/moth_markings/is_hidden(mob/living/carbon/human/owner) return FALSE @@ -133,7 +133,7 @@ icon = 'modular_skyrat/master_files/icons/mob/species/podperson_hair.dmi' key = "pod_hair" recommended_species = list(SPECIES_PODPERSON, SPECIES_PODPERSON_WEAK) - organ_type = /obj/item/organ/external/pod_hair + organ_type = /obj/item/organ/pod_hair /datum/sprite_accessory/pod_hair/none name = SPRITE_ACCESSORY_NONE @@ -146,7 +146,7 @@ icon = 'icons/mob/human/species/mush_cap.dmi' relevent_layers = list(BODY_ADJ_LAYER) color_src = USE_ONE_COLOR - organ_type = /obj/item/organ/external/mushroom_cap + organ_type = /obj/item/organ/mushroom_cap genetic = TRUE /datum/sprite_accessory/caps/is_hidden(mob/living/carbon/human/human) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm index 37bbbb0b44e..45968c80e18 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/ears key = "ears" generic = "Ears" - organ_type = /obj/item/organ/internal/ears/mutant + organ_type = /obj/item/organ/ears/mutant relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) color_src = USE_MATRIXED_COLORS genetic = TRUE @@ -42,7 +42,7 @@ /datum/sprite_accessory/ears/mutant icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/ears.dmi' - organ_type = /obj/item/organ/internal/ears/mutant + organ_type = /obj/item/organ/ears/mutant color_src = USE_MATRIXED_COLORS recommended_species = list(SPECIES_MAMMAL, SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_HUMANOID, SPECIES_GHOUL) uses_emissives = TRUE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm index 11353509aa8..144a41f7102 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/fluff.dm @@ -6,7 +6,7 @@ recommended_species = list(SPECIES_MOTH, SPECIES_MAMMAL, SPECIES_INSECT) relevent_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/fluff + organ_type = /obj/item/organ/fluff /datum/sprite_accessory/fluff/moth/none name = SPRITE_ACCESSORY_NONE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm index 92cf47307a3..e5a4fe48b36 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/frills.dm @@ -4,7 +4,7 @@ default_color = DEFAULT_SECONDARY relevent_layers = list(BODY_ADJ_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/frills + organ_type = /obj/item/organ/frills /datum/sprite_accessory/frills/is_hidden(mob/living/carbon/human/human) if((human.head?.flags_inv & HIDEEARS) || (key in human.try_hide_mutant_parts)) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm index 4e00fd4ee18..06988f66759 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm @@ -9,7 +9,7 @@ var/genital_location = GROIN /datum/sprite_accessory/genital/is_hidden(mob/living/carbon/human/target_mob) - var/obj/item/organ/external/genital/badonkers = target_mob.get_organ_slot(associated_organ_slot) + var/obj/item/organ/genital/badonkers = target_mob.get_organ_slot(associated_organ_slot) if(!badonkers) return TRUE switch(badonkers.visibility_preference) @@ -57,7 +57,7 @@ /datum/sprite_accessory/genital/penis icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/penis_onmob.dmi' - organ_type = /obj/item/organ/external/genital/penis + organ_type = /obj/item/organ/genital/penis associated_organ_slot = ORGAN_SLOT_PENIS key = ORGAN_SLOT_PENIS color_src = USE_MATRIXED_COLORS @@ -133,7 +133,7 @@ /datum/sprite_accessory/genital/testicles icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi' - organ_type = /obj/item/organ/external/genital/testicles + organ_type = /obj/item/organ/genital/testicles associated_organ_slot = ORGAN_SLOT_TESTICLES key = ORGAN_SLOT_TESTICLES always_color_customizable = TRUE @@ -178,7 +178,7 @@ /datum/sprite_accessory/genital/vagina icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/vagina_onmob.dmi' - organ_type = /obj/item/organ/external/genital/vagina + organ_type = /obj/item/organ/genital/vagina associated_organ_slot = ORGAN_SLOT_VAGINA key = ORGAN_SLOT_VAGINA always_color_customizable = TRUE @@ -229,7 +229,7 @@ name = "Cloaca" /datum/sprite_accessory/genital/womb - organ_type = /obj/item/organ/external/genital/womb + organ_type = /obj/item/organ/genital/womb associated_organ_slot = ORGAN_SLOT_WOMB key = ORGAN_SLOT_WOMB genetic = TRUE @@ -246,7 +246,7 @@ color_src = null /datum/sprite_accessory/genital/anus - organ_type = /obj/item/organ/external/genital/anus + organ_type = /obj/item/organ/genital/anus associated_organ_slot = ORGAN_SLOT_ANUS key = ORGAN_SLOT_ANUS genetic = TRUE @@ -264,7 +264,7 @@ /datum/sprite_accessory/genital/breasts icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/breasts_onmob.dmi' - organ_type = /obj/item/organ/external/genital/breasts + organ_type = /obj/item/organ/genital/breasts associated_organ_slot = ORGAN_SLOT_BREASTS key = ORGAN_SLOT_BREASTS always_color_customizable = TRUE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm index ceb3b84a0d7..4309361c389 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/head_accessory.dm @@ -4,7 +4,7 @@ generic = "Head Accessory" relevent_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/head_accessory + organ_type = /obj/item/organ/head_accessory /datum/sprite_accessory/head_accessory/none name = SPRITE_ACCESSORY_NONE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm index 30646cf26e4..dda1930cf5c 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/horns.dm @@ -5,7 +5,7 @@ icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/horns.dmi' default_color = "#555555" genetic = TRUE - organ_type = /obj/item/organ/external/horns + organ_type = /obj/item/organ/horns /datum/sprite_accessory/horns/is_hidden(mob/living/carbon/human/wearer) if(!wearer.head && !wearer.wear_mask) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm index 4d0584d8636..ec470d3f24c 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/ipc.dm @@ -8,7 +8,7 @@ key = MUTANT_SYNTH_SCREEN generic = "Screen" relevent_layers = list(BODY_FRONT_UNDER_CLOTHES) - organ_type = /obj/item/organ/external/synth_screen + organ_type = /obj/item/organ/synth_screen /datum/sprite_accessory/screen/none name = SPRITE_ACCESSORY_NONE @@ -151,7 +151,7 @@ generic = "Antenna" relevent_layers = list(BODY_ADJ_LAYER) genetic = FALSE - organ_type = /obj/item/organ/external/synth_antenna + organ_type = /obj/item/organ/synth_antenna /datum/sprite_accessory/antenna/is_hidden(mob/living/carbon/human/wearer) if(!wearer.head) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm index 9d0102a7ece..823be356de3 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/moth_antennae.dm @@ -3,7 +3,7 @@ key = "moth_antennae" relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/antennae + organ_type = /obj/item/organ/antennae /datum/sprite_accessory/moth_antennae/is_hidden(mob/living/carbon/human/wearer) if(!wearer.head) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm index d5533091e4a..4580dec4ab4 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/neck_accessory.dm @@ -4,7 +4,7 @@ generic = "Neck Accessory" relevent_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/neck_accessory + organ_type = /obj/item/organ/neck_accessory /datum/sprite_accessory/neck_accessory/none name = SPRITE_ACCESSORY_NONE diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm index 1b521eb606a..7d2c909f3f0 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/skrell_hair.dm @@ -5,7 +5,7 @@ color_src = USE_MATRIXED_COLORS relevent_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/skrell_hair + organ_type = /obj/item/organ/skrell_hair /datum/sprite_accessory/skrell_hair/is_hidden(mob/living/carbon/human/wearer) if((wearer.head?.flags_inv & HIDEHAIR) || (wearer.wear_mask?.flags_inv & HIDEHAIR)) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm index 830a1aac4fe..3420dfffc68 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm @@ -3,7 +3,7 @@ generic = "Snout" icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/lizard_snouts.dmi' flags_for_organ = SPRITE_ACCESSORY_USE_MUZZLED_SPRITE - organ_type = /obj/item/organ/external/snout + organ_type = /obj/item/organ/snout recommended_species = list(SPECIES_MAMMAL, SPECIES_LIZARD, SPECIES_UNATHI, SPECIES_LIZARD_ASH, SPECIES_LIZARD_SILVER) relevent_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) genetic = TRUE @@ -14,7 +14,7 @@ return FALSE -/obj/item/organ/external/snout +/obj/item/organ/snout mutantpart_key = "snout" mutantpart_info = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF", "#FFFFFF", "#FFFFFF")) external_bodyshapes = NONE // We don't actually want this to have by default, since some of them don't apply that. @@ -30,7 +30,7 @@ return !sprite_datum.is_hidden(human) -/obj/item/organ/external/snout/mob_insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/snout/mob_insert(mob/living/carbon/receiver, special, movement_flags) if(sprite_accessory_flags & SPRITE_ACCESSORY_USE_MUZZLED_SPRITE) external_bodyshapes |= BODYSHAPE_SNOUTED if(sprite_accessory_flags & SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER) @@ -38,14 +38,14 @@ return ..() -/obj/item/organ/external/snout/top +/obj/item/organ/snout/top bodypart_overlay = /datum/bodypart_overlay/mutant/snout/top /datum/bodypart_overlay/mutant/snout/top layers = EXTERNAL_FRONT -/obj/item/organ/external/snout/top_adj +/obj/item/organ/snout/top_adj bodypart_overlay = /datum/bodypart_overlay/mutant/snout/top_adj /datum/bodypart_overlay/mutant/snout/top_adj @@ -117,7 +117,7 @@ icon_state = "bug" flags_for_organ = NONE color_src = USE_MATRIXED_COLORS - organ_type = /obj/item/organ/external/snout/top_adj + organ_type = /obj/item/organ/snout/top_adj /datum/sprite_accessory/snouts/mammal/bug_no_eyes name = "Bug (No eyes)" @@ -251,7 +251,7 @@ /datum/sprite_accessory/snouts/mammal/top flags_for_organ = SPRITE_ACCESSORY_USE_MUZZLED_SPRITE | SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER - organ_type = /obj/item/organ/external/snout/top + organ_type = /obj/item/organ/snout/top relevent_layers = list(BODY_FRONT_LAYER) /datum/sprite_accessory/snouts/mammal/top/fbird @@ -267,7 +267,7 @@ icon_state = "fbug" flags_for_organ = NONE color_src = USE_MATRIXED_COLORS - organ_type = /obj/item/organ/external/snout/top_adj + organ_type = /obj/item/organ/snout/top_adj relevent_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/snouts/mammal/top/felephant diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm index fb2cf49ad70..e78b1e19ffe 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/spines.dm @@ -5,7 +5,7 @@ recommended_species = list(SPECIES_LIZARD, SPECIES_UNATHI, SPECIES_LIZARD_ASH, SPECIES_LIZARD_SILVER) relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/spines + organ_type = /obj/item/organ/spines /datum/sprite_accessory/spines/is_hidden(mob/living/carbon/human/wearer) if(wearer.w_uniform) diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/synthliz.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/synthliz.dm index 30efbc68f34..3347e757e5b 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/synthliz.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/synthliz.dm @@ -146,7 +146,7 @@ taur_mode = STYLE_TAUR_PAW recommended_species = list() genetic = FALSE - organ_type = /obj/item/organ/external/taur_body/horselike/synth + organ_type = /obj/item/organ/taur_body/horselike/synth /datum/sprite_accessory/taur/synthliz/inv name = "Cybernetic Lizard (Inverted)" @@ -182,13 +182,13 @@ name = "Cybernetic Naga" icon_state = "synthnaga" taur_mode = STYLE_TAUR_SNAKE - organ_type = /obj/item/organ/external/taur_body/serpentine/synth + organ_type = /obj/item/organ/taur_body/serpentine/synth /datum/sprite_accessory/taur/synthliz/biglegs name = "Synthetic Big Legs" icon_state = "biglegs" taur_mode = STYLE_TAUR_PAW - organ_type = /obj/item/organ/external/taur_body/anthro/synth + organ_type = /obj/item/organ/taur_body/anthro/synth /datum/sprite_accessory/taur/synthliz/biglegs/stanced name = "Synthetic Big Legs, Stanced" diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm index 9a986ca7953..db142ce4230 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/tails key = "tail" generic = "Tail" - organ_type = /obj/item/organ/external/tail + organ_type = /obj/item/organ/tail icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/tails.dmi' relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) genetic = TRUE @@ -37,7 +37,7 @@ /datum/sprite_accessory/tails/lizard icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/tails.dmi' recommended_species = list(SPECIES_LIZARD, SPECIES_LIZARD_ASH, SPECIES_MAMMAL, SPECIES_UNATHI, SPECIES_LIZARD_SILVER) - organ_type = /obj/item/organ/external/tail/lizard + organ_type = /obj/item/organ/tail/lizard /datum/sprite_accessory/tails/lizard/short/twotone name = "Short (Two-Tone)" @@ -46,7 +46,7 @@ /datum/sprite_accessory/tails/human recommended_species = list(SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_MAMMAL, SPECIES_GHOUL) - organ_type = /obj/item/organ/external/tail/cat + organ_type = /obj/item/organ/tail/cat /datum/sprite_accessory/tails/human/cat icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/tails.dmi' @@ -58,16 +58,16 @@ icon_state = "monkey" icon = 'icons/mob/human/species/monkey/monkey_tail.dmi' recommended_species = list(SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_MAMMAL, SPECIES_MONKEY, SPECIES_GHOUL) - organ_type = /obj/item/organ/external/tail/monkey + organ_type = /obj/item/organ/tail/monkey /datum/sprite_accessory/tails/mammal icon_state = "none" recommended_species = list(SPECIES_MAMMAL,SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_HUMANOID, SPECIES_GHOUL) - organ_type = /obj/item/organ/external/tail/fluffy/no_wag + organ_type = /obj/item/organ/tail/fluffy/no_wag color_src = USE_MATRIXED_COLORS /datum/sprite_accessory/tails/mammal/wagging - organ_type = /obj/item/organ/external/tail/fluffy + organ_type = /obj/item/organ/tail/fluffy flags_for_organ = SPRITE_ACCESSORY_WAG_ABLE /datum/sprite_accessory/tails/mammal/wagging/akula diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm index 825d14cc0e5..19ac9f2f218 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/taur_types.dm @@ -24,7 +24,7 @@ center = TRUE relevent_layers = list(BODY_FRONT_LAYER, BODY_ADJ_LAYER, BODY_FRONT_UNDER_CLOTHES, ABOVE_BODY_FRONT_HEAD_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/taur_body/horselike // horselike by default, dont forget to override if you make another bodytype + organ_type = /obj/item/organ/taur_body/horselike // horselike by default, dont forget to override if you make another bodytype flags_for_organ = SPRITE_ACCESSORY_HIDE_SHOES /// Must be a single specific tauric suit variation bitflag. Don't do FLAG_1|FLAG_2 var/taur_mode = NONE @@ -32,7 +32,7 @@ var/alt_taur_mode = NONE /datum/sprite_accessory/taur/is_hidden(mob/living/carbon/human/target) - var/obj/item/organ/external/taur_body/taur_body = target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/taur_body = target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) if (taur_body?.hide_self) return TRUE @@ -85,7 +85,7 @@ icon_state = "deer" taur_mode = STYLE_TAUR_HOOF alt_taur_mode = STYLE_TAUR_PAW - organ_type = /obj/item/organ/external/taur_body/horselike/deer + organ_type = /obj/item/organ/taur_body/horselike/deer /datum/sprite_accessory/taur/drake name = "Drake" @@ -99,12 +99,12 @@ /datum/sprite_accessory/taur/tarantula name = "Tarantula" icon_state = "tarantula" - organ_type = /obj/item/organ/external/taur_body/spider + organ_type = /obj/item/organ/taur_body/spider /datum/sprite_accessory/taur/drider name = "Drider" icon_state = "drider" - organ_type = /obj/item/organ/external/taur_body/spider + organ_type = /obj/item/organ/taur_body/spider /datum/sprite_accessory/taur/eevee name = "Eevee" @@ -121,7 +121,7 @@ name = "Naga" icon_state = "naga" taur_mode = STYLE_TAUR_SNAKE - organ_type = /obj/item/organ/external/taur_body/serpentine + organ_type = /obj/item/organ/taur_body/serpentine /datum/sprite_accessory/taur/naga/striped name = "Naga, Striped" @@ -148,7 +148,7 @@ icon_state = "tentacle" taur_mode = STYLE_TAUR_SNAKE color_src = USE_ONE_COLOR - organ_type = /obj/item/organ/external/taur_body/tentacle + organ_type = /obj/item/organ/taur_body/tentacle /datum/sprite_accessory/taur/tentacle/alt name = "Tentacle, Alt" @@ -171,20 +171,20 @@ icon_state = "goop" taur_mode = STYLE_TAUR_SNAKE color_src = USE_ONE_COLOR - organ_type = /obj/item/organ/external/taur_body/blob + organ_type = /obj/item/organ/taur_body/blob /datum/sprite_accessory/taur/slime name = "Slime" icon_state = "slime" taur_mode = STYLE_TAUR_SNAKE color_src = USE_ONE_COLOR - organ_type = /obj/item/organ/external/taur_body/blob + organ_type = /obj/item/organ/taur_body/blob /datum/sprite_accessory/taur/biglegs name = "Big Legs" icon_state = "biglegs" taur_mode = STYLE_TAUR_PAW - organ_type = /obj/item/organ/external/taur_body/anthro + organ_type = /obj/item/organ/taur_body/anthro /datum/sprite_accessory/taur/biglegs/stanced name = "Big Legs, Stanced" diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/vox.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/vox.dm index c0abbea701c..29ad5a9c30e 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/vox.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/vox.dm @@ -122,7 +122,7 @@ name = "Vox Tail" icon_state = "vox" recommended_species = list(SPECIES_VOX) - organ_type = /obj/item/organ/external/tail/lizard + organ_type = /obj/item/organ/tail/lizard spine_key = SPINE_KEY_VOX //The tail markings diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm index 48f4d616790..9cbfd06213d 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/wings.dm @@ -11,7 +11,7 @@ key = "wings" color_src = USE_ONE_COLOR recommended_species = list(SPECIES_HUMAN, SPECIES_SYNTH, SPECIES_FELINE, SPECIES_LIZARD, SPECIES_MAMMAL) - organ_type = /obj/item/organ/external/wings + organ_type = /obj/item/organ/wings relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER, BODY_ADJ_LAYER) genetic = TRUE @@ -304,7 +304,7 @@ icon = 'modular_skyrat/master_files/icons/mob/sprite_accessory/moth_wings.dmi' // Needs new icon to suit new naming convention default_color = "#FFFFFF" recommended_species = list(SPECIES_MOTH, SPECIES_MAMMAL, SPECIES_INSECT) // Mammals too, I guess. They wont get flight though, see the wing organs for that logic - organ_type = /obj/item/organ/external/wings/moth + organ_type = /obj/item/organ/wings/moth relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/wings/moth/none diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm index ee26228f7b6..3b9ba173f38 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/xeno.dm @@ -5,7 +5,7 @@ color_src = USE_ONE_COLOR relevent_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/xenodorsal + organ_type = /obj/item/organ/xenodorsal /datum/sprite_accessory/xenodorsal/none name = SPRITE_ACCESSORY_NONE @@ -48,7 +48,7 @@ key = "xenohead" relevent_layers = list(BODY_ADJ_LAYER) genetic = TRUE - organ_type = /obj/item/organ/external/xenohead + organ_type = /obj/item/organ/xenohead /datum/sprite_accessory/xenohead/none name = SPRITE_ACCESSORY_NONE diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm index 4531754b8a1..f528d35aa72 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_accessory_handler.dm @@ -30,7 +30,7 @@ if(!wearer?.organs) return - for(var/obj/item/organ/external/to_update in wearer.organs) + for(var/obj/item/organ/to_update in wearer.organs) to_update.bodypart_overlay.set_modsuit_status(status) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm index ccccc9c736f..8a4aaab24f3 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm @@ -16,7 +16,7 @@ continue if(G.is_hidden(src)) continue - var/obj/item/organ/external/genital/ORG = get_organ_slot(G.associated_organ_slot) + var/obj/item/organ/genital/ORG = get_organ_slot(G.associated_organ_slot) if(!ORG) continue line += ORG.get_description_string(G) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm index 78d9ee3151a..997bc458cd4 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species.dm @@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(customizable_races) if(noggin && !(HAS_TRAIT(species_human, TRAIT_HUSK))) if(noggin.head_flags & HEAD_EYESPRITES) - var/obj/item/organ/internal/eyes/eye_organ = species_human.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/eye_organ = species_human.get_organ_slot(ORGAN_SLOT_EYES) if(eye_organ) eye_organ.refresh(call_update = FALSE) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm index cec75599014..80d0e2deab1 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm @@ -17,8 +17,8 @@ OFFSET_HAIR = list(0, 1), ) eyes_icon = 'modular_skyrat/modules/organs/icons/akula_eyes.dmi' - mutanteyes = /obj/item/organ/internal/eyes/akula - mutanttongue = /obj/item/organ/internal/tongue/akula + mutanteyes = /obj/item/organ/eyes/akula + mutanttongue = /obj/item/organ/tongue/akula inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_CAN_STRIP, @@ -106,12 +106,12 @@ regenerate_organs(akula, src, visual_only = TRUE) akula.update_body(TRUE) -/obj/item/organ/internal/eyes/akula +/obj/item/organ/eyes/akula // Eyes over hair as bandaid for the low amounts of head matching hair eyes_layer = HAIR_LAYER-0.1 -/obj/item/organ/internal/tongue/akula +/obj/item/organ/tongue/akula liked_foodtypes = SEAFOOD | RAW disliked_foodtypes = CLOTH | DAIRY toxic_foodtypes = TOXIC diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm index bdd20d6b2d4..89c955a08fb 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm @@ -10,7 +10,7 @@ ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list() - mutanttongue = /obj/item/organ/internal/tongue/aquatic + mutanttongue = /obj/item/organ/tongue/aquatic payday_modifier = 1.0 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT examine_limb_id = SPECIES_AKULA @@ -35,7 +35,7 @@ "wings" = list("None", FALSE), ) -/obj/item/organ/internal/tongue/aquatic +/obj/item/organ/tongue/aquatic liked_foodtypes = SEAFOOD | MEAT | FRUIT | GORE disliked_foodtypes = CLOTH | GROSS toxic_foodtypes = TOXIC diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm index 76c3bb57fec..de6be921592 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm @@ -9,7 +9,7 @@ TRAIT_LITERATE, TRAIT_USES_SKINTONES, ) - mutanttongue = /obj/item/organ/internal/tongue/dwarven + mutanttongue = /obj/item/organ/tongue/dwarven skinned_type = /obj/item/stack/sheet/animalhide/human changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT payday_modifier = 1.0 diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm index cc33a629553..dbf51708746 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm @@ -4,7 +4,7 @@ examine_limb_id = SPECIES_GHOUL can_have_genitals = FALSE //WHY WOULD YOU WANT TO FUCK ONE OF THESE THINGS? mutant_bodyparts = list("ghoulcolor" = "Tan Necrotic") - mutanttongue = /obj/item/organ/internal/tongue/ghoul + mutanttongue = /obj/item/organ/tongue/ghoul inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, TRAIT_RADIMMUNE, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_organ_corruption.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_organ_corruption.dm index aa8c21a6d0e..427e61b85ca 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_organ_corruption.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/_organ_corruption.dm @@ -12,7 +12,7 @@ /datum/component/organ_corruption dupe_mode = COMPONENT_DUPE_UNIQUE /// The type of organ affected by this specific type of organ corruption. - var/corruptable_organ_type = /obj/item/organ/internal + var/corruptable_organ_type = /obj/item/organ /// If this type of organ has a unique sprite for what its corrupted /// version should look like, this will be the icon file it will be pulled /// from. diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/atrophied_lungs.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/atrophied_lungs.dm index f83b2caaec5..c361c5d9957 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/atrophied_lungs.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/atrophied_lungs.dm @@ -1,4 +1,4 @@ /datum/component/organ_corruption/lungs - corruptable_organ_type = /obj/item/organ/internal/lungs + corruptable_organ_type = /obj/item/organ/lungs corrupted_prefix = "atrophied" diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm index bdac122950d..92c4d8047f6 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_liver.dm @@ -2,7 +2,7 @@ #define MINIMUM_BLOOD_REGENING_REAGENT_RATIO 0.75 /datum/component/organ_corruption/liver - corruptable_organ_type = /obj/item/organ/internal/liver + corruptable_organ_type = /obj/item/organ/liver corrupted_icon_state = "liver" @@ -23,7 +23,7 @@ /datum/component/organ_corruption/liver/UnregisterFromParent() . = ..() - var/obj/item/organ/internal/liver/parent_liver = parent + var/obj/item/organ/liver/parent_liver = parent if(parent_liver.owner) UnregisterSignal(parent_liver.owner, COMSIG_GLASS_DRANK) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm index 0420f45216b..202be6804ef 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_stomach.dm @@ -1,5 +1,5 @@ /datum/component/organ_corruption/stomach - corruptable_organ_type = /obj/item/organ/internal/stomach + corruptable_organ_type = /obj/item/organ/stomach corrupted_icon_state = "stomach" @@ -29,7 +29,7 @@ if(BLOODY & eaten.foodtypes) // They're good if it's BLOODY food, they're less good if it isn't. return - var/obj/item/organ/internal/parent_organ = parent + var/obj/item/organ/parent_organ = parent if(parent_organ.owner && HAS_TRAIT(parent_organ.owner, TRAIT_AGEUSIA)) // They don't taste anything, their body shouldn't react strongly to the taste of that stuff. return diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_tongue.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_tongue.dm index 53d99426d0e..2741ceff17f 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_tongue.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/corrupted_tongue.dm @@ -4,7 +4,7 @@ #define BLOOD_DRAIN_MULTIPLIER_CKEY 1.15 /datum/component/organ_corruption/tongue - corruptable_organ_type = /obj/item/organ/internal/tongue + corruptable_organ_type = /obj/item/organ/tongue corrupted_icon_state = "tongue" /// The item action given to the tongue once it was corrupted. var/tongue_action_type = /datum/action/cooldown/hemophage/drain_victim @@ -16,7 +16,7 @@ if(!.) return - var/obj/item/organ/internal/tongue/corrupted_tongue = corruption_target + var/obj/item/organ/tongue/corrupted_tongue = corruption_target corrupted_tongue.liked_foodtypes = BLOODY corrupted_tongue.disliked_foodtypes = NONE @@ -126,7 +126,7 @@ // if you drained from a human with a client, congrats var/drained_multiplier = (is_target_human_with_client ? BLOOD_DRAIN_MULTIPLIER_CKEY : 1) - var/obj/item/organ/internal/stomach/hemophage/stomach_reference = hemophage.get_organ_slot(ORGAN_SLOT_STOMACH) + var/obj/item/organ/stomach/hemophage/stomach_reference = hemophage.get_organ_slot(ORGAN_SLOT_STOMACH) if(isnull(stomach_reference)) victim.blood_volume = clamp(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_actions.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_actions.dm index a46263935c8..e16431758d5 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_actions.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_actions.dm @@ -26,7 +26,7 @@ if(!owner || !ishuman(owner) || !target) return - var/obj/item/organ/internal/heart/hemophage/tumor = target + var/obj/item/organ/heart/hemophage/tumor = target if(!tumor || !istype(tumor)) // This shouldn't happen, but you can never be too careful. return diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_organs.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_organs.dm index 7a9cc37b6a0..268c0d4beff 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_organs.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_organs.dm @@ -7,19 +7,19 @@ #define ORGAN_CORRUPTION_INSTANT 0 -/obj/item/organ/internal/liver/hemophage +/obj/item/organ/liver/hemophage name = "liver" // Name change is handled by /datum/component/organ_corruption/corrupt_organ() desc = GENERIC_CORRUPTED_ORGAN_DESC icon = 'modular_skyrat/modules/organs/icons/hemophage_organs.dmi' organ_flags = ORGAN_EDIBLE | ORGAN_TUMOR_CORRUPTED -/obj/item/organ/internal/liver/hemophage/Initialize(mapload) +/obj/item/organ/liver/hemophage/Initialize(mapload) . = ..() AddComponent(/datum/component/organ_corruption/liver, time_to_corrupt = ORGAN_CORRUPTION_INSTANT) -/obj/item/organ/internal/liver/hemophage/handle_chemical(mob/living/carbon/affected_mob, datum/reagent/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/hemophage/handle_chemical(mob/living/carbon/affected_mob, datum/reagent/chem, seconds_per_tick, times_fired) . = ..() // parent returned COMSIG_MOB_STOP_REAGENT_CHECK or we are failing @@ -67,21 +67,21 @@ return TRUE -/obj/item/organ/internal/stomach/hemophage +/obj/item/organ/stomach/hemophage name = "stomach" // Name change is handled by /datum/component/organ_corruption/corrupt_organ() desc = GENERIC_CORRUPTED_ORGAN_DESC icon = 'modular_skyrat/modules/organs/icons/hemophage_organs.dmi' organ_flags = ORGAN_EDIBLE | ORGAN_TUMOR_CORRUPTED -/obj/item/organ/internal/stomach/hemophage/Initialize(mapload) +/obj/item/organ/stomach/hemophage/Initialize(mapload) . = ..() AddComponent(/datum/component/organ_corruption/stomach, time_to_corrupt = ORGAN_CORRUPTION_INSTANT) // I didn't feel like moving this behavior onto the component, it was just too annoying to do. -/obj/item/organ/internal/stomach/hemophage/on_life(seconds_per_tick, times_fired) +/obj/item/organ/stomach/hemophage/on_life(seconds_per_tick, times_fired) var/datum/reagent/blood/blood = reagents.has_reagent(/datum/reagent/blood) if(blood) blood.metabolization_rate = BLOOD_METABOLIZATION_RATE @@ -93,7 +93,7 @@ return ..() -/obj/item/organ/internal/tongue/hemophage +/obj/item/organ/tongue/hemophage name = "tongue" // Name change is handled by /datum/component/organ_corruption/corrupt_organ() desc = GENERIC_CORRUPTED_ORGAN_DESC icon = 'modular_skyrat/modules/organs/icons/hemophage_organs.dmi' @@ -102,7 +102,7 @@ disliked_foodtypes = NONE -/obj/item/organ/internal/tongue/hemophage/Initialize(mapload) +/obj/item/organ/tongue/hemophage/Initialize(mapload) . = ..() AddComponent(/datum/component/organ_corruption/tongue, time_to_corrupt = ORGAN_CORRUPTION_INSTANT) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm index 58080ecabad..a5591825a0d 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm @@ -17,10 +17,10 @@ ) inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC exotic_bloodtype = "U" - mutantheart = /obj/item/organ/internal/heart/hemophage - mutantliver = /obj/item/organ/internal/liver/hemophage - mutantstomach = /obj/item/organ/internal/stomach/hemophage - mutanttongue = /obj/item/organ/internal/tongue/hemophage + mutantheart = /obj/item/organ/heart/hemophage + mutantliver = /obj/item/organ/liver/hemophage + mutantstomach = /obj/item/organ/stomach/hemophage + mutanttongue = /obj/item/organ/tongue/hemophage mutantlungs = null changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT examine_limb_id = SPECIES_HUMAN diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm index fc711ee60b7..c1ed0d115d9 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_status_effects.dm @@ -21,7 +21,7 @@ if(!owner || !ishuman(owner)) return FALSE - var/obj/item/organ/internal/heart/hemophage/tumor_heart = owner.get_organ_by_type(/obj/item/organ/internal/heart/hemophage) + var/obj/item/organ/heart/hemophage/tumor_heart = owner.get_organ_by_type(/obj/item/organ/heart/hemophage) if(!tumor_heart) return FALSE @@ -36,7 +36,7 @@ if(!owner || !ishuman(owner)) return - var/obj/item/organ/internal/heart/hemophage/tumor_heart = owner.get_organ_by_type(/obj/item/organ/internal/heart/hemophage) + var/obj/item/organ/heart/hemophage/tumor_heart = owner.get_organ_by_type(/obj/item/organ/heart/hemophage) if(!tumor_heart) return @@ -73,7 +73,7 @@ if(!linked_alert) return - var/obj/item/organ/internal/heart/hemophage/tumor_heart = owner.get_organ_by_type(/obj/item/organ/internal/heart/hemophage) + var/obj/item/organ/heart/hemophage/tumor_heart = owner.get_organ_by_type(/obj/item/organ/heart/hemophage) if(tumor_heart) var/old_layer = tumor_heart.layer var/old_plane = tumor_heart.plane diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm index c715333654c..06c333d4016 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_tumor.dm @@ -12,7 +12,7 @@ #define FLOATING_POINT_ERROR_AVOIDING_FACTOR 1000 -/obj/item/organ/internal/heart/hemophage +/obj/item/organ/heart/hemophage name = "pulsating tumor" icon = 'modular_skyrat/modules/organs/icons/hemophage_organs.dmi' icon_state = "tumor-on" @@ -25,7 +25,7 @@ var/bloodloss_rate = NORMAL_BLOOD_DRAIN -/obj/item/organ/internal/heart/hemophage/mob_insert(mob/living/carbon/tumorful, special, movement_flags) +/obj/item/organ/heart/hemophage/mob_insert(mob/living/carbon/tumorful, special, movement_flags) . = ..() if(!. || !owner) return @@ -35,7 +35,7 @@ RegisterSignal(tumorful, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) -/obj/item/organ/internal/heart/hemophage/mob_remove(mob/living/carbon/tumorless, special = FALSE) +/obj/item/organ/heart/hemophage/mob_remove(mob/living/carbon/tumorless, special = FALSE) . = ..() SEND_SIGNAL(tumorless, COMSIG_PULSATING_TUMOR_REMOVED, tumorless) @@ -55,7 +55,7 @@ tumorless_human.remove_movespeed_modifier(/datum/movespeed_modifier/hemophage_dormant_state) -/obj/item/organ/internal/heart/hemophage/on_life(seconds_per_tick, times_fired) +/obj/item/organ/heart/hemophage/on_life(seconds_per_tick, times_fired) . = ..() // A Hemophage's tumor will be able to be operated on multiple times, so @@ -82,7 +82,7 @@ /// Simple helper proc that toggles the dormant state of the tumor, which also switches its appearance to reflect said change. -/obj/item/organ/internal/heart/hemophage/proc/toggle_dormant_state() +/obj/item/organ/heart/hemophage/proc/toggle_dormant_state() is_dormant = !is_dormant base_icon_state = is_dormant ? "[base_icon_state]-dormant" : initial(base_icon_state) @@ -101,12 +101,12 @@ /// Simple helper proc that returns whether or not the given hemophage is in a closet subtype (but not in any bodybag subtype). -/obj/item/organ/internal/heart/hemophage/proc/in_closet(mob/living/carbon/human/hemophage) +/obj/item/organ/heart/hemophage/proc/in_closet(mob/living/carbon/human/hemophage) return istype(hemophage.loc, /obj/structure/closet) && !istype(hemophage.loc, /obj/structure/closet/body_bag) /// Simple helper proc that returns whether or not the given hemophage is in total darkness. -/obj/item/organ/internal/heart/hemophage/proc/in_total_darkness(mob/living/carbon/human/hemophage) +/obj/item/organ/heart/hemophage/proc/in_total_darkness(mob/living/carbon/human/hemophage) var/turf/current_turf = get_turf(hemophage) if(!istype(current_turf)) return FALSE @@ -115,7 +115,7 @@ /// Whether or not we should be applying the healing status effect for the owner. -/obj/item/organ/internal/heart/hemophage/proc/can_heal_owner_damage() +/obj/item/organ/heart/hemophage/proc/can_heal_owner_damage() // We handle the least expensive checks first. if(owner.health >= owner.maxHealth || is_dormant || owner.blood_volume <= MINIMUM_VOLUME_FOR_REGEN || (!in_closet(owner) && !in_total_darkness(owner))) return FALSE @@ -126,7 +126,7 @@ /// Simple helper to toggle the hemophage's vulnerability (or lack thereof) based on the status of their tumor. /// This proc contains no check whatsoever, to avoid redundancy of null checks and such. /// That being said, it shouldn't be used by anything but the tumor, if you have to call it outside of that, you probably have gone wrong somewhere. -/obj/item/organ/internal/heart/hemophage/proc/toggle_dormant_tumor_vulnerabilities(mob/living/carbon/human/hemophage) +/obj/item/organ/heart/hemophage/proc/toggle_dormant_tumor_vulnerabilities(mob/living/carbon/human/hemophage) var/datum/physiology/hemophage_physiology = hemophage.physiology var/damage_multiplier = is_dormant ? DORMANT_DAMAGE_MULTIPLIER : 1 / DORMANT_DAMAGE_MULTIPLIER @@ -136,7 +136,7 @@ hemophage_physiology.stamina_mod *= damage_multiplier / 2 // Doing half here so that they don't instantly hit stam-crit when hit like only once. -/obj/item/organ/internal/heart/hemophage/proc/get_status_tab_item(mob/living/source, list/items) +/obj/item/organ/heart/hemophage/proc/get_status_tab_item(mob/living/source, list/items) SIGNAL_HANDLER items += "Current blood level: [owner.blood_volume]/[BLOOD_VOLUME_MAXIMUM]" diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/tumor_corruption.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/tumor_corruption.dm index df18d12b264..03743af54aa 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/tumor_corruption.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/tumor_corruption.dm @@ -27,19 +27,19 @@ * Handles corrupting already-existing organs upon having the tumor be inserted in the mob. */ /datum/element/tumor_corruption/proc/handle_organ_corruption_on_existing_organs(mob/living/carbon/organ_enjoyer) - var/obj/item/organ/internal/liver/liver = organ_enjoyer.get_organ_slot(ORGAN_SLOT_LIVER) + var/obj/item/organ/liver/liver = organ_enjoyer.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && !(liver.organ_flags & ORGAN_TUMOR_CORRUPTED)) liver.AddComponent(/datum/component/organ_corruption/liver) - var/obj/item/organ/internal/lungs/lungs = organ_enjoyer.get_organ_slot(ORGAN_SLOT_LUNGS) + var/obj/item/organ/lungs/lungs = organ_enjoyer.get_organ_slot(ORGAN_SLOT_LUNGS) if(lungs && !(lungs.organ_flags & ORGAN_TUMOR_CORRUPTED)) lungs.AddComponent(/datum/component/organ_corruption/lungs) - var/obj/item/organ/internal/stomach/stomach = organ_enjoyer.get_organ_slot(ORGAN_SLOT_STOMACH) + var/obj/item/organ/stomach/stomach = organ_enjoyer.get_organ_slot(ORGAN_SLOT_STOMACH) if(stomach && !(stomach.organ_flags & ORGAN_TUMOR_CORRUPTED)) stomach.AddComponent(/datum/component/organ_corruption/stomach) - var/obj/item/organ/internal/tongue/tongue = organ_enjoyer.get_organ_slot(ORGAN_SLOT_TONGUE) + var/obj/item/organ/tongue/tongue = organ_enjoyer.get_organ_slot(ORGAN_SLOT_TONGUE) if(tongue && !(tongue.organ_flags & ORGAN_TUMOR_CORRUPTED)) tongue.AddComponent(/datum/component/organ_corruption/tongue) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm index 97b21607c27..8cc6243658a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm @@ -9,7 +9,7 @@ ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG mutant_bodyparts = list() - mutanttongue = /obj/item/organ/internal/tongue/insect + mutanttongue = /obj/item/organ/tongue/insect payday_modifier = 1.0 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT examine_limb_id = SPECIES_INSECT diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm index a0899ed37e4..549a7cbad56 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm @@ -9,7 +9,7 @@ ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list() - mutanttongue = /obj/item/organ/internal/tongue/mammal + mutanttongue = /obj/item/organ/tongue/mammal payday_modifier = 1.0 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT bodypart_overrides = list( @@ -35,7 +35,7 @@ "neck_acc" = list("None", FALSE), ) -/obj/item/organ/internal/tongue/mammal +/obj/item/organ/tongue/mammal liked_foodtypes = GRAIN | MEAT disliked_foodtypes = CLOTH | GROSS | GORE toxic_foodtypes = TOXIC diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index a59bc755648..6e451078183 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -30,8 +30,8 @@ heatmod = 1 specific_alpha = 155 markings_alpha = 130 //This is set lower than the other so that the alpha values don't stack on top of each other so much - mutanteyes = /obj/item/organ/internal/eyes - mutanttongue = /obj/item/organ/internal/tongue/jelly + mutanteyes = /obj/item/organ/eyes + mutanttongue = /obj/item/organ/tongue/jelly bodypart_overrides = list( //Overriding jelly bodyparts BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/jelly/slime/roundstart, @@ -446,13 +446,13 @@ return switch(dna_alteration) if("Breasts Lactation") - var/obj/item/organ/external/genital/breasts/melons = alterer.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/melons = alterer.get_organ_slot(ORGAN_SLOT_BREASTS) alterer.dna.features["breasts_lactation"] = !alterer.dna.features["breasts_lactation"] melons.lactates = alterer.dna.features["breasts_lactation"] alterer.balloon_alert(alterer, "[alterer.dna.features["breasts_lactation"] ? "lactating" : "not lactating"]") if("Breasts Size") - var/obj/item/organ/external/genital/breasts/melons = alterer.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/melons = alterer.get_organ_slot(ORGAN_SLOT_BREASTS) var/new_size = tgui_input_list( alterer, "Choose your character's breasts size:", @@ -465,7 +465,7 @@ melons.set_size(alterer.dna.features["breasts_size"]) if("Penis Girth") - var/obj/item/organ/external/genital/penis/sausage = alterer.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis/sausage = alterer.get_organ_slot(ORGAN_SLOT_PENIS) var/max_girth = PENIS_MAX_GIRTH if(alterer.dna.features["penis_size"] >= max_girth) max_girth = alterer.dna.features["penis_size"] @@ -481,7 +481,7 @@ sausage.girth = alterer.dna.features["penis_girth"] if("Penis Length") - var/obj/item/organ/external/genital/penis/wang = alterer.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis/wang = alterer.get_organ_slot(ORGAN_SLOT_PENIS) var/new_length = tgui_input_number( alterer, "Choose your penis length:\n([PENIS_MIN_LENGTH]-[PENIS_MAX_LENGTH] inches)", @@ -498,7 +498,7 @@ wang.set_size(alterer.dna.features["penis_size"]) if("Penis Sheath") - var/obj/item/organ/external/genital/penis/schlong = alterer.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis/schlong = alterer.get_organ_slot(ORGAN_SLOT_PENIS) var/new_sheath = tgui_input_list( alterer, "Choose your penis sheath", @@ -514,7 +514,7 @@ alterer.balloon_alert(alterer, "[alterer.dna.features["penis_taur_mode"] ? "using taur penis" : "not using taur penis"]") if("Testicles Size") - var/obj/item/organ/external/genital/testicles/avocados = alterer.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/testicles/avocados = alterer.get_organ_slot(ORGAN_SLOT_TESTICLES) var/new_size = tgui_input_list( alterer, "Choose your character's testicles size:", diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm index c92c46a1406..1c6bf9b7ca7 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm @@ -14,16 +14,16 @@ bodytemp_cold_damage_limit = (T20C - 10) species_language_holder = /datum/language_holder/skrell mutant_bodyparts = list() - mutanttongue = /obj/item/organ/internal/tongue/skrell + mutanttongue = /obj/item/organ/tongue/skrell payday_modifier = 1.0 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT eyes_icon = 'modular_skyrat/modules/organs/icons/skrell_eyes.dmi' - mutantbrain = /obj/item/organ/internal/brain/skrell - mutanteyes = /obj/item/organ/internal/eyes/skrell - mutantlungs = /obj/item/organ/internal/lungs/skrell - mutantheart = /obj/item/organ/internal/heart/skrell - mutantliver = /obj/item/organ/internal/liver/skrell - mutanttongue = /obj/item/organ/internal/tongue/skrell + mutantbrain = /obj/item/organ/brain/skrell + mutanteyes = /obj/item/organ/eyes/skrell + mutantlungs = /obj/item/organ/lungs/skrell + mutantheart = /obj/item/organ/heart/skrell + mutantliver = /obj/item/organ/liver/skrell + mutanttongue = /obj/item/organ/tongue/skrell bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/mutant/skrell, BODY_ZONE_CHEST = /obj/item/bodypart/chest/mutant/skrell, @@ -77,7 +77,7 @@ skrell.update_body(TRUE) -/obj/item/organ/internal/tongue/skrell +/obj/item/organ/tongue/skrell name = "internal vocal sacs" desc = "An Strange looking sac." icon = 'modular_skyrat/modules/organs/icons/skrell_organ.dmi' @@ -107,27 +107,27 @@ disliked_foodtypes = RAW | CLOTH toxic_foodtypes = DAIRY | MEAT -/obj/item/organ/internal/tongue/skrell/get_possible_languages() +/obj/item/organ/tongue/skrell/get_possible_languages() return languages_possible_skrell -/obj/item/organ/internal/heart/skrell +/obj/item/organ/heart/skrell name = "skrellian heart" icon = 'modular_skyrat/modules/organs/icons/skrell_organ.dmi' icon_state = "heart" -/obj/item/organ/internal/brain/skrell +/obj/item/organ/brain/skrell name = "spongy brain" icon = 'modular_skyrat/modules/organs/icons/skrell_organ.dmi' icon_state = "brain2" -/obj/item/organ/internal/eyes/skrell +/obj/item/organ/eyes/skrell name = "amphibian eyes" desc = "Large black orbs." icon = 'modular_skyrat/modules/organs/icons/skrell_organ.dmi' icon_state = "eyes" flash_protect = FLASH_PROTECTION_SENSITIVE -/obj/item/organ/internal/lungs/skrell +/obj/item/organ/lungs/skrell name = "skrell lungs" icon = 'modular_skyrat/modules/organs/icons/skrell_organ.dmi' icon_state = "lungs" @@ -153,7 +153,7 @@ heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3 heat_damage_type = BURN -/obj/item/organ/internal/liver/skrell +/obj/item/organ/liver/skrell name = "skrell liver" icon_state = "liver" icon = 'modular_skyrat/modules/organs/icons/skrell_organ.dmi' diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm index 3891297e5d7..3dcfd2ffaa2 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm @@ -8,7 +8,7 @@ TRAIT_HATED_BY_DOGS, TRAIT_MUTANT_COLORS, ) - mutanttongue = /obj/item/organ/internal/tongue/cat/tajaran + mutanttongue = /obj/item/organ/tongue/cat/tajaran inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list() payday_modifier = 1.0 @@ -32,7 +32,7 @@ "legs" = list("Normal Legs", FALSE), ) -/obj/item/organ/internal/tongue/cat/tajaran +/obj/item/organ/tongue/cat/tajaran liked_foodtypes = GRAIN | MEAT disliked_foodtypes = CLOTH diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm index 8731ff495d1..ff3f78f4d20 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm @@ -9,7 +9,7 @@ ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list() - mutanttongue = /obj/item/organ/internal/tongue/unathi + mutanttongue = /obj/item/organ/tongue/unathi payday_modifier = 1.0 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT examine_limb_id = SPECIES_LIZARD @@ -34,7 +34,7 @@ "legs" = list("Normal Legs", FALSE), ) -/obj/item/organ/internal/tongue/unathi +/obj/item/organ/tongue/unathi liked_foodtypes = GORE | MEAT | SEAFOOD | NUTS disliked_foodtypes = GRAIN | DAIRY | CLOTH | GROSS toxic_foodtypes = TOXIC diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm index 9a03dd00b72..113875d4a8c 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm @@ -11,9 +11,9 @@ TRAIT_MUTANT_COLORS, ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID - mutanttongue = /obj/item/organ/internal/tongue/vox - mutantlungs = /obj/item/organ/internal/lungs/nitrogen/vox - mutantbrain = /obj/item/organ/internal/brain/cybernetic/cortical/vox + mutanttongue = /obj/item/organ/tongue/vox + mutantlungs = /obj/item/organ/lungs/nitrogen/vox + mutantbrain = /obj/item/organ/brain/cybernetic/cortical/vox breathid = "n2" mutant_bodyparts = list() payday_modifier = 1.0 diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm index 1a37c11e303..29faaac7ea2 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm @@ -9,7 +9,7 @@ ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID mutant_bodyparts = list() - mutanttongue = /obj/item/organ/internal/tongue/vulpkanin + mutanttongue = /obj/item/organ/tongue/vulpkanin species_language_holder = /datum/language_holder/vulpkanin payday_modifier = 1.0 changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT @@ -33,7 +33,7 @@ "legs" = list("Normal Legs", FALSE), ) -/obj/item/organ/internal/tongue/vulpkanin +/obj/item/organ/tongue/vulpkanin liked_foodtypes = RAW | MEAT disliked_foodtypes = CLOTH toxic_foodtypes = TOXIC diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm index ba764842d7d..338009139d4 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm @@ -10,14 +10,14 @@ TRAIT_MUTANT_COLORS, ) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID - mutantbrain = /obj/item/organ/internal/brain/xeno_hybrid - mutanttongue = /obj/item/organ/internal/tongue/xeno_hybrid - mutantliver = /obj/item/organ/internal/liver/xeno_hybrid - mutantstomach = /obj/item/organ/internal/stomach/xeno_hybrid + mutantbrain = /obj/item/organ/brain/xeno_hybrid + mutanttongue = /obj/item/organ/tongue/xeno_hybrid + mutantliver = /obj/item/organ/liver/xeno_hybrid + mutantstomach = /obj/item/organ/stomach/xeno_hybrid mutant_organs = list( - /obj/item/organ/internal/alien/plasmavessel/roundstart, - /obj/item/organ/internal/alien/resinspinner/roundstart, - /obj/item/organ/internal/alien/hivenode, + /obj/item/organ/alien/plasmavessel/roundstart, + /obj/item/organ/alien/resinspinner/roundstart, + /obj/item/organ/alien/hivenode, ) exotic_blood = /datum/reagent/toxin/acid heatmod = 2.5 @@ -85,7 +85,7 @@ #define BUILD_DURATION 0.5 SECONDS //Plasma vessel -/obj/item/organ/internal/alien/plasmavessel/roundstart +/obj/item/organ/alien/plasmavessel/roundstart stored_plasma = 55 max_plasma = 55 plasma_rate = 2 @@ -108,7 +108,7 @@ return ..() //Resin spinner -/obj/item/organ/internal/alien/resinspinner/roundstart +/obj/item/organ/alien/resinspinner/roundstart actions_types = list(/datum/action/cooldown/alien/make_structure/resin/roundstart) /datum/action/cooldown/alien/make_structure/resin @@ -119,17 +119,17 @@ //Non-modularly checked in `code\modules\mob\living\carbon\alien\adult\alien_powers.dm` //Organ resprites -/obj/item/organ/internal/brain/xeno_hybrid +/obj/item/organ/brain/xeno_hybrid icon_state = "brain-x" //rebranding -/obj/item/organ/internal/stomach/xeno_hybrid +/obj/item/organ/stomach/xeno_hybrid icon_state = "stomach-x" -/obj/item/organ/internal/liver/xeno_hybrid +/obj/item/organ/liver/xeno_hybrid icon_state = "liver-x" //Liver modification (xenohybrids can process plasma!) -/obj/item/organ/internal/liver/xeno_hybrid/handle_chemical(mob/living/carbon/owner, datum/reagent/toxin/chem, seconds_per_tick, times_fired) +/obj/item/organ/liver/xeno_hybrid/handle_chemical(mob/living/carbon/owner, datum/reagent/toxin/chem, seconds_per_tick, times_fired) . = ..() if(. & COMSIG_MOB_STOP_REAGENT_CHECK) return diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/cap.dm b/modular_skyrat/modules/customization/modules/surgery/organs/cap.dm index 64dc6dda493..af2dcd698b7 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/cap.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/cap.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/mushroom_cap +/obj/item/organ/mushroom_cap icon_state = "random_fly_1" mutantpart_key = "caps" @@ -6,7 +6,7 @@ slot = ORGAN_SLOT_EXTERNAL_CAP preference = "feature_caps" -/obj/item/organ/external/mushroom_cap/Initialize(mapload) +/obj/item/organ/mushroom_cap/Initialize(mapload) if(!ispath(bodypart_overlay)) mutantpart_info[MUTANT_INDEX_COLOR_LIST] = bodypart_overlay.draw_color return ..() diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm b/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm index d1b825b825a..ae1f091edb6 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/ears.dm @@ -1,13 +1,13 @@ -/obj/item/organ/internal/ears/mutant +/obj/item/organ/ears/mutant name = "fluffy ears" desc = "Wait, there's two pairs of these?" icon = 'icons/obj/clothing/head/costume.dmi' icon_state = "kitty" bodypart_overlay = /datum/bodypart_overlay/mutant/ears -/obj/item/organ/internal/ears/cat +/obj/item/organ/ears/cat -/obj/item/organ/internal/ears/fox +/obj/item/organ/ears/fox /datum/bodypart_overlay/mutant/ears feature_key = "ears" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/eyes.dm b/modular_skyrat/modules/customization/modules/surgery/organs/eyes.dm index c6135f9b2ef..ea97856d37e 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/eyes.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/eyes.dm @@ -1,8 +1,8 @@ -/obj/item/organ/internal/eyes +/obj/item/organ/eyes var/is_emissive = FALSE var/eyes_layer = BODY_LAYER - -/obj/item/organ/internal/eyes/night_vision/ashwalker + +/obj/item/organ/eyes/night_vision/ashwalker //give ashwalker darkvision a reddish-blue tint low_light_cutoff = list(22, 12, 17) medium_light_cutoff = list(33, 18, 26) diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/fluff.dm b/modular_skyrat/modules/customization/modules/surgery/organs/fluff.dm index 0dab3106c26..d63e83117aa 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/fluff.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/fluff.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/fluff +/obj/item/organ/fluff name = "fluff" desc = "Real fluffy." icon_state = "random_fly_1" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/frills.dm b/modular_skyrat/modules/customization/modules/surgery/organs/frills.dm index 0dacf38e09f..185e688e779 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/frills.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/frills.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/frills +/obj/item/organ/frills preference = "feature_frills" mutantpart_key = "frills" mutantpart_info = list(MUTANT_INDEX_NAME = "Divinity", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm index 4708d892bd5..fce35dec64b 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/genital +/obj/item/organ/genital color = "#fcccb3" organ_flags = ORGAN_ORGANIC | ORGAN_UNREMOVABLE ///Size value of the genital, needs to be translated to proper lengths/diameters/cups @@ -21,11 +21,11 @@ var/genital_location = GROIN //This translates the float size into a sprite string -/obj/item/organ/external/genital/proc/get_sprite_size_string() +/obj/item/organ/genital/proc/get_sprite_size_string() return 0 //This translates the float size into a sprite string -/obj/item/organ/external/genital/proc/update_sprite_suffix() +/obj/item/organ/genital/proc/update_sprite_suffix() sprite_suffix = "[get_sprite_size_string()]" var/datum/bodypart_overlay/mutant/genital/our_overlay = bodypart_overlay @@ -33,33 +33,33 @@ our_overlay.sprite_suffix = sprite_suffix -/obj/item/organ/external/genital/proc/get_description_string(datum/sprite_accessory/genital/gas) +/obj/item/organ/genital/proc/get_description_string(datum/sprite_accessory/genital/gas) return "You see genitals" -/obj/item/organ/external/genital/proc/update_genital_icon_state() +/obj/item/organ/genital/proc/update_genital_icon_state() return -/obj/item/organ/external/genital/proc/set_size(size) +/obj/item/organ/genital/proc/set_size(size) genital_size = size update_sprite_suffix() -/obj/item/organ/external/genital/Initialize(mapload) +/obj/item/organ/genital/Initialize(mapload) . = ..() update_sprite_suffix() if(CONFIG_GET(flag/disable_lewd_items)) return INITIALIZE_HINT_QDEL //Removes ERP organs depending on config -/obj/item/organ/external/genital/Insert(mob/living/carbon/M, special, movement_flags) +/obj/item/organ/genital/Insert(mob/living/carbon/M, special, movement_flags) if(CONFIG_GET(flag/disable_erp_preferences)) return . = ..() -/obj/item/organ/external/genital/Remove(mob/living/carbon/M, special = FALSE, moving) +/obj/item/organ/genital/Remove(mob/living/carbon/M, special = FALSE, moving) . = ..() update_genital_icon_state() -/obj/item/organ/external/genital/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/build_from_dna(datum/dna/DNA, associated_key) . = ..() var/datum/sprite_accessory/genital/accessory = SSaccessories.sprite_accessories[associated_key][DNA.mutant_bodyparts[associated_key][MUTANT_INDEX_NAME]] genital_name = accessory.name @@ -72,10 +72,10 @@ our_overlay.color_source = uses_skin_color ? ORGAN_COLOR_INHERIT : ORGAN_COLOR_OVERRIDE /// for specific build_from_dna behavior that also checks the genital accessory. -/obj/item/organ/external/genital/proc/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) +/obj/item/organ/genital/proc/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) return -/obj/item/organ/external/genital/proc/is_exposed() +/obj/item/organ/genital/proc/is_exposed() if(!owner) return TRUE @@ -134,7 +134,7 @@ return sprite_datum.color_layer_names -/obj/item/organ/external/genital/penis +/obj/item/organ/genital/penis name = "penis" desc = "A male reproductive organ." icon_state = "penis" @@ -153,7 +153,7 @@ layers = EXTERNAL_FRONT | EXTERNAL_BEHIND -/obj/item/organ/external/genital/penis/get_description_string(datum/sprite_accessory/genital/gas) +/obj/item/organ/genital/penis/get_description_string(datum/sprite_accessory/genital/gas) var/returned_string = "" var/pname = lowertext(genital_name) == "nondescript" ? "" : lowertext(genital_name) + " " if(sheath != SHEATH_NONE && aroused != AROUSAL_FULL) //Hidden in sheath @@ -175,7 +175,7 @@ returned_string += " It's fully erect." return returned_string -/obj/item/organ/external/genital/penis/update_genital_icon_state() +/obj/item/organ/genital/penis/update_genital_icon_state() var/size_affix var/measured_size = FLOOR(genital_size,1) if(measured_size < 1) @@ -194,7 +194,7 @@ passed_string += "_s" icon_state = passed_string -/obj/item/organ/external/genital/penis/get_sprite_size_string() +/obj/item/organ/genital/penis/get_sprite_size_string() if(aroused != AROUSAL_FULL && sheath != SHEATH_NONE) //Sheath time! var/poking_out = 0 if(aroused == AROUSAL_PARTIAL) @@ -222,14 +222,14 @@ passed_string += "_s" return passed_string -/obj/item/organ/external/genital/penis/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/penis/build_from_dna(datum/dna/DNA, associated_key) girth = DNA.features["penis_girth"] uses_skin_color = DNA.features["penis_uses_skincolor"] set_size(DNA.features["penis_size"]) return ..() -/obj/item/organ/external/genital/penis/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) +/obj/item/organ/genital/penis/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) var/datum/sprite_accessory/genital/penis/snake = accessory if(snake.can_have_sheath) sheath = DNA.features["penis_sheath"] @@ -240,7 +240,7 @@ return SSaccessories.sprite_accessories[ORGAN_SLOT_PENIS] -/obj/item/organ/external/genital/testicles +/obj/item/organ/genital/testicles name = "testicles" desc = "A male reproductive organ." icon_state = "testicles" @@ -258,30 +258,30 @@ feature_key = ORGAN_SLOT_TESTICLES layers = EXTERNAL_ADJACENT | EXTERNAL_BEHIND -/obj/item/organ/external/genital/testicles/update_genital_icon_state() +/obj/item/organ/genital/testicles/update_genital_icon_state() var/measured_size = clamp(genital_size, 1, TESTICLES_MAX_SIZE) var/passed_string = "testicles_[genital_type]_[measured_size]" if(uses_skintones) passed_string += "_s" icon_state = passed_string -/obj/item/organ/external/genital/testicles/get_description_string(datum/sprite_accessory/genital/gas) +/obj/item/organ/genital/testicles/get_description_string(datum/sprite_accessory/genital/gas) if(genital_name == "Internal") //Checks if Testicles are of Internal Variety visibility_preference = GENITAL_SKIP_VISIBILITY //Removes visibility if yes. else return "You see a pair of testicles, they look [lowertext(balls_size_to_description(genital_size))]." -/obj/item/organ/external/genital/testicles/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/testicles/build_from_dna(datum/dna/DNA, associated_key) uses_skin_color = DNA.features["testicles_uses_skincolor"] set_size(DNA.features["balls_size"]) return ..() -/obj/item/organ/external/genital/testicles/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) +/obj/item/organ/genital/testicles/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) if(DNA.features["testicles_uses_skintones"]) uses_skintones = accessory.has_skintone_shading -/obj/item/organ/external/genital/testicles/get_sprite_size_string() +/obj/item/organ/genital/testicles/get_sprite_size_string() var/measured_size = FLOOR(genital_size,1) measured_size = clamp(measured_size, 0, TESTICLES_MAX_SIZE) var/passed_string = "[genital_type]_[measured_size]" @@ -293,7 +293,7 @@ return SSaccessories.sprite_accessories[ORGAN_SLOT_TESTICLES] -/obj/item/organ/external/genital/testicles/proc/balls_size_to_description(number) +/obj/item/organ/genital/testicles/proc/balls_size_to_description(number) if(number < 0) number = 0 var/returned = GLOB.balls_size_translation["[number]"] @@ -301,14 +301,14 @@ returned = BREAST_SIZE_BEYOND_MEASUREMENT return returned -/obj/item/organ/external/genital/testicles/proc/balls_description_to_size(cup) +/obj/item/organ/genital/testicles/proc/balls_description_to_size(cup) for(var/key in GLOB.balls_size_translation) if(GLOB.balls_size_translation[key] == cup) return text2num(key) return 0 -/obj/item/organ/external/genital/vagina +/obj/item/organ/genital/vagina name = "vagina" icon = 'modular_skyrat/master_files/icons/obj/genitals/vagina.dmi' icon_state = "vagina" @@ -324,7 +324,7 @@ feature_key = ORGAN_SLOT_VAGINA layers = EXTERNAL_FRONT -/obj/item/organ/external/genital/vagina/get_description_string(datum/sprite_accessory/genital/gas) +/obj/item/organ/genital/vagina/get_description_string(datum/sprite_accessory/genital/gas) var/returned_string = "You see a [lowertext(genital_name)] vagina." if(lowertext(genital_name) == "cloaca") returned_string = "You see a cloaca." //i deserve a pipebomb for this @@ -337,18 +337,18 @@ returned_string += " It's bright and dripping with arousal." return returned_string -/obj/item/organ/external/genital/vagina/get_sprite_size_string() +/obj/item/organ/genital/vagina/get_sprite_size_string() var/is_dripping = 0 if(aroused == AROUSAL_FULL) is_dripping = 1 return "[genital_type]_[is_dripping]" -/obj/item/organ/external/genital/vagina/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/vagina/build_from_dna(datum/dna/DNA, associated_key) uses_skin_color = DNA.features["vagina_uses_skincolor"] return ..() // will update the sprite suffix -/obj/item/organ/external/genital/vagina/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) +/obj/item/organ/genital/vagina/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) if(DNA.features["vagina_uses_skintones"]) uses_skintones = accessory.has_skintone_shading @@ -356,7 +356,7 @@ return SSaccessories.sprite_accessories[ORGAN_SLOT_VAGINA] -/obj/item/organ/external/genital/womb +/obj/item/organ/genital/womb name = "womb" desc = "A female reproductive organ." icon = 'modular_skyrat/master_files/icons/obj/genitals/vagina.dmi' @@ -379,7 +379,7 @@ return SSaccessories.sprite_accessories[ORGAN_SLOT_WOMB] -/obj/item/organ/external/genital/anus +/obj/item/organ/genital/anus name = "anus" desc = "What do you want me to tell you?" icon = 'modular_skyrat/master_files/icons/obj/genitals/anus.dmi' @@ -396,7 +396,7 @@ feature_key = ORGAN_SLOT_ANUS layers = NONE -/obj/item/organ/external/genital/anus/get_description_string(datum/sprite_accessory/genital/gas) +/obj/item/organ/genital/anus/get_description_string(datum/sprite_accessory/genital/gas) var/returned_string = "You see an [lowertext(genital_name)]." if(aroused == AROUSAL_PARTIAL) returned_string += " It looks tight." @@ -408,7 +408,7 @@ return SSaccessories.sprite_accessories[ORGAN_SLOT_ANUS] -/obj/item/organ/external/genital/breasts +/obj/item/organ/genital/breasts name = "breasts" desc = "Female milk producing organs." icon_state = "breasts" @@ -427,7 +427,7 @@ feature_key = ORGAN_SLOT_BREASTS layers = EXTERNAL_FRONT | EXTERNAL_BEHIND -/obj/item/organ/external/genital/breasts/get_description_string(datum/sprite_accessory/genital/gas) +/obj/item/organ/genital/breasts/get_description_string(datum/sprite_accessory/genital/gas) var/returned_string = "You see a [lowertext(genital_name)] of breasts." var/size_description var/translation = breasts_size_to_cup(genital_size) @@ -446,7 +446,7 @@ returned_string += " Their nipples look hard and perky." return returned_string -/obj/item/organ/external/genital/breasts/update_genital_icon_state() +/obj/item/organ/genital/breasts/update_genital_icon_state() var/max_size = 5 var/current_size = FLOOR(genital_size, 1) if(current_size < 0) @@ -458,7 +458,7 @@ passed_string += "_s" icon_state = passed_string -/obj/item/organ/external/genital/breasts/get_sprite_size_string() +/obj/item/organ/genital/breasts/get_sprite_size_string() var/max_size = 5 if(genital_type == "pair") max_size = 16 @@ -472,21 +472,21 @@ passed_string += "_s" return passed_string -/obj/item/organ/external/genital/breasts/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/breasts/build_from_dna(datum/dna/DNA, associated_key) lactates = DNA.features["breasts_lactation"] uses_skin_color = DNA.features["breasts_uses_skincolor"] set_size(DNA.features["breasts_size"]) return ..() -/obj/item/organ/external/genital/breasts/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) +/obj/item/organ/genital/breasts/build_from_accessory(datum/sprite_accessory/genital/accessory, datum/dna/DNA) if(DNA.features["breasts_uses_skintones"]) uses_skintones = accessory.has_skintone_shading /datum/bodypart_overlay/mutant/genital/breasts/get_global_feature_list() return SSaccessories.sprite_accessories[ORGAN_SLOT_BREASTS] -/obj/item/organ/external/genital/breasts/proc/breasts_size_to_cup(number) +/obj/item/organ/genital/breasts/proc/breasts_size_to_cup(number) if(number < 0) number = 0 var/returned = GLOB.breast_size_translation["[number]"] @@ -494,7 +494,7 @@ returned = BREAST_SIZE_BEYOND_MEASUREMENT return returned -/obj/item/organ/external/genital/breasts/proc/breasts_cup_to_size(cup) +/obj/item/organ/genital/breasts/proc/breasts_cup_to_size(cup) for(var/key in GLOB.breast_size_translation) if(GLOB.breast_size_translation[key] == cup) return text2num(key) @@ -511,13 +511,13 @@ return var/list/genital_list = list() - for(var/obj/item/organ/external/genital/genital in organs) + for(var/obj/item/organ/genital/genital in organs) if(!genital.visibility_preference == GENITAL_SKIP_VISIBILITY) genital_list += genital if(!genital_list.len) //There is nothing to expose return //Full list of exposable genitals created - var/obj/item/organ/external/genital/picked_organ + var/obj/item/organ/genital/picked_organ picked_organ = input(src, "Choose which genitalia to expose/hide", "Expose/Hide genitals") as null|anything in genital_list if(picked_organ && (picked_organ in organs)) var/list/gen_vis_trans = list("Never show" = GENITAL_NEVER_SHOW, @@ -547,13 +547,13 @@ return var/list/genital_list = list() - for(var/obj/item/organ/external/genital/genital in organs) + for(var/obj/item/organ/genital/genital in organs) if(!genital.aroused == AROUSAL_CANT) genital_list += genital if(!genital_list.len) //There is nothing to expose return //Full list of exposable genitals created - var/obj/item/organ/external/genital/picked_organ + var/obj/item/organ/genital/picked_organ picked_organ = input(src, "Choose which genitalia to change arousal", "Expose/Hide genitals") as null|anything in genital_list if(picked_organ && (picked_organ in organs)) var/list/gen_arous_trans = list( diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/head_accessory.dm b/modular_skyrat/modules/customization/modules/surgery/organs/head_accessory.dm index 973b3d8e5a6..6f8b3255f71 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/head_accessory.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/head_accessory.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/head_accessory +/obj/item/organ/head_accessory name = "head accessory" desc = "It goes on the head." icon_state = "random_fly_1" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/horns.dm b/modular_skyrat/modules/customization/modules/surgery/organs/horns.dm index 02f0084ab24..efb22c9f971 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/horns.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/horns.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/horns +/obj/item/organ/horns desc = "Why do some people even have horns? Well, this one obviously doesn't." preference = "feature_horns" mutantpart_key = "horns" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/moth_antennae.dm b/modular_skyrat/modules/customization/modules/surgery/organs/moth_antennae.dm index b21e6756cab..3434897a685 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/moth_antennae.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/moth_antennae.dm @@ -1,3 +1,3 @@ -/obj/item/organ/external/antennae +/obj/item/organ/antennae mutantpart_key = "moth_antennae" mutantpart_info = list(MUTANT_INDEX_NAME = "Plain", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/moth_markings.dm b/modular_skyrat/modules/customization/modules/surgery/organs/moth_markings.dm index 4863ab2f55e..aa10a2e02ca 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/moth_markings.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/moth_markings.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/moth_markings +/obj/item/organ/moth_markings name = "moth markings" desc = "How did you even get that off...?" icon_state = "random_fly_2" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/neck_accessory.dm b/modular_skyrat/modules/customization/modules/surgery/organs/neck_accessory.dm index 51f97f36097..9f421623ce7 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/neck_accessory.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/neck_accessory.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/neck_accessory +/obj/item/organ/neck_accessory name = "neck accessory" desc = "It goes on the neck." icon_state = "random_fly_1" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/nif.dm b/modular_skyrat/modules/customization/modules/surgery/organs/nif.dm index a3df183ed8e..42d196abff7 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/nif.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/nif.dm @@ -17,7 +17,7 @@ /datum/surgery/repair_nif/can_start(mob/user, mob/living/patient) var/mob/living/carbon/human/nif_patient = patient - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = nif_patient.get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/installed_nif = nif_patient.get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) if(!nif_patient || !installed_nif) return FALSE @@ -47,7 +47,7 @@ ) var/mob/living/carbon/human/nif_patient = target - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = nif_patient.get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/installed_nif = nif_patient.get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) installed_nif.durability = installed_nif.max_durability diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm index 2f47b2edb7f..5d220a8fc46 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/organ.dm @@ -5,18 +5,19 @@ var/sprite_accessory_flags = NONE /// Relevant layer flags, as set by the organ's associated sprite_accessory, should there be one. var/relevant_layers - -/obj/item/organ/external ///This is for associating an organ with a mutant bodypart. Look at tails for examples var/mutantpart_key var/list/list/mutantpart_info + /// Whether or not we're a species-specific organ that will override + /// the ear choice on a certain species, while still applying its visuals. + var/overrides_sprite_datum_organ_type = FALSE -/obj/item/organ/external/Initialize(mapload) +/obj/item/organ/Initialize(mapload) . = ..() if(mutantpart_key) color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] -/obj/item/organ/external/Remove(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/Remove(mob/living/carbon/organ_owner, special, movement_flags) // SKYRAT EDIT ADDITION START if(mutantpart_key) transfer_mutantpart_info(organ_owner, special) @@ -24,7 +25,7 @@ return ..() /// Copies the organ's mutantpart_info to the owner's mutant_bodyparts -/obj/item/organ/external/proc/copy_to_mutant_bodyparts(mob/living/carbon/organ_owner, special) +/obj/item/organ/proc/copy_to_mutant_bodyparts(mob/living/carbon/organ_owner, special) var/mob/living/carbon/human/human_owner = organ_owner if(!istype(human_owner)) return @@ -34,7 +35,7 @@ human_owner.update_body() /// Copies the mob's mutant_bodyparts data to an organ's mutantpart_info for consistency e.g. on organ removal -/obj/item/organ/external/proc/transfer_mutantpart_info(mob/living/carbon/organ_owner, special) +/obj/item/organ/proc/transfer_mutantpart_info(mob/living/carbon/organ_owner, special) var/mob/living/carbon/human/human_owner = organ_owner if(!istype(human_owner)) return @@ -50,7 +51,7 @@ /obj/item/organ/proc/build_from_dna(datum/dna/DNA, associated_key) return -/obj/item/organ/external/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/build_from_dna(datum/dna/DNA, associated_key) mutantpart_key = associated_key mutantpart_info = DNA.mutant_bodyparts[associated_key].Copy() color = mutantpart_info[MUTANT_INDEX_COLOR_LIST][1] diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm b/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm index e545f3f17c0..2c53d32f204 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/pod.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/pod_hair +/obj/item/organ/pod_hair name = "podperson hair" desc = "Base for many-o-salads." diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/skrell_hair.dm b/modular_skyrat/modules/customization/modules/surgery/organs/skrell_hair.dm index 9bd71abe4c3..7240a8f16e6 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/skrell_hair.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/skrell_hair.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/skrell_hair +/obj/item/organ/skrell_hair name = "skrell_hair" desc = "Hair isn't really the best way to describe it, but you really can't think of any other word that makes sense." icon_state = "random_fly_1" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/synth_antenna.dm b/modular_skyrat/modules/customization/modules/surgery/organs/synth_antenna.dm index c9ff539dec6..8cafba48edb 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/synth_antenna.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/synth_antenna.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/synth_antenna +/obj/item/organ/synth_antenna name = "synth antenna" desc = "Wonder if we'll catch Syndicate frequencies with these..." icon_state = "random_fly_1" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/synth_screen.dm b/modular_skyrat/modules/customization/modules/surgery/organs/synth_screen.dm index 7339229ffc5..cbcb700fb79 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/synth_screen.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/synth_screen.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/synth_screen +/obj/item/organ/synth_screen name = "synth screen" desc = "Surely that's just a bunch of LEDs and not a retro-projected screen, right? Right...?" icon_state = "tonguerobot" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm index ab00f728f8f..10212302e90 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/tail +/obj/item/organ/tail mutantpart_key = "tail" mutantpart_info = list(MUTANT_INDEX_NAME = "Smooth", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) var/can_wag = TRUE @@ -41,22 +41,22 @@ return TRUE -/obj/item/organ/external/tail/mob_insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/tail/mob_insert(mob/living/carbon/receiver, special, movement_flags) if(sprite_accessory_flags & SPRITE_ACCESSORY_WAG_ABLE) wag_flags |= WAG_ABLE return ..() -/obj/item/organ/external/tail/cat +/obj/item/organ/tail/cat mutantpart_info = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list("#FFAA00")) -/obj/item/organ/external/tail/monkey +/obj/item/organ/tail/monkey wag_flags = WAG_ABLE // waggable monkey tails mutantpart_info = list(MUTANT_INDEX_NAME = "Monkey", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) -/obj/item/organ/external/tail/lizard +/obj/item/organ/tail/lizard mutantpart_info = list(MUTANT_INDEX_NAME = "Smooth", MUTANT_INDEX_COLOR_LIST = list("#DDFFDD")) -/obj/item/organ/external/tail/fluffy +/obj/item/organ/tail/fluffy name = "fluffy tail" -/obj/item/organ/external/tail/fluffy/no_wag +/obj/item/organ/tail/fluffy/no_wag diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm index 5c1494dc31a..f38e57ad077 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/taur_body +/obj/item/organ/taur_body name = "taur body" zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_EXTERNAL_TAUR @@ -45,15 +45,15 @@ /// When considering how much to offset our rider, we multiply size scaling against this. var/riding_offset_scaling_mult = 0.8 -/obj/item/organ/external/taur_body/horselike +/obj/item/organ/taur_body/horselike can_use_saddle = TRUE -/obj/item/organ/external/taur_body/horselike/synth +/obj/item/organ/taur_body/horselike/synth organ_flags = ORGAN_ROBOTIC -/obj/item/organ/external/taur_body/horselike/deer +/obj/item/organ/taur_body/horselike/deer -/obj/item/organ/external/taur_body/horselike/deer/Initialize(mapload) +/obj/item/organ/taur_body/horselike/deer/Initialize(mapload) . = ..() taur_specific_clothing_y_offsets = list( @@ -63,32 +63,32 @@ TEXT_SOUTH = 0, ) -/obj/item/organ/external/taur_body/serpentine +/obj/item/organ/taur_body/serpentine left_leg_name = "upper serpentine body" right_leg_name = "lower serpentine body" -/obj/item/organ/external/taur_body/serpentine/synth +/obj/item/organ/taur_body/serpentine/synth organ_flags = ORGAN_ROBOTIC -/obj/item/organ/external/taur_body/spider +/obj/item/organ/taur_body/spider left_leg_name = "left legs" right_leg_name = "right legs" -/obj/item/organ/external/taur_body/tentacle +/obj/item/organ/taur_body/tentacle left_leg_name = "front tentacles" right_leg_name = "back tentacles" -/obj/item/organ/external/taur_body/blob +/obj/item/organ/taur_body/blob left_leg_name = "outer blob" right_leg_name = "inner blob" -/obj/item/organ/external/taur_body/anthro +/obj/item/organ/taur_body/anthro left_leg_name = null right_leg_name = null can_ride_saddled_taurs = TRUE -/obj/item/organ/external/taur_body/anthro/synth +/obj/item/organ/taur_body/anthro/synth organ_flags = ORGAN_ROBOTIC /datum/bodypart_overlay/mutant/taur_body @@ -105,7 +105,7 @@ return SSaccessories.sprite_accessories["taur"] -/obj/item/organ/external/taur_body/mob_insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/taur_body/mob_insert(mob/living/carbon/receiver, special, movement_flags) if(sprite_accessory_flags & SPRITE_ACCESSORY_HIDE_SHOES) external_bodyshapes |= BODYSHAPE_HIDE_SHOES @@ -144,7 +144,7 @@ return ..() -/obj/item/organ/external/taur_body/mob_remove(mob/living/carbon/organ_owner, special, moving) +/obj/item/organ/taur_body/mob_remove(mob/living/carbon/organ_owner, special, moving) if(QDELETED(owner)) return ..() @@ -175,7 +175,7 @@ return ..() -/obj/item/organ/external/taur_body/Destroy() +/obj/item/organ/taur_body/Destroy() . = ..() if(old_left_leg) QDEL_NULL(old_left_leg) @@ -183,7 +183,7 @@ if(old_right_leg) QDEL_NULL(old_right_leg) -/obj/item/organ/external/taur_body/proc/get_riding_offset(oversized = FALSE) +/obj/item/organ/taur_body/proc/get_riding_offset(oversized = FALSE) var/size_scaling = (owner.dna.features["body_size"] / BODY_SIZE_NORMAL) - 1 var/scaling_mult = 1 + (size_scaling * riding_offset_scaling_mult) diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/vox.dm b/modular_skyrat/modules/customization/modules/surgery/organs/vox.dm index 1c552c32cc6..d443642c40b 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/vox.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/vox.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/lungs/nitrogen +/obj/item/organ/lungs/nitrogen name = "nitrogen lungs" desc = "A set of lungs for breathing nitrogen." safe_oxygen_min = 0 //Dont need oxygen @@ -8,7 +8,7 @@ oxy_breath_dam_min = 6 oxy_breath_dam_max = 20 -/obj/item/organ/internal/lungs/nitrogen/vox +/obj/item/organ/lungs/nitrogen/vox name = "vox lungs" desc = "They're filled with dust... wow." icon_state = "lungs-c" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/wings.dm b/modular_skyrat/modules/customization/modules/surgery/organs/wings.dm index 59719b12395..f288a095aeb 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/wings.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/wings.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/wings +/obj/item/organ/wings name = "wings" desc = "A pair of wings. Those may or may not allow you to fly... or at the very least flap." zone = BODY_ZONE_CHEST @@ -27,26 +27,26 @@ /datum/bodypart_overlay/mutant/wings/override_color(rgb_value) return draw_color -/obj/item/organ/external/wings/moth +/obj/item/organ/wings/moth name = "moth wings" desc = "A pair of fuzzy moth wings." flight_for_species = list(SPECIES_MOTH) -/obj/item/organ/external/wings/flight +/obj/item/organ/wings/flight unconditional_flight = TRUE can_open = TRUE -/obj/item/organ/external/wings/flight/angel +/obj/item/organ/wings/flight/angel name = "angel wings" desc = "A pair of magnificent, feathery wings. They look strong enough to lift you up in the air." mutantpart_info = list(MUTANT_INDEX_NAME = "Angel", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) -/obj/item/organ/external/wings/flight/dragon +/obj/item/organ/wings/flight/dragon name = "dragon wings" desc = "A pair of intimidating, membranous wings. They look strong enough to lift you up in the air." mutantpart_info = list(MUTANT_INDEX_NAME = "Dragon", MUTANT_INDEX_COLOR_LIST = list("#880000")) -/obj/item/organ/external/wings/flight/megamoth +/obj/item/organ/wings/flight/megamoth name = "megamoth wings" desc = "A pair of horrifyingly large, fuzzy wings. They look strong enough to lift you up in the air." mutantpart_info = list(MUTANT_INDEX_NAME = "Megamoth", MUTANT_INDEX_COLOR_LIST = list("#FFFFFF")) @@ -90,20 +90,20 @@ return COLOR_WHITE // We want to keep those wings as their original color, because it looks better. -/obj/item/organ/external/wings/functional +/obj/item/organ/wings/functional bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional/locked -/obj/item/organ/external/wings/functional/angel +/obj/item/organ/wings/functional/angel bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional/original_color -/obj/item/organ/external/wings/functional/dragon +/obj/item/organ/wings/functional/dragon bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional -/obj/item/organ/external/wings/functional/moth +/obj/item/organ/wings/functional/moth bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional/locked/original_color -/obj/item/organ/external/wings/functional/robotic +/obj/item/organ/wings/functional/robotic bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional -/obj/item/organ/external/wings/functional/slime +/obj/item/organ/wings/functional/slime bodypart_overlay = /datum/bodypart_overlay/mutant/wings/functional diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/xenodorsal.dm b/modular_skyrat/modules/customization/modules/surgery/organs/xenodorsal.dm index 5725cc1a9a2..b150617332c 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/xenodorsal.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/xenodorsal.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/xenodorsal +/obj/item/organ/xenodorsal name = "dorsal spines" desc = "How did that even fit on them...?" icon_state = "random_fly_2" diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/xenohead.dm b/modular_skyrat/modules/customization/modules/surgery/organs/xenohead.dm index c08af5cb985..e2ab2354573 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/xenohead.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/xenohead.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/xenohead +/obj/item/organ/xenohead name = "xeno head" desc = "How did you take that off?" icon_state = "random_fly_2" diff --git a/modular_skyrat/modules/customization/readme.md b/modular_skyrat/modules/customization/readme.md index 8d2ea79690a..f127719b13d 100644 --- a/modular_skyrat/modules/customization/readme.md +++ b/modular_skyrat/modules/customization/readme.md @@ -26,8 +26,8 @@ Re-writes how mutant bodyparts exist and how they're handled. Adds in a per limb ./code/modules/mob/living/carbon/human/species_types/felinid.dm > the 5 procs related to wagging tail ./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm the 5 procs related to wagging tail and - /datum/species/lizard/on_species_gain() ./code/modules/surgery/bodyparts/_bodyparts.dm > /obj/item/bodypart/proc/get_limb_icon() - ./code/modules/surgery/organs/ears.dm > /obj/item/organ/internal/ears/cat/Insert(), /obj/item/organ/internal/ears/cat/Remove() - ./code/modules/surgery/organs/tails.dm > /obj/item/organ/external/tail/cat/Insert(), /obj/item/organ/external/tail/cat/Remove(), /obj/item/organ/external/tail/lizard/Initialize(mapload), /obj/item/organ/external/tail/lizard/Insert(), /obj/item/organ/external/tail/lizard/Remove() + ./code/modules/surgery/organs/ears.dm > /obj/item/organ/ears/cat/Insert(), /obj/item/organ/ears/cat/Remove() + ./code/modules/surgery/organs/tails.dm > /obj/item/organ/tail/cat/Insert(), /obj/item/organ/tail/cat/Remove(), /obj/item/organ/tail/lizard/Initialize(mapload), /obj/item/organ/tail/lizard/Insert(), /obj/item/organ/tail/lizard/Remove() ./code/modules/surgery/bodyparts/dismemberment.dm > /mob/living/carbon/regenerate_limb() ./code/modules/mob/living/carbon/human/status_procs.dm > /mob/living/carbon/human/become_husk() > APPENDED ./code/modules/reagents/chemistry/holder.dm > /datum/reagents/metabolize() @@ -47,8 +47,8 @@ Re-writes how mutant bodyparts exist and how they're handled. Adds in a per limb ### Defines: ./code/modules/surgery/organs/tongue.dm > var/static/list/languages_possible_base - added 2 languages -./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm > commented out "mutant_organs = list(/obj/item/organ/external/tail/lizard)" -./code/modules/mob/living/carbon/human/species_types/felinid.dm > commented out "mutantears = /obj/item/organ/internal/ears/cat" and "mutant_organs = list(/obj/item/organ/external/tail/cat)" +./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm > commented out "mutant_organs = list(/obj/item/organ/tail/lizard)" +./code/modules/mob/living/carbon/human/species_types/felinid.dm > commented out "mutantears = /obj/item/organ/ears/cat" and "mutant_organs = list(/obj/item/organ/tail/cat)" ./code/modules/mob/living/carbon/human/species.dm > var/list/list/mutant_bodyparts (added typed list type) ./code/_globalvars/lists/flavor_misc.dm > Removed accessory list defines .\code\datums\keybindings\living.dm > /datum/keybinding/living/look_up > from L to P diff --git a/modular_skyrat/modules/emote_panel/code/emote_panel.dm b/modular_skyrat/modules/emote_panel/code/emote_panel.dm index e795474a190..485fef9ad18 100644 --- a/modular_skyrat/modules/emote_panel/code/emote_panel.dm +++ b/modular_skyrat/modules/emote_panel/code/emote_panel.dm @@ -235,7 +235,7 @@ if(!HAS_TRAIT(current_mob, TRAIT_SILICON_EMOTES_ALLOWED)) available_emotes += synth_emotes // Checking if can wag tail - var/obj/item/organ/external/tail/tail = current_mob.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) + var/obj/item/organ/tail/tail = current_mob.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) if(!(tail?.wag_flags & WAG_ABLE)) available_emotes -= /mob/living/carbon/human/proc/emote_wag // Checking if has wings diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm index 73451dbfbb5..9fa051195db 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm @@ -51,11 +51,11 @@ user.allowed_turfs += "holoseat" //wings - if((istype(user.get_organ_slot(ORGAN_SLOT_WINGS), /obj/item/organ/external/wings/moth)) || HAS_TRAIT(user, TRAIT_SPARKLE_ASPECT)) + if((istype(user.get_organ_slot(ORGAN_SLOT_WINGS), /obj/item/organ/wings/moth)) || HAS_TRAIT(user, TRAIT_SPARKLE_ASPECT)) user.allowed_turfs += "dust" //moth's dust ✨ //body parts - if(istype(user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL), /obj/item/organ/external/tail)) + if(istype(user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL), /obj/item/organ/tail)) var/name = human_user.dna.species.mutant_bodyparts["tail"][MUTANT_INDEX_NAME] var/datum/sprite_accessory/tails/tail = SSaccessories.sprite_accessories["tail"][name] if(tail.fluffy) diff --git a/modular_skyrat/modules/exp_corps/code/clothing.dm b/modular_skyrat/modules/exp_corps/code/clothing.dm index 7020aaf146c..a5b57e04cfd 100644 --- a/modular_skyrat/modules/exp_corps/code/clothing.dm +++ b/modular_skyrat/modules/exp_corps/code/clothing.dm @@ -225,7 +225,7 @@ /obj/item/clothing/head/helmet/expeditionary_corps/proc/enable_nv(mob/user) if(current_user) - var/obj/item/organ/internal/eyes/my_eyes = current_user.get_organ_by_type(/obj/item/organ/internal/eyes) + var/obj/item/organ/eyes/my_eyes = current_user.get_organ_by_type(/obj/item/organ/eyes) if(my_eyes) my_eyes.color_cutoffs = list(10, 30, 10) my_eyes.flash_protect = FLASH_PROTECTION_SENSITIVE @@ -233,7 +233,7 @@ /obj/item/clothing/head/helmet/expeditionary_corps/proc/disable_nv() if(current_user) - var/obj/item/organ/internal/eyes/my_eyes = current_user.get_organ_by_type(/obj/item/organ/internal/eyes) + var/obj/item/organ/eyes/my_eyes = current_user.get_organ_by_type(/obj/item/organ/eyes) if(my_eyes) my_eyes.color_cutoffs = initial(my_eyes.color_cutoffs) my_eyes.flash_protect = initial(my_eyes.flash_protect) diff --git a/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm b/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm index 796b50cf9b6..645531ceeef 100644 --- a/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm +++ b/modular_skyrat/modules/faction/code/mapping/mapping_helpers.dm @@ -200,11 +200,11 @@ new /obj/item/mod/control/pre_equipped/elite(src) if(5) //Implants new /obj/item/storage/box/cyber_implants(src) - new /obj/item/organ/internal/cyberimp/arm/combat(src) - new /obj/item/organ/internal/cyberimp/arm/surgery(src) - new /obj/item/organ/internal/cyberimp/arm/baton(src) - new /obj/item/organ/internal/cyberimp/arm/toolset(src) - new /obj/item/organ/internal/cyberimp/arm/gun/taser(src) + new /obj/item/organ/cyberimp/arm/combat(src) + new /obj/item/organ/cyberimp/arm/surgery(src) + new /obj/item/organ/cyberimp/arm/baton(src) + new /obj/item/organ/cyberimp/arm/toolset(src) + new /obj/item/organ/cyberimp/arm/gun/taser(src) /obj/structure/closet/crate/secure/tradership_cargo_very_valuable req_access = ACCESS_FACTION_COMMAND diff --git a/modular_skyrat/modules/implants/code/augments_arms.dm b/modular_skyrat/modules/implants/code/augments_arms.dm index 1d9a9ff374a..7a9a5e4dd61 100644 --- a/modular_skyrat/modules/implants/code/augments_arms.dm +++ b/modular_skyrat/modules/implants/code/augments_arms.dm @@ -37,14 +37,14 @@ armour_penetration = 10 //Energy isn't as good at going through armor as it is through flesh alone. hitsound = 'sound/items/weapons/blade1.ogg' -/obj/item/organ/internal/cyberimp/arm/armblade +/obj/item/organ/cyberimp/arm/armblade name = "arm blade implant" desc = "An integrated blade implant designed to be installed into a persons arm. Stylish and deadly; Although, being caught with this without proper permits is sure to draw unwanted attention." items_to_create = list(/obj/item/melee/implantarmblade) icon = 'modular_skyrat/modules/implants/icons/implanted_blade.dmi' icon_state = "mantis_blade" -/obj/item/organ/internal/cyberimp/arm/armblade/emag_act() +/obj/item/organ/cyberimp/arm/armblade/emag_act() if(obj_flags & EMAGGED) return FALSE for(var/datum/weakref/created_item in items_list) @@ -118,7 +118,7 @@ qdel(stone) return ..() -/obj/item/organ/internal/cyberimp/arm/razor_claws +/obj/item/organ/cyberimp/arm/razor_claws name = "razor claws implant" desc = "A set of hidden, retractable blades built into the fingertips; cyborg mercenary approved." items_to_create = list(/obj/item/knife/razor_claws) @@ -129,11 +129,11 @@ retract_sound = 'sound/items/sheath.ogg' /// bespoke subtypes for augs menu since it's a bit wonky -/obj/item/organ/internal/cyberimp/arm/razor_claws/right_arm +/obj/item/organ/cyberimp/arm/razor_claws/right_arm zone = BODY_ZONE_R_ARM slot = ORGAN_SLOT_RIGHT_ARM_AUG -/obj/item/organ/internal/cyberimp/arm/razor_claws/left_arm +/obj/item/organ/cyberimp/arm/razor_claws/left_arm zone = BODY_ZONE_L_ARM slot = ORGAN_SLOT_LEFT_ARM_AUG @@ -144,14 +144,14 @@ button_icon = 'modular_skyrat/master_files/icons/hud/actions.dmi' button_icon_state = "wolverine" -/obj/item/organ/internal/cyberimp/arm/hacker +/obj/item/organ/cyberimp/arm/hacker name = "hacking arm implant" desc = "An small arm implant containing an advanced screwdriver, wirecutters, and multitool designed for engineers and on-the-field machine modification. Actually legal, despite what the name may make you think." icon = 'icons/obj/items_cyborg.dmi' icon_state = "toolkit_engiborg_multitool" items_to_create = list(/obj/item/screwdriver/cyborg, /obj/item/wirecutters/cyborg, /obj/item/multitool/abductor/implant) -/obj/item/organ/internal/cyberimp/arm/botany +/obj/item/organ/cyberimp/arm/botany name = "botany arm implant" desc = "A rather simple arm implant containing tools used in gardening and botanical research." items_to_create = list(/obj/item/cultivator, /obj/item/shovel/spade, /obj/item/hatchet, /obj/item/gun/energy/floragun, /obj/item/plant_analyzer, /obj/item/geneshears, /obj/item/secateurs, /obj/item/storage/bag/plants, /obj/item/storage/bag/plants/portaseeder) @@ -175,7 +175,7 @@ tool_behaviour = TOOL_SAW toolspeed = 1 -/obj/item/organ/internal/cyberimp/arm/botany/emag_act() +/obj/item/organ/cyberimp/arm/botany/emag_act() if(obj_flags & EMAGGED) return FALSE for(var/datum/weakref/created_item in items_list) @@ -190,12 +190,12 @@ icon = 'icons/obj/items_cyborg.dmi' icon_state = "toolkit_engiborg_multitool" -/obj/item/organ/internal/cyberimp/arm/janitor +/obj/item/organ/cyberimp/arm/janitor name = "janitorial tools implant" desc = "A set of janitorial tools on the user's arm." items_to_create = list(/obj/item/lightreplacer, /obj/item/holosign_creator, /obj/item/soap/nanotrasen, /obj/item/reagent_containers/spray/cyborg_drying, /obj/item/mop/advanced, /obj/item/paint/paint_remover, /obj/item/reagent_containers/cup/beaker/large, /obj/item/reagent_containers/spray/cleaner) //Beaker if for refilling sprays -/obj/item/organ/internal/cyberimp/arm/janitor/emag_act() +/obj/item/organ/cyberimp/arm/janitor/emag_act() if(obj_flags & EMAGGED) return FALSE for(var/datum/weakref/created_item in items_list) @@ -205,12 +205,12 @@ obj_flags |= EMAGGED return TRUE -/obj/item/organ/internal/cyberimp/arm/lighter +/obj/item/organ/cyberimp/arm/lighter name = "lighter implant" desc = "A... implanted lighter. Incredibly useless." items_to_create = list(/obj/item/lighter/greyscale) //Hilariously useless. -/obj/item/organ/internal/cyberimp/arm/lighter/emag_act() +/obj/item/organ/cyberimp/arm/lighter/emag_act() if(obj_flags & EMAGGED) return FALSE for(var/datum/weakref/created_item in items_list) diff --git a/modular_skyrat/modules/implants/code/augments_brain.dm b/modular_skyrat/modules/implants/code/augments_brain.dm index fdf55101482..a2bba52913b 100644 --- a/modular_skyrat/modules/implants/code/augments_brain.dm +++ b/modular_skyrat/modules/implants/code/augments_brain.dm @@ -1,6 +1,6 @@ #define LANGUAGE_IMPLANT "implant" -/obj/item/organ/internal/cyberimp/brain/empathic_sensor +/obj/item/organ/cyberimp/brain/empathic_sensor name = "empathic sensor implant" desc = "This won't fix your social issues, but it may help you repress them better." //not final icon_state = "brain_implant_antidrop" @@ -8,14 +8,14 @@ var/list/stored_items = list() slot = ORGAN_SLOT_BRAIN_CEREBELLUM var/modifies_speech = TRUE - + // This should appropriately grant and remove empathy from the implant - important if you are a shadekin for some reason to not remove native languages, and allow the procs to work -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/emp_act(severity) +/obj/item/organ/cyberimp/brain/empathic_sensor/emp_act(severity) . = ..() if((organ_flags & ORGAN_FAILING) || . & EMP_PROTECT_SELF) return - + organ_flags |= ORGAN_FAILING UnregisterSignal(owner, COMSIG_MOB_SAY) owner.remove_language(/datum/language/marish/empathy, source = LANGUAGE_IMPLANT) @@ -29,12 +29,12 @@ owner.adjust_stutter(90 SECONDS) owner.adjust_silence(10 SECONDS) -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/proc/implant_ready() +/obj/item/organ/cyberimp/brain/empathic_sensor/proc/implant_ready() RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) owner.grant_language(/datum/language/marish/empathy, source = LANGUAGE_IMPLANT) to_chat(owner, span_abductor("Your mind opens to others. You can hear the thoughts of those around you, but only faintly.")) -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/on_mob_remove(mob/living/carbon/implant_owner) +/obj/item/organ/cyberimp/brain/empathic_sensor/on_mob_remove(mob/living/carbon/implant_owner) . = ..() organ_flags &= ~ORGAN_FAILING UnregisterSignal(implant_owner, COMSIG_MOB_SAY) @@ -43,34 +43,34 @@ return to_chat(implant_owner, span_abductor("Your mind closes from others. It's quiet, now.")) -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/on_mob_insert(mob/living/carbon/receiver) +/obj/item/organ/cyberimp/brain/empathic_sensor/on_mob_insert(mob/living/carbon/receiver) . = ..() to_chat(receiver, span_abductor("You begin to feel an awareness of those around you.")) addtimer(CALLBACK(src, PROC_REF(implant_ready)), 90) -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/proc/reboot() +/obj/item/organ/cyberimp/brain/empathic_sensor/proc/reboot() organ_flags &= ~ORGAN_FAILING implant_ready() //code mostly lifted from shadekins - -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/proc/modify_speech(datum/source, list/speech_args) + +/obj/item/organ/cyberimp/brain/empathic_sensor/proc/modify_speech(datum/source, list/speech_args) ASYNC if(organ_flags & ORGAN_FAILING) //just in case they somehow activate this while the implant is disabled... to_chat(owner, span_abductor("You are unable to project your thoughts.")) return actually_modify_speech(source, speech_args) speech_args[SPEECH_MESSAGE] = "" // Makes it not send to chat verbally - -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/proc/handle_speech(datum/source, list/speech_args) + +/obj/item/organ/cyberimp/brain/empathic_sensor/proc/handle_speech(datum/source, list/speech_args) if(speech_args[SPEECH_LANGUAGE] == /datum/language/marish/empathy) return modify_speech(source, speech_args) //I couldnt get this to work as a TYPE_PROC_REF. So it's copied. -/obj/item/organ/internal/cyberimp/brain/empathic_sensor/proc/actually_modify_speech(datum/source, list/speech_args) +/obj/item/organ/cyberimp/brain/empathic_sensor/proc/actually_modify_speech(datum/source, list/speech_args) var/message = speech_args[SPEECH_MESSAGE] var/mob/living/carbon/human/user = source - var/obj/item/organ/internal/ears/shadekin/user_ears = user.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/ears/shadekin/user_ears = user.get_organ_slot(ORGAN_SLOT_EARS) var/mode = istype(user_ears) user.balloon_alert_to_viewers("[mode ? "ears vibrate" : "shivers"]", "projecting thoughts...") @@ -80,12 +80,12 @@ user.log_talk(message, LOG_SAY, tag="empathic-sensor") for(var/mob/living/carbon/human/living_mob in GLOB.alive_mob_list) - var/obj/item/organ/internal/ears/shadekin/target_ears = living_mob.get_organ_slot(ORGAN_SLOT_EARS) - var/obj/item/organ/internal/cyberimp/brain/empathic_sensor/target_implant = living_mob.get_organ_slot(ORGAN_SLOT_BRAIN_CEREBELLUM) + var/obj/item/organ/ears/shadekin/target_ears = living_mob.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/cyberimp/brain/empathic_sensor/target_implant = living_mob.get_organ_slot(ORGAN_SLOT_BRAIN_CEREBELLUM) if(!istype(target_implant)) continue - + to_chat(living_mob, rendered) if(living_mob != user) mode = istype(target_ears) diff --git a/modular_skyrat/modules/implants/code/augments_chest.dm b/modular_skyrat/modules/implants/code/augments_chest.dm index 0b4fe75668b..1d8674ab510 100644 --- a/modular_skyrat/modules/implants/code/augments_chest.dm +++ b/modular_skyrat/modules/implants/code/augments_chest.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/cyberimp/chest/scanner +/obj/item/organ/cyberimp/chest/scanner name = "internal health analyzer" desc = "An advanced health analyzer implant, designed to directly interface with a host's body and relay scan information to the brain on command." slot = ORGAN_SLOT_SCANNER @@ -14,7 +14,7 @@ /datum/action/item_action/organ_action/use/internal_analyzer/Trigger(trigger_flags) . = ..() - var/obj/item/organ/internal/cyberimp/chest/scanner/our_scanner = target + var/obj/item/organ/cyberimp/chest/scanner/our_scanner = target if(our_scanner.organ_flags & ORGAN_FAILING) to_chat(owner, span_warning("Your health analyzer relays an error! It can't interface with your body in its current condition!")) return diff --git a/modular_skyrat/modules/implants/code/augments_eyes.dm b/modular_skyrat/modules/implants/code/augments_eyes.dm index 4de66355058..761fa72ec9e 100644 --- a/modular_skyrat/modules/implants/code/augments_eyes.dm +++ b/modular_skyrat/modules/implants/code/augments_eyes.dm @@ -1,23 +1,23 @@ -/obj/item/organ/internal/eyes/robotic +/obj/item/organ/eyes/robotic icon = 'modular_skyrat/modules/implants/icons/internal_HA.dmi' //So I had to fucking include the eye sprites icon_state = "cybernetic_eyeballs" -/obj/item/organ/internal/eyes/robotic/xray +/obj/item/organ/eyes/robotic/xray eye_color_left = "#00ffe5" eye_color_right = "#00ffe5" icon_state = "xray_eyes" -/obj/item/organ/internal/eyes/robotic/thermals +/obj/item/organ/eyes/robotic/thermals eye_color_left = "#FC0" eye_color_right = "#FC0" icon_state = "thermal_eyes" -/obj/item/organ/internal/eyes/robotic/shield +/obj/item/organ/eyes/robotic/shield eye_color_left = "#ff2700" eye_color_right = "#ff2700" icon_state = "shielded_eyes" -/obj/item/organ/internal/eyes/night_vision/cyber +/obj/item/organ/eyes/night_vision/cyber name = "nightvision eyes" icon = 'modular_skyrat/modules/implants/icons/internal_HA.dmi' //All in the chest implants .dmi icon_state = "eyes_nvcyber" diff --git a/modular_skyrat/modules/implants/code/augments_internal.dm b/modular_skyrat/modules/implants/code/augments_internal.dm index 1d52cedeacf..5f550f244e4 100644 --- a/modular_skyrat/modules/implants/code/augments_internal.dm +++ b/modular_skyrat/modules/implants/code/augments_internal.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/cyberimp/brain/anti_sleep +/obj/item/organ/cyberimp/brain/anti_sleep name = "CNS jumpstarter" desc = "This implant will automatically attempt to jolt you awake when it detects you have fallen unconscious outside of REM sleeping cycles. Has a short cooldown. Conflicts with the CNS Rebooter, making them incompatible with eachother." icon_state = "brain_implant_rebooter" @@ -6,7 +6,7 @@ slot = ORGAN_SLOT_BRAIN_CNS //One or the other, not both. var/cooldown -/obj/item/organ/internal/cyberimp/brain/anti_sleep/on_life(seconds_per_tick, times_fired) +/obj/item/organ/cyberimp/brain/anti_sleep/on_life(seconds_per_tick, times_fired) if(timeleft(cooldown)) return @@ -19,11 +19,11 @@ to_chat(owner, span_notice("You feel a rush of energy course through your body!")) cooldown = addtimer(CALLBACK(src, PROC_REF(sleepytimerend)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_DELETE_ME) -/obj/item/organ/internal/cyberimp/brain/anti_sleep/proc/sleepytimerend() +/obj/item/organ/cyberimp/brain/anti_sleep/proc/sleepytimerend() to_chat(owner, span_notice("You hear a small beep in your head as your CNS Jumpstarter finishes recharging.")) cooldown = null -/obj/item/organ/internal/cyberimp/brain/anti_sleep/emp_act(severity) +/obj/item/organ/cyberimp/brain/anti_sleep/emp_act(severity) . = ..() var/mob/living/carbon/human/human_owner = owner if((organ_flags & ORGAN_FAILING) || . & EMP_PROTECT_SELF) @@ -32,5 +32,5 @@ human_owner.AdjustUnconscious(200) cooldown = addtimer(CALLBACK(src, PROC_REF(reboot)), (9 SECONDS / severity), TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_DELETE_ME) -/obj/item/organ/internal/cyberimp/brain/anti_sleep/proc/reboot() +/obj/item/organ/cyberimp/brain/anti_sleep/proc/reboot() organ_flags &= ~ORGAN_FAILING diff --git a/modular_skyrat/modules/implants/code/medical_designs.dm b/modular_skyrat/modules/implants/code/medical_designs.dm index 5ebcfa2e63e..fb65009ee13 100644 --- a/modular_skyrat/modules/implants/code/medical_designs.dm +++ b/modular_skyrat/modules/implants/code/medical_designs.dm @@ -9,7 +9,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, ) construction_time = 200 - build_path = /obj/item/organ/internal/cyberimp/arm/armblade + build_path = /obj/item/organ/cyberimp/arm/armblade category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT, ) @@ -26,7 +26,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, ) construction_time = 20 SECONDS - build_path = /obj/item/organ/internal/cyberimp/arm/razor_claws + build_path = /obj/item/organ/cyberimp/arm/razor_claws category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS, ) @@ -43,7 +43,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, ) construction_time = 200 - build_path = /obj/item/organ/internal/cyberimp/arm/hacker + build_path = /obj/item/organ/cyberimp/arm/hacker category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY, ) @@ -60,7 +60,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, ) construction_time = 200 - build_path = /obj/item/organ/internal/cyberimp/arm/flash + build_path = /obj/item/organ/cyberimp/arm/flash category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT, ) @@ -78,7 +78,7 @@ /datum/material/plastic = SHEET_MATERIAL_AMOUNT, ) construction_time = 200 - build_path = /obj/item/organ/internal/cyberimp/arm/botany + build_path = /obj/item/organ/cyberimp/arm/botany category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS, ) @@ -97,7 +97,7 @@ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 6, /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/eyes/night_vision/cyber + build_path = /obj/item/organ/eyes/night_vision/cyber category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY, ) @@ -115,7 +115,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/cyberimp/brain/anti_sleep + build_path = /obj/item/organ/cyberimp/brain/anti_sleep category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT, ) @@ -133,7 +133,7 @@ /datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/cyberimp/chest/scanner + build_path = /obj/item/organ/cyberimp/chest/scanner category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH, ) @@ -150,7 +150,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, ) construction_time = 200 - build_path = /obj/item/organ/internal/cyberimp/arm/janitor + build_path = /obj/item/organ/cyberimp/arm/janitor category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS, ) @@ -167,7 +167,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, ) construction_time = 100 - build_path = /obj/item/organ/internal/cyberimp/arm/lighter + build_path = /obj/item/organ/cyberimp/arm/lighter category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC, ) diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm index 0dd44a9ccb2..8df622d6038 100644 --- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm +++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction) if(user_required_parts.len) for(var/thing in user_required_parts) - var/obj/item/organ/external/genital/required_part = user.get_organ_slot(thing) + var/obj/item/organ/genital/required_part = user.get_organ_slot(thing) if(isnull(required_part)) return FALSE if(!required_part.is_exposed()) @@ -65,7 +65,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction) if(target_required_parts.len) for(var/thing in target_required_parts) - var/obj/item/organ/external/genital/required_part = target.get_organ_slot(thing) + var/obj/item/organ/genital/required_part = target.get_organ_slot(thing) if(isnull(required_part)) return FALSE if(!required_part.is_exposed()) diff --git a/modular_skyrat/modules/medical/code/trauma_surgery.dm b/modular_skyrat/modules/medical/code/trauma_surgery.dm index 5f513d9a535..1b09745db79 100644 --- a/modular_skyrat/modules/medical/code/trauma_surgery.dm +++ b/modular_skyrat/modules/medical/code/trauma_surgery.dm @@ -36,7 +36,7 @@ . = ..() if(!.) return FALSE - var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) if(!target_brain) return FALSE return TRUE diff --git a/modular_skyrat/modules/medical_designs/medical_designs.dm b/modular_skyrat/modules/medical_designs/medical_designs.dm index 8d8b92d29e0..2f70cdb6f7b 100644 --- a/modular_skyrat/modules/medical_designs/medical_designs.dm +++ b/modular_skyrat/modules/medical_designs/medical_designs.dm @@ -27,7 +27,7 @@ id = "nitrogenlunggeneric" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20) - build_path = /obj/item/organ/internal/lungs/nitrogen + build_path = /obj/item/organ/lungs/nitrogen category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) /datum/design/vox_nitrogen_lungs @@ -35,7 +35,7 @@ id = "nitrogenlungvox" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 20) - build_path = /obj/item/organ/internal/lungs/nitrogen/vox + build_path = /obj/item/organ/lungs/nitrogen/vox category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) diff --git a/modular_skyrat/modules/modular_implants/code/misc_devices.dm b/modular_skyrat/modules/modular_implants/code/misc_devices.dm index d836d4408d9..d6b771f414d 100644 --- a/modular_skyrat/modules/modular_implants/code/misc_devices.dm +++ b/modular_skyrat/modules/modular_implants/code/misc_devices.dm @@ -13,7 +13,7 @@ /obj/item/nifsoft_remover/attack(mob/living/carbon/human/target_mob, mob/living/user) . = ..() - var/obj/item/organ/internal/cyberimp/brain/nif/target_nif = target_mob.get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/target_nif = target_mob.get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) if(!target_nif || !length(target_nif.loaded_nifsofts)) balloon_alert(user, "[target_mob] has no NIFSofts!") @@ -80,7 +80,7 @@ /obj/item/nif_repair_kit/attack(mob/living/carbon/human/mob_to_repair, mob/living/user) . = ..() - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = mob_to_repair.get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/installed_nif = mob_to_repair.get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) if(!installed_nif) balloon_alert(user, "[mob_to_repair] lacks a NIF") diff --git a/modular_skyrat/modules/modular_implants/code/nif_actions.dm b/modular_skyrat/modules/modular_implants/code/nif_actions.dm index bc574f71ee1..5d7206c747f 100644 --- a/modular_skyrat/modules/modular_implants/code/nif_actions.dm +++ b/modular_skyrat/modules/modular_implants/code/nif_actions.dm @@ -11,7 +11,7 @@ /datum/action/item_action/nif/open_menu/Trigger(trigger_flags) . = ..() - var/obj/item/organ/internal/cyberimp/brain/nif/target_nif = target + var/obj/item/organ/cyberimp/brain/nif/target_nif = target if(target_nif.calibrating) target_nif.send_message("The NIF is still calibrating, please wait!", TRUE) diff --git a/modular_skyrat/modules/modular_implants/code/nif_implants.dm b/modular_skyrat/modules/modular_implants/code/nif_implants.dm index a52cc75494c..15e6c4e103b 100644 --- a/modular_skyrat/modules/modular_implants/code/nif_implants.dm +++ b/modular_skyrat/modules/modular_implants/code/nif_implants.dm @@ -1,10 +1,10 @@ ///This is the standard 'baseline' NIF model. -/obj/item/organ/internal/cyberimp/brain/nif/standard +/obj/item/organ/cyberimp/brain/nif/standard name = "Standard Type NIF" desc = "'Standard-Type' is a classification for high-quality Nanite Implant Frameworks. This category primarily includes Framework patterns with high reliability, seamless bonding with a user, and a combination of storage space and processing power to run a wide array of programs." manufacturer_notes = "While countless manufacturers produce their own implementation of NIFs, open-source or not, there's less than a thousand Standard-Type models out there in the galaxy. These are the results of almost five years of improvements on older models of Frameworks, and are rather coveted due to being extremely difficult to 'homebrew." -/obj/item/organ/internal/cyberimp/brain/nif/roleplay_model +/obj/item/organ/cyberimp/brain/nif/roleplay_model name = "Econo-Deck Type NIF" desc = "'Econo-Deck' is a classification for lower-quality Nanite Implant Frameworks. Typically, these are off-brand 'economical' bootlegs of higher-quality Frameworks featuring lower-grade power cells, outdated and risky construction patterns, and far rougher calibration with a user." manufacturer_notes = "Most webspaces for hobbyists or hardcore users, Corpo neurologists, and developers of 'softs such as the Altspace Coven recommend against their purchase. Despite their affordability by the layman, it's a common notion in Framework user circles that a device directly hooked into a user's nervous system is never something which should be skimped on; hence, Econo-Decks typically find themselves in the hands of the truly desperate, criminals, or coming out of workshops as 'homebrews.'" @@ -16,7 +16,7 @@ death_durability_loss = 10 -/obj/item/organ/internal/cyberimp/brain/nif/roleplay_model/cheap +/obj/item/organ/cyberimp/brain/nif/roleplay_model/cheap name = "Trial-Lite Type NIF" desc = "'Trial-Lite' is a classification for temporary Nanite Implant Frameworks. These are typically distributed at promotional events, for the use of single-purpose NIFsofts, or at some Corporate dealerships to offer prospective users a look into the scene. Normally, Trial-Lite frameworks do not actually 'bond' with their user, forming an extremely loose connection before dissolving into scattered and dead nanomachines within a few hours, typically exhaled." manufacturer_notes = "Normally, Trial-Lite frameworks do not actually 'bond' with their user, forming an extremely loose connection before dissolving into scattered and dead nanomachines within a few hours, typically exhaled. It's so far been impossible to extend the lifespan of a Trial-Lite NIF, owing to their far inferior construction and programming." @@ -24,14 +24,14 @@ /obj/item/autosurgeon/organ/nif/disposable //Disposable, as in the fact that this only lasts for one shift name = "Econo-Deck Type Autosurgeon" - starting_organ = /obj/item/organ/internal/cyberimp/brain/nif/roleplay_model/cheap + starting_organ = /obj/item/organ/cyberimp/brain/nif/roleplay_model/cheap uses = 1 -/obj/item/organ/internal/cyberimp/brain/nif/standard/ghost_role +/obj/item/organ/cyberimp/brain/nif/standard/ghost_role nif_persistence = FALSE is_calibrated = TRUE /obj/item/autosurgeon/organ/nif/ghost_role name = "Enhanced Standard Type NIF Autosurgeon" - starting_organ = /obj/item/organ/internal/cyberimp/brain/nif/standard/ghost_role + starting_organ = /obj/item/organ/cyberimp/brain/nif/standard/ghost_role uses = 1 diff --git a/modular_skyrat/modules/modular_implants/code/nif_persistence.dm b/modular_skyrat/modules/modular_implants/code/nif_persistence.dm index ce4d865f7cf..a633dab637c 100644 --- a/modular_skyrat/modules/modular_implants/code/nif_persistence.dm +++ b/modular_skyrat/modules/modular_implants/code/nif_persistence.dm @@ -20,7 +20,7 @@ /// Saves the NIF data for a individual user. /mob/living/carbon/human/proc/save_nif_data(datum/modular_persistence/persistence, remove_nif = FALSE) - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/installed_nif = get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) if(HAS_TRAIT(src, TRAIT_GHOSTROLE)) //Nothing is lost from playing a ghost role return FALSE @@ -75,7 +75,7 @@ if(!persistence.nif_path) return - var/obj/item/organ/internal/cyberimp/brain/nif/new_nif = new persistence.nif_path + var/obj/item/organ/cyberimp/brain/nif/new_nif = new persistence.nif_path new_nif.durability = persistence.nif_durability new_nif.current_theme = persistence.nif_theme @@ -108,7 +108,7 @@ /datum/nifsoft/proc/load_persistence_data() if(!linked_mob || !persistence) return FALSE - var/obj/item/organ/internal/brain/linked_brain = linked_mob.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/linked_brain = linked_mob.get_organ_slot(ORGAN_SLOT_BRAIN) if(!linked_brain || !linked_brain.modular_persistence) return FALSE diff --git a/modular_skyrat/modules/modular_implants/code/nifs.dm b/modular_skyrat/modules/modular_implants/code/nifs.dm index 161d5c8d3e2..5c6d257eeef 100644 --- a/modular_skyrat/modules/modular_implants/code/nifs.dm +++ b/modular_skyrat/modules/modular_implants/code/nifs.dm @@ -12,7 +12,7 @@ #define MAX_NIF_REWARDS_POINTS 2000 // This is the original NIF that other NIFs are based on. -/obj/item/organ/internal/cyberimp/brain/nif +/obj/item/organ/cyberimp/brain/nif name = "Nanite Implant Framework" desc = "A brain implant that infuses the user with nanites." icon = 'modular_skyrat/modules/modular_implants/icons/obj/nifs.dmi' @@ -107,13 +107,13 @@ ///What icon does the NIF display in chat when sending out alerts? Icon states are stored in 'modular_skyrat/modules/modular_implants/icons/chat.dmi' var/chat_icon = "standard" -/obj/item/organ/internal/cyberimp/brain/nif/Initialize(mapload) +/obj/item/organ/cyberimp/brain/nif/Initialize(mapload) . = ..() durability = max_durability power_level = max_power_level -/obj/item/organ/internal/cyberimp/brain/nif/Destroy() +/obj/item/organ/cyberimp/brain/nif/Destroy() if(linked_mob) UnregisterSignal(linked_mob, COMSIG_LIVING_DEATH, PROC_REF(damage_on_death)) @@ -126,7 +126,7 @@ QDEL_LIST(loaded_nifsofts) return ..() -/obj/item/organ/internal/cyberimp/brain/nif/mob_insert(mob/living/carbon/human/insertee, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/cyberimp/brain/nif/mob_insert(mob/living/carbon/human/insertee, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() if(linked_mob && stored_ckey != insertee.ckey && theft_protection) @@ -153,7 +153,7 @@ send_message("Loading preinstalled and stored NIFSofts, please wait...") addtimer(CALLBACK(src, PROC_REF(install_preinstalled_nifsofts)), 3 SECONDS) -/obj/item/organ/internal/cyberimp/brain/nif/mob_remove(mob/living/carbon/organ_owner, special = FALSE) +/obj/item/organ/cyberimp/brain/nif/mob_remove(mob/living/carbon/organ_owner, special = FALSE) . = ..() organ_owner.log_message("'s [src] was removed from [organ_owner]", LOG_GAME) @@ -169,7 +169,7 @@ QDEL_LIST(loaded_nifsofts) ///Installs preinstalled NIFSofts -/obj/item/organ/internal/cyberimp/brain/nif/proc/install_preinstalled_nifsofts() +/obj/item/organ/cyberimp/brain/nif/proc/install_preinstalled_nifsofts() if(!preinstalled_nifsofts) return FALSE @@ -182,7 +182,7 @@ return TRUE -/obj/item/organ/internal/cyberimp/brain/nif/process(seconds_per_tick) +/obj/item/organ/cyberimp/brain/nif/process(seconds_per_tick) . = ..() if(!linked_mob || broken || HAS_TRAIT(linked_mob, TRAIT_STASIS)) @@ -211,7 +211,7 @@ change_power_level(power_usage) ///Modifies power based off power_to_change. Negative numbers add charge, positive numbers remove charge -/obj/item/organ/internal/cyberimp/brain/nif/proc/change_power_level(power_to_change) +/obj/item/organ/cyberimp/brain/nif/proc/change_power_level(power_to_change) if(!power_to_change) return TRUE @@ -226,7 +226,7 @@ return TRUE ///Toggles nutrition drain as a power source on NIFs on/off. Bypass - Ignores the need to perform the nutirition_check() proc. -/obj/item/organ/internal/cyberimp/brain/nif/proc/toggle_nutrition_drain(bypass = FALSE) +/obj/item/organ/cyberimp/brain/nif/proc/toggle_nutrition_drain(bypass = FALSE) if(!bypass && !nutrition_check()) return FALSE @@ -244,7 +244,7 @@ return TRUE /// Checks to see if the mob has a nutrition that can be drain from -/obj/item/organ/internal/cyberimp/brain/nif/proc/nutrition_check() //This is a seperate proc so that TGUI can perform this check on the menu +/obj/item/organ/cyberimp/brain/nif/proc/nutrition_check() //This is a seperate proc so that TGUI can perform this check on the menu if(!linked_mob || !linked_mob.nutrition) return FALSE @@ -254,7 +254,7 @@ return linked_mob.nutrition >= minimum_nutrition ///Toggles Blood Drain. Bypasss - Ignores the need to perform the blood_check proc. -/obj/item/organ/internal/cyberimp/brain/nif/proc/toggle_blood_drain(bypass = FALSE) +/obj/item/organ/cyberimp/brain/nif/proc/toggle_blood_drain(bypass = FALSE) if(!bypass && !blood_check()) return @@ -270,14 +270,14 @@ balloon_alert(linked_mob, "Blood draining enabled") ///Checks if the NIF is able to draw blood as a power source? -/obj/item/organ/internal/cyberimp/brain/nif/proc/blood_check() +/obj/item/organ/cyberimp/brain/nif/proc/blood_check() if(!linked_mob || !linked_mob.blood_volume || (linked_mob.blood_volume <= minimum_blood_level)) return FALSE return TRUE ///Calibrates the Parent NIF, this is ran every time the parent NIF is first installed inside of someone. -/obj/item/organ/internal/cyberimp/brain/nif/proc/perform_calibration() +/obj/item/organ/cyberimp/brain/nif/proc/perform_calibration() if(linked_mob.stat >= DEAD) return FALSE @@ -310,7 +310,7 @@ stack_trace("persistence was not saved for [linked_mob]!") ///Installs the loaded_nifsoft to the parent NIF. -/obj/item/organ/internal/cyberimp/brain/nif/proc/install_nifsoft(datum/nifsoft/loaded_nifsoft) +/obj/item/organ/cyberimp/brain/nif/proc/install_nifsoft(datum/nifsoft/loaded_nifsoft) if(broken || calibrating) //NIFSofts can't be installed to a broken NIF return FALSE @@ -343,7 +343,7 @@ return TRUE ///Removes a NIFSoft from a NIF. Silent - determines whether or not alerts will be given to the owner of the NIF -/obj/item/organ/internal/cyberimp/brain/nif/proc/remove_nifsoft(datum/nifsoft/removed_nifsoft, silent = FALSE) +/obj/item/organ/cyberimp/brain/nif/proc/remove_nifsoft(datum/nifsoft/removed_nifsoft, silent = FALSE) if(!is_type_in_list(removed_nifsoft, loaded_nifsofts) || broken) return FALSE @@ -356,7 +356,7 @@ return TRUE ///Adjusts the NIF based on the adjustment_amount. Positive values repair, negative values damage -/obj/item/organ/internal/cyberimp/brain/nif/proc/adjust_durability(adjustment_amount) +/obj/item/organ/cyberimp/brain/nif/proc/adjust_durability(adjustment_amount) if(!adjustment_amount || ((adjustment_amount > 0) && (durability >= max_durability) || ((adjustment_amount < 0) && (durability <= NIF_MINIMUM_DURABILITY)))) return FALSE @@ -368,7 +368,7 @@ return TRUE ///Sends a message to the owner of the NIF. Typically used for messages from the NIF itself or from NIFSofts. -/obj/item/organ/internal/cyberimp/brain/nif/proc/send_message(message_to_send, alert = FALSE) +/obj/item/organ/cyberimp/brain/nif/proc/send_message(message_to_send, alert = FALSE) var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat) var/tag = sheet.icon_tag("nif-[chat_icon]") var/nif_icon = "" @@ -386,7 +386,7 @@ ///Changes the broken variable to be false. This does not relate to durability. -/obj/item/organ/internal/cyberimp/brain/nif/proc/fix_nif() +/obj/item/organ/cyberimp/brain/nif/proc/fix_nif() if(!broken) return FALSE @@ -395,14 +395,14 @@ return TRUE ///Re-enables the durability_loss_vulnerable variable, allowing the parent NIF to take durability damage again. -/obj/item/organ/internal/cyberimp/brain/nif/proc/make_vulnerable() +/obj/item/organ/cyberimp/brain/nif/proc/make_vulnerable() durability_loss_vulnerable = TRUE //This is here so that a TGUI can't be opened by using the implant while it isn't implanted. -/obj/item/organ/internal/cyberimp/brain/nif/attack_self(mob/user, modifiers) +/obj/item/organ/cyberimp/brain/nif/attack_self(mob/user, modifiers) return FALSE -/obj/item/organ/internal/cyberimp/brain/nif/emp_act(severity) +/obj/item/organ/cyberimp/brain/nif/emp_act(severity) if(!durability_loss_vulnerable) return FALSE @@ -426,7 +426,7 @@ send_message("ELECTROMAGNETIC INTERFERENCE DETECTED.", TRUE) ///Applies damage to the parent NIF whenever the user dies. -/obj/item/organ/internal/cyberimp/brain/nif/proc/damage_on_death() +/obj/item/organ/cyberimp/brain/nif/proc/damage_on_death() SIGNAL_HANDLER if(!durability_loss_vulnerable) @@ -438,7 +438,7 @@ addtimer(CALLBACK(src, PROC_REF(make_vulnerable)), 20 MINUTES) //Players should have a decent grace period on this. /// Removes rewards points from the parent NIF. Returns FALSE if there are not enough points to remove, returns TRUE if the points have been succesfully removed. -/obj/item/organ/internal/cyberimp/brain/nif/proc/remove_rewards_points(points_to_remove) +/obj/item/organ/cyberimp/brain/nif/proc/remove_rewards_points(points_to_remove) if(points_to_remove > rewards_points) return FALSE @@ -468,7 +468,7 @@ ///Checks to see if a human with a NIF has the nifsoft_to_find type of NIFSoft installed? /mob/living/carbon/human/proc/find_nifsoft(datum/nifsoft/nifsoft_to_find) - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/installed_nif = get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) var/list/nifsoft_list = installed_nif?.loaded_nifsofts if(!nifsoft_list) @@ -486,14 +486,14 @@ InsertAll("nif", 'modular_skyrat/modules/modular_implants/icons/chat.dmi') /obj/item/autosurgeon/organ/nif - starting_organ = /obj/item/organ/internal/cyberimp/brain/nif/standard + starting_organ = /obj/item/organ/cyberimp/brain/nif/standard uses = 1 -/obj/item/organ/internal/cyberimp/brain/nif/debug +/obj/item/organ/cyberimp/brain/nif/debug is_calibrated = TRUE /obj/item/autosurgeon/organ/nif/debug - starting_organ = /obj/item/organ/internal/cyberimp/brain/nif/debug + starting_organ = /obj/item/organ/cyberimp/brain/nif/debug uses = 1 /obj/item/storage/box/nif_ghost_box diff --git a/modular_skyrat/modules/modular_implants/code/nifs_tgui.dm b/modular_skyrat/modules/modular_implants/code/nifs_tgui.dm index dfc9916ab83..0c4fc623844 100644 --- a/modular_skyrat/modules/modular_implants/code/nifs_tgui.dm +++ b/modular_skyrat/modules/modular_implants/code/nifs_tgui.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/cyberimp/brain/nif +/obj/item/organ/cyberimp/brain/nif ///Currently Avalible themese for the NIFs var/static/list/ui_themes = list( "abductor", @@ -16,22 +16,22 @@ ///What theme is currently being used on the NIF? var/current_theme = "default" -/obj/item/organ/internal/cyberimp/brain/nif/ui_interact(mob/user, datum/tgui/ui) +/obj/item/organ/cyberimp/brain/nif/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "NifPanel", name) ui.open() -/obj/item/organ/internal/cyberimp/brain/nif/ui_state(mob/user) +/obj/item/organ/cyberimp/brain/nif/ui_state(mob/user) return GLOB.conscious_state -/obj/item/organ/internal/cyberimp/brain/nif/ui_status(mob/user) +/obj/item/organ/cyberimp/brain/nif/ui_status(mob/user) if(user == linked_mob) return UI_INTERACTIVE return UI_CLOSE -/obj/item/organ/internal/cyberimp/brain/nif/ui_static_data(mob/user) +/obj/item/organ/cyberimp/brain/nif/ui_static_data(mob/user) var/list/data = list() data["loaded_nifsofts"] = list() @@ -60,7 +60,7 @@ return data -/obj/item/organ/internal/cyberimp/brain/nif/ui_data(mob/user) +/obj/item/organ/cyberimp/brain/nif/ui_data(mob/user) var/list/data = list() //User Preference Variables data["linked_mob_name"] = linked_mob.name @@ -82,7 +82,7 @@ return data -/obj/item/organ/internal/cyberimp/brain/nif/ui_act(action, list/params) +/obj/item/organ/cyberimp/brain/nif/ui_act(action, list/params) . = ..() if(.) return diff --git a/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm b/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm index d60dd4ac3f4..f8373458db4 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsoft_catalog.dm @@ -42,7 +42,7 @@ GLOBAL_LIST_INIT(purchasable_nifsofts, list( var/rewards_points = 0 if(target_nif) - var/obj/item/organ/internal/cyberimp/brain/nif/buyer_nif = target_nif.resolve() + var/obj/item/organ/cyberimp/brain/nif/buyer_nif = target_nif.resolve() if(buyer_nif) rewards_points = buyer_nif.rewards_points @@ -58,7 +58,7 @@ GLOBAL_LIST_INIT(purchasable_nifsofts, list( target_nif = null else - var/obj/item/organ/internal/cyberimp/brain/nif/user_nif = nif_user.get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/user_nif = nif_user.get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) if(!user_nif) target_nif = null @@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(purchasable_nifsofts, list( var/amount_to_charge = (params["product_cost"]) var/rewards_purchase = (params["rewards_purchase"]) - var/obj/item/organ/internal/cyberimp/brain/nif/buyer_nif = target_nif.resolve() + var/obj/item/organ/cyberimp/brain/nif/buyer_nif = target_nif.resolve() if(rewards_purchase) if(buyer_nif.rewards_points < amount_to_charge) diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts.dm b/modular_skyrat/modules/modular_implants/code/nifsofts.dm index ddbff9cf86e..8db8b1a75f2 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts.dm @@ -41,7 +41,7 @@ ///How long is the cooldown for? var/cooldown_duration = DEFAULT_NIFSOFT_COOLDOWN ///What NIF models can this software be installed on? - var/list/compatible_nifs = list(/obj/item/organ/internal/cyberimp/brain/nif) + var/list/compatible_nifs = list(/obj/item/organ/cyberimp/brain/nif) /// How much of the NIFSoft's purchase price is paid out as reward points, if any? var/rewards_points_rate = 0.5 @@ -62,7 +62,7 @@ if(no_rewards_points) //This is mostly so that credits can't be farmed through printed or stolen NIFSoft disks rewards_points_rate = 0 - compatible_nifs += /obj/item/organ/internal/cyberimp/brain/nif/debug + compatible_nifs += /obj/item/organ/cyberimp/brain/nif/debug program_name = name if(!recepient_nif.install_nifsoft(src)) @@ -77,7 +77,7 @@ linked_mob = null - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = parent_nif?.resolve() + var/obj/item/organ/cyberimp/brain/nif/installed_nif = parent_nif?.resolve() if(installed_nif) installed_nif.loaded_nifsofts.Remove(src) @@ -85,7 +85,7 @@ /// Activates the parent NIFSoft /datum/nifsoft/proc/activate() - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = parent_nif?.resolve() + var/obj/item/organ/cyberimp/brain/nif/installed_nif = parent_nif?.resolve() if(!installed_nif) stack_trace("NIFSoft [src] activated on a null parent!") // NIFSoft is -really- broken @@ -121,7 +121,7 @@ ///Refunds the activation cost of a NIFSoft. /datum/nifsoft/proc/refund_activation_cost() - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = parent_nif?.resolve() + var/obj/item/organ/cyberimp/brain/nif/installed_nif = parent_nif?.resolve() if(!installed_nif) return installed_nif.change_power_level(-activation_cost) @@ -153,7 +153,7 @@ /// Updates the theme of the NIFSoft to match the parent NIF /datum/nifsoft/proc/update_theme() - var/obj/item/organ/internal/cyberimp/brain/nif/target_nif = parent_nif.resolve() + var/obj/item/organ/cyberimp/brain/nif/target_nif = parent_nif.resolve() if(!target_nif) return FALSE @@ -190,7 +190,7 @@ /// Attempts to install the NIFSoft on the disk to the target /obj/item/disk/nifsoft_uploader/proc/attempt_software_install(mob/living/carbon/human/target) - var/obj/item/organ/internal/cyberimp/brain/nif/installed_nif = target.get_organ_by_type(/obj/item/organ/internal/cyberimp/brain/nif) + var/obj/item/organ/cyberimp/brain/nif/installed_nif = target.get_organ_by_type(/obj/item/organ/cyberimp/brain/nif) if(!ishuman(target) || !installed_nif) return FALSE diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm index 1fd07b658ac..c7b9e3dab5d 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts/huds.dm @@ -1,7 +1,7 @@ /datum/nifsoft/hud name = "Scrying Lens" program_desc = "An umbrella term for all sorts of NIFsofts dealing with heads-up displays, this sort of technology dates back almost to the beginning of NIFsoft development. These 'softs are commonly used in the civilian field for integration with all sorts of activities; piloting, swordplay, scientific research, or even AI copiloting for important social interactions. While normally the nanomachines involved in the program's operation are used as a sort of artificial contact lens over the user's visual organs, NanoTrasen regulations have bid these particular forks to instead integrate with glasses the user's already wearing." - compatible_nifs = list(/obj/item/organ/internal/cyberimp/brain/nif/standard) + compatible_nifs = list(/obj/item/organ/cyberimp/brain/nif/standard) active_mode = TRUE active_cost = 0.5 ui_icon = "eye" diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/money_sense.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/money_sense.dm index 668c9328135..37f06fddab5 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts/money_sense.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts/money_sense.dm @@ -7,7 +7,7 @@ program_desc = "Connects the user's brain to a database containing the current monetary values for most items, allowing them to determine their value in realtime" active_mode = TRUE active_cost = 0.5 - compatible_nifs = list(/obj/item/organ/internal/cyberimp/brain/nif/standard) + compatible_nifs = list(/obj/item/organ/cyberimp/brain/nif/standard) buying_category = NIFSOFT_CATEGORY_UTILITY ui_icon = "coins" diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/scryer.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/scryer.dm index 36c676795e9..566b585c31b 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts/scryer.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts/scryer.dm @@ -16,7 +16,7 @@ /datum/nifsoft/scryer/New() . = ..() - var/obj/item/organ/internal/cyberimp/brain/nif/parent_resolved = parent_nif.resolve() + var/obj/item/organ/cyberimp/brain/nif/parent_resolved = parent_nif.resolve() if(!istype(parent_resolved)) stack_trace("[src] ([REF(src)]) tried to create a linked scryer but it had no parent_nif!") if(!linked_scryer) diff --git a/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm b/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm index 113ea015e76..5de3cfc592a 100644 --- a/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm +++ b/modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm @@ -5,7 +5,7 @@ /datum/nifsoft/action_granter/shapeshifter name = "Polymorph" program_desc = "This program is a large-scale refitting of the nanomachine channels running over the skin of a NIF user. This allows the nanites to reach under the skin and even into the very bone structure of the host; including incorporation of mimetic materials and femto-level manipulation devices all for the purpose of allowing the user to, essentially, shapeshift on a low level. However, despite the incredible complexity behind these processes, there are still limits on the range of 'forms' a user can take. Mass can neither be created nor destroyed, after all, and you can only distribute and rearrange it in so many ways across a functioning humanoid body; meaning, the user cannot adopt forms too far out of their 'true' one." - compatible_nifs = list(/obj/item/organ/internal/cyberimp/brain/nif/standard) + compatible_nifs = list(/obj/item/organ/cyberimp/brain/nif/standard) purchase_price = 350 buying_category = NIFSOFT_CATEGORY_COSMETIC ui_icon = "paintbrush" diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm index 7c08663ae36..1430b8bf3c1 100644 --- a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm +++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm @@ -115,7 +115,7 @@ if(!istype(target_mob)) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN - var/obj/item/organ/internal/brain/target_brain = target_mob.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/target_brain = target_mob.get_organ_slot(ORGAN_SLOT_BRAIN) if(!istype(target_brain)) to_chat(user, span_warning("[target_mob] lacks a brain!")) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/arousal.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/arousal.dm index 6c1edbcdca3..e7932fad8c9 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/arousal.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/arousal.dm @@ -13,7 +13,7 @@ arousal_status = arousal_flag if(istype(src, /mob/living/carbon/human)) var/mob/living/carbon/human/target = src - for(var/obj/item/organ/external/genital/target_genital in target.organs) + for(var/obj/item/organ/genital/target_genital in target.organs) if(!target_genital.aroused == AROUSAL_CANT) target_genital.aroused = arousal_status target_genital.update_sprite_suffix() @@ -38,7 +38,7 @@ if(get_organ_slot(ORGAN_SLOT_VAGINA) && !has_status_effect(/datum/status_effect/body_fluid_regen/vagina)) apply_status_effect(/datum/status_effect/body_fluid_regen/vagina) - var/obj/item/organ/external/genital/breasts/breasts = get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/breasts = get_organ_slot(ORGAN_SLOT_BREASTS) if(!breasts || !breasts.lactates) remove_status_effect(/datum/status_effect/body_fluid_regen/breasts) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm index 8b296ff2ebf..740192df9ef 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm @@ -54,7 +54,7 @@ var/self_their = p_their() if(climax_choice == CLIMAX_PENIS || climax_choice == CLIMAX_BOTH) - var/obj/item/organ/external/genital/penis/penis = get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis/penis = get_organ_slot(ORGAN_SLOT_PENIS) if(!get_organ_slot(ORGAN_SLOT_TESTICLES)) //If we have no god damn balls, we can't cum anywhere... GET BALLS! visible_message(span_userlove("[src] orgasms, but nothing comes out of [self_their] penis!"), \ span_userlove("You orgasm, it feels great, but nothing comes out of your penis!")) @@ -109,7 +109,7 @@ if(target_human.has_anus(REQUIRE_GENITAL_EXPOSED)) target_buttons += "asshole" if(target_human.has_penis(REQUIRE_GENITAL_EXPOSED)) - var/obj/item/organ/external/genital/penis/other_penis = target_human.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis/other_penis = target_human.get_organ_slot(ORGAN_SLOT_PENIS) if(other_penis.sheath != "None") target_buttons += "sheath" target_buttons += "On [target_human_them]" @@ -129,7 +129,7 @@ span_userlove("You hilt your cock into [target_human]'s [climax_into_choice], shooting cum into [target_human_them]!")) to_chat(target_human, span_userlove("Your [climax_into_choice] fills with warm cum as [src] shoots [self_their] load into it.")) - var/obj/item/organ/external/genital/testicles/testicles = get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/testicles/testicles = get_organ_slot(ORGAN_SLOT_TESTICLES) testicles.transfer_internal_fluid(null, testicles.internal_fluid_count * 0.6) // yep. we are sending semen to nullspace if(create_cum_decal) add_cum_splatter_floor(get_turf(src)) @@ -143,7 +143,7 @@ return TRUE if(climax_choice == CLIMAX_VAGINA || climax_choice == CLIMAX_BOTH) - var/obj/item/organ/external/genital/vagina/vagina = get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/vagina/vagina = get_organ_slot(ORGAN_SLOT_VAGINA) if(is_bottomless() || vagina.visibility_preference == GENITAL_ALWAYS_SHOW) visible_message(span_userlove("[src] twitches and moans as [p_they()] climax from their vagina!"), span_userlove("You twitch and moan as you climax from your vagina!")) add_cum_splatter_floor(get_turf(src), female = TRUE) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/aroused.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/aroused.dm index ec632635bbd..db4baa355b3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/aroused.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/aroused.dm @@ -25,7 +25,7 @@ var/temp_pleasure = BASE_PAIN_AND_PLEASURE_ADJUSTMENT var/temp_pain = BASE_PAIN_AND_PLEASURE_ADJUSTMENT - var/obj/item/organ/external/genital/testicles/balls = affected_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/testicles/balls = affected_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) if(balls && balls.internal_fluid_full()) temp_arousal += BLUEBALL_AROUSAL_MODIFIER diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm index c1a5cbd978d..af2102cea3d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm @@ -48,10 +48,10 @@ alert_type = null /datum/status_effect/climax_cooldown/tick(seconds_between_ticks) - var/obj/item/organ/external/genital/vagina/vagina = owner.get_organ_slot(ORGAN_SLOT_VAGINA) - var/obj/item/organ/external/genital/testicles/balls = owner.get_organ_slot(ORGAN_SLOT_TESTICLES) - var/obj/item/organ/external/genital/testicles/penis = owner.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/testicles/anus = owner.get_organ_slot(ORGAN_SLOT_ANUS) + var/obj/item/organ/genital/vagina/vagina = owner.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/testicles/balls = owner.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/testicles/penis = owner.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/testicles/anus = owner.get_organ_slot(ORGAN_SLOT_ANUS) if(penis) penis.aroused = AROUSAL_NONE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm index c4a5bc5f83c..1d0b80b5267 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/fluid_generation.dm @@ -23,7 +23,7 @@ if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp) || !istype(affected_human)) return FALSE - var/obj/item/organ/external/genital/vagina/vagina = owner.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/vagina/vagina = owner.get_organ_slot(ORGAN_SLOT_VAGINA) if(!vagina) return FALSE @@ -41,7 +41,7 @@ if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp) || !istype(affected_human)) return FALSE - var/obj/item/organ/external/genital/testicles/testes = owner.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/testicles/testes = owner.get_organ_slot(ORGAN_SLOT_TESTICLES) if(!testes || (affected_human.arousal < AROUSAL_LOW)) return FALSE @@ -56,7 +56,7 @@ if(owner.stat >= DEAD || !owner.client?.prefs?.read_preference(/datum/preference/toggle/erp) || !istype(affected_human)) return FALSE - var/obj/item/organ/external/genital/breasts/breasts = owner.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/breasts = owner.get_organ_slot(ORGAN_SLOT_BREASTS) if(!breasts || !breasts.lactates) return FALSE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm index 768acd607bc..1d67a04743e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/_aphrodisiac.dm @@ -202,7 +202,7 @@ if(!exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/penis_enlargement)) return - var/obj/item/organ/external/genital/penis/mob_penis = exposed_mob.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis/mob_penis = exposed_mob.get_organ_slot(ORGAN_SLOT_PENIS) if(mob_testicles.genital_size < balls_big_size && prob(balls_increase_chance)) // Add some randomness so growth happens more gradually in most cases mob_testicles.genital_size = min(mob_testicles.genital_size + testicles_size_increase_step, balls_max_size) @@ -384,7 +384,7 @@ * message - the message to send to chat */ /datum/reagent/drug/aphrodisiac/proc/remove_genitals(mob/living/carbon/human/exposed_mob, suppress_chat = FALSE, list/genitals_to_remove, message) - for(var/obj/item/organ/external/genital/mob_genital in genitals_to_remove) + for(var/obj/item/organ/genital/mob_genital in genitals_to_remove) remove_genital(exposed_mob, mob_genital, suppress_chat) if(!suppress_chat && message) @@ -462,7 +462,7 @@ exposed_mob.dna.mutant_bodyparts[ORGAN_SLOT_PENIS][MUTANT_INDEX_COLOR_LIST] = list(colour) // Create the new penis - var/obj/item/organ/external/genital/penis/new_penis = new + var/obj/item/organ/genital/penis/new_penis = new new_penis.build_from_dna(exposed_mob.dna, ORGAN_SLOT_PENIS) new_penis.Insert(exposed_mob, 0, FALSE) new_penis.genital_size = 4 @@ -488,7 +488,7 @@ if(!exposed_mob.client?.prefs.read_preference(/datum/preference/toggle/erp/new_genitalia_growth)) return - var/obj/item/organ/external/genital/testicles/new_balls = new + var/obj/item/organ/genital/testicles/new_balls = new new_balls.build_from_dna(exposed_mob.dna, ORGAN_SLOT_TESTICLES) new_balls.Insert(exposed_mob, 0, FALSE) new_balls.genital_size = 0 @@ -517,7 +517,7 @@ exposed_mob.dna.mutant_bodyparts[ORGAN_SLOT_BREASTS][MUTANT_INDEX_NAME] = "Pair" // Create the new breasts - var/obj/item/organ/external/genital/breasts/new_breasts = new + var/obj/item/organ/genital/breasts/new_breasts = new new_breasts.build_from_dna(exposed_mob.dna, ORGAN_SLOT_BREASTS) new_breasts.Insert(exposed_mob, FALSE, FALSE) new_breasts.genital_size = 2 @@ -554,7 +554,7 @@ if (exposed_mob.dna.mutant_bodyparts[ORGAN_SLOT_VAGINA][MUTANT_INDEX_NAME] == "None") exposed_mob.dna.mutant_bodyparts[ORGAN_SLOT_VAGINA][MUTANT_INDEX_NAME] = "Human" - var/obj/item/organ/external/genital/vagina/new_vagina = new + var/obj/item/organ/genital/vagina/new_vagina = new new_vagina.build_from_dna(exposed_mob.dna, ORGAN_SLOT_VAGINA) new_vagina.Insert(exposed_mob, 0, FALSE) update_appearance(exposed_mob) @@ -577,7 +577,7 @@ if (exposed_mob.dna.mutant_bodyparts[ORGAN_SLOT_WOMB][MUTANT_INDEX_NAME] == "None") exposed_mob.dna.mutant_bodyparts[ORGAN_SLOT_WOMB][MUTANT_INDEX_NAME] = "Normal" - var/obj/item/organ/external/genital/womb/new_womb = new + var/obj/item/organ/genital/womb/new_womb = new new_womb.build_from_dna(exposed_mob.dna, ORGAN_SLOT_WOMB) new_womb.Insert(exposed_mob, 0, FALSE) update_appearance(exposed_mob) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/camphor.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/camphor.dm index 8ee5d31d059..2af3c7fcb39 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/camphor.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/camphor.dm @@ -30,7 +30,7 @@ exposed_mob.set_gender(exposed_mob.client?.prefs?.read_preference(/datum/preference/choiced/gender)) if(exposed_mob.get_organ_slot(ORGAN_SLOT_BREASTS)) - var/obj/item/organ/external/genital/breasts/mob_breasts = exposed_mob.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/mob_breasts = exposed_mob.get_organ_slot(ORGAN_SLOT_BREASTS) var/original_breast_size = GLOB.breast_size_to_number[exposed_mob.client?.prefs.read_preference(/datum/preference/choiced/breasts_size)] if(original_breast_size) if(mob_breasts?.genital_size > original_breast_size) @@ -43,7 +43,7 @@ modified_genitals = TRUE if(exposed_mob.get_organ_slot(ORGAN_SLOT_PENIS)) - var/obj/item/organ/external/genital/penis/mob_penis = exposed_mob.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis/mob_penis = exposed_mob.get_organ_slot(ORGAN_SLOT_PENIS) if(exposed_mob.client?.prefs?.read_preference(/datum/preference/numeric/penis_length)) var/original_penis_length = exposed_mob.client?.prefs.read_preference(/datum/preference/numeric/penis_length) var/original_penis_girth = exposed_mob.client?.prefs.read_preference(/datum/preference/numeric/penis_girth) @@ -66,7 +66,7 @@ modified_genitals = TRUE if(exposed_mob.get_organ_slot(ORGAN_SLOT_TESTICLES)) - var/obj/item/organ/external/genital/testicles/mob_testicles = exposed_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/testicles/mob_testicles = exposed_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) if(exposed_mob.client?.prefs?.read_preference(/datum/preference/numeric/balls_size)) var/original_ball_size = exposed_mob.client?.prefs.read_preference(/datum/preference/numeric/balls_size) if(mob_testicles?.genital_size > original_ball_size) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/crocin.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/crocin.dm index abb45ae5c04..070cea0cd53 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/crocin.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/crocin.dm @@ -37,7 +37,7 @@ exposed_mob.adjust_pain(pain_adjust_amount) var/modified_genitals = FALSE - for(var/obj/item/organ/external/genital/mob_genitals in exposed_mob.organs) + for(var/obj/item/organ/genital/mob_genitals in exposed_mob.organs) if(!mob_genitals.aroused == AROUSAL_CANT) mob_genitals.aroused = AROUSAL_FULL mob_genitals.update_sprite_suffix() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/incubus_draft.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/incubus_draft.dm index e2dd1518258..be21cfc2283 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/incubus_draft.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/incubus_draft.dm @@ -107,9 +107,9 @@ if(!mob_genital) return - if(istype(mob_genital, /obj/item/organ/external/genital/penis)) + if(istype(mob_genital, /obj/item/organ/genital/penis)) penis_growth_to_chat(exposed_mob, mob_genital) - else if(istype(mob_genital, /obj/item/organ/external/genital/testicles)) + else if(istype(mob_genital, /obj/item/organ/genital/testicles)) testicles_growth_to_chat(exposed_mob, mob_genital, suppress_chat) /** diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm index c208bc46725..ed9b8ea4234 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/latex_catsuit.dm @@ -32,7 +32,7 @@ /obj/item/clothing/under/misc/latex_catsuit/equipped(mob/living/affected_mob, slot) . = ..() var/mob/living/carbon/human/affected_human = affected_mob - var/obj/item/organ/external/genital/breasts/affected_breasts = affected_human.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/affected_breasts = affected_human.get_organ_slot(ORGAN_SLOT_BREASTS) if(src == affected_human.w_uniform) if(affected_mob.gender == FEMALE) icon_state = "latex_catsuit_female" diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm index 1a53fbdd256..2368b98e8ea 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm @@ -56,10 +56,10 @@ /obj/item/clothing/strapon/equipped(mob/user, slot) . = ..() var/mob/living/carbon/human/affected_mob = user - var/obj/item/organ/external/genital/vagina/affected_vagina = affected_mob.get_organ_slot(ORGAN_SLOT_VAGINA) - var/obj/item/organ/external/genital/womb/affected_womb = affected_mob.get_organ_slot(ORGAN_SLOT_WOMB) - var/obj/item/organ/external/genital/penis/affected_penis = affected_mob.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/testicles/affected_testicles = affected_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/vagina/affected_vagina = affected_mob.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/womb/affected_womb = affected_mob.get_organ_slot(ORGAN_SLOT_WOMB) + var/obj/item/organ/genital/penis/affected_penis = affected_mob.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/testicles/affected_testicles = affected_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) if(src == affected_mob.belt) affected_vagina?.visibility_preference = GENITAL_NEVER_SHOW @@ -73,10 +73,10 @@ /obj/item/clothing/strapon/dropped(mob/living/user) . = ..() var/mob/living/carbon/human/affected_mob = user - var/obj/item/organ/external/genital/vagina/affected_vagina = affected_mob.get_organ_slot(ORGAN_SLOT_VAGINA) - var/obj/item/organ/external/genital/womb/affected_womb = affected_mob.get_organ_slot(ORGAN_SLOT_WOMB) - var/obj/item/organ/external/genital/penis/affected_penis = affected_mob.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/testicles/affected_testicles = affected_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/vagina/affected_vagina = affected_mob.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/womb/affected_womb = affected_mob.get_organ_slot(ORGAN_SLOT_WOMB) + var/obj/item/organ/genital/penis/affected_penis = affected_mob.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/testicles/affected_testicles = affected_mob.get_organ_slot(ORGAN_SLOT_TESTICLES) if(strapon_item && !ismob(loc) && in_hands == TRUE && src != affected_mob.belt) qdel(strapon_item) @@ -193,7 +193,7 @@ return var/message = "" - var/obj/item/organ/external/genital/vagina = hit_mob.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/vagina = hit_mob.get_organ_slot(ORGAN_SLOT_VAGINA) if(hit_mob.check_erp_prefs(/datum/preference/toggle/erp/sex_toy, user, src)) switch(user.zone_selected) //to let code know what part of body we gonna fuck if(BODY_ZONE_PRECISE_GROIN) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm index 01ef376b03e..6cee535c0ee 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm @@ -38,7 +38,7 @@ /// Returns true if the human has an accessible penis for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines. /mob/living/carbon/human/proc/has_penis(required_state = REQUIRE_GENITAL_ANY) - var/obj/item/organ/external/genital/genital = get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/genital = get_organ_slot(ORGAN_SLOT_PENIS) if(!genital) return FALSE @@ -54,7 +54,7 @@ /// Returns true if the human has a accessible balls for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines. /mob/living/carbon/human/proc/has_balls(required_state = REQUIRE_GENITAL_ANY) - var/obj/item/organ/external/genital/genital = get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/genital = get_organ_slot(ORGAN_SLOT_TESTICLES) if(!genital) return FALSE @@ -70,7 +70,7 @@ /// Returns true if the human has an accessible vagina for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines. /mob/living/carbon/human/proc/has_vagina(required_state = REQUIRE_GENITAL_ANY) - var/obj/item/organ/external/genital/genital = get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/genital = get_organ_slot(ORGAN_SLOT_VAGINA) if(!genital) return FALSE @@ -86,7 +86,7 @@ /// Returns true if the human has a accessible breasts for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines. /mob/living/carbon/human/proc/has_breasts(required_state = REQUIRE_GENITAL_ANY) - var/obj/item/organ/external/genital/genital = get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/genital = get_organ_slot(ORGAN_SLOT_BREASTS) if(!genital) return FALSE @@ -104,7 +104,7 @@ /mob/living/carbon/human/proc/has_anus(required_state = REQUIRE_GENITAL_ANY) if(issilicon(src)) return TRUE - var/obj/item/organ/external/genital/genital = get_organ_slot(ORGAN_SLOT_ANUS) + var/obj/item/organ/genital/genital = get_organ_slot(ORGAN_SLOT_ANUS) if(!genital) return FALSE @@ -380,5 +380,5 @@ ..() /// Checks if the tail is exposed. -/obj/item/organ/external/tail/proc/is_exposed() +/obj/item/organ/tail/proc/is_exposed() return TRUE // your tail is always exposed, dummy! why are you checking this diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm index bbc1610e6ef..b42413ee3bc 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/organs.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/brain/on_life(seconds_per_tick, times_fired) //All your horny is here *points to the head* +/obj/item/organ/brain/on_life(seconds_per_tick, times_fired) //All your horny is here *points to the head* . = ..() var/mob/living/carbon/human/brain_owner = owner if(istype(brain_owner, /mob/living/carbon/human) && brain_owner.client?.prefs?.read_preference(/datum/preference/toggle/erp)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm index 506a21248a3..b37f135285b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm @@ -18,8 +18,8 @@ return var/mob/living/carbon/human/affected_human = user - var/obj/item/organ/external/genital/testicles/testicles = affected_human.get_organ_slot(ORGAN_SLOT_TESTICLES) - var/obj/item/organ/external/genital/penis/penis = affected_human.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/testicles/testicles = affected_human.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/penis/penis = affected_human.get_organ_slot(ORGAN_SLOT_PENIS) var/datum/sprite_accessory/genital/penis_sprite = SSaccessories.sprite_accessories[ORGAN_SLOT_PENIS][affected_human.dna.species.mutant_bodyparts[ORGAN_SLOT_PENIS][MUTANT_INDEX_NAME]] if(penis_sprite.is_hidden(affected_human)) to_chat(user, span_notice("You need to expose yourself in order to masturbate.")) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm index 00f5c762858..6f40032059c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/clamps.dm @@ -40,7 +40,7 @@ . = ..() if(!istype(user)) return - var/obj/item/organ/external/genital/breasts/user_breast = user.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/user_breast = user.get_organ_slot(ORGAN_SLOT_BREASTS) if(src == user.nipples) if(user_breast) @@ -70,7 +70,7 @@ /obj/item/clothing/sextoy/nipple_clamps/process(seconds_per_tick) . = ..() var/mob/living/carbon/human/target = loc - var/obj/item/organ/external/genital/breasts/target_breast = target.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts/target_breast = target.get_organ_slot(ORGAN_SLOT_BREASTS) if(!target || !target_breast) return target.adjust_arousal(1 * seconds_per_tick) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index bdf1417c492..d48acab2609 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -112,7 +112,7 @@ var/list/possible_emotes = list("moan") switch(user.zone_selected) //to let code know what part of body we gonna fuck if(BODY_ZONE_PRECISE_GROIN) - var/obj/item/organ/external/genital/vagina = target.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/vagina = target.get_organ_slot(ORGAN_SLOT_VAGINA) if(!vagina?.is_exposed()) to_chat(user, span_danger("Looks like [target]'s groin is covered!")) return FALSE @@ -159,7 +159,7 @@ possible_emotes = list("gasp", "moan") else - var/obj/item/organ/external/genital/anus = target.get_organ_slot(ORGAN_SLOT_ANUS) + var/obj/item/organ/genital/anus = target.get_organ_slot(ORGAN_SLOT_ANUS) if(!anus?.is_exposed()) to_chat(user, span_danger("Looks like [target]'s anus is covered!")) return FALSE @@ -346,11 +346,11 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors . = ..() if(!istype(user)) return - var/obj/item/organ/external/genital/vagina/vagina = user.get_organ_slot(ORGAN_SLOT_VAGINA) - var/obj/item/organ/external/genital/womb/womb = user.get_organ_slot(ORGAN_SLOT_WOMB) - var/obj/item/organ/external/genital/penis/penis = user.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/testicles/testicles = user.get_organ_slot(ORGAN_SLOT_TESTICLES) - var/obj/item/organ/external/genital/anus/anus = user.get_organ_slot(ORGAN_SLOT_ANUS) + var/obj/item/organ/genital/vagina/vagina = user.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/womb/womb = user.get_organ_slot(ORGAN_SLOT_WOMB) + var/obj/item/organ/genital/penis/penis = user.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/testicles/testicles = user.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/anus/anus = user.get_organ_slot(ORGAN_SLOT_ANUS) if(src == user.vagina) vagina?.visibility_preference = GENITAL_NEVER_SHOW @@ -379,11 +379,11 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors if(other_end) QDEL_NULL(other_end) - var/obj/item/organ/external/genital/vagina/vagina = user.get_organ_slot(ORGAN_SLOT_VAGINA) - var/obj/item/organ/external/genital/womb/womb = user.get_organ_slot(ORGAN_SLOT_WOMB) - var/obj/item/organ/external/genital/penis/penis = user.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/testicles/testicles = user.get_organ_slot(ORGAN_SLOT_TESTICLES) - var/obj/item/organ/external/genital/anus/anus = user.get_organ_slot(ORGAN_SLOT_ANUS) + var/obj/item/organ/genital/vagina/vagina = user.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/womb/womb = user.get_organ_slot(ORGAN_SLOT_WOMB) + var/obj/item/organ/genital/penis/penis = user.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/testicles/testicles = user.get_organ_slot(ORGAN_SLOT_TESTICLES) + var/obj/item/organ/genital/anus/anus = user.get_organ_slot(ORGAN_SLOT_ANUS) if(!(src == user.vagina)) anus?.visibility_preference = GENITAL_HIDDEN_BY_CLOTHES diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/feather.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/feather.dm index 506d2e83bba..c4fa1b7a322 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/feather.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/feather.dm @@ -37,7 +37,7 @@ "tickles [target] with [src]") if(BODY_ZONE_CHEST) if(carbon_target) - var/obj/item/organ/external/genital/badonkers = carbon_target.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/badonkers = carbon_target.get_organ_slot(ORGAN_SLOT_BREASTS) if(!badonkers?.is_exposed()) to_chat(user, span_danger("Looks like [target]'s chest is covered!")) return diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm index ceaa70651fb..62cdae19214 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm @@ -66,7 +66,7 @@ to_chat(user, span_danger("[target] doesn't want you to do that!")) return - var/obj/item/organ/external/genital/penis = target.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/penis = target.get_organ_slot(ORGAN_SLOT_PENIS) if(!penis?.is_exposed()) to_chat(user, span_danger("Looks like [target]'s groin is covered!")) return diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm index 4a44cc8edc7..fcdd954f8ed 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm @@ -128,8 +128,8 @@ var/message = "" switch(user.zone_selected) //to let code know what part of body we gonna tickle if(BODY_ZONE_PRECISE_GROIN) - var/obj/item/organ/external/genital/penis = target.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/vagina = target.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/penis = target.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/vagina = target.get_organ_slot(ORGAN_SLOT_VAGINA) var/penis_message = (user == target) ? pick("leans [src] against [target.p_their()] penis, letting it shock [target.p_them()]. Ouch...", "shocks [target.p_their()] penis with [src]") \ : pick("uses [src] to shock [target]'s penis", @@ -165,7 +165,7 @@ return if(BODY_ZONE_CHEST) - var/obj/item/organ/external/genital/breasts = target.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts = target.get_organ_slot(ORGAN_SLOT_BREASTS) if(breasts?.is_exposed()) message = (user == target) ? pick("leans [src] against [target.p_their()] breasts, letting it shock [target.p_them()].", "shocks [target.p_their()] tits with [src]") \ diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm index 52b7891ae03..b61d19abe99 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm @@ -129,8 +129,8 @@ switch(user.zone_selected) if(BODY_ZONE_PRECISE_GROIN) if(carbon_target) - var/obj/item/organ/external/genital/penis = carbon_target.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/vagina = carbon_target.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/penis = carbon_target.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/vagina = carbon_target.get_organ_slot(ORGAN_SLOT_VAGINA) if(!vagina && !penis) return FALSE @@ -166,7 +166,7 @@ if(BODY_ZONE_CHEST) if(carbon_target) - var/obj/item/organ/external/genital/breasts = carbon_target.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts = carbon_target.get_organ_slot(ORGAN_SLOT_BREASTS) if(!breasts?.is_exposed()) to_chat(user, span_danger("Looks like [target]'s chest is covered!")) return FALSE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm index 6eb5415bc1a..864464ff824 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm @@ -152,8 +152,8 @@ return switch(user.zone_selected) //to let code know what part of body we gonna wax if(BODY_ZONE_PRECISE_GROIN) - var/obj/item/organ/external/genital/penis = attacked.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/vagina = attacked.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/penis = attacked.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/vagina = attacked.get_organ_slot(ORGAN_SLOT_VAGINA) var/penis_message = (user == attacked) ? pick("drips some wax on [attacked.p_their()] penis, causing [attacked.p_them()] to moan in pleasure.", "drips some wax on [attacked.p_them()]self, letting it reach [attacked.p_their()] penis.") \ : pick("drips wax right on [attacked]'s penis. It slightly itches.", @@ -184,7 +184,7 @@ attacked.adjust_pain(PAIN_DEFAULT) if(BODY_ZONE_CHEST) - var/obj/item/organ/external/genital/breasts = attacked.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts = attacked.get_organ_slot(ORGAN_SLOT_BREASTS) if(breasts?.is_exposed()) var/breasts_or_nipples = breasts ? ORGAN_SLOT_BREASTS : ORGAN_SLOT_NIPPLES message = (user == attacked) ? pick("drips some wax on [attacked.p_their()] [breasts_or_nipples], releasing all [attacked.p_their()] lustness", diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm index 974f2130b41..fedd9e235b6 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm @@ -139,8 +139,8 @@ switch(user.zone_selected) //to let code know what part of body we gonna vibe if(BODY_ZONE_PRECISE_GROIN) - var/obj/item/organ/external/genital/penis = target.get_organ_slot(ORGAN_SLOT_PENIS) - var/obj/item/organ/external/genital/vagina = target.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/penis = target.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/vagina = target.get_organ_slot(ORGAN_SLOT_VAGINA) var/penis_message = (user == target) ? pick("massages their penis with the [src]", "[vibration_adj] teases their penis with [src]") \ : pick("[vibration_adj] massages [target]'s penis with [src]", @@ -167,7 +167,7 @@ target.try_lewd_autoemote(pick("twitch_s", "moan", "blush")) if(BODY_ZONE_CHEST) - var/obj/item/organ/external/genital/breasts = target.get_organ_slot(ORGAN_SLOT_BREASTS) + var/obj/item/organ/genital/breasts = target.get_organ_slot(ORGAN_SLOT_BREASTS) if(breasts?.is_exposed()) var/breasts_or_nipples = breasts ? ORGAN_SLOT_BREASTS : ORGAN_SLOT_NIPPLES message = (user == target) ? pick("massages their [breasts_or_nipples] with the [src]", diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm index 269d1087842..de502083fb7 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm @@ -85,7 +85,7 @@ var/mob/living/carbon/human/user = loc if(!user || !istype(user)) return PROCESS_KILL - var/obj/item/organ/external/genital/testicles/balls = user.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/testicles/balls = user.get_organ_slot(ORGAN_SLOT_PENIS) if(!toy_on || !balls) return user.adjust_arousal(1 * seconds_per_tick) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index 50c21f8653d..42c8f94c858 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -41,17 +41,17 @@ */ /// What organ is fluid being extracted from? - var/obj/item/organ/external/genital/current_selected_organ = null + var/obj/item/organ/genital/current_selected_organ = null /// What beaker is liquid being outputted to? var/obj/item/reagent_containers/cup/beaker = null /// What human mob is currently buckled to the machine? var/mob/living/carbon/human/current_mob = null /// What is the current breast organ of the buckled mob? - var/obj/item/organ/external/genital/breasts/current_breasts = null + var/obj/item/organ/genital/breasts/current_breasts = null /// What is the current testicles organ of the buckled mob? - var/obj/item/organ/external/genital/testicles/current_testicles = null + var/obj/item/organ/genital/testicles/current_testicles = null /// What is the current vagina organ of the buckled mob? - var/obj/item/organ/external/genital/vagina/current_vagina = null + var/obj/item/organ/genital/vagina/current_vagina = null /// What color is the machine currently set to? var/machine_color = "pink" @@ -353,7 +353,7 @@ update_all_visuals() return FALSE - if((istype(current_selected_organ, /obj/item/organ/external/genital/testicles) && (semen_vessel.reagents.total_volume == MILKING_PUMP_MAX_CAPACITY)) || (istype(current_selected_organ, /obj/item/organ/external/genital/vagina) && (girlcum_vessel.reagents.total_volume == MILKING_PUMP_MAX_CAPACITY)) || (istype(current_selected_organ, /obj/item/organ/external/genital/breasts) && (milk_vessel.reagents.total_volume == MILKING_PUMP_MAX_CAPACITY))) + if((istype(current_selected_organ, /obj/item/organ/genital/testicles) && (semen_vessel.reagents.total_volume == MILKING_PUMP_MAX_CAPACITY)) || (istype(current_selected_organ, /obj/item/organ/genital/vagina) && (girlcum_vessel.reagents.total_volume == MILKING_PUMP_MAX_CAPACITY)) || (istype(current_selected_organ, /obj/item/organ/genital/breasts) && (milk_vessel.reagents.total_volume == MILKING_PUMP_MAX_CAPACITY))) current_mode = MILKING_PUMP_MODE_OFF pump_state = MILKING_PUMP_STATE_OFF update_all_visuals() @@ -384,11 +384,11 @@ var/obj/item/reagent_containers/target_container switch(current_selected_organ.type) - if(/obj/item/organ/external/genital/breasts) + if(/obj/item/organ/genital/breasts) target_container = milk_vessel - if(/obj/item/organ/external/genital/vagina) + if(/obj/item/organ/genital/vagina) target_container = girlcum_vessel - if(/obj/item/organ/external/genital/testicles) + if(/obj/item/organ/genital/testicles) target_container = semen_vessel if(!target_container || current_selected_organ.internal_fluid_count <= 0) @@ -447,7 +447,7 @@ var/current_selected_organ_size = current_selected_organ.genital_size cut_overlay(organ_overlay) - if(istype(current_selected_organ, /obj/item/organ/external/genital/breasts)) + if(istype(current_selected_organ, /obj/item/organ/genital/breasts)) switch(current_selected_organ.genital_type) if("pair") current_selected_organ_type = "double_breast" @@ -471,14 +471,14 @@ else current_selected_organ_size = "5" - if(istype(current_selected_organ, /obj/item/organ/external/genital/testicles)) + if(istype(current_selected_organ, /obj/item/organ/genital/testicles)) current_selected_organ_type = ORGAN_SLOT_PENIS - if(istype(current_selected_organ, /obj/item/organ/external/genital/vagina)) + if(istype(current_selected_organ, /obj/item/organ/genital/vagina)) current_selected_organ_type = ORGAN_SLOT_VAGINA organ_overlay_new_icon_state = "[current_selected_organ_type]_pump_[pump_state]" - if(istype(current_selected_organ, /obj/item/organ/external/genital/breasts)) + if(istype(current_selected_organ, /obj/item/organ/genital/breasts)) organ_overlay_new_icon_state += "_[current_selected_organ_size]" if(current_mode == MILKING_PUMP_MODE_OFF) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/washing_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/washing_machine.dm index 176750d8d64..f93a67c5adb 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/washing_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/washing_machine.dm @@ -30,8 +30,8 @@ if (covered) continue - var/obj/item/organ/external/genital/vagina/found_vagina = buckled_human.get_organ_slot(ORGAN_SLOT_VAGINA) - var/obj/item/organ/external/genital/vagina/found_penis = buckled_human.get_organ_slot(ORGAN_SLOT_PENIS) + var/obj/item/organ/genital/vagina/found_vagina = buckled_human.get_organ_slot(ORGAN_SLOT_VAGINA) + var/obj/item/organ/genital/vagina/found_penis = buckled_human.get_organ_slot(ORGAN_SLOT_PENIS) var/arousal_mult = seconds_per_tick var/message_chance = 40 diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/_genital.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/_genital.dm index ff1fdfe8cb5..319683e3c39 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/_genital.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/_genital.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/genital +/obj/item/organ/genital /// The fluid count of the genital. var/internal_fluid_count = 0 @@ -12,15 +12,15 @@ var/obj/item/inserted_item /// Helper proc for checking if internal fluids are full or not. -/obj/item/organ/external/genital/proc/internal_fluid_full() +/obj/item/organ/genital/proc/internal_fluid_full() return internal_fluid_count >= internal_fluid_maximum /// Adds the given amount to the internal fluid count, clamping it between 0 and internal_fluid_maximum. -/obj/item/organ/external/genital/proc/adjust_internal_fluid(amount) +/obj/item/organ/genital/proc/adjust_internal_fluid(amount) internal_fluid_count = clamp(internal_fluid_count + amount, 0, internal_fluid_maximum) /// Tries to add the specified amount to the target reagent container, or removes it if none are available. Keeps in mind internal_fluid_count. -/obj/item/organ/external/genital/proc/transfer_internal_fluid(datum/reagents/reagent_container = null, attempt_amount) +/obj/item/organ/genital/proc/transfer_internal_fluid(datum/reagents/reagent_container = null, attempt_amount) if(!internal_fluid_datum || !internal_fluid_count || !internal_fluid_maximum) return FALSE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm index 8899db9d003..9e2686001a3 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm @@ -1,7 +1,7 @@ -/obj/item/organ/external/genital/breasts +/obj/item/organ/genital/breasts internal_fluid_datum = /datum/reagent/consumable/breast_milk -/obj/item/organ/external/genital/breasts/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/breasts/build_from_dna(datum/dna/DNA, associated_key) . = ..() var/breasts_capacity = 0 var/size = 0.5 diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/testicles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/testicles.dm index e9864538174..dfe777b38a6 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/testicles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/testicles.dm @@ -1,7 +1,7 @@ -/obj/item/organ/external/genital/testicles +/obj/item/organ/genital/testicles internal_fluid_datum = /datum/reagent/consumable/cum -/obj/item/organ/external/genital/testicles/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/testicles/build_from_dna(datum/dna/DNA, associated_key) . = ..() var/size = 0.5 if(DNA.features["balls_size"] > 0) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/vagina.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/vagina.dm index c74995845a1..9a201ea5c5e 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/vagina.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_organs/vagina.dm @@ -1,6 +1,6 @@ -/obj/item/organ/external/genital/vagina +/obj/item/organ/genital/vagina internal_fluid_datum = /datum/reagent/consumable/femcum -/obj/item/organ/external/genital/vagina/build_from_dna(datum/dna/DNA, associated_key) +/obj/item/organ/genital/vagina/build_from_dna(datum/dna/DNA, associated_key) . = ..() internal_fluid_maximum = 10 diff --git a/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm b/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm index d76b1f07e41..33faffa1299 100644 --- a/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm +++ b/modular_skyrat/modules/modular_persistence/code/modular_persistence.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(modular_persistence_ignored_vars, list( "stored_character_slot_index", )) -/obj/item/organ/internal/brain +/obj/item/organ/brain /// The modular persistence data for a character. var/datum/modular_persistence/modular_persistence @@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(modular_persistence_ignored_vars, list( /// The master persistence datum. Add vars onto this in your own code. Just be aware that you'll need to use simple data types, such as strings, ints, and lists. /datum/modular_persistence /// The human that this is attached to. - var/obj/item/organ/internal/brain/owner + var/obj/item/organ/brain/owner /// The owner's character slot index. var/stored_character_slot_index @@ -114,6 +114,6 @@ GLOBAL_LIST_INIT(modular_persistence_ignored_vars, list( /// Saves the persistence data for the owner. /mob/living/carbon/human/proc/save_individual_persistence(var/ckey) - var/obj/item/organ/internal/brain/brain = get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/brain = get_organ_slot(ORGAN_SLOT_BRAIN) return brain?.modular_persistence?.save_data(ckey) diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index e12508fc2f7..982e1ff14ee 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -83,7 +83,7 @@ ) skyrat_contraband = list( - /obj/item/organ/internal/tongue/lizard/robot = 2, + /obj/item/organ/tongue/lizard/robot = 2, ) /obj/machinery/vending/wardrobe/science_wardrobe diff --git a/modular_skyrat/modules/moretraitoritems/code/autosurgeon.dm b/modular_skyrat/modules/moretraitoritems/code/autosurgeon.dm index b6b69baaff8..23c8527916d 100644 --- a/modular_skyrat/modules/moretraitoritems/code/autosurgeon.dm +++ b/modular_skyrat/modules/moretraitoritems/code/autosurgeon.dm @@ -1,36 +1,36 @@ /obj/item/autosurgeon/toolset - starting_organ = /obj/item/organ/internal/cyberimp/arm/toolset + starting_organ = /obj/item/organ/cyberimp/arm/toolset /obj/item/autosurgeon/surgery - starting_organ = /obj/item/organ/internal/cyberimp/arm/surgery + starting_organ = /obj/item/organ/cyberimp/arm/surgery /obj/item/autosurgeon/botany - starting_organ = /obj/item/organ/internal/cyberimp/arm/botany + starting_organ = /obj/item/organ/cyberimp/arm/botany /obj/item/autosurgeon/janitor - starting_organ = /obj/item/organ/internal/cyberimp/arm/janitor + starting_organ = /obj/item/organ/cyberimp/arm/janitor /obj/item/autosurgeon/armblade - starting_organ = /obj/item/organ/internal/cyberimp/arm/armblade + starting_organ = /obj/item/organ/cyberimp/arm/armblade /obj/item/autosurgeon/muscle - starting_organ = /obj/item/organ/internal/cyberimp/arm/strongarm + starting_organ = /obj/item/organ/cyberimp/arm/strongarm //syndie /obj/item/autosurgeon/syndicate/hackerman - starting_organ = /obj/item/organ/internal/cyberimp/arm/hacker + starting_organ = /obj/item/organ/cyberimp/arm/hacker /obj/item/autosurgeon/syndicate/esword_arm - starting_organ = /obj/item/organ/internal/cyberimp/arm/esword + starting_organ = /obj/item/organ/cyberimp/arm/esword /obj/item/autosurgeon/syndicate/nodrop - starting_organ = /obj/item/organ/internal/cyberimp/brain/anti_drop + starting_organ = /obj/item/organ/cyberimp/brain/anti_drop /obj/item/autosurgeon/syndicate/baton - starting_organ = /obj/item/organ/internal/cyberimp/arm/baton + starting_organ = /obj/item/organ/cyberimp/arm/baton /obj/item/autosurgeon/syndicate/flash - starting_organ = /obj/item/organ/internal/cyberimp/arm/flash + starting_organ = /obj/item/organ/cyberimp/arm/flash //bodypart /obj/item/autosurgeon/bodypart/r_arm_robotic @@ -45,9 +45,9 @@ name = "strange autosurgeon" icon = 'modular_skyrat/modules/moretraitoritems/icons/alien.dmi' surgery_speed = 2 - organ_whitelist = list(/obj/item/organ/internal/alien) + organ_whitelist = list(/obj/item/organ/alien) -/obj/item/organ/internal/alien/plasmavessel/opfor +/obj/item/organ/alien/plasmavessel/opfor stored_plasma = 500 max_plasma = 500 plasma_rate = 10 @@ -62,12 +62,12 @@ /obj/item/storage/organbox/strange/PopulateContents() new /obj/item/autosurgeon/xeno(src) - new /obj/item/organ/internal/alien/plasmavessel/opfor(src) - new /obj/item/organ/internal/alien/resinspinner(src) - new /obj/item/organ/internal/alien/acid(src) - new /obj/item/organ/internal/alien/neurotoxin(src) - new /obj/item/organ/internal/alien/hivenode(src) + new /obj/item/organ/alien/plasmavessel/opfor(src) + new /obj/item/organ/alien/resinspinner(src) + new /obj/item/organ/alien/acid(src) + new /obj/item/organ/alien/neurotoxin(src) + new /obj/item/organ/alien/hivenode(src) /obj/item/storage/organbox/strange/eggsac/PopulateContents() . = ..() - new /obj/item/organ/internal/alien/eggsac(src) + new /obj/item/organ/alien/eggsac(src) diff --git a/modular_skyrat/modules/mutants/code/mutant_species.dm b/modular_skyrat/modules/mutants/code/mutant_species.dm index 66c71e514ef..17ac43a3162 100644 --- a/modular_skyrat/modules/mutants/code/mutant_species.dm +++ b/modular_skyrat/modules/mutants/code/mutant_species.dm @@ -20,7 +20,7 @@ TRAIT_NO_ZOMBIFY, ) inherent_biotypes = MOB_UNDEAD | MOB_HUMANOID - mutanttongue = /obj/item/organ/internal/tongue/zombie + mutanttongue = /obj/item/organ/tongue/zombie changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | ERT_SPAWN bodytemp_normal = T0C // They have no natural body heat, the environment regulates body temp bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // Take damage at fire temp @@ -57,7 +57,7 @@ name = "Mutated Abomination" id = SPECIES_MUTANT_INFECTIOUS damage_modifier = 10 - mutanteyes = /obj/item/organ/internal/eyes/zombie + mutanteyes = /obj/item/organ/eyes/zombie changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/mutant_zombie, diff --git a/modular_skyrat/modules/night_vision/night_vision.dm b/modular_skyrat/modules/night_vision/night_vision.dm index 942d52fa645..5e2bfc04c52 100644 --- a/modular_skyrat/modules/night_vision/night_vision.dm +++ b/modular_skyrat/modules/night_vision/night_vision.dm @@ -21,7 +21,7 @@ /datum/quirk/night_vision/proc/refresh_quirk_holder_eyes() var/mob/living/carbon/human/human_quirk_holder = quirk_holder - var/obj/item/organ/internal/eyes/eyes = human_quirk_holder.get_organ_by_type(/obj/item/organ/internal/eyes) + var/obj/item/organ/eyes/eyes = human_quirk_holder.get_organ_by_type(/obj/item/organ/eyes) if(!eyes) return // We've either added or removed TRAIT_NIGHT_VISION before calling this proc. Just refresh the eyes. diff --git a/modular_skyrat/modules/organs/code/brain.dm b/modular_skyrat/modules/organs/code/brain.dm index e2c9349176b..48d4ad7ad22 100644 --- a/modular_skyrat/modules/organs/code/brain.dm +++ b/modular_skyrat/modules/organs/code/brain.dm @@ -1,16 +1,16 @@ //Unifying vox brains and android brains, so that when one is updated the other is as well. //The accessible cybernetic brain -/obj/item/organ/internal/brain/cybernetic/cortical +/obj/item/organ/brain/cybernetic/cortical name = "cortically-augmented brain" desc = "A brain which has been in some part mechanized." - icon = 'modular_skyrat/master_files/icons/obj/medical/organs/organs.dmi' + icon = 'modular_skyrat/master_files/icons/obj/medical/organs/organs.dmi' icon_state = "brain-c" emp_dmg_mult = 1.5 //Note that the base damage is 20/10 emp_dmg_max = 150 //Extra effects -/obj/item/organ/internal/brain/cybernetic/cortical/emp_act(severity) +/obj/item/organ/brain/cybernetic/cortical/emp_act(severity) . = ..() if(. & EMP_PROTECT_SELF) return @@ -25,10 +25,10 @@ owner.set_jitter_if_lower(15 SECONDS) owner.adjust_stutter(15 SECONDS) owner.adjust_confusion(3 SECONDS) - + // It's still organic -/obj/item/organ/internal/brain/cybernetic/cortical/brain_damage_examine() +/obj/item/organ/brain/cybernetic/cortical/brain_damage_examine() if(suicided) return span_info("Its circuitry is smoking slightly. They must not have been able to handle the stress of it all.") if(brainmob && (decoy_override || brainmob.client || brainmob.get_ghost())) @@ -40,15 +40,15 @@ return span_info("You can feel the small spark of life still left in this one.") else return span_info("This one is completely devoid of life.") - + //New vox Brain -/obj/item/organ/internal/brain/cybernetic/cortical/vox +/obj/item/organ/brain/cybernetic/cortical/vox name = "vox-augmented brain" desc = "A brain which has been in some part mechanized. The components are seamlessly integrated into the flesh." emp_dmg_mult = 1 //Nobody notices the brain damage anyways wink wink //surplus; TBI to prosthetic organ quirk -/obj/item/organ/internal/brain/cybernetic/cortical/surplus +/obj/item/organ/brain/cybernetic/cortical/surplus name = "surplus augmented brain" desc = "A brain which has been in some part mechanized. It looks a bit cheap." maxHealth = BRAIN_DAMAGE_DEATH*0.5 //200 -> 100, at time of creation diff --git a/modular_skyrat/modules/organs/code/ears.dm b/modular_skyrat/modules/organs/code/ears.dm index 6a706d132cc..6a45e429e14 100644 --- a/modular_skyrat/modules/organs/code/ears.dm +++ b/modular_skyrat/modules/organs/code/ears.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/ears/teshari +/obj/item/organ/ears/teshari name = "teshari ears" desc = "A set of four long rabbit-like ears, a Teshari's main tool while hunting. Naturally extremely sensitive to loud sounds." damage_multiplier = 1.5 @@ -6,7 +6,7 @@ overrides_sprite_datum_organ_type = TRUE bodypart_overlay = /datum/bodypart_overlay/mutant/ears -/obj/item/organ/internal/ears/teshari/on_mob_remove(mob/living/carbon/ear_owner) +/obj/item/organ/ears/teshari/on_mob_remove(mob/living/carbon/ear_owner) . = ..() REMOVE_TRAIT(ear_owner, TRAIT_GOOD_HEARING, ORGAN_TRAIT) @@ -41,7 +41,7 @@ user.visible_message(span_notice("[user], pricks up [user.p_their()] four ears, each twitching intently!"), span_notice("You perk up all four of your ears, hunting for even the quietest sounds.")) update_button_state("echolocation_on") - var/obj/item/organ/internal/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS) if(ears) ears.damage_multiplier = 3 @@ -53,7 +53,7 @@ user.visible_message(span_notice("[user] drops [user.p_their()] ears down a bit, no longer listening as closely."), span_notice("You drop your ears down, no longer paying close attention.")) update_button_state("echolocation_off") - var/obj/item/organ/internal/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS) if(ears) ears.damage_multiplier = 1.5 diff --git a/modular_skyrat/modules/organs/code/heart.dm b/modular_skyrat/modules/organs/code/heart.dm index cd46215a5f6..d21194c04f9 100644 --- a/modular_skyrat/modules/organs/code/heart.dm +++ b/modular_skyrat/modules/organs/code/heart.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/heart/snail +/obj/item/organ/heart/snail name = "twin gastropod hearts" desc = "A primary heart normally nestled inside a gastropod's shell, and another in the owner's actual chest; necessary to maintain ample bloodflow through essentially two torsos." icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' @@ -9,7 +9,7 @@ COOLDOWN_DECLARE(shell_effect_cd) -/obj/item/organ/internal/heart/snail/on_mob_insert(mob/living/carbon/organ_owner, special) +/obj/item/organ/heart/snail/on_mob_insert(mob/living/carbon/organ_owner, special) . = ..() if(!ishuman(organ_owner)) return @@ -22,7 +22,7 @@ RegisterSignal(human_owner, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(modify_damage)) RegisterSignal(human_owner, COMSIG_MOB_AFTER_APPLY_DAMAGE, PROC_REF(do_block_effect)) -/obj/item/organ/internal/heart/snail/on_mob_remove(mob/living/carbon/organ_owner, special) +/obj/item/organ/heart/snail/on_mob_remove(mob/living/carbon/organ_owner, special) . = ..() if(!ishuman(organ_owner) || QDELETED(organ_owner)) return @@ -36,7 +36,7 @@ * * Adds a 0.5 modifier to attacks from the back, code borrowed (wholesale) from the roach heart. */ -/obj/item/organ/internal/heart/snail/proc/modify_damage(mob/living/carbon/human/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) +/obj/item/organ/heart/snail/proc/modify_damage(mob/living/carbon/human/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) SIGNAL_HANDLER if(!is_blocking(source, damage_amount, damagetype, attack_direction)) @@ -49,7 +49,7 @@ * * Does a special effect if we blocked damage with our shell. */ -/obj/item/organ/internal/heart/snail/proc/do_block_effect(mob/living/carbon/human/source, damage_dealt, damagetype, def_zone, blocked, wound_bonus, bare_wound_bonus, sharpness, attack_direction, obj/item/attacking_item) +/obj/item/organ/heart/snail/proc/do_block_effect(mob/living/carbon/human/source, damage_dealt, damagetype, def_zone, blocked, wound_bonus, bare_wound_bonus, sharpness, attack_direction, obj/item/attacking_item) SIGNAL_HANDLER if(!is_blocking(source, damage_dealt, damagetype, attack_direction)) @@ -62,7 +62,7 @@ COOLDOWN_START(src, shell_effect_cd, 5 SECONDS) // Cooldown resets EVERY time we get hit /// Checks if the passed mob is in a valid state to be blocking damage with the snail shell -/obj/item/organ/internal/heart/snail/proc/is_blocking(mob/living/carbon/human/blocker, damage_amount, damagetype, attack_direction) +/obj/item/organ/heart/snail/proc/is_blocking(mob/living/carbon/human/blocker, damage_amount, damagetype, attack_direction) if(damage_amount < 5 || damagetype != BRUTE || !attack_direction) return if(!ishuman(blocker) || blocker.stat >= UNCONSCIOUS) diff --git a/modular_skyrat/modules/organs/code/liver.dm b/modular_skyrat/modules/organs/code/liver.dm index 8c275530084..71e92c2d162 100644 --- a/modular_skyrat/modules/organs/code/liver.dm +++ b/modular_skyrat/modules/organs/code/liver.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/liver/snail +/obj/item/organ/liver/snail name = "gastropod liver" icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' icon_state = "liver-snail" diff --git a/modular_skyrat/modules/organs/code/lungs.dm b/modular_skyrat/modules/organs/code/lungs.dm index 3d3d78a277c..50eddd84058 100644 --- a/modular_skyrat/modules/organs/code/lungs.dm +++ b/modular_skyrat/modules/organs/code/lungs.dm @@ -1,6 +1,6 @@ #define ADAPTIVE_TOLERANCE 2 -/obj/item/organ/internal/lungs/adaptive +/obj/item/organ/lungs/adaptive name = "debug-adaptive lungs" desc = "if you have these, or see these, someone fucked up" icon = 'modular_skyrat/modules/organs/icons/lungs.dmi' @@ -10,7 +10,7 @@ /// The type of air mix (hot/cold) that we are tuned for var/air_mix = null -/obj/item/organ/internal/lungs/adaptive/cold +/obj/item/organ/lungs/adaptive/cold name = "cold-adapted lungs" desc = "A set of lungs adapted to low temperatures, though they are more susceptible to high temperatures" icon_state = "lungs_cold" @@ -25,7 +25,7 @@ heat_level_3_threshold = 913.15 heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_2 -/obj/item/organ/internal/lungs/adaptive/hot +/obj/item/organ/lungs/adaptive/hot name = "heat-adapted lungs" desc = "A set of lungs adapted to high temperatures, though they are more susceptible to low temperatures" icon_state = "lungs_heat" @@ -40,7 +40,7 @@ heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_1 heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_2 -/obj/item/organ/internal/lungs/adaptive/Initialize(mapload) +/obj/item/organ/lungs/adaptive/Initialize(mapload) var/datum/gas_mixture/immutable/planetary/mix = SSair.planetary[air_mix] if(!mix?.total_moles()) // this typically means we don't have the respective cold/hot z-level, like if we're using the LOWMEMORYMODE define @@ -82,7 +82,7 @@ return ..() -/obj/item/organ/internal/lungs/toxin +/obj/item/organ/lungs/toxin name = "toxin-adapted lungs" icon = 'modular_skyrat/modules/organs/icons/lungs.dmi' desc = "A set of lungs adapted to toxic environments, though more susceptible to extreme temperatures." @@ -94,7 +94,7 @@ heat_level_2_threshold = 387.15 heat_level_3_threshold = 913.15 -/obj/item/organ/internal/lungs/oxy +/obj/item/organ/lungs/oxy name = "low-oxygen-adapted lungs" icon = 'modular_skyrat/modules/organs/icons/lungs.dmi' desc = "A set of lungs adapted to lower-pressure environments, though more susceptible to extreme temperatures." diff --git a/modular_skyrat/modules/organs/code/stomach.dm b/modular_skyrat/modules/organs/code/stomach.dm index 03bdc1b9df7..ca57e60af1f 100644 --- a/modular_skyrat/modules/organs/code/stomach.dm +++ b/modular_skyrat/modules/organs/code/stomach.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/stomach/oversized +/obj/item/organ/stomach/oversized name = "huge guts" desc = "Typically found in huge creatures, this monstrous engine has developed to be highly efficient, made to get an enormous amount of nutrients to an enormous eater." icon = 'modular_skyrat/modules/organs/icons/stomach.dmi' @@ -6,7 +6,7 @@ maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD metabolism_efficiency = 0.07 -/obj/item/organ/internal/stomach/synth/oversized +/obj/item/organ/stomach/synth/oversized name = "huge synthetic bio-reactor" desc = "Typically found in huge synthetics, this monstrous engine has been developed to be highly efficient, made to provide an enormous amount of power to an enormous machine." icon = 'modular_skyrat/modules/organs/icons/stomach.dmi' diff --git a/modular_skyrat/modules/organs/code/tongue.dm b/modular_skyrat/modules/organs/code/tongue.dm index bf6580daec6..43210f1a648 100644 --- a/modular_skyrat/modules/organs/code/tongue.dm +++ b/modular_skyrat/modules/organs/code/tongue.dm @@ -1,25 +1,25 @@ -/obj/item/organ/internal/tongue/copy_traits_from(obj/item/organ/internal/tongue/old_tongue, copy_actions = FALSE) +/obj/item/organ/tongue/copy_traits_from(obj/item/organ/internal/tongue/old_tongue, copy_actions = FALSE) . = ..() // make sure we get food preferences too, because those are now tied to tongues for some reason liked_foodtypes = old_tongue.liked_foodtypes disliked_foodtypes = old_tongue.disliked_foodtypes toxic_foodtypes = old_tongue.toxic_foodtypes -/obj/item/organ/internal/tongue/dog +/obj/item/organ/tongue/dog name = "long tongue" desc = "A long and wet tongue. It seems to jump when it's called good, oddly enough." say_mod = "woofs" icon_state = "tongue" modifies_speech = TRUE -/obj/item/organ/internal/tongue/dog/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/tongue/dog/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() signer.verb_ask = "arfs" signer.verb_exclaim = "wans" signer.verb_whisper = "whimpers" signer.verb_yell = "barks" -/obj/item/organ/internal/tongue/dog/mob_remove(mob/living/carbon/speaker, special = FALSE) +/obj/item/organ/tongue/dog/mob_remove(mob/living/carbon/speaker, special = FALSE) . = ..() speaker.verb_ask = initial(verb_ask) speaker.verb_exclaim = initial(verb_exclaim) @@ -27,35 +27,35 @@ speaker.verb_sing = initial(verb_sing) speaker.verb_yell = initial(verb_yell) -/obj/item/organ/internal/tongue/cat/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/tongue/cat/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() signer.verb_ask = "mrrps" signer.verb_exclaim = "mrrowls" signer.verb_whisper = "purrs" signer.verb_yell = "yowls" -/obj/item/organ/internal/tongue/cat/mob_remove(mob/living/carbon/speaker, special = FALSE) +/obj/item/organ/tongue/cat/mob_remove(mob/living/carbon/speaker, special = FALSE) . = ..() speaker.verb_ask = initial(verb_ask) speaker.verb_exclaim = initial(verb_exclaim) speaker.verb_whisper = initial(verb_whisper) speaker.verb_yell = initial(verb_yell) -/obj/item/organ/internal/tongue/avian +/obj/item/organ/tongue/avian name = "avian tongue" desc = "A short and stubby tongue that craves seeds." say_mod = "chirps" icon_state = "tongue" modifies_speech = TRUE -/obj/item/organ/internal/tongue/avian/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) +/obj/item/organ/tongue/avian/mob_insert(mob/living/carbon/signer, special = FALSE, movement_flags = DELETE_IF_REPLACED) . = ..() signer.verb_ask = "peeps" signer.verb_exclaim = "squawks" signer.verb_whisper = "murmurs" signer.verb_yell = "shrieks" -/obj/item/organ/internal/tongue/avian/mob_remove(mob/living/carbon/speaker, special = FALSE) +/obj/item/organ/tongue/avian/mob_remove(mob/living/carbon/speaker, special = FALSE) . = ..() speaker.verb_ask = initial(verb_ask) speaker.verb_exclaim = initial(verb_exclaim) @@ -65,10 +65,10 @@ /// This "human" tongue is only used in Character Preferences / Augmentation menu. /// The base tongue class lacked a say_mod. With say_mod included it makes a non-Human user sound like a Human. -/obj/item/organ/internal/tongue/human +/obj/item/organ/tongue/human say_mod = "says" -/obj/item/organ/internal/tongue/lizard/robot +/obj/item/organ/tongue/lizard/robot name = "robotic lizard voicebox" desc = "A lizard-like voice synthesizer that can interface with organic lifeforms." organ_flags = ORGAN_ROBOTIC @@ -80,14 +80,14 @@ taste_sensitivity = 25 // not as good as an organic tongue voice_filter = "alimiter=0.9,acompressor=threshold=0.2:ratio=20:attack=10:release=50:makeup=2,highpass=f=1000" -/obj/item/organ/internal/tongue/lizard/robot/can_speak_language(language) +/obj/item/organ/tongue/lizard/robot/can_speak_language(language) return TRUE // THE MAGIC OF ELECTRONICS -/obj/item/organ/internal/tongue/lizard/robot/modify_speech(datum/source, list/speech_args) +/obj/item/organ/tongue/lizard/robot/modify_speech(datum/source, list/speech_args) . = ..() speech_args[SPEECH_SPANS] |= SPAN_ROBOT -/obj/item/organ/internal/tongue/lizard/cybernetic +/obj/item/organ/tongue/lizard/cybernetic name = "forked cybernetic tongue" icon = 'modular_skyrat/modules/organs/icons/cyber_tongue.dmi' icon_state = "cybertongue-lizard" @@ -97,7 +97,7 @@ taste_sensitivity = 20 modifies_speech = TRUE -/obj/item/organ/internal/tongue/cybernetic +/obj/item/organ/tongue/cybernetic name = "cybernetic tongue" icon = 'modular_skyrat/modules/organs/icons/cyber_tongue.dmi' icon_state = "cybertongue" @@ -107,20 +107,20 @@ // Not as good as organic tongues, not as bad as the robotic voicebox. taste_sensitivity = 20 -/obj/item/organ/internal/tongue/vox +/obj/item/organ/tongue/vox name = "vox tongue" desc = "A fleshy muscle mostly used for skreeing." say_mod = "skrees" liked_foodtypes = MEAT | FRIED -/obj/item/organ/internal/tongue/dwarven +/obj/item/organ/tongue/dwarven name = "dwarven tongue" desc = "A fleshy muscle mostly used for bellowing." say_mod = "bellows" liked_foodtypes = ALCOHOL | MEAT | DAIRY //Dwarves like alcohol, meat, and dairy products. disliked_foodtypes = JUNKFOOD | FRIED | CLOTH //Dwarves hate foods that have no nutrition other than alcohol. -/obj/item/organ/internal/tongue/ghoul +/obj/item/organ/tongue/ghoul name = "ghoulish tongue" desc = "A fleshy muscle mostly used for rasping." say_mod = "rasps" @@ -128,7 +128,7 @@ disliked_foodtypes = VEGETABLES | FRUIT | CLOTH toxic_foodtypes = DAIRY | PINEAPPLE -/obj/item/organ/internal/tongue/insect +/obj/item/organ/tongue/insect name = "insect tongue" desc = "A fleshy muscle mostly used for chittering." say_mod = "chitters" @@ -136,7 +136,7 @@ disliked_foodtypes = CLOTH | GRAIN | FRIED toxic_foodtypes = DAIRY -/obj/item/organ/internal/tongue/xeno_hybrid +/obj/item/organ/tongue/xeno_hybrid name = "alien tongue" desc = "According to leading xenobiologists the evolutionary benefit of having a second mouth in your mouth is \"that it looks badass\"." icon_state = "tonguexeno" @@ -144,12 +144,12 @@ taste_sensitivity = 10 liked_foodtypes = MEAT -/obj/item/organ/internal/tongue/xeno_hybrid/Initialize(mapload) +/obj/item/organ/tongue/xeno_hybrid/Initialize(mapload) . = ..() - var/obj/item/organ/internal/tongue/alien/alien_tongue_type = /obj/item/organ/internal/tongue/alien + var/obj/item/organ/tongue/alien/alien_tongue_type = /obj/item/organ/tongue/alien voice_filter = initial(alien_tongue_type.voice_filter) -/obj/item/organ/internal/tongue/skrell +/obj/item/organ/tongue/skrell name = "skrell tongue" desc = "A fleshy muscle mostly used for warbling." say_mod = "warbles" diff --git a/modular_skyrat/modules/primitive_catgirls/code/organs.dm b/modular_skyrat/modules/primitive_catgirls/code/organs.dm index a50c9b67700..4bfd69673e3 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/organs.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/organs.dm @@ -2,11 +2,11 @@ // Lungs -/obj/item/organ/internal/lungs/icebox_adapted +/obj/item/organ/lungs/icebox_adapted name = "hardy lungs" desc = "Lungs adapted to frozen environments that would be otherwise inhospitable to most races. Feels cold." -/obj/item/organ/internal/lungs/icebox_adapted/Initialize(mapload) +/obj/item/organ/lungs/icebox_adapted/Initialize(mapload) . = ..() var/datum/gas_mixture/immutable/planetary/mix = SSair.planetary[ICEMOON_DEFAULT_ATMOS] @@ -57,12 +57,12 @@ // Eyes -/obj/item/organ/internal/eyes/low_light_adapted +/obj/item/organ/eyes/low_light_adapted color_cutoffs = list(30, 15, 15) // Tongue -/obj/item/organ/internal/tongue/cat/primitive +/obj/item/organ/tongue/cat/primitive liked_foodtypes = SEAFOOD | MEAT | GORE diff --git a/modular_skyrat/modules/primitive_catgirls/code/species.dm b/modular_skyrat/modules/primitive_catgirls/code/species.dm index 9ae49a3dd98..f241b42c018 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/species.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/species.dm @@ -16,9 +16,9 @@ name = "Primitive Demihuman" id = SPECIES_FELINE_PRIMITIVE - mutantlungs = /obj/item/organ/internal/lungs/icebox_adapted - mutanteyes = /obj/item/organ/internal/eyes/low_light_adapted - mutanttongue = /obj/item/organ/internal/tongue/cat/primitive + mutantlungs = /obj/item/organ/lungs/icebox_adapted + mutanteyes = /obj/item/organ/eyes/low_light_adapted + mutanttongue = /obj/item/organ/tongue/cat/primitive species_language_holder = /datum/language_holder/primitive_felinid language_prefs_whitelist = list(/datum/language/primitive_catgirl) diff --git a/modular_skyrat/modules/quirks/good.dm b/modular_skyrat/modules/quirks/good.dm index 1b00edc51ce..97098aa73b3 100644 --- a/modular_skyrat/modules/quirks/good.dm +++ b/modular_skyrat/modules/quirks/good.dm @@ -138,7 +138,7 @@ lose_text = span_danger("Your appendix has magically.. regrown?") medical_record_text = "Patient had appendicitis in the past and has had their appendix surgically removed." /// The mob's original appendix - var/obj/item/organ/internal/appendix/old_appendix + var/obj/item/organ/appendix/old_appendix /datum/quirk/no_appendix/post_add() var/mob/living/carbon/carbon_quirk_holder = quirk_holder @@ -158,7 +158,7 @@ if(isnull(old_appendix)) return - var/obj/item/organ/internal/appendix/current_appendix = carbon_quirk_holder.get_organ_slot(ORGAN_SLOT_APPENDIX) + var/obj/item/organ/appendix/current_appendix = carbon_quirk_holder.get_organ_slot(ORGAN_SLOT_APPENDIX) // if we have not gained an appendix already, put the old one back if(isnull(current_appendix)) diff --git a/modular_skyrat/modules/quirks/neutral.dm b/modular_skyrat/modules/quirks/neutral.dm index 897b88bff68..1d17250341c 100644 --- a/modular_skyrat/modules/quirks/neutral.dm +++ b/modular_skyrat/modules/quirks/neutral.dm @@ -238,7 +238,7 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay()) /datum/quirk/felinid_aspect/add_unique(client/client_source) var/mob/living/carbon/human/human_holder = quirk_holder - var/obj/item/organ/internal/tongue/cat/new_tongue = new(get_turf(human_holder)) + var/obj/item/organ/tongue/cat/new_tongue = new(get_turf(human_holder)) new_tongue.copy_traits_from(human_holder.get_organ_slot(ORGAN_SLOT_TONGUE)) new_tongue.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED) @@ -253,7 +253,7 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay()) /datum/quirk/item_quirk/canine/add_unique(client/client_source) var/mob/living/carbon/human/human_holder = quirk_holder - var/obj/item/organ/internal/tongue/dog/new_tongue = new(get_turf(human_holder)) + var/obj/item/organ/tongue/dog/new_tongue = new(get_turf(human_holder)) new_tongue.copy_traits_from(human_holder.get_organ_slot(ORGAN_SLOT_TONGUE)) new_tongue.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED) @@ -268,7 +268,7 @@ GLOBAL_VAR_INIT(DNR_trait_overlay, generate_DNR_trait_overlay()) /datum/quirk/item_quirk/avian/add_unique(client/client_source) var/mob/living/carbon/human/human_holder = quirk_holder - var/obj/item/organ/internal/tongue/avian/new_tongue = new(get_turf(human_holder)) + var/obj/item/organ/tongue/avian/new_tongue = new(get_turf(human_holder)) new_tongue.copy_traits_from(human_holder.get_organ_slot(ORGAN_SLOT_TONGUE)) new_tongue.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED) diff --git a/modular_skyrat/modules/resleeving/code/rsd_interface.dm b/modular_skyrat/modules/resleeving/code/rsd_interface.dm index 046c5564d61..36b1683f8a4 100644 --- a/modular_skyrat/modules/resleeving/code/rsd_interface.dm +++ b/modular_skyrat/modules/resleeving/code/rsd_interface.dm @@ -9,7 +9,7 @@ /// Attempts to use the item on the target brain. /obj/item/rsd_interface/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) - if(!istype(interacting_with, /obj/item/organ/internal/brain)) + if(!istype(interacting_with, /obj/item/organ/brain)) return NONE if(HAS_TRAIT(interacting_with, TRAIT_RSD_COMPATIBLE)) @@ -25,7 +25,7 @@ /datum/element/rsd_interface/Attach(datum/target) . = ..() - if(!istype(target, /obj/item/organ/internal/brain)) + if(!istype(target, /obj/item/organ/brain)) return ELEMENT_INCOMPATIBLE RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) diff --git a/modular_skyrat/modules/synths/code/bodyparts/brain.dm b/modular_skyrat/modules/synths/code/bodyparts/brain.dm index 824c3df27e0..3bb9db4a13c 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/brain.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/brain.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/brain/synth +/obj/item/organ/brain/synth name = "compact positronic brain" slot = ORGAN_SLOT_BRAIN zone = BODY_ZONE_CHEST @@ -11,7 +11,7 @@ var/last_message_time = 0 organ_traits = list(TRAIT_SILICON_EMOTES_ALLOWED) -/obj/item/organ/internal/brain/synth/on_mob_insert(mob/living/carbon/brain_owner, special, movement_flags = NO_ID_TRANSFER) +/obj/item/organ/brain/synth/on_mob_insert(mob/living/carbon/brain_owner, special, movement_flags = NO_ID_TRANSFER) . = ..() if(brain_owner.stat != DEAD || !ishuman(brain_owner)) @@ -21,7 +21,7 @@ if(HAS_TRAIT(user_human, TRAIT_REVIVES_BY_HEALING) && user_human.health > SYNTH_BRAIN_WAKE_THRESHOLD) user_human.revive(FALSE) -/obj/item/organ/internal/brain/synth/emp_act(severity) // EMP act against the posi, keep the cap far below the organ health +/obj/item/organ/brain/synth/emp_act(severity) // EMP act against the posi, keep the cap far below the organ health . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -38,7 +38,7 @@ to_chat(owner, span_warning("Alert: Electromagnetic damage taken in central processing unit. Error Code: 401-YT")) apply_organ_damage(SYNTH_ORGAN_LIGHT_EMP_DAMAGE, SYNTH_EMP_BRAIN_DAMAGE_MAXIMUM, required_organ_flag = ORGAN_ROBOTIC) -/obj/item/organ/internal/brain/synth/apply_organ_damage(damage_amount, maximum = maxHealth, required_organ_flag = NONE) +/obj/item/organ/brain/synth/apply_organ_damage(damage_amount, maximum = maxHealth, required_organ_flag = NONE) . = ..() if(owner && damage > 0 && (world.time - last_message_time) > SYNTH_BRAIN_DAMAGE_MESSAGE_INTERVAL) @@ -51,7 +51,7 @@ if(damage > BRAIN_DAMAGE_MILD) to_chat(owner, span_warning("Alert: Minor corruption in central processing unit. Error Code: 001-HP")) -/obj/item/organ/internal/brain/synth/circuit +/obj/item/organ/brain/synth/circuit name = "compact AI circuit" desc = "A compact and extremely complex circuit, perfectly dimensioned to fit in the same slot as a synthetic-compatible positronic brain. It is usually slotted into the chest of synthetic crewmembers." icon = 'modular_skyrat/master_files/icons/obj/alt_silicon_brains.dmi' @@ -60,7 +60,7 @@ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' -/obj/item/organ/internal/brain/synth/mmi +/obj/item/organ/brain/synth/mmi name = "compact man-machine interface" desc = "A compact man-machine interface, perfectly dimensioned to fit in the same slot as a synthetic-compatible positronic brain. Unfortunately, the brain seems to be permanently attached to the circuitry, and it seems relatively sensitive to it's environment. It is usually slotted into the chest of synthetic crewmembers." icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' diff --git a/modular_skyrat/modules/synths/code/bodyparts/ears.dm b/modular_skyrat/modules/synths/code/bodyparts/ears.dm index 0525baa7a01..25985e69503 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/ears.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/ears.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/ears/synth +/obj/item/organ/ears/synth name = "auditory sensors" icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' icon_state = "ears-ipc" @@ -11,7 +11,7 @@ overrides_sprite_datum_organ_type = TRUE bodypart_overlay = /datum/bodypart_overlay/mutant/ears -/obj/item/organ/internal/ears/synth/emp_act(severity) +/obj/item/organ/ears/synth/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -39,7 +39,7 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/ears/synth + build_path = /obj/item/organ/ears/synth category = list( RND_SUBCATEGORY_MECHFAB_ANDROID + RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS, ) diff --git a/modular_skyrat/modules/synths/code/bodyparts/eyes.dm b/modular_skyrat/modules/synths/code/bodyparts/eyes.dm index 75b0478b0fc..eebc19d8697 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/eyes.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/eyes.dm @@ -1,11 +1,11 @@ -/obj/item/organ/internal/eyes/synth +/obj/item/organ/eyes/synth name = "optical sensors" icon_state = "cybernetic_eyeballs" desc = "A very basic set of optical sensors with no extra vision modes or functions." maxHealth = 1 * STANDARD_ORGAN_THRESHOLD organ_flags = ORGAN_ROBOTIC -/obj/item/organ/internal/eyes/synth/emp_act(severity) +/obj/item/organ/eyes/synth/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -29,7 +29,7 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/eyes/synth + build_path = /obj/item/organ/eyes/synth category = list( RND_SUBCATEGORY_MECHFAB_ANDROID + RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS, ) diff --git a/modular_skyrat/modules/synths/code/bodyparts/heart.dm b/modular_skyrat/modules/synths/code/bodyparts/heart.dm index 07fe5ce60b3..5f7d18baf5d 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/heart.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/heart.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/heart/synth +/obj/item/organ/heart/synth name = "hydraulic pump engine" desc = "An electronic device that handles the hydraulic pumps, powering one's robotic limbs. Without this, synthetics are unable to move." organ_flags = ORGAN_ROBOTIC @@ -10,7 +10,7 @@ slot = ORGAN_SLOT_HEART var/last_message_time = 0 -/obj/item/organ/internal/heart/synth/emp_act(severity) +/obj/item/organ/heart/synth/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -37,7 +37,7 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/heart/synth + build_path = /obj/item/organ/heart/synth category = list( RND_SUBCATEGORY_MECHFAB_ANDROID + RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS, ) diff --git a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm index 08daebc3ed7..3aa90da9ce5 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm @@ -1,34 +1,34 @@ -/obj/item/organ/internal/brain/synth +/obj/item/organ/brain/synth var/obj/item/modular_computer/pda/synth/internal_computer actions_types = list(/datum/action/item_action/synth/open_internal_computer) -/obj/item/organ/internal/brain/synth/Initialize(mapload) +/obj/item/organ/brain/synth/Initialize(mapload) . = ..() internal_computer = new(src) ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT) -/obj/item/organ/internal/brain/synth/Destroy() +/obj/item/organ/brain/synth/Destroy() QDEL_NULL(internal_computer) return ..() -/obj/item/organ/internal/brain/synth/on_mob_insert(mob/living/carbon/brain_owner, special, movement_flags) +/obj/item/organ/brain/synth/on_mob_insert(mob/living/carbon/brain_owner, special, movement_flags) . = ..() RegisterSignal(brain_owner, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(on_equip_signal)) RegisterSignal(brain_owner, COMSIG_HUMAN_UNEQUIPPED_ITEM, PROC_REF(on_unequip_signal)) -/obj/item/organ/internal/brain/synth/on_mob_remove(mob/living/carbon/brain_owner, special) +/obj/item/organ/brain/synth/on_mob_remove(mob/living/carbon/brain_owner, special) . = ..() UnregisterSignal(brain_owner, COMSIG_MOB_EQUIPPED_ITEM) UnregisterSignal(brain_owner, COMSIG_HUMAN_UNEQUIPPED_ITEM) -/obj/item/organ/internal/brain/synth/proc/on_equip_signal(datum/source, obj/item/item, slot) +/obj/item/organ/brain/synth/proc/on_equip_signal(datum/source, obj/item/item, slot) SIGNAL_HANDLER if(isnull(internal_computer)) return if(slot == ITEM_SLOT_ID) internal_computer.handle_id_slot(owner) -/obj/item/organ/internal/brain/synth/proc/on_unequip_signal(datum/source, obj/item/dropped_item, force, new_location) +/obj/item/organ/brain/synth/proc/on_unequip_signal(datum/source, obj/item/dropped_item, force, new_location) SIGNAL_HANDLER if(isnull(internal_computer)) return diff --git a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm index 1c9dd9b1500..fb03572e141 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/internal_computer.dm @@ -15,7 +15,7 @@ . = ..() // prevent these from being created outside of synth brains - if(!istype(loc, /obj/item/organ/internal/brain/synth)) + if(!istype(loc, /obj/item/organ/brain/synth)) return INITIALIZE_HINT_QDEL /* Action for opening the synthbrain computer */ @@ -26,7 +26,7 @@ /datum/action/item_action/synth/open_internal_computer/Trigger(trigger_flags) . = ..() - var/obj/item/organ/internal/brain/synth/targetmachine = target + var/obj/item/organ/brain/synth/targetmachine = target targetmachine.internal_computer.interact(owner) /* @@ -36,7 +36,7 @@ Various overrides necessary to get the persocom working, namely ui status, power return GLOB.default_state /obj/item/modular_computer/pda/synth/ui_status(mob/user) - var/obj/item/organ/internal/brain/synth/brain_loc = loc + var/obj/item/organ/brain/synth/brain_loc = loc if(!istype(brain_loc)) return UI_CLOSE @@ -82,7 +82,7 @@ Various overrides necessary to get the persocom working, namely ui status, power if(!istype(targetmachine)) return ..() - var/obj/item/organ/internal/brain/synth/robotbrain = targetmachine.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/synth/robotbrain = targetmachine.get_organ_slot(ORGAN_SLOT_BRAIN) if(istype(robotbrain)) if(user.zone_selected == BODY_ZONE_PRECISE_EYES) balloon_alert(user, "Establishing SSH login with persocom...") @@ -95,7 +95,7 @@ Various overrides necessary to get the persocom working, namely ui status, power /obj/item/modular_computer/pda/synth/get_header_data() var/list/data = ..() - var/obj/item/organ/internal/brain/synth/brain_loc = loc + var/obj/item/organ/brain/synth/brain_loc = loc // Battery level is now according to the synth charge if(istype(brain_loc)) var/charge_level = (brain_loc.owner.nutrition / NUTRITION_LEVEL_ALMOST_FULL) * 100 diff --git a/modular_skyrat/modules/synths/code/bodyparts/limbs.dm b/modular_skyrat/modules/synths/code/bodyparts/limbs.dm index feae67951e6..d1195e4b012 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/limbs.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/limbs.dm @@ -112,7 +112,7 @@ bodypart_flags = BODYPART_UNHUSKABLE wing_types = list( - /obj/item/organ/external/wings/functional/robotic, + /obj/item/organ/wings/functional/robotic, ) /datum/design/synth_chest diff --git a/modular_skyrat/modules/synths/code/bodyparts/liver.dm b/modular_skyrat/modules/synths/code/bodyparts/liver.dm index eed7c6fa2a1..eb68884b63e 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/liver.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/liver.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/liver/synth +/obj/item/organ/liver/synth name = "reagent processing unit" desc = "An electronic device that processes the beneficial chemicals for the synthetic user." icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' @@ -9,7 +9,7 @@ maxHealth = 1 * STANDARD_ORGAN_THRESHOLD organ_flags = ORGAN_ROBOTIC -/obj/item/organ/internal/liver/synth/emp_act(severity) +/obj/item/organ/liver/synth/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -37,7 +37,7 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/liver/synth + build_path = /obj/item/organ/liver/synth category = list( RND_SUBCATEGORY_MECHFAB_ANDROID + RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS, ) diff --git a/modular_skyrat/modules/synths/code/bodyparts/lungs.dm b/modular_skyrat/modules/synths/code/bodyparts/lungs.dm index c07c2357790..c43ce2a7b9d 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/lungs.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/lungs.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/lungs/synth +/obj/item/organ/lungs/synth name = "heatsink" desc = "A device that transfers generated heat to a fluid medium to cool it down. Required to keep your synthetics cool-headed. It's shape resembles lungs." //Purposefully left the 'fluid medium' ambigious for interpretation of the character, whether it be air or fluid cooling icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' @@ -14,7 +14,7 @@ maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD organ_flags = ORGAN_ROBOTIC -/obj/item/organ/internal/lungs/synth/emp_act(severity) +/obj/item/organ/lungs/synth/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -44,7 +44,7 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/lungs/synth + build_path = /obj/item/organ/lungs/synth category = list( RND_SUBCATEGORY_MECHFAB_ANDROID + RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS, ) diff --git a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm index f8974667c40..c8d8fc45ce0 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/cyberimp/arm/power_cord +/obj/item/organ/cyberimp/arm/power_cord name = "charging implant" desc = "An internal power cord. Useful if you run on elecricity. Not so much otherwise." items_to_create = list(/obj/item/synth_powercord) @@ -41,7 +41,7 @@ var/nutrition_level_joules = user.nutrition * SYNTH_JOULES_PER_NUTRITION user.changeNext_move(CLICK_CD_MELEE) - var/obj/item/organ/internal/stomach/synth/synth_cell = user.get_organ_slot(ORGAN_SLOT_STOMACH) + var/obj/item/organ/stomach/synth/synth_cell = user.get_organ_slot(ORGAN_SLOT_STOMACH) if(QDELETED(synth_cell) || !istype(synth_cell)) to_chat(user, span_warning("You plug into [target], but nothing happens! It seems you don't have an internal cell to charge.")) return diff --git a/modular_skyrat/modules/synths/code/bodyparts/silicon_alt_brains.dm b/modular_skyrat/modules/synths/code/bodyparts/silicon_alt_brains.dm index 26dfa58064f..134400d57a6 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/silicon_alt_brains.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/silicon_alt_brains.dm @@ -24,13 +24,13 @@ /mob/living/proc/prefs_get_brain_to_use(value, is_cyborg = FALSE) switch(value) if(ORGAN_PREF_POSI_BRAIN) - return is_cyborg ? /obj/item/mmi/posibrain : /obj/item/organ/internal/brain/synth + return is_cyborg ? /obj/item/mmi/posibrain : /obj/item/organ/brain/synth if(ORGAN_PREF_MMI_BRAIN) - return is_cyborg ? /obj/item/mmi : /obj/item/organ/internal/brain/synth/mmi + return is_cyborg ? /obj/item/mmi : /obj/item/organ/brain/synth/mmi if(ORGAN_PREF_CIRCUIT_BRAIN) - return is_cyborg ? /obj/item/mmi/posibrain/circuit : /obj/item/organ/internal/brain/synth/circuit + return is_cyborg ? /obj/item/mmi/posibrain/circuit : /obj/item/organ/brain/synth/circuit /mob/living/silicon/robot/Initialize(mapload) . = ..() @@ -76,7 +76,7 @@ new_mmi = new new_mmi(src) // Probably shitcode, but silicon code is spaghetti as fuck. - new_mmi.brain = new /obj/item/organ/internal/brain(new_mmi) + new_mmi.brain = new /obj/item/organ/brain(new_mmi) new_mmi.brain.organ_flags |= ORGAN_FROZEN new_mmi.brain.name = "[real_name]'s brain" new_mmi.name = "[initial(new_mmi.name)]: [real_name]" diff --git a/modular_skyrat/modules/synths/code/bodyparts/stomach.dm b/modular_skyrat/modules/synths/code/bodyparts/stomach.dm index b5d9fad2e12..1117bd69561 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/stomach.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/stomach.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/stomach/synth +/obj/item/organ/stomach/synth name = "synthetic bio-reactor" icon = 'modular_skyrat/master_files/icons/obj/surgery.dmi' icon_state = "stomach-ipc" @@ -11,7 +11,7 @@ desc = "A specialised mini reactor, for synthetic use only. Has a low-power mode to ensure baseline functions. Without this, synthetics are unable to stay powered." organ_flags = ORGAN_ROBOTIC -/obj/item/organ/internal/stomach/synth/emp_act(severity) +/obj/item/organ/stomach/synth/emp_act(severity) . = ..() if(!owner || . & EMP_PROTECT_SELF) @@ -41,22 +41,22 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/stomach/synth + build_path = /obj/item/organ/stomach/synth category = list( RND_SUBCATEGORY_MECHFAB_ANDROID + RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS, ) departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE -/obj/item/organ/internal/stomach/synth/mob_insert(mob/living/carbon/receiver, special, movement_flags) +/obj/item/organ/stomach/synth/mob_insert(mob/living/carbon/receiver, special, movement_flags) . = ..() RegisterSignal(receiver, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge)) -/obj/item/organ/internal/stomach/synth/mob_remove(mob/living/carbon/stomach_owner, special) +/obj/item/organ/stomach/synth/mob_remove(mob/living/carbon/stomach_owner, special) . = ..() UnregisterSignal(stomach_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) ///Handles charging the synth from borg chargers -/obj/item/organ/internal/stomach/synth/proc/on_borg_charge(datum/source, datum/callback/charge_cell, seconds_per_tick) +/obj/item/organ/stomach/synth/proc/on_borg_charge(datum/source, datum/callback/charge_cell, seconds_per_tick) SIGNAL_HANDLER if(owner.nutrition >= NUTRITION_LEVEL_FULL) diff --git a/modular_skyrat/modules/synths/code/bodyparts/tongue.dm b/modular_skyrat/modules/synths/code/bodyparts/tongue.dm index 7fe20ae9c08..604f70f7f39 100644 --- a/modular_skyrat/modules/synths/code/bodyparts/tongue.dm +++ b/modular_skyrat/modules/synths/code/bodyparts/tongue.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/tongue/synth +/obj/item/organ/tongue/synth name = "synthetic voicebox" desc = "A fully-functional synthetic tongue, encased in soft silicone. Features include high-resolution vocals and taste receptors." icon = 'modular_skyrat/modules/organs/icons/cyber_tongue.dmi' @@ -15,10 +15,10 @@ slot = ORGAN_SLOT_TONGUE organ_flags = ORGAN_ROBOTIC -/obj/item/organ/internal/tongue/synth/can_speak_language(language) +/obj/item/organ/tongue/synth/can_speak_language(language) return TRUE -/obj/item/organ/internal/tongue/synth/handle_speech(datum/source, list/speech_args) +/obj/item/organ/tongue/synth/handle_speech(datum/source, list/speech_args) speech_args[SPEECH_SPANS] |= SPAN_ROBOT /datum/design/synth_tongue @@ -31,7 +31,7 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, ) - build_path = /obj/item/organ/internal/tongue/synth + build_path = /obj/item/organ/tongue/synth category = list( RND_SUBCATEGORY_MECHFAB_ANDROID + RND_SUBCATEGORY_MECHFAB_ANDROID_ORGANS, ) diff --git a/modular_skyrat/modules/synths/code/species/synthetic.dm b/modular_skyrat/modules/synths/code/species/synthetic.dm index a4f324318f9..1daa00151bf 100644 --- a/modular_skyrat/modules/synths/code/species/synthetic.dm +++ b/modular_skyrat/modules/synths/code/species/synthetic.dm @@ -23,15 +23,15 @@ reagent_flags = PROCESS_SYNTHETIC payday_modifier = 1.0 // Matches the rest of the pay penalties the non-human crew have species_language_holder = /datum/language_holder/machine - mutant_organs = list(/obj/item/organ/internal/cyberimp/arm/power_cord) - mutantbrain = /obj/item/organ/internal/brain/synth - mutantstomach = /obj/item/organ/internal/stomach/synth - mutantears = /obj/item/organ/internal/ears/synth - mutanttongue = /obj/item/organ/internal/tongue/synth - mutanteyes = /obj/item/organ/internal/eyes/synth - mutantlungs = /obj/item/organ/internal/lungs/synth - mutantheart = /obj/item/organ/internal/heart/synth - mutantliver = /obj/item/organ/internal/liver/synth + mutant_organs = list(/obj/item/organ/cyberimp/arm/power_cord) + mutantbrain = /obj/item/organ/brain/synth + mutantstomach = /obj/item/organ/stomach/synth + mutantears = /obj/item/organ/ears/synth + mutanttongue = /obj/item/organ/tongue/synth + mutanteyes = /obj/item/organ/eyes/synth + mutantlungs = /obj/item/organ/lungs/synth + mutantheart = /obj/item/organ/heart/synth + mutantliver = /obj/item/organ/liver/synth mutantappendix = null exotic_blood = /datum/reagent/fuel/oil bodypart_overrides = list( @@ -94,7 +94,7 @@ sing_action.Grant(transformer) var/screen_mutant_bodypart = transformer.dna.mutant_bodyparts[MUTANT_SYNTH_SCREEN] - var/obj/item/organ/internal/eyes/eyes = transformer.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/eyes = transformer.get_organ_slot(ORGAN_SLOT_EYES) if(!screen && screen_mutant_bodypart && screen_mutant_bodypart[MUTANT_INDEX_NAME] && screen_mutant_bodypart[MUTANT_INDEX_NAME] != "None") @@ -150,7 +150,7 @@ UnregisterSignal(human, COMSIG_ATOM_EMAG_ACT) - var/obj/item/organ/internal/eyes/eyes = human.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/eyes = human.get_organ_slot(ORGAN_SLOT_EYES) if(eyes) eyes.eye_icon_state = initial(eyes.eye_icon_state) @@ -192,7 +192,7 @@ return // This is awful. Please find a better way to do this. - var/obj/item/organ/external/synth_screen/screen_organ = transformer.get_organ_slot(ORGAN_SLOT_EXTERNAL_SYNTH_SCREEN) + var/obj/item/organ/synth_screen/screen_organ = transformer.get_organ_slot(ORGAN_SLOT_EXTERNAL_SYNTH_SCREEN) if(!istype(screen_organ)) return @@ -201,7 +201,7 @@ transformer.update_body() /datum/species/synthetic/get_types_to_preload() - return ..() - typesof(/obj/item/organ/internal/cyberimp/arm/power_cord) // Don't cache things that lead to hard deletions. + return ..() - typesof(/obj/item/organ/cyberimp/arm/power_cord) // Don't cache things that lead to hard deletions. /datum/species/synthetic/create_pref_unique_perks() var/list/perk_descriptions = list() diff --git a/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm index 27442f031f3..3e2e61006e7 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm @@ -15,7 +15,7 @@ desc = "A surgical procedure that restores the default behavior logic and personality matrix of an IPC posibrain." /datum/surgery/robot_brain_surgery/can_start(mob/user, mob/living/carbon/target, obj/item/tool) - var/obj/item/organ/internal/brain/synth/brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/synth/brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) if (!..()) return FALSE diff --git a/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm index 3b23802bc47..a789592cefe 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm @@ -17,7 +17,7 @@ desc = "A mechanical surgery procedure designed to repair an androids internal hydraulic pump." /datum/surgery/hydraulic_maintenance/can_start(mob/user, mob/living/carbon/target) - var/obj/item/organ/internal/heart/hydraulic_pump = target.get_organ_slot(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/hydraulic_pump = target.get_organ_slot(ORGAN_SLOT_HEART) if(isnull(hydraulic_pump) || !issynthetic(target) || hydraulic_pump.damage < 10) return FALSE return ..() @@ -45,7 +45,7 @@ /datum/surgery_step/hydraulic/repair/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/mob/living/carbon/human/patient = target - var/obj/item/organ/internal/heart/hydraulic = patient.get_organ_slot(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/hydraulic = patient.get_organ_slot(ORGAN_SLOT_HEART) patient.setOrganLoss(ORGAN_SLOT_HEART, 0) // adjustOrganLoss didnt work here without runtimes spamming, setting to 0 as synths have no natural organ decay/regeneration if(hydraulic.organ_flags & ORGAN_EMP) hydraulic.organ_flags &= ~ORGAN_EMP diff --git a/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm index 685d36580ad..7b74de90793 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm @@ -17,7 +17,7 @@ desc = "A mechanical list of actions to reset the reagent processor and purge built up minerals." /datum/surgery/reagent_pump/can_start(mob/user, mob/living/carbon/target) - var/obj/item/organ/internal/liver/reagent_processor = target.get_organ_slot(ORGAN_SLOT_LIVER) + var/obj/item/organ/liver/reagent_processor = target.get_organ_slot(ORGAN_SLOT_LIVER) if(isnull(reagent_processor) || !issynthetic(target) || reagent_processor.damage < 10) return FALSE return ..() @@ -46,7 +46,7 @@ /datum/surgery_step/reagent_pump/repair/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/mob/living/carbon/human/patient = target - var/obj/item/organ/internal/liver/reagent_processor = target.get_organ_slot(ORGAN_SLOT_LIVER) + var/obj/item/organ/liver/reagent_processor = target.get_organ_slot(ORGAN_SLOT_LIVER) patient.setOrganLoss(ORGAN_SLOT_LIVER, 0) // adjustOrganLoss didnt work here without runtimes spamming, setting to 0 as synths have no natural organ decay/regeneration if(reagent_processor.organ_flags & ORGAN_EMP) reagent_processor.organ_flags &= ~ORGAN_EMP diff --git a/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm index 3213cc954b3..684fa7cd560 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm @@ -18,7 +18,7 @@ desc = "A mechanical surgery procedure designed to repair an androids internal heatsink." /datum/surgery/heatsink/can_start(mob/user, mob/living/carbon/target, obj/item/tool) - var/obj/item/organ/internal/lungs/target_lungs = target.get_organ_slot(ORGAN_SLOT_LUNGS) + var/obj/item/organ/lungs/target_lungs = target.get_organ_slot(ORGAN_SLOT_LUNGS) if(isnull(target_lungs) || !issynthetic(target) || target_lungs.damage < 10 ) return FALSE return ..() @@ -46,7 +46,7 @@ /datum/surgery_step/heatsink/repair/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) if(ishuman(target)) var/mob/living/carbon/human/patient = target - var/obj/item/organ/internal/lungs/heatsink = patient.get_organ_slot(ORGAN_SLOT_LUNGS) + var/obj/item/organ/lungs/heatsink = patient.get_organ_slot(ORGAN_SLOT_LUNGS) patient.setOrganLoss(ORGAN_SLOT_LUNGS, 0) // adjustOrganLoss didnt work here without runtimes spamming, setting to 0 as synths have no natural organ decay/regeneration if(heatsink.organ_flags & ORGAN_EMP) heatsink.organ_flags &= ~ORGAN_EMP diff --git a/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm index 92c91ff895d..bac5216474a 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm @@ -17,7 +17,7 @@ desc = "A mechanical surgery procedure designed to repair an androids internal bioreactor." /datum/surgery/bioreactor/can_start(mob/user, mob/living/carbon/target) - var/obj/item/organ/internal/stomach/bioreactor = target.get_organ_slot(ORGAN_SLOT_STOMACH) + var/obj/item/organ/stomach/bioreactor = target.get_organ_slot(ORGAN_SLOT_STOMACH) if(isnull(bioreactor) || !issynthetic(target) || bioreactor.damage < 10) return FALSE return ..() @@ -46,7 +46,7 @@ /datum/surgery_step/bioreactor/repair/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) var/mob/living/carbon/human/patient = target - var/obj/item/organ/internal/stomach/bioreactor = target.get_organ_slot(ORGAN_SLOT_STOMACH) + var/obj/item/organ/stomach/bioreactor = target.get_organ_slot(ORGAN_SLOT_STOMACH) patient.setOrganLoss(ORGAN_SLOT_STOMACH, 0) // adjustOrganLoss didnt work here without runtimes spamming, setting to 0 as synths have no natural organ decay/regeneration if(bioreactor.organ_flags & ORGAN_EMP) bioreactor.organ_flags &= ~ORGAN_EMP diff --git a/modular_skyrat/modules/taur_mechanics/code/constrict.dm b/modular_skyrat/modules/taur_mechanics/code/constrict.dm index 2ca443ba106..00ac67851ad 100644 --- a/modular_skyrat/modules/taur_mechanics/code/constrict.dm +++ b/modular_skyrat/modules/taur_mechanics/code/constrict.dm @@ -507,13 +507,13 @@ UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_GRAB, COMSIG_LIVING_TRY_PULL, COMSIG_LIVING_SET_BODY_POSITION, COMSIG_ATOM_POST_DIR_CHANGE)) if (owner) - var/obj/item/organ/external/taur_body/taur_body = owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/taur_body = owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) taur_body?.hide_self = FALSE owner = new_owner if (owner) - var/obj/item/organ/external/taur_body/taur_body = owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/taur_body = owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) taur_body?.hide_self = TRUE RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(owner_moved)) diff --git a/modular_skyrat/modules/taur_mechanics/code/human.dm b/modular_skyrat/modules/taur_mechanics/code/human.dm index f2495180e4e..80673f1ac96 100644 --- a/modular_skyrat/modules/taur_mechanics/code/human.dm +++ b/modular_skyrat/modules/taur_mechanics/code/human.dm @@ -86,8 +86,8 @@ var/mob/living/carbon/human/human_target = to_buckle - var/obj/item/organ/external/taur_body/taur_body = get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) - var/obj/item/organ/external/taur_body/other_taur_body = human_target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/taur_body = get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/other_taur_body = human_target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) if (isnull(taur_body) || isnull(other_taur_body)) return TRUE diff --git a/modular_skyrat/modules/taur_mechanics/code/preferences.dm b/modular_skyrat/modules/taur_mechanics/code/preferences.dm index 35e9eba4a52..d050a0c5b60 100644 --- a/modular_skyrat/modules/taur_mechanics/code/preferences.dm +++ b/modular_skyrat/modules/taur_mechanics/code/preferences.dm @@ -15,6 +15,6 @@ /datum/preference/toggle/naga_soles/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) if (value) return - var/obj/item/organ/external/taur_body/serpentine/snake_body = target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/serpentine/snake_body = target.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) if (istype(snake_body)) snake_body.add_hardened_soles(target) diff --git a/modular_skyrat/modules/taur_mechanics/code/saddle_component.dm b/modular_skyrat/modules/taur_mechanics/code/saddle_component.dm index 80bff206af1..a1d0ff2ee92 100644 --- a/modular_skyrat/modules/taur_mechanics/code/saddle_component.dm +++ b/modular_skyrat/modules/taur_mechanics/code/saddle_component.dm @@ -74,9 +74,9 @@ return TRUE for (var/obj/item/organ/iter_organ as anything in target.organs) - if (!istype(iter_organ, /obj/item/organ/external/taur_body)) + if (!istype(iter_organ, /obj/item/organ/taur_body)) continue - var/obj/item/organ/external/taur_body/taur_body = iter_organ + var/obj/item/organ/taur_body/taur_body = iter_organ if (taur_body.can_use_saddle) return TRUE diff --git a/modular_skyrat/modules/taur_mechanics/code/serpentine_taur.dm b/modular_skyrat/modules/taur_mechanics/code/serpentine_taur.dm index c5579362c44..e35db1e6c31 100644 --- a/modular_skyrat/modules/taur_mechanics/code/serpentine_taur.dm +++ b/modular_skyrat/modules/taur_mechanics/code/serpentine_taur.dm @@ -1,15 +1,15 @@ -/obj/item/organ/external/taur_body/serpentine +/obj/item/organ/taur_body/serpentine /// The constrict ability we have given our owner. Nullable, if we have no owner. var/datum/action/innate/constrict/constrict_ability /// Did our owner have their feet blocked before we ran on_mob_insert? Used for determining if we should unblock their feet slots on removal. var/owner_blocked_feet_before_insert -/obj/item/organ/external/taur_body/serpentine/Destroy() +/obj/item/organ/taur_body/serpentine/Destroy() QDEL_NULL(constrict_ability) // handled in remove, but lets be safe return ..() -/obj/item/organ/external/taur_body/serpentine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/taur_body/serpentine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) . = ..() constrict_ability = new /datum/action/innate/constrict(organ_owner) @@ -32,10 +32,10 @@ add_hardened_soles(organ_owner) /// Adds TRAIT_HARD_SOLES to our owner. -/obj/item/organ/external/taur_body/serpentine/proc/add_hardened_soles(mob/living/carbon/organ_owner = owner) +/obj/item/organ/taur_body/serpentine/proc/add_hardened_soles(mob/living/carbon/organ_owner = owner) ADD_TRAIT(organ_owner, TRAIT_HARD_SOLES, ORGAN_TRAIT) -/obj/item/organ/external/taur_body/serpentine/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/taur_body/serpentine/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() QDEL_NULL(constrict_ability) diff --git a/modular_skyrat/modules/taur_mechanics/code/taur_clothing_offset.dm b/modular_skyrat/modules/taur_mechanics/code/taur_clothing_offset.dm index d810478e7e9..46b4218d8b2 100644 --- a/modular_skyrat/modules/taur_mechanics/code/taur_clothing_offset.dm +++ b/modular_skyrat/modules/taur_mechanics/code/taur_clothing_offset.dm @@ -26,7 +26,7 @@ return var/mob/living/carbon/target_carbon = signal_source.loc - var/obj/item/organ/external/taur_body/taur_body = target_carbon.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/taur_body = target_carbon.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) if (!istype(taur_body)) return var/icon_dir = target_carbon.dir @@ -56,7 +56,7 @@ /datum/component/taur_clothing_offset/proc/wearer_dir_changed(mob/living/carbon/human/signal_source, old_dir, new_dir) SIGNAL_HANDLER - var/obj/item/organ/external/taur_body/taur_body = signal_source.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) + var/obj/item/organ/taur_body/taur_body = signal_source.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAUR) if (isnull(taur_body)) return diff --git a/modular_skyrat/modules/teshari/code/_teshari.dm b/modular_skyrat/modules/teshari/code/_teshari.dm index e1ffe68dc30..5be369f45c3 100644 --- a/modular_skyrat/modules/teshari/code/_teshari.dm +++ b/modular_skyrat/modules/teshari/code/_teshari.dm @@ -17,7 +17,7 @@ digitigrade_customization = DIGITIGRADE_NEVER changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT payday_modifier = 1.0 - mutanttongue = /obj/item/organ/internal/tongue/teshari + mutanttongue = /obj/item/organ/tongue/teshari custom_worn_icons = list( OFFSET_HEAD = TESHARI_HEAD_ICON, OFFSET_FACEMASK = TESHARI_MASK_ICON, @@ -38,7 +38,7 @@ bodytemp_heat_damage_limit = (BODYTEMP_HEAT_DAMAGE_LIMIT + TESHARI_TEMP_OFFSET) bodytemp_cold_damage_limit = (BODYTEMP_COLD_DAMAGE_LIMIT + TESHARI_TEMP_OFFSET) species_language_holder = /datum/language_holder/teshari - mutantears = /obj/item/organ/internal/ears/teshari + mutantears = /obj/item/organ/ears/teshari body_size_restricted = TRUE bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/mutant/teshari, @@ -58,7 +58,7 @@ ) -/obj/item/organ/internal/tongue/teshari +/obj/item/organ/tongue/teshari liked_foodtypes = MEAT | GORE | RAW disliked_foodtypes = GROSS | GRAIN diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm index d13b0b85662..e5cf4784771 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_reward.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_INIT(tier1_reward, list( /obj/item/stack/sheet/sinew = 1, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 1, - /obj/item/organ/internal/monster_core/regenerative_core/legion = 1, + /obj/item/organ/monster_core/regenerative_core/legion = 1, )) GLOBAL_LIST_INIT(tier2_reward, list( @@ -95,7 +95,7 @@ GLOBAL_LIST_INIT(animal_reward, list( /obj/item/stack/sheet/sinew = 1, /obj/item/stack/sheet/animalhide/goliath_hide = 1, /obj/item/stack/sheet/bone = 1, - /obj/item/organ/internal/monster_core/regenerative_core/legion = 1, + /obj/item/organ/monster_core/regenerative_core/legion = 1, )) GLOBAL_LIST_INIT(alien_reward, list( diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm index a4b57732f68..18c2f3d7c39 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm @@ -118,7 +118,7 @@ evolver.balloon_alert(evolver, "too many of our evolution already") return FALSE - var/obj/item/organ/internal/alien/hivenode/node = evolver.get_organ_by_type(/obj/item/organ/internal/alien/hivenode) + var/obj/item/organ/alien/hivenode/node = evolver.get_organ_by_type(/obj/item/organ/alien/hivenode) if(!node) to_chat(evolver, span_bolddanger("We can't sense our node's connection to the hive... We can't evolve!")) return FALSE @@ -176,7 +176,7 @@ apply_overlay(HANDS_LAYER) /mob/living/carbon/proc/get_max_plasma() - var/obj/item/organ/internal/alien/plasmavessel/vessel = get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel) + var/obj/item/organ/alien/plasmavessel/vessel = get_organ_by_type(/obj/item/organ/alien/plasmavessel) if(!vessel) return -1 return vessel.max_plasma diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/defender.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/defender.dm index 5b79b7a8934..e35af2f62f1 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/defender.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/defender.dm @@ -24,7 +24,7 @@ add_movespeed_modifier(/datum/movespeed_modifier/alien_heavy) /mob/living/carbon/alien/adult/skyrat/defender/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel/small + organs += new /obj/item/organ/alien/plasmavessel/small ..() /datum/action/cooldown/spell/aoe/repulse/xeno/skyrat_tailsweep diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm index 0d18e05e942..cc8ed435513 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm @@ -16,8 +16,8 @@ GRANT_ACTION(/datum/action/cooldown/alien/skyrat/heal_aura) /mob/living/carbon/alien/adult/skyrat/drone/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel - organs += new /obj/item/organ/internal/alien/resinspinner + organs += new /obj/item/organ/alien/plasmavessel + organs += new /obj/item/organ/alien/resinspinner ..() /datum/action/cooldown/alien/skyrat/heal_aura diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm index c88c6c97401..de7266ff724 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm @@ -24,9 +24,9 @@ add_movespeed_modifier(/datum/movespeed_modifier/alien_big) /mob/living/carbon/alien/adult/skyrat/praetorian/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel/large - organs += new /obj/item/organ/internal/alien/neurotoxin/spitter - organs += new /obj/item/organ/internal/alien/resinspinner + organs += new /obj/item/organ/alien/plasmavessel/large + organs += new /obj/item/organ/alien/neurotoxin/spitter + organs += new /obj/item/organ/alien/resinspinner ..() /datum/action/cooldown/alien/skyrat/heal_aura/juiced @@ -106,7 +106,7 @@ damage = 15 damage_type = BURN -/obj/item/organ/internal/alien/neurotoxin/spitter +/obj/item/organ/alien/neurotoxin/spitter name = "large neurotoxin gland" icon_state = "neurotox" zone = BODY_ZONE_PRECISE_MOUTH diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm index cd30ff472bf..4937c8d73cf 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm @@ -24,16 +24,16 @@ add_movespeed_modifier(/datum/movespeed_modifier/alien_big) /mob/living/carbon/alien/adult/skyrat/queen/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel/large/queen - organs += new /obj/item/organ/internal/alien/resinspinner - organs += new /obj/item/organ/internal/alien/neurotoxin/queen - organs += new /obj/item/organ/internal/alien/eggsac + organs += new /obj/item/organ/alien/plasmavessel/large/queen + organs += new /obj/item/organ/alien/resinspinner + organs += new /obj/item/organ/alien/neurotoxin/queen + organs += new /obj/item/organ/alien/eggsac ..() /mob/living/carbon/alien/adult/skyrat/queen/alien_talk(message, shown_name = name) ..(message, shown_name, TRUE) -/obj/item/organ/internal/alien/neurotoxin/queen +/obj/item/organ/alien/neurotoxin/queen name = "neurotoxin gland" icon_state = "neurotox" zone = BODY_ZONE_PRECISE_MOUTH @@ -52,7 +52,7 @@ if(carbon_mob == src) continue - var/obj/item/organ/internal/alien/hivenode/node = carbon_mob.get_organ_by_type(/obj/item/organ/internal/alien/hivenode) + var/obj/item/organ/alien/hivenode/node = carbon_mob.get_organ_by_type(/obj/item/organ/alien/hivenode) if(istype(node)) node.queen_death() diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm index 00e469883a4..8a6b9e6f03c 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm @@ -24,7 +24,7 @@ REMOVE_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) /mob/living/carbon/alien/adult/skyrat/ravager/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel + organs += new /obj/item/organ/alien/plasmavessel ..() /datum/action/cooldown/mob_cooldown/charge/triple_charge/ravager diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm index 1f952d99828..5faaef51e96 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm @@ -26,7 +26,7 @@ add_movespeed_modifier(/datum/movespeed_modifier/alien_quick) /mob/living/carbon/alien/adult/skyrat/runner/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel/small/tiny + organs += new /obj/item/organ/alien/plasmavessel/small/tiny ..() /datum/action/cooldown/alien/skyrat/evade diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/sentinel.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/sentinel.dm index c517401954b..beacd313c25 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/sentinel.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/sentinel.dm @@ -17,8 +17,8 @@ add_movespeed_modifier(/datum/movespeed_modifier/alien_slow) /mob/living/carbon/alien/adult/skyrat/sentinel/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel/small - organs += new /obj/item/organ/internal/alien/neurotoxin/sentinel + organs += new /obj/item/organ/alien/plasmavessel/small + organs += new /obj/item/organ/alien/neurotoxin/sentinel ..() /datum/action/cooldown/alien/acid/skyrat @@ -132,7 +132,7 @@ paralyze = 0 damage_type = BURN -/obj/item/organ/internal/alien/neurotoxin/sentinel +/obj/item/organ/alien/neurotoxin/sentinel name = "neurotoxin gland" icon_state = "neurotox" zone = BODY_ZONE_PRECISE_MOUTH diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/spitter.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/spitter.dm index 0a3ca252d54..a5f5f69de0c 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/spitter.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/spitter.dm @@ -18,6 +18,6 @@ REMOVE_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) /mob/living/carbon/alien/adult/skyrat/spitter/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel - organs += new /obj/item/organ/internal/alien/neurotoxin/spitter + organs += new /obj/item/organ/alien/plasmavessel + organs += new /obj/item/organ/alien/neurotoxin/spitter ..() diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/warrior.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/warrior.dm index 1a483472792..b86543408a8 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/warrior.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/warrior.dm @@ -24,7 +24,7 @@ add_movespeed_modifier(/datum/movespeed_modifier/alien_big) /mob/living/carbon/alien/adult/skyrat/warrior/create_internal_organs() - organs += new /obj/item/organ/internal/alien/plasmavessel + organs += new /obj/item/organ/alien/plasmavessel ..() /datum/action/cooldown/alien/skyrat/warrior_agility diff --git a/modular_zubbers/code/datums/mood_events/food_events.dm b/modular_zubbers/code/datums/mood_events/food_events.dm index f20b96c8852..b10b482096c 100644 --- a/modular_zubbers/code/datums/mood_events/food_events.dm +++ b/modular_zubbers/code/datums/mood_events/food_events.dm @@ -29,5 +29,5 @@ return if(prob(5 + (qheal_strength * 2.5))) //Very tiny and in no way combat viable, might pick you up from crit in a very rare case O.heal_bodypart_damage(brute = healpwr, burn = healpwr, required_bodytype = BODYTYPE_ORGANIC) - for(var/obj/item/organ/internal/stomach/S in O.organs) + for(var/obj/item/organ/stomach/S in O.organs) S.apply_organ_damage((S.healing_factor * healpwr)) diff --git a/modular_zubbers/code/datums/quirks/neutral_quirks/lungs.dm b/modular_zubbers/code/datums/quirks/neutral_quirks/lungs.dm index d6bab35cbe0..3cdb978a3ad 100644 --- a/modular_zubbers/code/datums/quirks/neutral_quirks/lungs.dm +++ b/modular_zubbers/code/datums/quirks/neutral_quirks/lungs.dm @@ -1,9 +1,9 @@ /datum/quirk/equipping/lungs abstract_parent_type = /datum/quirk/equipping/lungs icon = FA_ICON_LUNGS - var/obj/item/organ/internal/lungs/lungs_holding - var/obj/item/organ/internal/lungs/lungs_added - var/lungs_typepath = /obj/item/organ/internal/lungs + var/obj/item/organ/lungs/lungs_holding + var/obj/item/organ/lungs/lungs_added + var/lungs_typepath = /obj/item/organ/lungs items = list(/obj/item/clothing/accessory/breathing = list(ITEM_SLOT_BACKPACK)) var/breath_type = "oxygen" @@ -27,7 +27,7 @@ var/mob/living/carbon/carbon_holder = quirk_holder if (!istype(carbon_holder) || !istype(lungs_holding)) return - var/obj/item/organ/internal/lungs/lungs = carbon_holder.get_organ_slot(ORGAN_SLOT_LUNGS) + var/obj/item/organ/lungs/lungs = carbon_holder.get_organ_slot(ORGAN_SLOT_LUNGS) if (lungs != lungs_added && lungs != lungs_holding) qdel(lungs_holding) return @@ -80,7 +80,7 @@ forced_items = list( /obj/item/clothing/mask/breath = list(ITEM_SLOT_MASK), /obj/item/tank/internals/nitrogen/belt/full = list(ITEM_SLOT_HANDS, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET)) - lungs_typepath = /obj/item/organ/internal/lungs/nitrogen + lungs_typepath = /obj/item/organ/lungs/nitrogen breath_type = "nitrogen" /datum/quirk/equipping/lungs/nitrogen/on_equip_item(obj/item/equipped, success) diff --git a/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm b/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm index 531ebba0304..0c69761e905 100644 --- a/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm +++ b/modular_zubbers/code/datums/quirks/neutral_quirks/oversized_quirk.dm @@ -30,17 +30,17 @@ human_holder.blood_volume_normal = BLOOD_VOLUME_OVERSIZED human_holder.physiology.hunger_mod *= OVERSIZED_HUNGER_MOD //50% hungrier human_holder.add_movespeed_modifier(/datum/movespeed_modifier/oversized) - var/obj/item/organ/internal/stomach/old_stomach = human_holder.get_organ_slot(ORGAN_SLOT_STOMACH) + var/obj/item/organ/stomach/old_stomach = human_holder.get_organ_slot(ORGAN_SLOT_STOMACH) if(!istype(old_stomach) || old_stomach.organ_flags & ORGAN_ROBOTIC || old_stomach.organ_traits & TRAIT_NOHUNGER) return old_stomach.Remove(human_holder, special = TRUE) qdel(old_stomach) if(issynthetic(human_holder)) - var/obj/item/organ/internal/stomach/synth/oversized/new_synth_stomach = new //YOU LOOK HUGE, THAT MUST MEAN YOU HAVE HUGE reactor! RIP AND TEAR YOUR HUGE reactor! + var/obj/item/organ/stomach/synth/oversized/new_synth_stomach = new //YOU LOOK HUGE, THAT MUST MEAN YOU HAVE HUGE reactor! RIP AND TEAR YOUR HUGE reactor! new_synth_stomach.Insert(human_holder, special = TRUE) to_chat(human_holder, span_warning("You feel your massive engine rumble!")) else - var/obj/item/organ/internal/stomach/oversized/new_stomach = new //YOU LOOK HUGE, THAT MUST MEAN YOU HAVE HUGE GUTS! RIP AND TEAR YOUR HUGE GUTS! + var/obj/item/organ/stomach/oversized/new_stomach = new //YOU LOOK HUGE, THAT MUST MEAN YOU HAVE HUGE GUTS! RIP AND TEAR YOUR HUGE GUTS! new_stomach.Insert(human_holder, special = TRUE) to_chat(human_holder, span_warning("You feel your massive stomach rumble!")) diff --git a/modular_zubbers/code/datums/weather/weather_types/sand_storm.dm b/modular_zubbers/code/datums/weather/weather_types/sand_storm.dm index 85a6b18de3c..ca8f5ac3e85 100644 --- a/modular_zubbers/code/datums/weather/weather_types/sand_storm.dm +++ b/modular_zubbers/code/datums/weather/weather_types/sand_storm.dm @@ -159,7 +159,7 @@ GLOBAL_LIST_EMPTY(sand_storm_sounds) var/heat_protection_flags = victim_as_human.get_heat_protection_flags(400) //400 is the minimum that shows up in the examine menu. - var/obj/item/organ/internal/eyes/victim_eyes = victim_as_human.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/victim_eyes = victim_as_human.get_organ_slot(ORGAN_SLOT_EYES) if(victim_eyes && !victim_as_human.is_pepper_proof() && !victim_as_human.get_eye_protection()) //If we're pepper spray immune or have eye protection, don't blind. This should get all masks and goggles. if(!victim.is_eyes_covered()) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm index 8a2e7b35415..cbf87a1b9a2 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm @@ -491,10 +491,10 @@ owner.current.remove_language(/datum/language/vampiric, ALL, LANGUAGE_MIND) // Heart & Eyes var/mob/living/carbon/user = owner.current - var/obj/item/organ/internal/heart/newheart = owner.current.get_organ_slot(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/newheart = owner.current.get_organ_slot(ORGAN_SLOT_HEART) if(newheart) newheart.Restart() - var/obj/item/organ/internal/eyes/user_eyes = user.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/user_eyes = user.get_organ_slot(ORGAN_SLOT_EYES) if(user_eyes) user_eyes.flash_protect = initial(user_eyes.flash_protect) user_eyes.color_cutoffs = initial(user_eyes.color_cutoffs) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm index 9539df3be8a..ca20fa07e21 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm @@ -231,10 +231,10 @@ bloodsuckeruser.regenerate_organs(regenerate_existing = FALSE) if(!HAS_TRAIT(bloodsuckeruser, TRAIT_MASQUERADE)) - var/obj/item/organ/internal/heart/current_heart = bloodsuckeruser.get_organ_slot(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/current_heart = bloodsuckeruser.get_organ_slot(ORGAN_SLOT_HEART) current_heart?.Stop() - var/obj/item/organ/internal/eyes/current_eyes = bloodsuckeruser.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/current_eyes = bloodsuckeruser.get_organ_slot(ORGAN_SLOT_EYES) if(current_eyes && !(current_eyes.organ_flags & ORGAN_ROBOTIC)) current_eyes.flash_protect = max(initial(current_eyes.flash_protect) - 1, FLASH_PROTECTION_SENSITIVE) current_eyes.color_cutoffs = BLOODSUCKER_SIGHT_COLOR_CUTOFF @@ -255,8 +255,8 @@ // From [powers/panacea.dm] var/list/bad_organs = list( - bloodsuckeruser.get_organ_by_type(/obj/item/organ/internal/body_egg), - bloodsuckeruser.get_organ_by_type(/obj/item/organ/internal/zombie_infection) + bloodsuckeruser.get_organ_by_type(/obj/item/organ/body_egg), + bloodsuckeruser.get_organ_by_type(/obj/item/organ/zombie_infection) ) for(var/tumors in bad_organs) var/obj/item/organ/yucky_organs = tumors @@ -356,7 +356,7 @@ var/obj/item/bodypart/head/head = is_head(poor_fucker) if(!head || poor_fucker.stat != DEAD || !poor_fucker.can_be_revived()) return - if(istype(poor_fucker.loc, /obj/item/organ/internal/brain)) + if(istype(poor_fucker.loc, /obj/item/organ/brain)) RegisterSignal(poor_fucker.loc, COMSIG_QDELETING, PROC_REF(on_brain_remove)) RegisterSignal(poor_fucker.loc, COMSIG_ORGAN_BODYPART_REMOVED, PROC_REF(on_brain_remove)) @@ -385,7 +385,7 @@ /datum/antagonist/bloodsucker/proc/on_brainmob_qdel() SIGNAL_HANDLER - if(istype(owner.current.loc, /obj/item/organ/internal/brain)) + if(istype(owner.current.loc, /obj/item/organ/brain)) cleanup_talking_head(owner.current.loc) else cleanup_talking_head() diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm index 2f8074964d0..89a1c9792cb 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm @@ -175,7 +175,7 @@ /datum/objective/steal_n_of_type/hearts martyr_compatible = TRUE name = "heartthief" - wanted_items = (/obj/item/organ/internal/heart) + wanted_items = (/obj/item/organ/heart) // GENERATE! /datum/objective/steal_n_of_type/hearts/New() @@ -186,7 +186,7 @@ /datum/objective/steal_n_of_type/hearts/check_if_valid_item(obj/item/organ/internal/heart/current_item) . = ..() - if(current_item.type == /obj/item/organ/internal/heart/monkey || IS_ROBOTIC_ORGAN(current_item)) + if(current_item.type == /obj/item/organ/heart/monkey || IS_ROBOTIC_ORGAN(current_item)) return FALSE ////////////////////////////////////////////////////////////////////////////////////// diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm index fe0c67d6eff..3b0aa7f35c4 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm @@ -221,7 +221,7 @@ /// checks if we're a brainmob inside a brain & the brain is inside a head /datum/antagonist/bloodsucker/proc/is_head(mob/living/poor_fucker) - if(!istype(poor_fucker?.loc, /obj/item/organ/internal/brain)) + if(!istype(poor_fucker?.loc, /obj/item/organ/brain)) return var/obj/brain = poor_fucker.loc if(!istype(brain?.loc, /obj/item/bodypart/head)) @@ -277,7 +277,7 @@ power.on_power_upgrade() /datum/antagonist/bloodsucker/proc/regain_heart(mob/living/carbon/target, obj/structure/closet/crate/coffin/coffin) - var/obj/item/organ/heart = locate(/obj/item/organ/internal/heart) in coffin.contents + var/obj/item/organ/heart = locate(/obj/item/organ/heart) in coffin.contents if(heart && !target.get_organ_slot(ORGAN_SLOT_HEART) && heart.Insert(target)) to_chat(span_warning("You have regained your heart!")) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm index 9c6e43fb53f..ba386b43343 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm @@ -49,10 +49,10 @@ if(target_chest) target_chest.bodypart_flags &= ~BODYPART_UNREMOVABLE // Handle organs - var/obj/item/organ/internal/heart/vampheart = user.get_organ_slot(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/vampheart = user.get_organ_slot(ORGAN_SLOT_HEART) if(vampheart) vampheart.Restart() - var/obj/item/organ/internal/eyes/eyes = user.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/eyes = user.get_organ_slot(ORGAN_SLOT_EYES) if(eyes) eyes.flash_protect = initial(eyes.flash_protect) eyes.color_cutoffs = initial(eyes.color_cutoffs) @@ -80,10 +80,10 @@ if(target_chest) target_chest.bodypart_flags |= BODYPART_UNREMOVABLE // Handle organs - var/obj/item/organ/internal/heart/vampheart = user.get_organ_slot(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/vampheart = user.get_organ_slot(ORGAN_SLOT_HEART) if(vampheart) vampheart.Stop() - var/obj/item/organ/internal/eyes/eyes = user.get_organ_slot(ORGAN_SLOT_EYES) + var/obj/item/organ/eyes/eyes = user.get_organ_slot(ORGAN_SLOT_EYES) if(eyes) eyes.flash_protect = max(initial(eyes.flash_protect) - 1, FLASH_PROTECTION_SENSITIVE) eyes.color_cutoffs = BLOODSUCKER_SIGHT_COLOR_CUTOFF diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm index 18b185fb02d..e519c3724d8 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm @@ -157,7 +157,7 @@ span_warning("[user] tears into [target]'s [bodypart]!"), span_warning("You tear into [target]'s [bodypart]!")) playsound(target, 'sound/effects/wounds/crackandbleed.ogg', 100, TRUE, 5) - var/obj/item/organ/internal/myheart_now + var/obj/item/organ/myheart_now if(bodypart.body_zone == BODY_ZONE_CHEST) myheart_now = target.get_organ_slot(ORGAN_SLOT_HEART) if(!myheart_now) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm index aab7f08db81..35d685a092b 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm @@ -170,7 +170,7 @@ return /obj/item/stake/hardened/silver/on_stake_embed(mob/living/target, mob/living/user) - var/obj/item/organ/internal/heart/heart = target.get_organ_slot(ORGAN_SLOT_HEART) + var/obj/item/organ/heart/heart = target.get_organ_slot(ORGAN_SLOT_HEART) if(!heart) return target.visible_message( @@ -343,9 +343,9 @@ /// just a typepath to specify that it's monkey-owned, used for the heart thief objective -/obj/item/organ/internal/heart/monkey +/obj/item/organ/heart/monkey -/obj/item/organ/internal/heart/examine_more(mob/user) +/obj/item/organ/heart/examine_more(mob/user) . = ..() var/datum/antagonist/bloodsucker/vampire = IS_BLOODSUCKER(user) if(!vampire) diff --git a/modular_zubbers/code/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_zubbers/code/modules/ashwalkers/code/effects/ash_rituals.dm index cec3cc503c3..b649ccb1a5c 100644 --- a/modular_zubbers/code/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_zubbers/code/modules/ashwalkers/code/effects/ash_rituals.dm @@ -3,13 +3,13 @@ desc = "Prepare a meal for a drake." required_components = list( "north" = /obj/item/crusher_trophy/legion_skull, - "south" = /obj/item/organ/internal/monster_core/regenerative_core, + "south" = /obj/item/organ/monster_core/regenerative_core, "east" = /obj/item/food/meat/steak/goliath, "west" = /obj/item/stack/sheet/sinew, ) consumed_components = list( /obj/item/crusher_trophy/legion_skull, - /obj/item/organ/internal/monster_core/regenerative_core, + /obj/item/organ/monster_core/regenerative_core, /obj/item/food/meat/steak/goliath, /obj/item/stack/sheet/sinew, ) diff --git a/modular_zubbers/code/modules/client/ssd.dm b/modular_zubbers/code/modules/client/ssd.dm index 537ab5c0588..286bb22adce 100644 --- a/modular_zubbers/code/modules/client/ssd.dm +++ b/modular_zubbers/code/modules/client/ssd.dm @@ -4,7 +4,7 @@ alpha = GHOST_ALPHA if(!(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH)))) - if(get_organ_by_type(/obj/item/organ/internal/brain)) + if(get_organ_by_type(/obj/item/organ/brain)) if(!key) alpha = GHOST_ALPHA diff --git a/modular_zubbers/code/modules/customization/species/synths/code/synth_prefab.dm b/modular_zubbers/code/modules/customization/species/synths/code/synth_prefab.dm index 8d543af6f4c..2a927be80d7 100644 --- a/modular_zubbers/code/modules/customization/species/synths/code/synth_prefab.dm +++ b/modular_zubbers/code/modules/customization/species/synths/code/synth_prefab.dm @@ -10,7 +10,7 @@ death_sound = null // We don't need them screaming death() - var/obj/item/organ/internal/brain/to_remove = get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/to_remove = get_organ_slot(ORGAN_SLOT_BRAIN) QDEL_NULL(to_remove) death_sound = old_death_sound // Now they can die loudly again diff --git a/modular_zubbers/code/modules/designs/limbgrower_designs.dm b/modular_zubbers/code/modules/designs/limbgrower_designs.dm index e324d774319..8cbcf8a98ea 100644 --- a/modular_zubbers/code/modules/designs/limbgrower_designs.dm +++ b/modular_zubbers/code/modules/designs/limbgrower_designs.dm @@ -3,7 +3,7 @@ id = "hemophageheart" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) - build_path = /obj/item/organ/internal/heart/hemophage + build_path = /obj/item/organ/heart/hemophage category = list(SPECIES_HEMOPHAGE) /datum/design/hemophage_liver @@ -11,7 +11,7 @@ id = "hemophageliver" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) - build_path = /obj/item/organ/internal/liver/hemophage + build_path = /obj/item/organ/liver/hemophage category = list(SPECIES_HEMOPHAGE) /datum/design/hemophage_stomach @@ -19,7 +19,7 @@ id = "hemophagestomach" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) - build_path = /obj/item/organ/internal/stomach/hemophage + build_path = /obj/item/organ/stomach/hemophage category = list(SPECIES_HEMOPHAGE) /datum/design/hemophage_tongue @@ -27,7 +27,7 @@ id = "hemophagetongue" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10, /datum/reagent/blood = 10) - build_path = /obj/item/organ/internal/tongue/hemophage + build_path = /obj/item/organ/tongue/hemophage category = list(SPECIES_HEMOPHAGE) /obj/item/disk/design_disk/limbs/hemophage @@ -46,7 +46,7 @@ id = "tajaraneyes" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) - build_path = /obj/item/organ/internal/eyes/tajaran + build_path = /obj/item/organ/eyes/tajaran category = list(SPECIES_TAJARAN) /datum/design/tajaran_tongue @@ -54,7 +54,7 @@ id = "tajarantounge" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) - build_path = /obj/item/organ/internal/tongue/cat/tajaran + build_path = /obj/item/organ/tongue/cat/tajaran category = list(SPECIES_TAJARAN) /datum/design/tajaran_ears @@ -62,7 +62,7 @@ id = "tajaranears" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 10) - build_path = /obj/item/organ/internal/ears/cat/tajaran + build_path = /obj/item/organ/ears/cat/tajaran category = list(SPECIES_TAJARAN) /datum/design/limb_disk/tajaran @@ -73,7 +73,7 @@ /obj/item/disk/design_disk/limbs/tajaran name = "Tajaran Organ Design Disk" - limb_designs = list(/obj/item/organ/internal/tongue/cat/tajaran, /obj/item/organ/internal/eyes/tajaran, /obj/item/organ/internal/ears/cat/tajaran) + limb_designs = list(/obj/item/organ/tongue/cat/tajaran, /obj/item/organ/eyes/tajaran, /obj/item/organ/ears/cat/tajaran) /obj/machinery/limbgrower/Initialize(mapload) categories += list( diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm index e73f028c431..b598cd27b16 100644 --- a/modular_zubbers/code/modules/emotes/emotes.dm +++ b/modular_zubbers/code/modules/emotes/emotes.dm @@ -119,7 +119,7 @@ sound = 'modular_zubbers/code/modules/emotes/sound/voice/tailthump.ogg' // See https://github.com/shiptest-ss13/Shiptest/pull/2159 /datum/emote/living/tail_thump/can_run_emote(mob/user, status_check, intentional, params) - var/obj/item/organ/external/tail/tail = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) + var/obj/item/organ/tail/tail = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL) if(isnull(tail)) return FALSE return ..() diff --git a/modular_zubbers/code/modules/experisci/experiment/experiments.dm b/modular_zubbers/code/modules/experisci/experiment/experiments.dm index 189e34facd7..7c22c901db0 100644 --- a/modular_zubbers/code/modules/experisci/experiment/experiments.dm +++ b/modular_zubbers/code/modules/experisci/experiment/experiments.dm @@ -17,8 +17,8 @@ return TRUE //check for shadekin organs - var/obj/item/organ/internal/ears/shadekin/ears = check.get_organ_slot(ORGAN_SLOT_EARS) - var/obj/item/organ/internal/tongue/shadekin/tongue = check.get_organ_slot(ORGAN_SLOT_TONGUE) + var/obj/item/organ/ears/shadekin/ears = check.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/tongue/shadekin/tongue = check.get_organ_slot(ORGAN_SLOT_TONGUE) if(istype(ears) || istype(tongue)) return TRUE diff --git a/modular_zubbers/code/modules/jobs/_job.dm b/modular_zubbers/code/modules/jobs/_job.dm index 157735f5042..96312e1b144 100644 --- a/modular_zubbers/code/modules/jobs/_job.dm +++ b/modular_zubbers/code/modules/jobs/_job.dm @@ -1,2 +1,2 @@ /datum/job/prisoner - banned_augments = list(/obj/item/organ/internal/cyberimp/arm/razor_claws/left_arm, /obj/item/organ/internal/cyberimp/arm/razor_claws/right_arm) + banned_augments = list(/obj/item/organ/cyberimp/arm/razor_claws/left_arm, /obj/item/organ/cyberimp/arm/razor_claws/right_arm) diff --git a/modular_zubbers/code/modules/languages/empathy.dm b/modular_zubbers/code/modules/languages/empathy.dm index ec4cf34bf9f..78602e83896 100644 --- a/modular_zubbers/code/modules/languages/empathy.dm +++ b/modular_zubbers/code/modules/languages/empathy.dm @@ -18,7 +18,7 @@ /datum/language/marish = list(LANGUAGE_ATOM), /datum/language/marish/empathy = list(LANGUAGE_ATOM), ) -/obj/item/organ/internal/tongue/shadekin +/obj/item/organ/tongue/shadekin name = "shadekin tongue" desc = "A mysterious tongue." icon_state = "silvertongue" @@ -27,7 +27,7 @@ modifies_speech = TRUE languages_native = list(/datum/language/marish/empathy) -/obj/item/organ/internal/ears/shadekin +/obj/item/organ/ears/shadekin name = "shadekin ears" desc = "Ears, covered in fur." icon = 'icons/obj/clothing/head/costume.dmi' @@ -42,19 +42,19 @@ key = "9" icon_state = "empathy" -/obj/item/organ/internal/tongue/shadekin/handle_speech(datum/source, list/speech_args) +/obj/item/organ/tongue/shadekin/handle_speech(datum/source, list/speech_args) if(speech_args[SPEECH_LANGUAGE] in languages_native) // Speaking a native language? return modify_speech(source, speech_args) -/obj/item/organ/internal/tongue/shadekin/modify_speech(datum/source, list/speech_args) +/obj/item/organ/tongue/shadekin/modify_speech(datum/source, list/speech_args) ASYNC actually_modify_speech(source, speech_args) speech_args[SPEECH_MESSAGE] = "" // Makes it not send to chat verbally. -/obj/item/organ/internal/tongue/shadekin/proc/actually_modify_speech(datum/source, list/speech_args) +/obj/item/organ/tongue/shadekin/proc/actually_modify_speech(datum/source, list/speech_args) var/message = speech_args[SPEECH_MESSAGE] var/mob/living/carbon/human/user = source - var/obj/item/organ/internal/ears/shadekin/user_ears = user.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/ears/shadekin/user_ears = user.get_organ_slot(ORGAN_SLOT_EARS) var/mode = istype(user_ears) user.balloon_alert_to_viewers("[mode ? "ears vibrate" : "shivers"]", "projecting thoughts...") @@ -64,7 +64,7 @@ user.log_talk(message, LOG_SAY, tag="shadekin") for(var/mob/living/carbon/human/living_mob in GLOB.alive_mob_list) - var/obj/item/organ/internal/ears/shadekin/target_ears = living_mob.get_organ_slot(ORGAN_SLOT_EARS) + var/obj/item/organ/ears/shadekin/target_ears = living_mob.get_organ_slot(ORGAN_SLOT_EARS) if(!istype(target_ears)) continue diff --git a/modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm b/modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm index 82a9c729e66..fe7b8dbf6ec 100644 --- a/modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm +++ b/modular_zubbers/code/modules/limbgrowncorpses/limbgrowerblanks.dm @@ -5,7 +5,7 @@ . = ..() death() - var/obj/item/organ/internal/brain/to_remove = get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/to_remove = get_organ_slot(ORGAN_SLOT_BRAIN) QDEL_NULL(to_remove) /datum/design/wholehuman @@ -21,5 +21,5 @@ id = "blankbrain" build_type = LIMBGROWER reagents_list = list(/datum/reagent/medicine/c2/synthflesh = 100) - build_path = /obj/item/organ/internal/brain + build_path = /obj/item/organ/brain category = list(SPECIES_HUMAN, RND_CATEGORY_INITIAL) diff --git a/modular_zubbers/code/modules/mkultra/enthrall.dm b/modular_zubbers/code/modules/mkultra/enthrall.dm index 2767e440491..c9d5149fa91 100644 --- a/modular_zubbers/code/modules/mkultra/enthrall.dm +++ b/modular_zubbers/code/modules/mkultra/enthrall.dm @@ -67,7 +67,7 @@ /datum/status_effect/chem/enthrall/on_apply() var/mob/living/carbon/enthrall_victim = owner if(HAS_TRAIT(enthrall_victim, TRAIT_PET_SKILLCHIP)) - var/obj/item/organ/internal/brain/neopet_brain = enthrall_victim.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/neopet_brain = enthrall_victim.get_organ_slot(ORGAN_SLOT_BRAIN) for(var/obj/item/skillchip/mkiiultra/neopet_chip in neopet_brain?.skillchips) if(istype(neopet_chip) && neopet_chip.active) enthrall_ckey = neopet_chip.enthrall_ckey diff --git a/modular_zubbers/code/modules/mkultra/misc.dm b/modular_zubbers/code/modules/mkultra/misc.dm index b5eac5a2418..6e8cdf7e93a 100644 --- a/modular_zubbers/code/modules/mkultra/misc.dm +++ b/modular_zubbers/code/modules/mkultra/misc.dm @@ -78,7 +78,7 @@ return "Incompatible lifeform detected." // No brain - var/obj/item/organ/internal/brain/brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) + var/obj/item/organ/brain/brain = target.get_organ_slot(ORGAN_SLOT_BRAIN) if(QDELETED(brain)) return "Get a brain, moran." @@ -106,8 +106,8 @@ . = ..() var/mob/living/carbon/human/enthrall = enthrall_ref?.resolve() if(!isnull(enthrall)) - var/obj/item/organ/internal/vocal_cords/vocal_cords = enthrall.get_organ_slot(ORGAN_SLOT_VOICE) - var/obj/item/organ/internal/vocal_cords/new_vocal_cords = new /obj/item/organ/internal/vocal_cords/velvet + var/obj/item/organ/vocal_cords/vocal_cords = enthrall.get_organ_slot(ORGAN_SLOT_VOICE) + var/obj/item/organ/vocal_cords/new_vocal_cords = new /obj/item/organ/vocal_cords/velvet if(vocal_cords) vocal_cords.Remove() new_vocal_cords.Insert(enthrall) diff --git a/modular_zubbers/code/modules/mkultra/reagent.dm b/modular_zubbers/code/modules/mkultra/reagent.dm index 6cab02c175d..59d8fd28db7 100644 --- a/modular_zubbers/code/modules/mkultra/reagent.dm +++ b/modular_zubbers/code/modules/mkultra/reagent.dm @@ -166,8 +166,8 @@ Creating a chem with a low purity will make you permanently fall in love with so to_chat(mob_affected, "Your addled, plastic, mind bends under the chemical influence of a new [(enthrall_chem.lewd?"enthrall_mob":"leader")]. Your highest priority is now to stay by [enthrall_name]'s side, following and aiding them at all costs.") //THIS SHOULD ONLY EVER APPEAR IF YOU MINDBREAK YOURSELF AND THEN GET INJECTED FROM SOMEONE ELSE. return if((mob_affected.ckey == enthrall_ckey) && (enthrall_name == mob_affected.real_name)) //same name AND same player - same instance of the player. (should work for clones?) - var/obj/item/organ/internal/vocal_cords/vocal_cords = mob_affected.get_organ_slot(ORGAN_SLOT_VOICE) - var/obj/item/organ/internal/vocal_cords/new_vocal_cords = new /obj/item/organ/internal/vocal_cords/velvet + var/obj/item/organ/vocal_cords/vocal_cords = mob_affected.get_organ_slot(ORGAN_SLOT_VOICE) + var/obj/item/organ/vocal_cords/new_vocal_cords = new /obj/item/organ/vocal_cords/velvet if(vocal_cords) vocal_cords.Remove() new_vocal_cords.Insert(mob_affected) diff --git a/modular_zubbers/code/modules/mkultra/vocal_cords.dm b/modular_zubbers/code/modules/mkultra/vocal_cords.dm index 5e771c91d6c..639c7a1442e 100644 --- a/modular_zubbers/code/modules/mkultra/vocal_cords.dm +++ b/modular_zubbers/code/modules/mkultra/vocal_cords.dm @@ -3,7 +3,7 @@ ////////////////////////////////////// //Heavily modified voice of god code -/obj/item/organ/internal/vocal_cords/velvet +/obj/item/organ/vocal_cords/velvet name = "Velvet chords" desc = "The voice spoken from these just make you want to drift off, sleep and obey." icon = 'modular_zubbers/code/modules/mkultra/vocal_cords.dmi' @@ -13,7 +13,7 @@ /datum/action/item_action/organ_action/velvet name = "Velvet chords" - var/obj/item/organ/internal/vocal_cords/velvet/cords = null + var/obj/item/organ/vocal_cords/velvet/cords = null /datum/action/item_action/organ_action/velvet/New() ..() @@ -31,10 +31,10 @@ return owner.say(".x[command]") -/obj/item/organ/internal/vocal_cords/velvet/can_speak_with() +/obj/item/organ/vocal_cords/velvet/can_speak_with() return TRUE -/obj/item/organ/internal/vocal_cords/velvet/handle_speech(message) //actually say the message +/obj/item/organ/vocal_cords/velvet/handle_speech(message) //actually say the message owner.say(message, spans = spans, sanitize = FALSE) velvetspeech(message, owner, 1) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm b/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm index d5b3a0e6c96..1a91984b435 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm @@ -9,10 +9,10 @@ /datum/species/proc/humanize_organs(mob/living/carbon/human/target, organs = list()) if(!organs || !length(organs)) organs = list( - ORGAN_SLOT_HEART = /obj/item/organ/internal/heart, - ORGAN_SLOT_LIVER = /obj/item/organ/internal/liver, - ORGAN_SLOT_STOMACH = /obj/item/organ/internal/stomach, - ORGAN_SLOT_TONGUE = /obj/item/organ/internal/tongue, + ORGAN_SLOT_HEART = /obj/item/organ/heart, + ORGAN_SLOT_LIVER = /obj/item/organ/liver, + ORGAN_SLOT_STOMACH = /obj/item/organ/stomach, + ORGAN_SLOT_TONGUE = /obj/item/organ/tongue, ) mutantheart = organs[ORGAN_SLOT_HEART] mutantliver = organs[ORGAN_SLOT_LIVER] diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species/akula.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/akula.dm index 484e6dda3dc..91ef0f3dd33 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species/akula.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species/akula.dm @@ -1,2 +1,2 @@ -/obj/item/organ/internal/tongue/akula +/obj/item/organ/tongue/akula say_mod = "bubbles" diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm index 1044e4812b1..540ee3a3985 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species/tajaran.dm @@ -10,8 +10,8 @@ TRAIT_MUTANT_COLORS, TRAIT_CATLIKE_GRACE, ) - mutanteyes = /obj/item/organ/internal/eyes/tajaran - mutantears = /obj/item/organ/internal/ears/cat/tajaran + mutanteyes = /obj/item/organ/eyes/tajaran + mutantears = /obj/item/organ/ears/cat/tajaran //Cold resistance coldmod = 0.45 heatmod = 1.25 @@ -24,12 +24,12 @@ /obj/item/bodypart/chest/mutant/tajaran //Tajaran tongue -/obj/item/organ/internal/tongue/cat/tajaran +/obj/item/organ/tongue/cat/tajaran name = "tajaran tongue" modifies_speech = TRUE languages_native = list(/datum/language/siiktajr) -/obj/item/organ/internal/tongue/cat/tajaran/modify_speech(datum/source, list/speech_args) +/obj/item/organ/tongue/cat/tajaran/modify_speech(datum/source, list/speech_args) var/static/regex/tajara_roll = new("r+", "g") var/static/regex/tajara_roLL = new("R+", "g") var/message = speech_args[SPEECH_MESSAGE] @@ -42,23 +42,23 @@ /datum/augment_item/organ/tongue/tajaran name = "Tajaran tongue" - path = /obj/item/organ/internal/tongue/cat/tajaran + path = /obj/item/organ/tongue/cat/tajaran //Tajara have the innate ability to see in the dark better than most -/obj/item/organ/internal/eyes/tajaran +/obj/item/organ/eyes/tajaran name = "tajaran eyes" desc = "they seem very cat like." flash_protect = FLASH_PROTECTION_SENSITIVE //One layer protection color_cutoffs = list(12, 7, 7) -/obj/item/organ/internal/eyes/tajaran/on_mob_insert(mob/living/carbon/human/eyes_owner) +/obj/item/organ/eyes/tajaran/on_mob_insert(mob/living/carbon/human/eyes_owner) . = ..() if(istype(eyes_owner)) if(HAS_TRAIT(eyes_owner, TRAIT_NIGHT_VISION)) //prevents double stacking of tajara night vision and the night vision quirk. to_chat(eyes_owner, span_danger("You feel as the shadows are gone but suddenly they return!")) REMOVE_TRAIT(eyes_owner, TRAIT_NIGHT_VISION, QUIRK_TRAIT) -/obj/item/organ/internal/ears/cat/tajaran +/obj/item/organ/ears/cat/tajaran name = "Tajaran ears" desc = "These ears to seem to be from a feline of some type" diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm index b971960876f..438982c2c63 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/hemophage_species.dm @@ -22,7 +22,7 @@ to_chat(target, span_warning("Your hemophage features have been removed, your nature as a bloodsucker abates the hemophage virus.")) // Without this any new organs would get corrupted again. target.RemoveElement(/datum/element/tumor_corruption) - for(var/obj/item/organ/internal/organ in target.organs) + for(var/obj/item/organ/organ in target.organs) organ.RemoveElement(/datum/element/tumor_corruption) humanize_organs(target) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 1a46c9aa65a..3d80bcc8bd5 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -1,6 +1,6 @@ /datum/species/monkey - mutantheart = /obj/item/organ/internal/heart/monkey + mutantheart = /obj/item/organ/heart/monkey /datum/species/monkey/get_species_description() return list("Monkeys are a type of primate that exist between humans and animals on the evolutionary chain. \ diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm index 8a06d29ee96..bb39f46e331 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm @@ -2,10 +2,10 @@ name = "Shadekin" id = SPECIES_SHADEKIN eyes_icon = 'modular_zubbers/icons/mob/human/human_face.dmi' - mutanttongue = /obj/item/organ/internal/tongue/shadekin - mutantears = /obj/item/organ/internal/ears/shadekin - mutantbrain = /obj/item/organ/internal/brain/shadekin - mutanteyes = /obj/item/organ/internal/eyes/shadekin + mutanttongue = /obj/item/organ/tongue/shadekin + mutantears = /obj/item/organ/ears/shadekin + mutantbrain = /obj/item/organ/brain/shadekin + mutanteyes = /obj/item/organ/eyes/shadekin mutant_bodyparts = list() changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT bodypart_overrides = list( @@ -98,14 +98,14 @@ regenerate_organs(shadekin, src, visual_only = TRUE) shadekin.update_body(TRUE) -/obj/item/organ/internal/brain/shadekin +/obj/item/organ/brain/shadekin name = "shadekin brain" desc = "A mysterious brain." icon = 'icons/obj/medical/organs/organs.dmi' icon_state = "brain-x-d" var/applied_status = /datum/status_effect/shadekin_regeneration -/obj/item/organ/internal/brain/shadekin/on_life(seconds_per_tick, times_fired) +/obj/item/organ/brain/shadekin/on_life(seconds_per_tick, times_fired) . = ..() var/turf/owner_turf = owner.loc if(!isturf(owner_turf)) diff --git a/modular_zubbers/code/modules/mob/living/examine.dm b/modular_zubbers/code/modules/mob/living/examine.dm index 4296c8c188e..ccd69865ce7 100644 --- a/modular_zubbers/code/modules/mob/living/examine.dm +++ b/modular_zubbers/code/modules/mob/living/examine.dm @@ -4,7 +4,7 @@ var/t_He = p_They() var/t_is = p_are() //This checks to see if the body is revivable - if(key || !get_organ_by_type(/obj/item/organ/internal/brain) || ghost?.can_reenter_corpse) + if(key || !get_organ_by_type(/obj/item/organ/brain) || ghost?.can_reenter_corpse) return span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life...") else return span_deadsay("[t_He] [t_is] limp and unresponsive; there are no signs of life and their soul has departed...") diff --git a/modular_zubbers/code/modules/research/designs/medical_designs.dm b/modular_zubbers/code/modules/research/designs/medical_designs.dm index 4218b0f5ab4..352a79e64e7 100644 --- a/modular_zubbers/code/modules/research/designs/medical_designs.dm +++ b/modular_zubbers/code/modules/research/designs/medical_designs.dm @@ -21,7 +21,7 @@ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,) - build_path = /obj/item/organ/internal/cyberimp/brain/empathic_sensor + build_path = /obj/item/organ/cyberimp/brain/empathic_sensor category = list( RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY ) diff --git a/modular_zubbers/code/modules/surgery/organs/external/antennae.dm b/modular_zubbers/code/modules/surgery/organs/external/antennae.dm index bf68a3c8b8a..398ee997b03 100644 --- a/modular_zubbers/code/modules/surgery/organs/external/antennae.dm +++ b/modular_zubbers/code/modules/surgery/organs/external/antennae.dm @@ -1,10 +1,10 @@ -/obj/item/organ/external/antennae +/obj/item/organ/antennae -/obj/item/organ/external/antennae/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/antennae/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) . = ..() if(ismoth(organ_owner)) ADD_TRAIT(organ_owner, TRAIT_REAGENT_SCANNER, ORGAN_TRAIT) -/obj/item/organ/external/antennae/on_mob_remove(mob/living/carbon/organ_owner, special) +/obj/item/organ/antennae/on_mob_remove(mob/living/carbon/organ_owner, special) . = ..() REMOVE_TRAIT(organ_owner, TRAIT_REAGENT_SCANNER, ORGAN_TRAIT) diff --git a/modular_zubbers/code/modules/surgery/organs/external/wings.dm b/modular_zubbers/code/modules/surgery/organs/external/wings.dm index 1b535b530d7..886bf07a359 100644 --- a/modular_zubbers/code/modules/surgery/organs/external/wings.dm +++ b/modular_zubbers/code/modules/surgery/organs/external/wings.dm @@ -1,4 +1,4 @@ -/obj/item/organ/external/wings/moth +/obj/item/organ/wings/moth name = "moth wings" desc = "A pair of fuzzy moth wings." flight_for_species = list(SPECIES_MOTH) @@ -7,7 +7,7 @@ ///Our associated terrorize spell, for antagonist nightmares var/datum/action/cooldown/spell/moth_and_dash/our_dash -/obj/item/organ/external/wings/moth/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/wings/moth/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) . = ..() if(ismoth(organ_owner)) @@ -17,7 +17,7 @@ our_dash = new(organ_owner) our_dash.Grant(organ_owner) -/obj/item/organ/external/wings/moth/on_mob_remove(mob/living/carbon/organ_owner) +/obj/item/organ/wings/moth/on_mob_remove(mob/living/carbon/organ_owner) . = ..() QDEL_NULL(our_climb) QDEL_NULL(our_dash) diff --git a/modular_zubbers/code/modules/surgery/organs/internal/eyes/_eyes.dm b/modular_zubbers/code/modules/surgery/organs/internal/eyes/_eyes.dm index c38bc000a0f..13b53f508d4 100644 --- a/modular_zubbers/code/modules/surgery/organs/internal/eyes/_eyes.dm +++ b/modular_zubbers/code/modules/surgery/organs/internal/eyes/_eyes.dm @@ -1,4 +1,4 @@ -/obj/item/organ/internal/eyes/shadekin +/obj/item/organ/eyes/shadekin name = "shadekin eyes" desc = "These eyes are massive, and feel warm to the touch. The shadekin that's missing these is probably feeling very queasy." eye_icon_state = "shadekin_eyes" diff --git a/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm b/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm index a91fb9702e7..6525292627b 100644 --- a/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm +++ b/modular_zubbers/code/modules/surgery/organs/internal/lungs/_lungs.dm @@ -1,9 +1,9 @@ -/obj/item/organ/internal/lungs/Initialize(mapload) +/obj/item/organ/lungs/Initialize(mapload) . = ..() add_gas_reaction(/datum/gas/goblin, while_present = PROC_REF(consume_goblin)) -/obj/item/organ/internal/lungs/proc/consume_goblin(mob/living/carbon/breather, datum/gas_mixture/breath, goblin_pp, old_goblin_pp) +/obj/item/organ/lungs/proc/consume_goblin(mob/living/carbon/breather, datum/gas_mixture/breath, goblin_pp, old_goblin_pp) if(goblin_pp >= 5) switch(rand(1,3)) diff --git a/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm b/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm index fb0822e965a..72164071e2a 100644 --- a/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm +++ b/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm @@ -1,11 +1,11 @@ -/obj/item/organ/external/taur_body/serpentine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/taur_body/serpentine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) . = ..() // These args must be the same as the args used to add the basic human footstep! organ_owner.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) organ_owner.AddElement(/datum/element/footstep, FOOTSTEP_MOB_SNAKE, 15, -6) -/obj/item/organ/external/taur_body/serpentine/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) +/obj/item/organ/taur_body/serpentine/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) organ_owner.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_SNAKE, 15, -6) organ_owner.AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) diff --git a/tgstation.dme b/tgstation.dme index 65cb716b3fb..bd16beb9043 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7063,7 +7063,6 @@ #include "modular_skyrat\master_files\code\modules\surgery\surgery.dm" #include "modular_skyrat\master_files\code\modules\surgery\bodyparts\_bodyparts.dm" #include "modular_skyrat\master_files\code\modules\surgery\bodyparts\robot_bodyparts.dm" -#include "modular_skyrat\master_files\code\modules\surgery\organs\_organ.dm" #include "modular_skyrat\master_files\code\modules\surgery\organs\tongue.dm" #include "modular_skyrat\master_files\code\modules\surgery\organs\external\wings\functional_wings.dm" #include "modular_skyrat\master_files\code\modules\surgery\organs\external\wings\wings.dm"