No item loaded. Standing-by...
"
else
l += "Destroy Item"
+ l += "
[RDSCREEN_NOBREAK]"
anything = TRUE
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index ba9289630d5d..423afdaeb938 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -139,7 +139,6 @@
"universal_scanner",
"voice_analyzer",
"watering_can",
- "diskplantgene", // monkestation edit: move to roundstart tech
)
/datum/techweb_node/mmi
@@ -426,8 +425,6 @@
"defibrillator",
"genescanner",
"healthanalyzer",
- "scanning_pad",
- "vitals_monitor",
"antibodyscanner",
"med_spray_bottle",
"medical_kiosk",
@@ -440,9 +437,6 @@
"diseaseanalyzer",
"centrifuge",
"path_data",
- "heat_pack",
- "cold_pack",
- "medical_crutch",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
discount_experiments = list(/datum/experiment/dissection/human = 1000)
@@ -454,7 +448,6 @@
prereq_ids = list("biotech")
design_ids = list(
"crewpinpointer",
- "vitals_monitor_advanced",
"defibrillator_compact",
"harvester",
"healthanalyzer_advanced",
@@ -1514,7 +1507,7 @@
description = "Botanical tools"
prereq_ids = list("biotech")
design_ids = list(
- /* "diskplantgene", */ // monkestation edit: move to roundstart tech
+ "diskplantgene",
"biogenerator",
"flora_gun",
"gene_shears",
@@ -1523,10 +1516,7 @@
"seed_extractor",
"adv_watering_can",
"plantgenes",
- // monkestation edit: our hydroponics stuff
- "composters",
- "splicer",
- // monkestation end
+ "composters", // monkestation edit: build composters
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)
discount_experiments = list(/datum/experiment/scanning/random/plants/traits = 2000,
@@ -1818,7 +1808,6 @@
"mod_sonar",
"mod_projectile_dampener",
"mod_criminalcapture",
- "mod_mirage_grenade",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
@@ -2412,7 +2401,6 @@
prereq_ids = list("base")
design_ids = list(
"mod_disposal",
- "mod_joint_torsion",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
hidden = TRUE
diff --git a/code/modules/research/xenobiology/crossbreeding/_potions.dm b/code/modules/research/xenobiology/crossbreeding/_potions.dm
index 08c80609d7e4..1e6205dc8039 100644
--- a/code/modules/research/xenobiology/crossbreeding/_potions.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_potions.dm
@@ -129,6 +129,7 @@ Slimecrossing Potions
C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
C.min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+ C.cold_protection = C.body_parts_covered
C.clothing_flags |= STOPSPRESSUREDAMAGE
uses--
if(!uses)
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 67c92ea362ca..6c91d1a863d6 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -213,12 +213,13 @@
return ..()
/datum/status_effect/bonechill/tick()
- if(!prob(50))
- return
-
- owner.adjustFireLoss(1)
- owner.set_jitter_if_lower(6 SECONDS)
- owner.adjust_bodytemperature(-1 KELVIN)
+ if(prob(50))
+ owner.adjustFireLoss(1)
+ owner.set_jitter_if_lower(6 SECONDS)
+ owner.adjust_bodytemperature(-10)
+ if(ishuman(owner))
+ var/mob/living/carbon/human/humi = owner
+ humi.adjust_coretemperature(-10)
/datum/status_effect/bonechill/on_remove()
owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
@@ -233,7 +234,7 @@
alert_type = null
/datum/status_effect/rebreathing/tick()
- owner.adjustOxyLoss(-6) //Just a bit more than normal breathing.
+ owner.adjustOxyLoss(-6, 0) //Just a bit more than normal breathing.
///////////////////////////////////////////////////////
//////////////////CONSUMING EXTRACTS///////////////////
@@ -246,12 +247,12 @@
duration = 100
/datum/status_effect/firecookie/on_apply()
- ADD_TRAIT(owner, TRAIT_RESISTCOLD, id)
- owner.adjust_bodytemperature(20 KELVIN)
+ ADD_TRAIT(owner, TRAIT_RESISTCOLD,"firecookie")
+ owner.adjust_bodytemperature(110)
return ..()
/datum/status_effect/firecookie/on_remove()
- REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, id)
+ REMOVE_TRAIT(owner, TRAIT_RESISTCOLD,"firecookie")
/datum/status_effect/watercookie
id = "watercookie"
@@ -487,12 +488,21 @@
colour = "orange"
/datum/status_effect/stabilized/orange/tick()
- owner.update_homeostasis_level(id, owner.standard_body_temperature, 0.5 KELVIN)
+ var/body_temp_target = owner.get_body_temp_normal(apply_change = FALSE)
+ var/body_temp_actual = owner.bodytemperature
+ var/body_temp_offset = body_temp_target - body_temp_actual
+ body_temp_offset = clamp(body_temp_offset, -5, 5)
+ owner.adjust_bodytemperature(body_temp_offset)
-/datum/status_effect/stabilized/orange/on_remove()
- . = ..()
- owner.remove_homeostasis_level(id)
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human = owner
+ var/core_temp_actual = human.coretemperature
+ var/core_temp_offset = body_temp_target - core_temp_actual
+ core_temp_offset = clamp(core_temp_offset, -5, 5)
+ human.adjust_coretemperature(core_temp_offset)
+
+ return ..()
/datum/status_effect/stabilized/purple
id = "stabilizedpurple"
diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm
index d33c314d6277..4ccc9567271a 100644
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ b/code/modules/research/xenobiology/crossbreeding/burning.dm
@@ -70,10 +70,9 @@ Burning extracts:
for(var/turf/open/T in range(3, get_turf(user)))
T.MakeSlippery(TURF_WET_PERMAFROST, min_wet_time = 10, wet_time_to_add = 5)
for(var/mob/living/carbon/M in range(5, get_turf(user)))
- if(M == user)
- continue
- M.adjust_bodytemperature(-INFINITY, min_temp = M.bodytemp_cold_damage_limit + 5 KELVIN)
- to_chat(M, span_danger("You feel a chill run down your spine, and the floor feels a bit slippery with frost..."))
+ if(M != user)
+ M.bodytemperature = BODYTEMP_COLD_DAMAGE_LIMIT + 10 //Not quite cold enough to hurt.
+ to_chat(M, span_danger("You feel a chill run down your spine, and the floor feels a bit slippery with frost..."))
..()
/obj/item/slimecross/burning/metal
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index 787af8195771..98821ff7176f 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -133,6 +133,7 @@ Regenerative extracts:
C.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
C.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
C.max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ C.heat_protection = C.body_parts_covered
C.resistance_flags |= FIRE_PROOF
/obj/item/slimecross/regenerative/silver
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 2e9610dba099..edc0b1313653 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -596,8 +596,8 @@
/obj/item/slime_extract/rainbow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
- var/datum/color_palette/generic_colors/located = user.dna.color_palettes[/datum/color_palette/generic_colors]
- located.mutant_color = "#[pick("7F", "FF")][pick("7F", "FF")][pick("7F", "FF")]"
+ user.dna.features["mcolor"] = "#[pick("7F", "FF")][pick("7F", "FF")][pick("7F", "FF")]"
+ user.dna.update_uf_block(DNA_MUTANT_COLOR_BLOCK)
user.updateappearance(mutcolor_update=1)
species.update_glow(user)
to_chat(user, span_notice("You feel different..."))
@@ -927,6 +927,7 @@
clothing.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
clothing.add_atom_colour("#000080", FIXED_COLOUR_PRIORITY)
clothing.max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ clothing.heat_protection = clothing.body_parts_covered
clothing.resistance_flags |= FIRE_PROOF
uses --
if(!uses)
diff --git a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm
index 0afb21953152..836bfd98dca4 100644
--- a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm
+++ b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm
@@ -144,7 +144,7 @@
// Make the mob have the color of the blood pool it came out of
var/obj/effect/decal/cleanable/came_from = locate() in landing_turf
- var/new_color = came_from?.get_blood_dna_color()
+ var/new_color = came_from?.get_blood_color()
if(!new_color)
return
diff --git a/code/modules/spells/spell_types/pointed/abyssal_gaze.dm b/code/modules/spells/spell_types/pointed/abyssal_gaze.dm
index 7a1d13275760..a7336ef7834a 100644
--- a/code/modules/spells/spell_types/pointed/abyssal_gaze.dm
+++ b/code/modules/spells/spell_types/pointed/abyssal_gaze.dm
@@ -21,7 +21,7 @@
/// The duration of the blind on our target
var/blind_duration = 4 SECONDS
/// The amount of temperature we take from our target
- var/amount_to_cool = CELCIUS_TO_KELVIN(10 CELCIUS)
+ var/amount_to_cool = 200
/datum/action/cooldown/spell/pointed/abyssal_gaze/is_valid_target(atom/cast_on)
return iscarbon(cast_on)
@@ -37,4 +37,7 @@
cast_on.playsound_local(get_turf(cast_on), 'sound/hallucinations/i_see_you1.ogg', 50, 1)
owner.playsound_local(get_turf(owner), 'sound/effects/ghost2.ogg', 50, 1)
cast_on.adjust_temp_blindness(blind_duration)
+ if(ishuman(cast_on))
+ var/mob/living/carbon/human/human_cast_on = cast_on
+ human_cast_on.adjust_coretemperature(-amount_to_cool)
cast_on.adjust_bodytemperature(-amount_to_cool)
diff --git a/code/modules/spells/spell_types/pointed/spell_cards.dm b/code/modules/spells/spell_types/pointed/spell_cards.dm
index 340a59c5a67f..d2f12092ff59 100644
--- a/code/modules/spells/spell_types/pointed/spell_cards.dm
+++ b/code/modules/spells/spell_types/pointed/spell_cards.dm
@@ -7,7 +7,7 @@
school = SCHOOL_EVOCATION
cooldown_time = 5 SECONDS
- cooldown_reduction_per_rank = 1 SECONDS
+ cooldown_reduction_per_rank = 2 SECONDS
spell_max_level = 3
invocation = "Sigi'lu M'Fan 'Tasia!"
diff --git a/code/modules/spells/spell_types/self/mutate.dm b/code/modules/spells/spell_types/self/mutate.dm
index 6f5040c6b5e7..59f8f6ddc37f 100644
--- a/code/modules/spells/spell_types/self/mutate.dm
+++ b/code/modules/spells/spell_types/self/mutate.dm
@@ -51,8 +51,8 @@
/datum/action/cooldown/spell/apply_mutations/mutate/cast(mob/living/carbon/human/cast_on)
..()
- if(HAS_TRAIT(cast_on, TRAIT_USES_SKINTONES) || HAS_TRAIT(cast_on, TRAIT_MUTANT_COLORS))
- return//monkestation temp removal, we dont have this refactor yet
+ /*if(HAS_TRAIT(cast_on, TRAIT_USES_SKINTONES) || HAS_TRAIT(cast_on, TRAIT_MUTANT_COLORS))
+ return*/ //monkestation temp removal, we dont have this refactor yet
// Our caster has a species that doesn't greenify when hulked, so we will do it manually.
cast_on.add_atom_colour("#00FF00", TEMPORARY_COLOUR_PRIORITY)
diff --git a/code/modules/surgery/bodyparts/_arms.dm b/code/modules/surgery/bodyparts/_arms.dm
deleted file mode 100644
index 7678a8e9e1c9..000000000000
--- a/code/modules/surgery/bodyparts/_arms.dm
+++ /dev/null
@@ -1,181 +0,0 @@
-/// Parent Type for arms, should not appear in game.
-/obj/item/bodypart/arm
- name = "arm"
- desc = "Hey buddy give me a HAND and report this to the github because you shouldn't be seeing this."
- attack_verb_continuous = list("slaps", "punches")
- attack_verb_simple = list("slap", "punch")
- max_damage = 50
- aux_layer = BODYPARTS_HIGH_LAYER
- body_damage_coeff = 0.75
- can_be_disabled = TRUE
- unarmed_attack_verb = "punch" /// The classic punch, wonderfully classic and completely random
- unarmed_damage_low = 5
- unarmed_damage_high = 5
- unarmed_stun_threshold = 10
- body_zone = BODY_ZONE_L_ARM
-
- biological_state = BIO_STANDARD_JOINTED
- /// Basically, bodypart traits that ONLY apply when this arm is the active hand of the mob
- var/list/hand_traits
-
-/obj/item/bodypart/arm/Destroy()
- return ..()
-
-/obj/item/bodypart/arm/Destroy()
- return ..()
-
-/obj/item/bodypart/arm/set_owner(new_owner)
- . = ..()
- if(. == FALSE)
- return
-
- if(owner)
- RegisterSignal(owner, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands))
- on_swap_hands(owner)
-
- if(.)
- var/mob/living/carbon/old_owner = .
- UnregisterSignal(old_owner, COMSIG_MOB_SWAP_HANDS)
- on_inactive_hand(old_owner)
-
-/obj/item/bodypart/arm/set_disabled(new_disabled)
- . = ..()
- if(isnull(.) || !owner)
- return
-
- if(!.)
- if(bodypart_disabled)
- owner.set_usable_hands(owner.usable_hands - 1)
- if(owner.stat < UNCONSCIOUS)
- to_chat(owner, span_userdanger("You lose control of your [name]!"))
- if(held_index)
- owner.dropItemToGround(owner.get_item_for_held_index(held_index))
- else if(!bodypart_disabled)
- owner.set_usable_hands(owner.usable_hands + 1)
-
- if(owner.hud_used)
- var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"]
- hand_screen_object?.update_appearance()
-
-/obj/item/bodypart/arm/proc/on_swap_hands(mob/living/carbon/source)
- SIGNAL_HANDLER
- if(!length(hand_traits))
- return
- if(source.get_active_hand() == src)
- on_active_hand(source)
- else
- on_inactive_hand(source)
-
-/obj/item/bodypart/arm/proc/on_active_hand(mob/living/carbon/source)
- SHOULD_CALL_PARENT(TRUE)
- if(!length(hand_traits))
- return
- source.add_traits(hand_traits, REF(src))
-
-/obj/item/bodypart/arm/proc/on_inactive_hand(mob/living/carbon/source)
- SHOULD_CALL_PARENT(TRUE)
- if(!length(hand_traits))
- return
- source.remove_traits(hand_traits, REF(src))
-
-/obj/item/bodypart/arm/left
- name = "left arm"
- desc = "Did you know that the word 'sinister' stems originally from the \
- Latin 'sinestra' (left hand), because the left hand was supposed to \
- be possessed by the devil? This arm appears to be possessed by no \
- one though."
- icon_state = "default_human_l_arm"
- body_zone = BODY_ZONE_L_ARM
- body_part = ARM_LEFT
- plaintext_zone = "left arm"
- aux_zone = BODY_ZONE_PRECISE_L_HAND
- held_index = 1
- px_x = -6
- px_y = 0
- bodypart_trait_source = LEFT_ARM_TRAIT
-
-/obj/item/bodypart/arm/left/set_owner(new_owner)
- . = ..()
- if(. == FALSE)
- return
-
- if(owner)
- if(HAS_TRAIT(owner, TRAIT_PARALYSIS_L_ARM))
- ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
- RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss))
- else
- REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
- RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain))
- if(.)
- var/mob/living/carbon/old_owner = .
- if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_ARM))
- UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM))
- if(!owner || !HAS_TRAIT(owner, TRAIT_PARALYSIS_L_ARM))
- REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
- else
- UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM))
-
-///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_ARM trait.
-/obj/item/bodypart/arm/left/proc/on_owner_paralysis_gain(mob/living/carbon/source)
- SIGNAL_HANDLER
- ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
- UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM))
- RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss))
-
-
-///Proc to react to the owner losing the TRAIT_PARALYSIS_L_ARM trait.
-/obj/item/bodypart/arm/left/proc/on_owner_paralysis_loss(mob/living/carbon/source)
- SIGNAL_HANDLER
- REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
- UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM))
- RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain))
-
-/obj/item/bodypart/arm/right
- name = "right arm"
- desc = "Over 87% of humans are right handed. That figure is much lower \
- among humans missing their right arm."
- body_zone = BODY_ZONE_R_ARM
- body_part = ARM_RIGHT
- icon_state = "default_human_r_arm"
- plaintext_zone = "right arm"
- aux_zone = BODY_ZONE_PRECISE_R_HAND
- held_index = 2
- px_x = 6
- px_y = 0
- bodypart_trait_source = RIGHT_ARM_TRAIT
-
-/obj/item/bodypart/arm/right/set_owner(new_owner)
- . = ..()
- if(. == FALSE)
- return
-
- if(owner)
- if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_ARM))
- ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
- RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss))
- else
- REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
- RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain))
- if(.)
- var/mob/living/carbon/old_owner = .
- if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_ARM))
- UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM))
- if(!owner || !HAS_TRAIT(owner, TRAIT_PARALYSIS_R_ARM))
- REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
- else
- UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM))
-
-///Proc to react to the owner gaining the TRAIT_PARALYSIS_R_ARM trait.
-/obj/item/bodypart/arm/right/proc/on_owner_paralysis_gain(mob/living/carbon/source)
- SIGNAL_HANDLER
- ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
- UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM))
- RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss))
-
-
-///Proc to react to the owner losing the TRAIT_PARALYSIS_R_ARM trait.
-/obj/item/bodypart/arm/right/proc/on_owner_paralysis_loss(mob/living/carbon/source)
- SIGNAL_HANDLER
- REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
- UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM))
- RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain))
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 21f3c0ae6bbc..5178752d63af 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -66,8 +66,6 @@
var/list/embedded_objects = list()
/// are we a hand? if so, which one!
var/held_index = 0
- /// A speed modifier we apply to the owner when attached, if any. Positive numbers make it move slower, negative numbers make it move faster.
- var/speed_modifier = 0
// Limb disabling variables
///Controls if the limb is disabled. TRUE means it is disabled (similar to being removed, but still present for the sake of targeted interactions).
@@ -107,12 +105,16 @@
var/should_draw_greyscale = TRUE
///An "override" color that can be applied to ANY limb, greyscale or not.
var/variable_color = ""
- /// Color of the damage overlay
- var/damage_color = COLOR_BLOOD
var/px_x = 0
var/px_y = 0
+ /**
+ * A copy of the original owner's species datum species_traits list (very hacky)
+ * It sucks that we have to do this, but due to MUTCOLORS and others, we have to. For now.
+ */
+
+ var/species_flags_list = list()
///the type of damage overlay (if any) to use when this bodypart is bruised/burned.
var/dmg_overlay_type = "human"
/// If we're bleeding, which icon are we displaying on this part
@@ -198,14 +200,6 @@
/// If false, no wound that can be applied to us can mangle our interior. Used for determining if we should use [hp_percent_to_dismemberable] instead of normal dismemberment.
var/any_existing_wound_can_mangle_our_interior
- ///an assoc list of type to % for limbs that share id's useful for traits or components we want to add that should require more than 1 limb being added
- var/list/composition_effects
- ///a list of different limb_ids that we share composition with
- var/list/shared_composition
- ///this is our color palette we pull colors from
- var/datum/color_palette/palette
- var/palette_key
-
/obj/item/bodypart/apply_fantasy_bonuses(bonus)
. = ..()
unarmed_damage_low = modify_fantasy_variable("unarmed_damage_low", unarmed_damage_low, bonus, minimum = 1)
@@ -338,19 +332,22 @@
else
is_disabled += " and"
- check_list += "\t
Your [name][is_disabled][self_aware ? " has " : " is "][status]."
+ check_list += "\t
Your [name][is_disabled][self_aware ? " has " : " is "][status]."
for(var/datum/wound/wound as anything in wounds)
- var/wound_desc = wound.get_self_check_description(src, examiner)
- if(wound_desc)
- check_list += "\t\t[wound_desc]"
+ switch(wound.severity)
+ if(WOUND_SEVERITY_TRIVIAL)
+ check_list += "\t [span_danger("Your [name] is suffering [wound.a_or_from] [lowertext(wound.name)].")]"
+ if(WOUND_SEVERITY_MODERATE)
+ check_list += "\t [span_warning("Your [name] is suffering [wound.a_or_from] [lowertext(wound.name)]!")]"
+ if(WOUND_SEVERITY_SEVERE)
+ check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [lowertext(wound.name)]!!")]"
+ if(WOUND_SEVERITY_CRITICAL)
+ check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [lowertext(wound.name)]!!!")]"
for(var/obj/item/embedded_thing in embedded_objects)
var/stuck_word = embedded_thing.isEmbedHarmless() ? "stuck" : "embedded"
- check_list += "\t
There is \a [embedded_thing] [stuck_word] in your [name]!"
-
- if(current_gauze)
- check_list += span_notice("\t There is some
[current_gauze.name] wrapped around your [name].")
+ check_list += "\t
There is \a [embedded_thing] [stuck_word] in your [name]!"
/obj/item/bodypart/blob_act()
@@ -404,9 +401,6 @@
pixel_x = rand(-3, 3)
pixel_y = rand(-3, 3)
-/obj/item/bodypart/drop_location()
- return ..() || owner?.drop_location()
-
//empties the bodypart from its organs and other things inside it
/obj/item/bodypart/proc/drop_organs(mob/user, violent_removal)
SHOULD_CALL_PARENT(TRUE)
@@ -656,7 +650,7 @@
if(burn)
set_burn_dam(round(max(burn_dam - burn, 0), DAMAGE_PRECISION))
- if(HAS_TRAIT(owner, TRAIT_REVIVES_BY_HEALING))
+ if(owner.dna && owner.dna.species && (REVIVESBYHEALING in owner.dna.species.species_traits))
if(owner.health > 0)
owner.revive(0)
owner.cure_husk(0) // If it has REVIVESBYHEALING, it probably can't be cloned. No husk cure.
@@ -767,10 +761,6 @@
owner = new_owner
var/needs_update_disabled = FALSE //Only really relevant if there's an owner
if(old_owner)
- if(length(bodypart_traits))
- old_owner.remove_traits(bodypart_traits, bodypart_trait_source)
- if(speed_modifier)
- old_owner.update_bodypart_speed_modifier()
if(initial(can_be_disabled))
if(HAS_TRAIT(old_owner, TRAIT_NOLIMBDISABLE))
if(!owner || !HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE))
@@ -783,13 +773,7 @@
SIGNAL_ADDTRAIT(TRAIT_NOBLOOD),
))
UnregisterSignal(old_owner, COMSIG_ATOM_RESTYLE)
- UnregisterSignal(old_owner, list(COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB))
- check_removal_composition(old_owner)
if(owner)
- if(length(bodypart_traits))
- owner.add_traits(bodypart_traits, bodypart_trait_source)
- if(speed_modifier)
- owner.update_bodypart_speed_modifier()
if(initial(can_be_disabled))
if(HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE))
set_can_be_disabled(FALSE)
@@ -799,13 +783,11 @@
// Bleeding stuff
RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD), PROC_REF(on_owner_nobleed_loss))
RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOBLOOD), PROC_REF(on_owner_nobleed_gain))
- RegisterSignals(owner, list(COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), PROC_REF(reassess_body_composition))
if(needs_update_disabled)
update_disabled()
RegisterSignal(owner, COMSIG_ATOM_RESTYLE, PROC_REF(on_attempt_feature_restyle_mob))
- check_adding_composition(owner)
refresh_bleed_rate()
return old_owner
@@ -815,7 +797,6 @@
return
owner.remove_traits(bodypart_traits, bodypart_trait_source)
- check_removal_composition(owner)
///Proc to change the value of the `can_be_disabled` variable and react to the event of its change.
/obj/item/bodypart/proc/set_can_be_disabled(new_can_be_disabled)
@@ -912,38 +893,32 @@
else
draw_color = null
- damage_color = owner?.get_blood_type()?.color || COLOR_BLOOD
-
if(!is_creating || !owner)
return
// There should technically to be an ishuman(owner) check here, but it is absent because no basetype carbons use bodyparts
// No, xenos don't actually use bodyparts. Don't ask.
var/mob/living/carbon/human/human_owner = owner
+ var/datum/species/owner_species = human_owner.dna.species
+ species_flags_list = owner_species.species_traits.Copy()
limb_gender = (human_owner.physique == MALE) ? "m" : "f"
- if(HAS_TRAIT(human_owner, TRAIT_USES_SKINTONES))
+
+ if(owner_species.use_skintones)
skin_tone = human_owner.skin_tone
- else if(HAS_TRAIT(human_owner, TRAIT_MUTANT_COLORS))
+ else
skin_tone = ""
- if(palette)
- var/datum/color_palette/located = human_owner.dna.color_palettes[palette]
- if(!located)
- species_color = initial(palette.default_color)
- species_color = located.return_color(palette_key)
+
+ if(((MUTCOLORS in owner_species.species_traits) || (DYNCOLORS in owner_species.species_traits) || (SPECIES_FUR in owner_species.species_traits))) //Ethereal code. Motherfuckers.
+ if(owner_species.fixed_mut_color)
+ species_color = owner_species.fixed_mut_color
else
- var/datum/species/owner_species = human_owner.dna.species
- if(owner_species.fixed_mut_color)
- species_color = owner_species.fixed_mut_color
- else
- if(should_draw_greyscale)
- CRASH("Forgot to move something to new color_palette system [src]")
+ species_color = human_owner.dna.features["mcolor"]
else
- skin_tone = ""
- species_color = ""
+ species_color = null
draw_color = variable_color
if(should_draw_greyscale) //Should the limb be colored?
- draw_color ||= species_color || (skin_tone ? skintone2hex(skin_tone) : null)
+ draw_color ||= (species_color) || (skin_tone && skintone2hex(skin_tone))
recolor_external_organs()
return TRUE
@@ -976,9 +951,7 @@
image_dir = SOUTH
if(dmg_overlay_type)
if(brutestate)
- var/image/bruteimage = image('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, image_dir)
- bruteimage.color = damage_color
- . += bruteimage
+ . += image('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_[brutestate]0", -DAMAGE_LAYER, image_dir)
if(burnstate)
. += image('icons/mob/effects/dam_mob.dmi', "[dmg_overlay_type]_[body_zone]_0[burnstate]", -DAMAGE_LAYER, image_dir)
@@ -1225,6 +1198,46 @@
return ((biological_state & BIO_BLOODED) && (!owner || !HAS_TRAIT(owner, TRAIT_NOBLOOD)))
+/**
+ * apply_gauze() is used to- well, apply gauze to a bodypart
+ *
+ * As of the Wounds 2 PR, all bleeding is now bodypart based rather than the old bleedstacks system, and 90% of standard bleeding comes from flesh wounds (the exception is embedded weapons).
+ * The same way bleeding is totaled up by bodyparts, gauze now applies to all wounds on the same part. Thus, having a slash wound, a pierce wound, and a broken bone wound would have the gauze
+ * applying blood staunching to the first two wounds, while also acting as a sling for the third one. Once enough blood has been absorbed or all wounds with the ACCEPTS_GAUZE flag have been cleared,
+ * the gauze falls off.
+ *
+ * Arguments:
+ * * gauze- Just the gauze stack we're taking a sheet from to apply here
+ */
+/obj/item/bodypart/proc/apply_gauze(obj/item/stack/gauze)
+ if(!istype(gauze) || !gauze.absorption_capacity)
+ return
+ var/newly_gauzed = FALSE
+ if(!current_gauze)
+ newly_gauzed = TRUE
+ QDEL_NULL(current_gauze)
+ current_gauze = new gauze.type(src, 1)
+ gauze.use(1)
+ if(newly_gauzed)
+ SEND_SIGNAL(src, COMSIG_BODYPART_GAUZED, gauze)
+
+/**
+ * seep_gauze() is for when a gauze wrapping absorbs blood or pus from wounds, lowering its absorption capacity.
+ *
+ * The passed amount of seepage is deducted from the bandage's absorption capacity, and if we reach a negative absorption capacity, the bandages falls off and we're left with nothing.
+ *
+ * Arguments:
+ * * seep_amt - How much absorption capacity we're removing from our current bandages (think, how much blood or pus are we soaking up this tick?)
+ */
+/obj/item/bodypart/proc/seep_gauze(seep_amt = 0)
+ if(!current_gauze)
+ return
+ current_gauze.absorption_capacity -= seep_amt
+ if(current_gauze.absorption_capacity <= 0)
+ owner.visible_message(span_danger("\The [current_gauze.name] on [owner]'s [name] falls away in rags."), span_warning("\The [current_gauze.name] on your [name] falls away in rags."), vision_distance=COMBAT_MESSAGE_RANGE)
+ QDEL_NULL(current_gauze)
+ SEND_SIGNAL(src, COMSIG_BODYPART_GAUZE_DESTROYED)
+
///Loops through all of the bodypart's external organs and update's their color.
/obj/item/bodypart/proc/recolor_external_organs()
for(var/datum/bodypart_overlay/mutant/overlay in bodypart_overlays)
@@ -1314,66 +1327,3 @@
return "metal"
return "error"
-
-/// Returns what message is displayed when the bodypart is on the cusp of being dismembered.
-/obj/item/bodypart/proc/get_soon_dismember_message()
- return ", threatening to sever it entirely"
-
-/obj/item/bodypart/chest/get_soon_dismember_message()
- return ", threatening to split it open" // we don't sever, we dump organs when "dismembered"
-
-/obj/item/bodypart/head/get_soon_dismember_message()
- return ", threatening to split it open" // we don't sever, we cranial fissure when "dismembered" // we also don't dismember i think
-
-/obj/item/bodypart/proc/return_compoostion_precent(mob/living/carbon/checker)
- var/matching_ids = 0
- for(var/obj/item/bodypart/bodypart as anything in checker.bodyparts)
- if((bodypart.limb_id != limb_id) && !(bodypart.limb_id in shared_composition))
- continue
- matching_ids++
-
- return matching_ids / TOTAL_BODYPART_COUNT
-
-/obj/item/bodypart/proc/check_removal_composition(mob/living/carbon/remover)
- var/precent = return_compoostion_precent(remover)
-
- for(var/item as anything in composition_effects)
- if(composition_effects[item] < precent)
- continue
- if(!ispath(item))
- REMOVE_TRAIT(remover, item, BODYPART_TRAIT)
- else
- if(ispath(item, /datum/component))
- var/datum/component/component = remover.GetComponent(item)
- if(component)
- qdel(component)
- else if(ispath(item, /datum/element))
- if(!HasElement(remover, item))
- continue
- remover.RemoveElement(item)
-
-/obj/item/bodypart/proc/check_adding_composition(mob/living/carbon/adder)
- var/precent = return_compoostion_precent(adder)
-
- for(var/item as anything in composition_effects)
- if(composition_effects[item] > precent)
- continue
- if(!ispath(item))
- if(HAS_TRAIT_FROM(adder, item, BODYPART_TRAIT))
- continue
- ADD_TRAIT(adder, item, BODYPART_TRAIT)
- else
- if(ispath(item, /datum/component))
- if(adder.GetComponent(item))
- continue
- adder.AddComponent(item)
- else if(ispath(item, /datum/element))
- if(HasElement(adder, item))
- continue
- adder.AddElement(item)
-
-/obj/item/bodypart/proc/reassess_body_composition(mob/living/carbon/adder)
- SIGNAL_HANDLER
-
- check_removal_composition(adder) //remove first
- check_adding_composition(adder) //then
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index bec42b32b08c..6991a2bdd46a 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -77,8 +77,6 @@
//limb is out and about, it can't really be considered an implant
bodypart_flags &= ~BODYPART_IMPLANTED
owner.remove_bodypart(src)
- if(speed_modifier)
- owner.update_bodypart_speed_modifier()
for(var/datum/wound/wound as anything in wounds)
wound.remove_wound(TRUE)
@@ -255,15 +253,6 @@
arm_owner.dropItemToGround(arm_owner.gloves, TRUE, violent = violent)
arm_owner.update_worn_gloves() //to remove the bloody hands overlay
-/obj/item/bodypart/arm/try_attach_limb(mob/living/carbon/new_arm_owner, special = FALSE)
- . = ..()
-
- if(!.)
- return
-
- new_arm_owner.update_worn_gloves()
-
-
/obj/item/bodypart/leg/drop_limb(special, dismembered, violent)
if(owner && !special)
if(owner.legcuffed)
@@ -343,9 +332,6 @@
hand.update_appearance()
new_limb_owner.update_worn_gloves()
- if(speed_modifier)
- new_limb_owner.update_bodypart_speed_modifier()
-
LAZYREMOVE(new_limb_owner.body_zone_dismembered_by, body_zone)
if(special) //non conventional limb attachment
diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
index 1e3f2078ca46..670462bdac8c 100644
--- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm
+++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
@@ -8,16 +8,6 @@
var/mob/living/carbon/human/human_head_owner = owner
var/datum/species/owner_species = human_head_owner.dna.species
- var/offset = 0
- if(!istype(owner, /mob/living/carbon/human/dummy))
- switch(human_head_owner.get_mob_height())
- if(HUMAN_HEIGHT_DWARF)
- offset = -2
- if(HUMAN_HEIGHT_SHORTEST)
- offset = -1
- if(HUMAN_HEIGHT_SHORT)
- offset = 0
-
//HIDDEN CHECKS START
hair_hidden = FALSE
facial_hair_hidden = FALSE
@@ -85,7 +75,6 @@
//Overlay
facial_overlay = mutable_appearance(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER)
facial_overlay.alpha = facial_hair_alpha
- facial_overlay.pixel_y = offset
//Gradients
facial_hair_gradient_style = LAZYACCESS(human_head_owner.grad_style, GRADIENT_FACIAL_HAIR_KEY)
if(facial_hair_gradient_style)
@@ -100,7 +89,6 @@
//Overlay
hair_overlay = mutable_appearance(sprite_accessory.icon, sprite_accessory.icon_state, -HAIR_LAYER)
hair_overlay.alpha = hair_alpha
- //hair_overlay.pixel_y = offset
//Gradients
hair_gradient_style = LAZYACCESS(human_head_owner.grad_style, GRADIENT_HAIR_KEY)
if(hair_gradient_style)
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index bfcbb0b7062a..500437797654 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -16,8 +16,6 @@
///The bodytype(s) allowed to attach to this chest.
var/acceptable_bodytype = BODYTYPE_HUMANOID
- var/icon/ass_image
- var/list/wing_types = list(/obj/item/organ/external/wings/functional/angel)
var/obj/item/cavity_item
/obj/item/bodypart/chest/can_dismember(obj/item/item)
@@ -74,6 +72,101 @@
bodytype = BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_ORGANIC
acceptable_bodytype = BODYTYPE_LARVA_PLACEHOLDER
+/// Parent Type for arms, should not appear in game.
+/obj/item/bodypart/arm
+ name = "arm"
+ desc = "Hey buddy give me a HAND and report this to the github because you shouldn't be seeing this."
+ attack_verb_continuous = list("slaps", "punches")
+ attack_verb_simple = list("slap", "punch")
+ max_damage = 50
+ aux_layer = BODYPARTS_HIGH_LAYER
+ body_damage_coeff = 0.75
+ can_be_disabled = TRUE
+ unarmed_attack_verb = "punch" /// The classic punch, wonderfully classic and completely random
+ unarmed_damage_low = 5
+ unarmed_damage_high = 5
+ unarmed_stun_threshold = 10
+ body_zone = BODY_ZONE_L_ARM
+
+ biological_state = BIO_STANDARD_JOINTED
+
+/obj/item/bodypart/arm/Destroy()
+ return ..()
+
+/obj/item/bodypart/arm/left
+ name = "left arm"
+ desc = "Did you know that the word 'sinister' stems originally from the \
+ Latin 'sinestra' (left hand), because the left hand was supposed to \
+ be possessed by the devil? This arm appears to be possessed by no \
+ one though."
+ icon_state = "default_human_l_arm"
+ body_zone = BODY_ZONE_L_ARM
+ body_part = ARM_LEFT
+ plaintext_zone = "left arm"
+ aux_zone = BODY_ZONE_PRECISE_L_HAND
+ held_index = 1
+ px_x = -6
+ px_y = 0
+ bodypart_trait_source = LEFT_ARM_TRAIT
+
+
+/obj/item/bodypart/arm/left/set_owner(new_owner)
+ . = ..()
+ if(. == FALSE)
+ return
+ if(owner)
+ if(HAS_TRAIT(owner, TRAIT_PARALYSIS_L_ARM))
+ ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
+ RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss))
+ else
+ REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
+ RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain))
+ if(.)
+ var/mob/living/carbon/old_owner = .
+ if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_ARM))
+ UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM))
+ if(!owner || !HAS_TRAIT(owner, TRAIT_PARALYSIS_L_ARM))
+ REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
+ else
+ UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM))
+
+
+///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_ARM trait.
+/obj/item/bodypart/arm/left/proc/on_owner_paralysis_gain(mob/living/carbon/source)
+ SIGNAL_HANDLER
+ ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
+ UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM))
+ RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss))
+
+
+///Proc to react to the owner losing the TRAIT_PARALYSIS_L_ARM trait.
+/obj/item/bodypart/arm/left/proc/on_owner_paralysis_loss(mob/living/carbon/source)
+ SIGNAL_HANDLER
+ REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
+ UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM))
+ RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain))
+
+
+/obj/item/bodypart/arm/left/set_disabled(new_disabled)
+ . = ..()
+ if(isnull(.) || !owner)
+ return
+
+ if(!.)
+ if(bodypart_disabled)
+ owner.set_usable_hands(owner.usable_hands - 1)
+ if(owner.stat < UNCONSCIOUS)
+ to_chat(owner, span_userdanger("You lose control of your [name]!"))
+ if(held_index)
+ owner.dropItemToGround(owner.get_item_for_held_index(held_index))
+ else if(!bodypart_disabled)
+ owner.set_usable_hands(owner.usable_hands + 1)
+
+ if(owner.hud_used)
+ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"]
+ hand_screen_object?.update_appearance()
+
+
/obj/item/bodypart/arm/left/monkey
icon = 'icons/mob/species/monkey/bodyparts.dmi'
icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
@@ -105,6 +198,78 @@
should_draw_greyscale = FALSE
+/obj/item/bodypart/arm/right
+ name = "right arm"
+ desc = "Over 87% of humans are right handed. That figure is much lower \
+ among humans missing their right arm."
+ body_zone = BODY_ZONE_R_ARM
+ body_part = ARM_RIGHT
+ icon_state = "default_human_r_arm"
+ plaintext_zone = "right arm"
+ aux_zone = BODY_ZONE_PRECISE_R_HAND
+ aux_layer = BODYPARTS_HIGH_LAYER
+ held_index = 2
+ px_x = 6
+ px_y = 0
+ bodypart_trait_source = RIGHT_ARM_TRAIT
+
+/obj/item/bodypart/arm/right/set_owner(new_owner)
+ . = ..()
+ if(. == FALSE)
+ return
+ if(owner)
+ if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_ARM))
+ ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
+ RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss))
+ else
+ REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
+ RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain))
+ if(.)
+ var/mob/living/carbon/old_owner = .
+ if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_ARM))
+ UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM))
+ if(!owner || !HAS_TRAIT(owner, TRAIT_PARALYSIS_R_ARM))
+ REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
+ else
+ UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM))
+
+
+///Proc to react to the owner gaining the TRAIT_PARALYSIS_R_ARM trait.
+/obj/item/bodypart/arm/right/proc/on_owner_paralysis_gain(mob/living/carbon/source)
+ SIGNAL_HANDLER
+ ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
+ UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM))
+ RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss))
+
+
+///Proc to react to the owner losing the TRAIT_PARALYSIS_R_ARM trait.
+/obj/item/bodypart/arm/right/proc/on_owner_paralysis_loss(mob/living/carbon/source)
+ SIGNAL_HANDLER
+ REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
+ UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM))
+ RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain))
+
+
+/obj/item/bodypart/arm/right/set_disabled(new_disabled)
+ . = ..()
+ if(isnull(.) || !owner)
+ return
+
+ if(!.)
+ if(bodypart_disabled)
+ owner.set_usable_hands(owner.usable_hands - 1)
+ if(owner.stat < UNCONSCIOUS)
+ to_chat(owner, span_userdanger("You lose control of your [name]!"))
+ if(held_index)
+ owner.dropItemToGround(owner.get_item_for_held_index(held_index))
+ else if(!bodypart_disabled)
+ owner.set_usable_hands(owner.usable_hands + 1)
+
+ if(owner.hud_used)
+ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"]
+ hand_screen_object?.update_appearance()
+
+
/obj/item/bodypart/arm/right/monkey
icon = 'icons/mob/species/monkey/bodyparts.dmi'
icon_static = 'icons/mob/species/monkey/bodyparts.dmi'
@@ -160,8 +325,6 @@
var/old_limb_id
/// Used by the bloodysoles component to make footprints
var/footprint_sprite = FOOTPRINT_SPRITE_SHOES
- ///our step sound
- var/list/step_sounds
biological_state = BIO_STANDARD_JOINTED
/obj/item/bodypart/leg/Destroy()
diff --git a/code/modules/surgery/bodyparts/species_parts/android_parts.dm b/code/modules/surgery/bodyparts/species_parts/android_parts.dm
index 6f7700c266f3..b7a1f55bf43f 100644
--- a/code/modules/surgery/bodyparts/species_parts/android_parts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/android_parts.dm
@@ -10,8 +10,6 @@
/obj/item/bodypart/chest/robot/android
change_exempt_flags = null
- bodypart_traits = list(TRAIT_LIMBATTACHMENT)
- wing_types = list(/obj/item/organ/external/wings/functional/robotic)
/obj/item/bodypart/arm/left/robot/android
change_exempt_flags = null
@@ -21,8 +19,6 @@
/obj/item/bodypart/leg/left/robot/android
change_exempt_flags = null
- step_sounds = list('sound/effects/servostep.ogg')
/obj/item/bodypart/leg/right/robot/android
change_exempt_flags = null
- step_sounds = list('sound/effects/servostep.ogg')
diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
index 9d524cd75c2f..06db450e5dd2 100644
--- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
@@ -6,8 +6,6 @@
attack_type = BURN // bish buzz
unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
- palette = /datum/color_palette/generic_colors
- palette_key = "ethereal_color"
/obj/item/bodypart/head/ethereal/update_limb(dropping_limb, is_creating)
. = ..()
@@ -22,8 +20,6 @@
limb_id = SPECIES_ETHEREAL
is_dimorphic = FALSE
dmg_overlay_type = null
- palette = /datum/color_palette/generic_colors
- palette_key = "ethereal_color"
/obj/item/bodypart/chest/ethereal/update_limb(dropping_limb, is_creating)
. = ..()
@@ -40,8 +36,6 @@
unarmed_attack_verb = "burn"
unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
- palette = /datum/color_palette/generic_colors
- palette_key = "ethereal_color"
/obj/item/bodypart/arm/left/ethereal/update_limb(dropping_limb, is_creating)
. = ..()
@@ -58,8 +52,6 @@
unarmed_attack_verb = "burn"
unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
- palette = /datum/color_palette/generic_colors
- palette_key = "ethereal_color"
/obj/item/bodypart/arm/right/ethereal/update_limb(dropping_limb, is_creating)
. = ..()
@@ -76,8 +68,6 @@
attack_type = BURN // bish buzz
unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
- palette = /datum/color_palette/generic_colors
- palette_key = "ethereal_color"
/obj/item/bodypart/leg/left/ethereal/update_limb(dropping_limb, is_creating)
. = ..()
@@ -93,8 +83,6 @@
attack_type = BURN // bish buzz
unarmed_attack_sound = 'sound/weapons/etherealhit.ogg'
unarmed_miss_sound = 'sound/weapons/etherealmiss.ogg'
- palette = /datum/color_palette/generic_colors
- palette_key = "ethereal_color"
/obj/item/bodypart/leg/right/ethereal/update_limb(dropping_limb, is_creating)
. = ..()
diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
index d8ded87d42a0..1b496fc3bd74 100644
--- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
@@ -3,19 +3,11 @@
limb_id = SPECIES_LIZARD
is_dimorphic = FALSE
head_flags = HEAD_HAIR| HEAD_EYESPRITES | HEAD_EYEHOLES | HEAD_DEBRAIN | HEAD_EYECOLOR
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/chest/lizard
icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
limb_id = SPECIES_LIZARD
is_dimorphic = FALSE
- ass_image = 'icons/ass/asslizard.png'
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
- wing_types = list(/obj/item/organ/external/wings/functional/dragon)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/lizard
icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
@@ -24,9 +16,6 @@
unarmed_attack_effect = ATTACK_EFFECT_CLAW
unarmed_attack_sound = 'sound/weapons/slash.ogg'
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/right/lizard
icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
@@ -35,15 +24,12 @@
unarmed_attack_effect = ATTACK_EFFECT_CLAW
unarmed_attack_sound = 'sound/weapons/slash.ogg'
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/lizard/ashwalker
- hand_traits = list(TRAIT_CHUNKYFINGERS)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
/obj/item/bodypart/arm/right/lizard/ashwalker
- hand_traits = list(TRAIT_CHUNKYFINGERS)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
/obj/item/bodypart/leg/left/lizard
icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
@@ -51,15 +37,6 @@
can_be_digitigrade = TRUE
digitigrade_id = "digitigrade"
footprint_sprite = FOOTPRINT_SPRITE_CLAWS
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
- step_sounds = list(
- 'sound/effects/footstep/hardclaw1.ogg',
- 'sound/effects/footstep/hardclaw2.ogg',
- 'sound/effects/footstep/hardclaw3.ogg',
- 'sound/effects/footstep/hardclaw4.ogg',
- )
/obj/item/bodypart/leg/right/lizard
icon_greyscale = 'icons/mob/species/lizard/bodyparts.dmi'
@@ -67,18 +44,3 @@
can_be_digitigrade = TRUE
digitigrade_id = "digitigrade"
footprint_sprite = FOOTPRINT_SPRITE_CLAWS
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
- step_sounds = list(
- 'sound/effects/footstep/hardclaw1.ogg',
- 'sound/effects/footstep/hardclaw2.ogg',
- 'sound/effects/footstep/hardclaw3.ogg',
- 'sound/effects/footstep/hardclaw4.ogg',
- )
-
-/obj/item/bodypart/leg/right/lizard/ashwalker
- bodypart_traits = list(TRAIT_HARD_SOLES)
-
-/obj/item/bodypart/leg/left/lizard/ashwalker
- bodypart_traits = list(TRAIT_HARD_SOLES)
diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
index 31c7a40e6cad..3522df549ea8 100644
--- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
@@ -3,58 +3,29 @@
limb_id = SPECIES_SNAIL
is_dimorphic = FALSE
head_flags = HEAD_EYESPRITES|HEAD_DEBRAIN
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/chest/snail
limb_id = SPECIES_SNAIL
is_dimorphic = FALSE
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/snail
limb_id = SPECIES_SNAIL
unarmed_attack_verb = "slap"
unarmed_attack_effect = ATTACK_EFFECT_DISARM
unarmed_damage_high = 0.5 //snails are soft and squishy
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/right/snail
limb_id = SPECIES_SNAIL
unarmed_attack_verb = "slap"
unarmed_attack_effect = ATTACK_EFFECT_DISARM
unarmed_damage_high = 0.5
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/left/snail
limb_id = SPECIES_SNAIL
unarmed_damage_high = 0.5
- speed_modifier = 3 //disgustingly slow
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
-
/obj/item/bodypart/leg/right/snail
limb_id = SPECIES_SNAIL
unarmed_damage_high = 0.5
- speed_modifier = 3 //disgustingly slow
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
-
-/obj/item/bodypart/leg/left/zombie/infectious
- limb_id = SPECIES_ZOMBIE
- should_draw_greyscale = FALSE
- speed_modifier = 0.8 //braaaaains
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
-
-/obj/item/bodypart/leg/right/zombie/infectious
- limb_id = SPECIES_ZOMBIE
- should_draw_greyscale = FALSE
- speed_modifier = 0.8 //braaaaains
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
///ABDUCTOR
/obj/item/bodypart/head/abductor
@@ -67,17 +38,16 @@
limb_id = SPECIES_ABDUCTOR
is_dimorphic = FALSE
should_draw_greyscale = FALSE
- ass_image = 'icons/ass/assgrey.png'
/obj/item/bodypart/arm/left/abductor
limb_id = SPECIES_ABDUCTOR
should_draw_greyscale = FALSE
- hand_traits = list(TRAIT_CHUNKYFINGERS, TRAIT_CHUNKYFINGERS_IGNORE_BATON)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
/obj/item/bodypart/arm/right/abductor
limb_id = SPECIES_ABDUCTOR
should_draw_greyscale = FALSE
- hand_traits = list(TRAIT_CHUNKYFINGERS, TRAIT_CHUNKYFINGERS_IGNORE_BATON)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
/obj/item/bodypart/leg/left/abductor
limb_id = SPECIES_ABDUCTOR
@@ -94,52 +64,32 @@
is_dimorphic = TRUE
dmg_overlay_type = null
head_flags = HEAD_ALL_FEATURES
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/chest/jelly
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_JELLYPERSON
is_dimorphic = TRUE
dmg_overlay_type = null
- composition_effects = list(/datum/element/soft_landing = 0.5)
- ass_image = 'icons/ass/assslime.png'
- wing_types = list(/obj/item/organ/external/wings/functional/slime)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/jelly
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_JELLYPERSON
dmg_overlay_type = null
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/right/jelly
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_JELLYPERSON
dmg_overlay_type = null
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/left/jelly
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_JELLYPERSON
dmg_overlay_type = null
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/right/jelly
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_JELLYPERSON
dmg_overlay_type = null
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
///SLIME
/obj/item/bodypart/head/slime
@@ -147,84 +97,54 @@
limb_id = SPECIES_SLIMEPERSON
is_dimorphic = FALSE
head_flags = HEAD_ALL_FEATURES
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/chest/slime
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_SLIMEPERSON
is_dimorphic = TRUE
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/slime
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_SLIMEPERSON
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/right/slime
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_SLIMEPERSON
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/left/slime
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_SLIMEPERSON
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/right/slime
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_SLIMEPERSON
- composition_effects = list(/datum/element/soft_landing = 0.5)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
///LUMINESCENT
/obj/item/bodypart/head/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_LUMINESCENT
is_dimorphic = TRUE
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/chest/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_LUMINESCENT
is_dimorphic = TRUE
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_LUMINESCENT
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/right/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_LUMINESCENT
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/left/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_LUMINESCENT
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/right/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED|BIO_JOINTED)
limb_id = SPECIES_LUMINESCENT
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
///ZOMBIE
/obj/item/bodypart/head/zombie
@@ -232,48 +152,36 @@
is_dimorphic = FALSE
should_draw_greyscale = FALSE
head_flags = HEAD_EYESPRITES | HEAD_DEBRAIN | HEAD_HAIR
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
/obj/item/bodypart/chest/zombie
limb_id = SPECIES_ZOMBIE
is_dimorphic = FALSE
should_draw_greyscale = FALSE
- bodypart_traits = list(TRAIT_LIMBATTACHMENT)
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
/obj/item/bodypart/arm/left/zombie
limb_id = SPECIES_ZOMBIE
should_draw_greyscale = FALSE
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
/obj/item/bodypart/arm/right/zombie
limb_id = SPECIES_ZOMBIE
should_draw_greyscale = FALSE
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
/obj/item/bodypart/leg/left/zombie
limb_id = SPECIES_ZOMBIE
should_draw_greyscale = FALSE
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
/obj/item/bodypart/leg/right/zombie
limb_id = SPECIES_ZOMBIE
should_draw_greyscale = FALSE
- composition_effects = list(TRAIT_COLD_BLOODED = 0.5)
///PODPEOPLE
/obj/item/bodypart/head/pod
limb_id = SPECIES_PODPERSON
is_dimorphic = TRUE
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/chest/pod
limb_id = SPECIES_PODPERSON
is_dimorphic = TRUE
- ass_image = 'icons/ass/asspodperson.png'
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/pod
limb_id = SPECIES_PODPERSON
@@ -281,9 +189,6 @@
unarmed_attack_effect = ATTACK_EFFECT_CLAW
unarmed_attack_sound = 'sound/weapons/slice.ogg'
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
- hand_traits = list(TRAIT_PLANT_SAFE)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/right/pod
limb_id = SPECIES_PODPERSON
@@ -291,19 +196,12 @@
unarmed_attack_effect = ATTACK_EFFECT_CLAW
unarmed_attack_sound = 'sound/weapons/slice.ogg'
unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
- hand_traits = list(TRAIT_PLANT_SAFE)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/left/pod
limb_id = SPECIES_PODPERSON
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/right/pod
limb_id = SPECIES_PODPERSON
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
///FLY
/obj/item/bodypart/head/fly
@@ -316,7 +214,6 @@
limb_id = SPECIES_FLYPERSON
is_dimorphic = TRUE
should_draw_greyscale = FALSE
- wing_types = list(/obj/item/organ/external/wings/functional/fly)
/obj/item/bodypart/arm/left/fly
limb_id = SPECIES_FLYPERSON
@@ -363,10 +260,10 @@
should_draw_greyscale = FALSE
/obj/item/bodypart/arm/left/shadow/nightmare
- hand_traits = list(TRAIT_CHUNKYFINGERS)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
/obj/item/bodypart/arm/right/shadow/nightmare
- hand_traits = list(TRAIT_CHUNKYFINGERS)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
///SKELETON
/obj/item/bodypart/head/skeleton
@@ -383,8 +280,6 @@
is_dimorphic = FALSE
should_draw_greyscale = FALSE
dmg_overlay_type = null
- bodypart_traits = list(TRAIT_LIMBATTACHMENT)
- wing_types = list(/obj/item/organ/external/wings/functional/skeleton)
/obj/item/bodypart/arm/left/skeleton
biological_state = (BIO_BONE|BIO_JOINTED)
@@ -415,49 +310,35 @@
limb_id = SPECIES_MUSHROOM
is_dimorphic = TRUE
head_flags = NONE
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/chest/mushroom
limb_id = SPECIES_MUSHROOM
is_dimorphic = TRUE
bodypart_traits = list(TRAIT_NO_JUMPSUIT)
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/left/mushroom
limb_id = SPECIES_MUSHROOM
unarmed_damage_low = 8
unarmed_damage_high = 8
unarmed_stun_threshold = 14
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/arm/right/mushroom
limb_id = SPECIES_MUSHROOM
unarmed_damage_low = 8
unarmed_damage_high = 8
unarmed_stun_threshold = 14
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/left/mushroom
limb_id = SPECIES_MUSHROOM
unarmed_damage_low = 15
unarmed_damage_high = 15
unarmed_stun_threshold = 14
- speed_modifier = 0.75 //big fungus big fungus
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
/obj/item/bodypart/leg/right/mushroom
limb_id = SPECIES_MUSHROOM
unarmed_damage_low = 15
unarmed_damage_high = 15
unarmed_stun_threshold = 14
- speed_modifier = 0.75 //big fungus big fungus
- palette = /datum/color_palette/generic_colors
- palette_key = MUTANT_COLOR
///GOLEMS (i hate xenobio SO FUCKING MUCH) (from 2022: Yeah I fucking feel your pain brother) (2024: yeah this is shit)
/obj/item/bodypart/head/golem
@@ -482,7 +363,7 @@
bodytype = BODYTYPE_ORGANIC
limb_id = SPECIES_GOLEM
dmg_overlay_type = null
- hand_traits = list(TRAIT_CHUNKYFINGERS)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
unarmed_damage_low = 8 // I'd like to take the moment that maintaining all of these random ass golem speciese is hell and oranges was right
unarmed_damage_high = 8
unarmed_stun_threshold = 11
@@ -503,7 +384,7 @@
bodytype = BODYTYPE_ORGANIC
limb_id = SPECIES_GOLEM
dmg_overlay_type = null
- hand_traits = list(TRAIT_CHUNKYFINGERS)
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
unarmed_damage_low = 8
unarmed_damage_high = 8
unarmed_stun_threshold = 11
@@ -527,7 +408,6 @@
unarmed_damage_low = 11
unarmed_damage_high = 11
unarmed_stun_threshold = 11
- speed_modifier = 1.5
/obj/item/bodypart/leg/right/golem
biological_state = (BIO_BONE|BIO_JOINTED)
@@ -537,7 +417,6 @@
unarmed_damage_low = 11
unarmed_damage_high = 11
unarmed_stun_threshold = 11
- speed_modifier = 1.5
///CULT GOLEM
/obj/item/bodypart/head/golem/cult
diff --git a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
index 5c0de35b4571..f0fc78f83f0b 100644
--- a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
@@ -14,7 +14,6 @@
limb_id = SPECIES_MOTH
is_dimorphic = TRUE
should_draw_greyscale = FALSE
- wing_types = list(/obj/item/organ/external/wings/functional/moth/megamoth, /obj/item/organ/external/wings/functional/moth/mothra)
/obj/item/bodypart/arm/left/moth
icon = 'icons/mob/species/moth/bodyparts.dmi'
diff --git a/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm
index 350a9ca55118..fad07868ea04 100644
--- a/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/plasmaman_bodyparts.dm
@@ -18,7 +18,6 @@
is_dimorphic = FALSE
should_draw_greyscale = FALSE
dmg_overlay_type = null
- ass_image = 'icons/ass/assplasma.png'
/obj/item/bodypart/arm/left/plasmaman
icon = 'icons/mob/species/plasmaman/bodyparts.dmi'
diff --git a/code/modules/surgery/ear_surgery.dm b/code/modules/surgery/ear_surgery.dm
index fb5346c49ee9..416857bafb25 100644
--- a/code/modules/surgery/ear_surgery.dm
+++ b/code/modules/surgery/ear_surgery.dm
@@ -24,9 +24,9 @@
/datum/surgery/ear_surgery/can_start(mob/user, mob/living/carbon/target)
var/obj/item/organ/internal/ears/target_ears = target.get_organ_slot(ORGAN_SLOT_EARS)
- if(target_ears?.damage > 0) // monkestation edit: ear surgery is repeatable so no worries about wasting the surgery
- return TRUE
- return FALSE
+ if(!target_ears)
+ return FALSE
+ return TRUE
/datum/surgery_step/fix_ears/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
display_results(
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 6523832bc392..7b6d7844ee6c 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -22,9 +22,10 @@
/datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target)
var/obj/item/organ/internal/eyes/target_eyes = target.get_organ_slot(ORGAN_SLOT_EYES)
- if(target_eyes?.damage > 0) // monkestation edit: eye surgery is repeatable so only give the option if damaged.
- return TRUE
- return FALSE
+ if(!target_eyes)
+ to_chat(user, span_warning("It's hard to do surgery on someone's eyes when [target.p_they()] [target.p_do()]n't have any."))
+ return FALSE
+ return TRUE
/datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
display_results(
diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm
index d0d21b82f4c1..8ff8a5d78991 100644
--- a/code/modules/surgery/healing.dm
+++ b/code/modules/surgery/healing.dm
@@ -159,7 +159,7 @@
var/estimated_remaining_steps = target.getBruteLoss() / brute_healed
var/progress_text
- if(get_perfect_information(user, target))
+ if(locate(/obj/item/healthanalyzer) in user.held_items)
progress_text = ". Remaining brute:
[target.getBruteLoss()]"
else
switch(estimated_remaining_steps)
@@ -224,7 +224,7 @@
var/estimated_remaining_steps = target.getFireLoss() / burn_healed
var/progress_text
- if(get_perfect_information(user, target))
+ if(locate(/obj/item/healthanalyzer) in user.held_items)
progress_text = ". Remaining burn:
[target.getFireLoss()]"
else
switch(estimated_remaining_steps)
@@ -292,7 +292,7 @@
var/progress_text
- if(get_perfect_information(user, target))
+ if(locate(/obj/item/healthanalyzer) in user.held_items)
if(target.getBruteLoss())
progress_text = ". Remaining brute:
[target.getBruteLoss()]"
if(target.getFireLoss())
diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index 61fe34778817..487ac25091ee 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -14,7 +14,7 @@
/datum/surgery_step/replace_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(HAS_TRAIT(target, TRAIT_NO_AUGMENTS))
+ if(NOAUGMENTS in target.dna.species.species_traits)
to_chat(user, span_warning("[target] cannot be augmented!"))
return SURGERY_STEP_FAIL
if(istype(tool, /obj/item/borg/apparatus/organ_storage) && istype(tool.contents[1], /obj/item/bodypart))
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index f6faf6dec651..56e256534f7f 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -72,4 +72,3 @@
human_target.losebreath += 4
human_target.adjustOrganLoss(ORGAN_SLOT_LUNGS, 10)
return FALSE
-
diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm
index 51015e0692d8..b9c959bb7dfa 100644
--- a/code/modules/surgery/organs/_organ.dm
+++ b/code/modules/surgery/organs/_organ.dm
@@ -415,34 +415,18 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
replacement.set_organ_damage(damage)
/// Called by medical scanners to get a simple summary of how healthy the organ is. Returns an empty string if things are fine.
-/obj/item/organ/proc/get_status_text(advanced, add_tooltips)
- if(organ_flags & ORGAN_FAILING)
- . = "
Non-Functional"
- if(add_tooltips)
- . = span_tooltip("Repair or replace surgically.", .)
- return .
-
+/obj/item/organ/proc/get_status_text()
+ var/status = ""
if(owner.has_reagent(/datum/reagent/inverse/technetium))
- return "
[round((damage/maxHealth)*100, 1)]% damaged"
- if(damage > high_threshold)
- . = "
Severely Damaged"
- if(add_tooltips && owner.stat != DEAD)
- . = span_tooltip("[healing_factor ? "Treat with rest or use specialty medication." : "Repair surgically or use specialty medication."]", .)
- return .
- if(damage > low_threshold)
- . = "
Mildly Damaged"
- if(add_tooltips && owner.stat != DEAD)
- . = span_tooltip("[healing_factor ? "Treat with rest." : "Use specialty medication."]", .)
- return .
-
-/// Determines if this organ is shown when a user has condensed scans enabled
-/obj/item/organ/proc/show_on_condensed_scans()
- // We don't need to show *most* damaged organs as they have no effects associated
- return (organ_flags & (ORGAN_FAILING|ORGAN_VITAL))
-
-/// Similar to get_status_text, but appends the text after the damage report, for additional status info
-/obj/item/organ/proc/get_status_appendix(advanced, add_tooltips)
- return
+ status = "
organ is [round((damage/maxHealth)*100, 1)]% damaged."
+ else if(organ_flags & ORGAN_FAILING)
+ status = "
Non-Functional"
+ else if(damage > high_threshold)
+ status = "
Severely Damaged"
+ else if (damage > low_threshold)
+ status = "
Mildly Damaged"
+
+ return status
/// Tries to replace the existing organ on the passed mob with this one, with special handling for replacing a brain without ghosting target
/obj/item/organ/proc/replace_into(mob/living/carbon/new_owner)
diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm
index 3452e9a5954f..3562f29890c3 100644
--- a/code/modules/surgery/organs/appendix.dm
+++ b/code/modules/surgery/organs/appendix.dm
@@ -89,13 +89,11 @@
ADD_TRAIT(organ_owner, TRAIT_DISEASELIKE_SEVERITY_MEDIUM, type)
organ_owner.med_hud_set_status()
-/obj/item/organ/internal/appendix/get_status_text(advanced, add_tooltips)
- if(!(organ_flags & ORGAN_FAILING) && inflamation_stage)
- . = "
Inflamed"
- if(add_tooltips)
- . = span_tooltip("Remove surgically.", .)
- return .
- return ..()
+/obj/item/organ/internal/appendix/get_status_text()
+ if((!(organ_flags & ORGAN_FAILING)) && inflamation_stage)
+ return "
Inflamed"
+ else
+ return ..()
#undef APPENDICITIS_PROB
#undef INFLAMATION_ADVANCEMENT_PROB
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index e0006710dcc3..f191fb54d689 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -28,21 +28,6 @@
// Multiplier for both long term and short term ear damage
var/damage_multiplier = 1
-/obj/item/organ/internal/ears/get_status_appendix(advanced, add_tooltips)
- if(owner.stat == DEAD)
- return
- if(advanced)
- if(HAS_TRAIT_FROM(owner, TRAIT_DEAF, GENETIC_MUTATION))
- return "Subject is genetically deaf."
- if(HAS_TRAIT_FROM(owner, TRAIT_DEAF, EAR_DAMAGE))
- return "Subject is [(organ_flags & ORGAN_FAILING) ? "permanently": "temporarily"] deaf from ear damage."
- if(HAS_TRAIT(owner, TRAIT_DEAF))
- return "Subject is deaf."
-
-/obj/item/organ/internal/ears/show_on_condensed_scans()
- // Always show if we have an appendix
- return ..() || (owner.stat != DEAD && HAS_TRAIT(owner, TRAIT_DEAF))
-
/obj/item/organ/internal/ears/on_life(seconds_per_tick, times_fired)
// only inform when things got worse, needs to happen before we heal
if((damage > low_threshold && prev_damage < low_threshold) || (damage > high_threshold && prev_damage < high_threshold))
diff --git a/code/modules/surgery/organs/external/_external_organs.dm b/code/modules/surgery/organs/external/_external_organs.dm
index d3d3e6333e6f..ecc1259e00e6 100644
--- a/code/modules/surgery/organs/external/_external_organs.dm
+++ b/code/modules/surgery/organs/external/_external_organs.dm
@@ -284,7 +284,7 @@
/obj/item/organ/external/antennae/proc/try_burn_antennae(mob/living/carbon/human/human)
SIGNAL_HANDLER
- if(!burnt && human.get_skin_temperature() >= CELCIUS_TO_KELVIN(175 CELCIUS) && human.fire_stacks > 0) //do not go into the extremely hot light. you will not survive
+ if(!burnt && human.bodytemperature >= 800 && human.fire_stacks > 0) //do not go into the extremely hot light. you will not survive
to_chat(human, span_danger("Your precious antennae burn to a crisp!"))
burn_antennae()
diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm
index 791eb4b06abb..a7c2f0b52585 100644
--- a/code/modules/surgery/organs/external/wings/functional_wings.dm
+++ b/code/modules/surgery/organs/external/wings/functional_wings.dm
@@ -105,13 +105,11 @@
if(!HAS_TRAIT_FROM(human, TRAIT_MOVE_FLYING, SPECIES_FLIGHT_TRAIT))
human.physiology.stun_mod *= 2
human.add_traits(list(TRAIT_NO_FLOATING_ANIM, TRAIT_MOVE_FLYING), SPECIES_FLIGHT_TRAIT)
- DO_FLOATING_ANIM(human)
passtable_on(human, SPECIES_TRAIT)
open_wings()
else
human.physiology.stun_mod *= 0.5
human.remove_traits(list(TRAIT_NO_FLOATING_ANIM, TRAIT_MOVE_FLYING), SPECIES_FLIGHT_TRAIT)
- STOP_FLOATING_ANIM(human)
passtable_off(human, SPECIES_TRAIT)
close_wings()
human.update_body_parts()
diff --git a/code/modules/surgery/organs/external/wings/moth_wings.dm b/code/modules/surgery/organs/external/wings/moth_wings.dm
index 9c2f7098d626..f13b346ab075 100644
--- a/code/modules/surgery/organs/external/wings/moth_wings.dm
+++ b/code/modules/surgery/organs/external/wings/moth_wings.dm
@@ -44,7 +44,7 @@
/obj/item/organ/external/wings/moth/proc/try_burn_wings(mob/living/carbon/human/human)
SIGNAL_HANDLER
- if(!burnt && human.get_skin_temperature() >= CELCIUS_TO_KELVIN(175 CELCIUS) && human.fire_stacks > 0) //do not go into the extremely hot light. you will not survive
+ if(!burnt && human.bodytemperature >= 800 && human.fire_stacks > 0) //do not go into the extremely hot light. you will not survive
to_chat(human, span_danger("Your precious wings burn to a crisp!"))
human.add_mood_event("burnt_wings", /datum/mood_event/burnt_wings)
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 016e76320210..c8006bd92dc0 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -114,33 +114,6 @@
#define OFFSET_X 1
#define OFFSET_Y 2
-/// Similar to get_status_text, but appends the text after the damage report, for additional status info
-/obj/item/organ/internal/eyes/get_status_appendix(advanced, add_tooltips)
- if(owner.stat == DEAD || HAS_TRAIT(owner, TRAIT_KNOCKEDOUT))
- return
- if(owner.is_blind())
- if(advanced)
- if(owner.is_blind_from(EYE_DAMAGE))
- return "Subject is blind from eye damage."
- if(owner.is_blind_from(GENETIC_MUTATION))
- return "Subject is genetically blind."
- if(owner.is_blind_from(QUIRK_TRAIT))
- return "Subject is permanently blind."
- return "Subject is blind."
- if(owner.is_nearsighted())
- if(advanced)
- if(owner.is_nearsighted_from(EYE_DAMAGE))
- return "Subject is nearsighted from eye damage."
- if(owner.is_nearsighted_from(GENETIC_MUTATION))
- return "Subject is genetically nearsighted."
- if(owner.is_nearsighted_from(QUIRK_TRAIT))
- return "Subject is permanently nearsighted."
- return "Subject is nearsighted."
-
-/obj/item/organ/internal/eyes/show_on_condensed_scans()
- // Always show if we have an appendix
- return ..() || (owner.stat != DEAD && !HAS_TRAIT(owner, TRAIT_KNOCKEDOUT) && (owner.is_blind() || owner.is_nearsighted()))
-
/// This proc generates a list of overlays that the eye should be displayed using for the given parent
/obj/item/organ/internal/eyes/proc/generate_body_overlay(mob/living/carbon/human/parent)
if(!istype(parent) || parent.get_organ_by_type(/obj/item/organ/internal/eyes) != src)
diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/heart.dm
similarity index 91%
rename from code/modules/surgery/organs/internal/heart/_heart.dm
rename to code/modules/surgery/organs/heart.dm
index ce9995f6ed1b..6c317316fc97 100644
--- a/code/modules/surgery/organs/internal/heart/_heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -23,21 +23,12 @@
var/failed = FALSE //to prevent constantly running failing code
var/operated = FALSE //whether the heart's been operated on to fix some of its damages
- var/datum/blood_type/heart_bloodtype
-
/obj/item/organ/internal/heart/update_icon_state()
icon_state = "[base_icon_state]-[beating ? "on" : "off"]"
return ..()
-/obj/item/organ/internal/heart/Insert(mob/living/carbon/receiver, special, drop_if_replaced)
- . = ..()
- if(heart_bloodtype)
- receiver.dna?.human_blood_type = heart_bloodtype
-
/obj/item/organ/internal/heart/Remove(mob/living/carbon/heartless, special = 0)
. = ..()
- if(heart_bloodtype)
- heartless.dna?.human_blood_type = random_human_blood_type()
if(!special)
addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 120)
@@ -68,29 +59,6 @@
beating = FALSE
update_appearance()
-/obj/item/organ/internal/heart/proc/get_heart_rate()
- if(!beating)
- return 0
-
- var/base_amount = 0
-
- if(owner.has_status_effect(/datum/status_effect/jitter))
- base_amount = 100 + rand(0, 25)
- else if(owner.stat == SOFT_CRIT || owner.stat == HARD_CRIT)
- base_amount = 60 + rand(-15, -10)
- else
- base_amount = 80 + rand(-10, 10)
- base_amount += round(owner.getOxyLoss() / 5)
- base_amount += ((BLOOD_VOLUME_NORMAL - owner.blood_volume) / 25)
- base_amount += owner.pain_controller?.get_heartrate_modifier()
- if(owner.has_status_effect(/datum/status_effect/determined)) // adrenaline
- base_amount += 10
-
- if(owner.has_reagent(/datum/reagent/consumable/coffee)) // funny
- base_amount += 10
-
- return round(base_amount * clamp(1.5 * ((maxHealth - damage) / maxHealth), 0.5, 1)) // heart damage puts a multiplier on it
-
/obj/item/organ/internal/heart/on_life(seconds_per_tick, times_fired)
..()
@@ -107,7 +75,6 @@
beat = BEAT_SLOW
owner.playsound_local(get_turf(owner), slowbeat, 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
to_chat(owner, span_notice("You feel your heart slow down..."))
-
if(beat == BEAT_SLOW && owner.health > owner.crit_threshold)
owner.stop_sound_channel(CHANNEL_HEARTBEAT)
beat = BEAT_NONE
@@ -121,14 +88,12 @@
owner.stop_sound_channel(CHANNEL_HEARTBEAT)
beat = BEAT_NONE
- if((organ_flags & ORGAN_FAILING) || !beating) //heart broke, stopped beating, death imminent... unless you have veins that pump blood without a heart
- if(owner.can_heartattack() && !(HAS_TRAIT(src, TRAIT_STABLEHEART)))
- if(owner.stat == CONSCIOUS && beating) // monkestation edit: antispam
- owner.visible_message(span_danger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!"), \
- span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!"))
- owner.set_heartattack(TRUE)
- failed = TRUE
- owner.adjust_pain_shock(1 * seconds_per_tick)
+ if((organ_flags & ORGAN_FAILING) && owner.can_heartattack() && !(HAS_TRAIT(src, TRAIT_STABLEHEART))) //heart broke, stopped beating, death imminent... unless you have veins that pump blood without a heart
+ if(owner.stat == CONSCIOUS && beating) // monkestation edit: antispam
+ owner.visible_message(span_danger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!"), \
+ span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!"))
+ owner.set_heartattack(TRUE)
+ failed = TRUE
/obj/item/organ/internal/heart/get_availability(datum/species/owner_species, mob/living/owner_mob)
return owner_species.mutantheart
@@ -319,7 +284,6 @@
icon_state = "ethereal_heart" //Welp. At least it's more unique in functionaliy.
visual = TRUE //This is used by the ethereal species for color
desc = "A crystal-like organ that functions similarly to a heart for Ethereals. It can revive its owner."
- heart_bloodtype = /datum/blood_type/crew/ethereal
///Cooldown for the next time we can crystalize
COOLDOWN_DECLARE(crystalize_cooldown)
@@ -567,15 +531,3 @@
// this qdeleted check is just for sanity.
if(!QDELETED(src))
qdel(src)
-
-/obj/item/organ/internal/heart/lizard
- name = "lizard heart"
- heart_bloodtype = /datum/blood_type/crew/lizard
-
-/obj/item/organ/internal/heart/pod
- name = "plant heart"
- heart_bloodtype = /datum/blood_type/water
-
-/obj/item/organ/internal/heart/spider
- name = "spider heart"
- heart_bloodtype = /datum/blood_type/spider
diff --git a/code/modules/surgery/organs/internal/liver/liver_plasmamen.dm b/code/modules/surgery/organs/internal/liver/liver_plasmamen.dm
deleted file mode 100644
index 34dbec6ab612..000000000000
--- a/code/modules/surgery/organs/internal/liver/liver_plasmamen.dm
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Plasmaman liver
- * Makes plasma and hot ice heal wounds, also makes gunpowder a hallucinogen.
- **/
-/obj/item/organ/internal/liver/bone/plasmaman
- name = "reagent processing crystal"
- desc = "A large crystal that is somehow capable of metabolizing chemicals, these are found in plasmamen."
- icon_state = "liver-p"
- status = ORGAN_MINERAL
-
-/obj/item/organ/internal/liver/bone/plasmaman/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired)
- . = ..()
- //parent returned COMSIG_MOB_STOP_REAGENT_CHECK or we are failing
- if(. || (organ_flags & ORGAN_FAILING))
- return
- // plasmamen use plasma to reform their bones or whatever
- if(istype(chem, /datum/reagent/toxin/plasma) || istype(chem, /datum/reagent/toxin/hot_ice))
- for(var/datum/wound/iter_wound as anything in organ_owner.all_wounds)
- iter_wound.on_xadone(4 * REM * seconds_per_tick)
- return // Do normal metabolism
- if(istype(chem, /datum/reagent/gunpowder))
- organ_owner.set_timed_status_effect(15 SECONDS * seconds_per_tick, /datum/status_effect/drugginess)
- if(organ_owner.get_timed_status_effect_duration(/datum/status_effect/hallucination) / 10 < chem.volume)
- organ_owner.adjust_hallucinations(2.5 SECONDS * seconds_per_tick)
- return // Do normal metabolism
diff --git a/code/modules/surgery/organs/internal/liver/liver_skeleton.dm b/code/modules/surgery/organs/internal/liver/liver_skeleton.dm
deleted file mode 100644
index 8e2de95ef506..000000000000
--- a/code/modules/surgery/organs/internal/liver/liver_skeleton.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Bone liver
- * Gives the owner liverless metabolism, makes them vulnerable to bone hurting juice and
- * makes milk heal them through meme magic.
- **/
-/obj/item/organ/internal/liver/bone
- name = "mass of bones"
- desc = "You have no idea what this strange ball of bones does."
- organ_traits = list(TRAIT_LIVERLESS_METABOLISM)
-
-/obj/item/organ/internal/liver/bone/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired)
- . = ..()
- //parent returned COMSIG_MOB_STOP_REAGENT_CHECK or we are failing
- if(. || (organ_flags & ORGAN_FAILING))
- return
- if(istype(chem, /datum/reagent/toxin/bonehurtingjuice))
- organ_owner.stamina?.adjust(7.5 * REM * seconds_per_tick, 0)
- organ_owner.adjustBruteLoss(0.5 * REM * seconds_per_tick, 0)
- if(SPT_PROB(10, seconds_per_tick))
- switch(rand(1, 3))
- if(1)
- INVOKE_ASYNC(organ_owner, TYPE_PROC_REF(/atom/movable, say), pick("oof.", "ouch.", "my bones.", "oof ouch.", "oof ouch my bones."), forced = chem.type)
- if(2)
- organ_owner.manual_emote(pick("oofs silently.", "looks like [organ_owner.p_their()] bones hurt.", "grimaces, as though [organ_owner.p_their()] bones hurt."))
- if(3)
- to_chat(organ_owner, span_warning("Your bones hurt!"))
- if(chem.overdosed)
- if(SPT_PROB(2, seconds_per_tick)) //big oof
- var/selected_part = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) //God help you if the same limb gets picked twice quickly...
- var/obj/item/bodypart/bodypart = organ_owner.get_bodypart(selected_part) //We're so sorry skeletons, you're so misunderstood
- if(bodypart)
- playsound(organ_owner, SFX_DESECRATION, 50, vary = TRUE) //You just want to socialize
- organ_owner.visible_message(span_warning("[organ_owner] rattles loudly and flails around!!"), span_danger("Your bones hurt so much that your missing muscles spasm!!"))
- INVOKE_ASYNC(organ_owner, TYPE_PROC_REF(/atom/movable, say), "OOF!!", forced = chem.type)
- bodypart.receive_damage(brute = 200) //But I don't think we should
- else
- to_chat(organ_owner, span_warning("Your missing [parse_zone(selected_part)] aches from wherever you left it."))
- INVOKE_ASYNC(organ_owner, TYPE_PROC_REF(/mob, emote), "sigh")
- organ_owner.reagents.remove_reagent(chem.type, chem.metabolization_rate * seconds_per_tick)
- return COMSIG_MOB_STOP_REAGENT_CHECK // Stop metabolism
- if(chem.type == /datum/reagent/consumable/milk)
- if(chem.volume > 50)
- organ_owner.reagents.remove_reagent(chem.type, (chem.volume - 50))
- to_chat(organ_owner, span_warning("The excess milk is dripping off your bones!"))
- organ_owner.heal_bodypart_damage(2.5 * REM * seconds_per_tick)
- for(var/datum/wound/iter_wound as anything in organ_owner.all_wounds)
- iter_wound.on_xadone(1 * REM * seconds_per_tick)
- return // Do normal metabolism
diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/liver.dm
old mode 100644
new mode 100755
similarity index 84%
rename from code/modules/surgery/organs/internal/liver/_liver.dm
rename to code/modules/surgery/organs/liver.dm
index 27e6a0756ff7..eb9f78c05823
--- a/code/modules/surgery/organs/internal/liver/_liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -33,7 +33,6 @@
// If the liver handles foods like a clown, it honks like a bike horn
// Don't think about it too much.
RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_COMEDY_METABOLISM), PROC_REF(on_add_comedy_metabolism))
- RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_COMEDY_METABOLISM), PROC_REF(on_remove_comedy_metabolism))
/* Signal handler for the liver gaining the TRAIT_COMEDY_METABOLISM trait
*
@@ -51,35 +50,6 @@
// Would that make the clown more or less likely to honk it
AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50, falloff_exponent = 20)
-/* Signal handler for the liver losing the TRAIT_COMEDY_METABOLISM trait
- *
- * Basically just removes squeak component
- */
-/obj/item/organ/internal/liver/proc/on_remove_comedy_metabolism()
- SIGNAL_HANDLER
-
- qdel(GetComponent(/datum/component/squeak))
-
-/// Registers COMSIG_MOB_REAGENT_CHECK from owner
-/obj/item/organ/internal/liver/on_insert(mob/living/carbon/organ_owner, special)
- . = ..()
- RegisterSignal(organ_owner, COMSIG_SPECIES_HANDLE_CHEMICAL, PROC_REF(handle_chemical))
-
-/// Unregisters COMSIG_MOB_REAGENT_CHECK from owner
-/obj/item/organ/internal/liver/on_remove(mob/living/carbon/organ_owner, special)
- . = ..()
- UnregisterSignal(organ_owner, COMSIG_SPECIES_HANDLE_CHEMICAL)
-
-/**
- * This proc can be overriden by liver subtypes so they can handle certain chemicals in special ways.
- * Return null to continue running the normal on_mob_life() for that reagent.
- * Return COMSIG_MOB_STOP_REAGENT_CHECK to not run the normal metabolism effects.
- *
- * NOTE: If you return COMSIG_MOB_STOP_REAGENT_CHECK, that reagent will not be removed like normal! You must handle it manually.
- **/
-/obj/item/organ/internal/liver/proc/handle_chemical(mob/living/carbon/organ_owner, datum/reagent/chem, seconds_per_tick, times_fired)
- SIGNAL_HANDLER
-
/obj/item/organ/internal/liver/examine(mob/user)
. = ..()
@@ -121,19 +91,21 @@
#define HAS_PAINFUL_TOXIN 2
/obj/item/organ/internal/liver/on_life(seconds_per_tick, times_fired)
- . = ..()
- //If your liver is failing, then we use the liverless version of metabolize
- //We don't check for TRAIT_LIVERLESS_METABOLISM here because we do want a functional liver if somehow we have one inserted
- if(organ_flags & ORGAN_FAILING)
- owner.reagents.metabolize(owner, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE)
+ var/mob/living/carbon/liver_owner = owner
+ . = ..() //perform general on_life()
+
+ if(!istype(liver_owner))
+ return
+ if(organ_flags & ORGAN_FAILING || HAS_TRAIT(liver_owner, TRAIT_NOMETABOLISM)) //If your liver is failing or you lack a metabolism then we use the liverless version of metabolize
+ liver_owner.reagents.metabolize(liver_owner, seconds_per_tick, times_fired, can_overdose=TRUE, liverless=TRUE)
return
- var/obj/belly = owner.get_organ_slot(ORGAN_SLOT_STOMACH)
- var/list/cached_reagents = owner.reagents.reagent_list
+ var/obj/belly = liver_owner.get_organ_slot(ORGAN_SLOT_STOMACH)
+ var/list/cached_reagents = liver_owner.reagents.reagent_list
var/liver_damage = 0
var/provide_pain_message = HAS_NO_TOXIN
- if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
+ if(filterToxins && !HAS_TRAIT(liver_owner, TRAIT_TOXINLOVER))
for(var/datum/reagent/toxin/toxin in cached_reagents)
if(status != toxin.affected_organtype) //this particular toxin does not affect this type of organ
continue
@@ -147,17 +119,17 @@
if(provide_pain_message != HAS_PAINFUL_TOXIN)
provide_pain_message = toxin.silent_toxin ? HAS_SILENT_TOXIN : HAS_PAINFUL_TOXIN
- owner.reagents.metabolize(owner, seconds_per_tick, times_fired, can_overdose=TRUE)
+ liver_owner.reagents.metabolize(liver_owner, seconds_per_tick, times_fired, can_overdose=TRUE)
if(liver_damage)
apply_organ_damage(min(liver_damage * seconds_per_tick , MAX_TOXIN_LIVER_DAMAGE * seconds_per_tick))
if(provide_pain_message && damage > 10 && SPT_PROB(damage/6, seconds_per_tick)) //the higher the damage the higher the probability
- to_chat(owner, span_warning("You feel a dull pain in your abdomen."))
+ to_chat(liver_owner, span_warning("You feel a dull pain in your abdomen."))
/obj/item/organ/internal/liver/handle_failing_organs(seconds_per_tick)
- if(HAS_TRAIT(owner, TRAIT_STABLELIVER) || HAS_TRAIT(owner, TRAIT_LIVERLESS_METABOLISM))
+ if(HAS_TRAIT(owner, TRAIT_STABLELIVER) || HAS_TRAIT(owner, TRAIT_NOMETABOLISM))
return
return ..()
@@ -229,6 +201,12 @@
/obj/item/organ/internal/liver/get_availability(datum/species/owner_species, mob/living/owner_mob)
return owner_species.mutantliver
+/obj/item/organ/internal/liver/plasmaman
+ name = "reagent processing crystal"
+ icon_state = "liver-p"
+ desc = "A large crystal that is somehow capable of metabolizing chemicals, these are found in plasmamen."
+ status = ORGAN_MINERAL
+
// alien livers can ignore up to 15u of toxins, but they take x3 liver damage
/obj/item/organ/internal/liver/alien
name = "alien liver" // doesnt matter for actual aliens because they dont take toxin damage
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index ebe938e69eaf..31f69eeacacf 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -85,37 +85,26 @@
var/tritium_irradiation_probability_min = 10
var/tritium_irradiation_probability_max = 60
- /// Message displayed when breathing cold air
var/cold_message = "your face freezing and an icicle forming"
- /// At this threshold, a cold breath displays a warning message
- var/cold_level_warning_threshold = CELCIUS_TO_KELVIN(-13.15 CELCIUS)
- /// At this threshold, a cold breath deals a minor amount of damage
- var/cold_level_hazard_threshold = CELCIUS_TO_KELVIN(-73.15 CELCIUS)
- /// At this threshold, a cold breath deals a moderate amount of damage
- var/cold_level_danger_threshold = CELCIUS_TO_KELVIN(-153.15 CELCIUS)
- /// Amount of damage dealt by a cold breath. Halved if at the hazard threshold
- var/cold_level_damage = 3
- /// Type of damage dealt by a cold breath
+ var/cold_level_1_threshold = 260
+ var/cold_level_2_threshold = 200
+ var/cold_level_3_threshold = 120
+ var/cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_1 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead.
+ var/cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2
+ var/cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3
var/cold_damage_type = BURN
- /// Message displayed when breathing hot air
var/hot_message = "your face burning and a searing heat"
- /// At this threshold, a hot breath displays a warning message
- var/heat_level_warning_threshold = CELCIUS_TO_KELVIN(86.85 CELCIUS)
- /// At this threshold, a hot breath deals a minor amount of damage
- var/heat_level_hazard_threshold = CELCIUS_TO_KELVIN(126.85 CELCIUS)
- /// At this threshold, a hot breath deals a moderate amount of damage
- var/heat_level_danger_threshold = CELCIUS_TO_KELVIN(726.85 CELCIUS)
- /// Amount of damage dealt by a hot breath. Halved if at the hazard threshold
- var/heat_level_damage = 8
- /// Type of damage dealt by a hot breath
+ var/heat_level_1_threshold = 360
+ var/heat_level_2_threshold = 400
+ var/heat_level_3_threshold = 1000
+ var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
+ var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
+ var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
var/heat_damage_type = BURN
var/crit_stabilizing_reagent = /datum/reagent/medicine/epinephrine
- ///our last lung pop adventure
- var/lung_pop_tick = 0
-
// assign the respiration_type
/obj/item/organ/internal/lungs/Initialize(mapload)
. = ..()
@@ -175,8 +164,6 @@
receiver.clear_alert(ALERT_NOT_ENOUGH_NITRO)
receiver.clear_alert(ALERT_NOT_ENOUGH_PLASMA)
receiver.clear_alert(ALERT_NOT_ENOUGH_N2O)
- receiver.remove_status_effect(/datum/status_effect/lungless)
- RegisterSignal(receiver, COMSIG_CARBON_ATTEMPT_BREATHE, PROC_REF(block_breath))
/obj/item/organ/internal/lungs/Remove(mob/living/carbon/organ_owner, special)
. = ..()
@@ -190,13 +177,6 @@
call(src, on_loss)(organ_owner, dummy, last_partial_pressures[gas_id])
dummy.garbage_collect()
- UnregisterSignal(organ_owner, COMSIG_CARBON_ATTEMPT_BREATHE)
- if(!special)
- organ_owner.apply_status_effect(/datum/status_effect/lungless)
-
-/obj/item/organ/internal/lungs/proc/block_breath(...)
- SIGNAL_HANDLER
- return (failed && !HAS_TRAIT(owner, TRAIT_ASSISTED_BREATHING)) ? BREATHE_SKIP_BREATH : NONE
/**
* Tells the lungs to pay attention to the passed in gas type
@@ -270,7 +250,6 @@
// Note this can be redundant, because of the vacuum check. It is fail safe tho, so it's ok
if(old_o2_pp < safe_oxygen_min)
breather.failed_last_breath = FALSE
- lung_pop_tick = 0
breather.clear_alert(ALERT_NOT_ENOUGH_OXYGEN)
breathe_gas_volume(breath, /datum/gas/oxygen, /datum/gas/carbon_dioxide)
@@ -552,23 +531,14 @@
if(!HAS_TRAIT(breather, TRAIT_SLEEPIMMUNE))
breather.Unconscious(6 SECONDS)
// Enough to make the mob sleep.
- if(n2o_pp > n2o_sleep_min)
- breather.Sleeping(min(breather.AmountSleeping() + 100, 200))
- // And apply anesthesia if it worked
- if(HAS_TRAIT(breather, TRAIT_KNOCKEDOUT))
- breather.apply_status_effect(/datum/status_effect/grouped/anesthetic, /datum/gas/nitrous_oxide)
+ if(n2o_pp > n2o_sleep_min)
+ breather.Sleeping(min(breather.AmountSleeping() + 100, 200))
/// N2O side-effects. "Too much N2O!"
/obj/item/organ/internal/lungs/proc/safe_n2o(mob/living/carbon/breather, datum/gas_mixture/breath, old_n2o_pp)
n2o_euphoria = EUPHORIA_INACTIVE
breather.clear_alert(ALERT_TOO_MUCH_N2O)
-/obj/item/organ/internal/lungs/check_damage_thresholds(mob/organ_owner)
- // Don't give random feedback messages if you're suffocating
- if(owner?.failed_last_breath)
- return null
- return ..()
-
// Breath in nitrium. It's helpful, but has nasty side effects
/obj/item/organ/internal/lungs/proc/too_much_nitrium(mob/living/carbon/breather, datum/gas_mixture/breath, nitrium_pp, old_nitrium_pp)
breathe_gas_volume(breath, /datum/gas/nitrium)
@@ -620,26 +590,25 @@
* * breath: A gas mixture to test, or null.
* * breather: A carbon mob that is using the lungs to breathe.
*/
-/obj/item/organ/internal/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/breather, skip_breath)
+/obj/item/organ/internal/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/breather)
if(breather.status_flags & GODMODE)
breather.failed_last_breath = FALSE
+ breather.clear_alert(ALERT_NOT_ENOUGH_OXYGEN)
return FALSE
if(HAS_TRAIT(breather, TRAIT_NOBREATH))
return FALSE
- // If the breath is null, it's actually a failed breath
- var/no_breath = isnull(breath) || skip_breath
- if(no_breath)
+ // If the breath is falsy or "null", we can use the backup empty_breath.
+ if(!breath)
var/static/datum/gas_mixture/immutable/empty_breath = new(BREATH_VOLUME)
breath = empty_breath
// Indicates if there are moles of gas in the breath.
- var/num_moles = breath.total_moles()
- var/not_low_pressure = num_moles > 0.01 || HAS_TRAIT(breather, TRAIT_RESISTLOWPRESSURE)
- var/not_high_pressure = num_moles < 0.1 || HAS_TRAIT(breather, TRAIT_RESISTHIGHPRESSURE)
+ var/has_moles = breath.total_moles() != 0
+
// Check for moles of gas and handle partial pressures / special conditions.
- if(num_moles > 0 && not_low_pressure && not_high_pressure)
+ if(has_moles)
// Breath has more than 0 moles of gas.
// Route gases through mask filter if breather is wearing one.
if(istype(breather.wear_mask) && (breather.wear_mask.clothing_flags & GAS_FILTERING) && breather.wear_mask.has_filter)
@@ -648,34 +617,10 @@
else if(HAS_TRAIT(src, TRAIT_SPACEBREATHING))
// The lungs can breathe anyways. What are you? Some bottom-feeding, scum-sucking algae eater?
breather.failed_last_breath = FALSE
- lung_pop_tick = 0
// Vacuum-adapted lungs regenerate oxyloss even when breathing nothing.
- if(HAS_TRAIT(breather, TRAIT_NOBLOOD))
- breather.adjustOxyLoss(-4)
- else
- // Less blood so breaths give you less oxygen
- breather.adjustOxyLoss(-1 * min(5, BLOOD_VOLUME_NORMAL / breather.blood_volume))
-
- // We're in a low / high pressure environment, can't breathe, but trying to, so this hurts the lungs
- // Unless it's cybernetic then it just doesn't care. Handwave magic whatever
- else if(!skip_breath && (owner && !HAS_TRAIT(owner, TRAIT_ASSISTED_BREATHING)))
- if(lung_pop_tick > 10)
- lung_pop_tick = 0
- if(!failed)
- // Lungs are poppin
- if(damage >= 40 && damage <= 50 && breather.can_feel_pain())
- to_chat(breather, span_userdanger("You feel a stabbing pain in your chest!"))
- else if(num_moles < 0.02)
- to_chat(breather, span_boldwarning("You feel air rapidly exiting your lungs!"))
- else if(num_moles > 0.1)
- to_chat(breather, span_boldwarning("You feel air force itself into your lungs!"))
-
- breather.cause_pain(BODY_ZONE_CHEST, 10, BRUTE)
- apply_organ_damage(5)
- breather.failed_last_breath = TRUE
- lung_pop_tick++
- // Robot, don't care lol
- else if((owner && !HAS_TRAIT(owner, TRAIT_ASSISTED_BREATHING)))
+ if(breather.health >= breather.crit_threshold && breather.oxyloss)
+ breather.adjustOxyLoss(-5)
+ else
// Can't breathe!
breather.failed_last_breath = TRUE
@@ -749,7 +694,7 @@
else if (old_euphoria && !new_euphoria)
breather.clear_mood_event("chemical_euphoria")
- if(num_moles > 0)
+ if(has_moles)
handle_breath_temperature(breath, breather)
// Merge breath_out into breath. They're kept seprerate before now to ensure stupid like, order of operations shit doesn't happen
// But that time has passed
@@ -786,13 +731,14 @@
// Give them a chance to notice something is wrong.
if(prob(20))
suffocator.emote("gasp")
- var/oxyloss = suffocator.getOxyLoss()
- if(oxyloss >= 50)
- // Suffocating = brain damage
- suffocator.adjustOrganLoss(ORGAN_SLOT_BRAIN, (oxyloss / MAX_OXYLOSS(suffocator.maxHealth)) * 4, required_organtype = ORGAN_ORGANIC)
// If mob is at critical health, check if they can be damaged further.
- if(suffocator.stat >= SOFT_CRIT && HAS_TRAIT(suffocator, TRAIT_NOCRITDAMAGE))
- return
+ if(suffocator.health < suffocator.crit_threshold)
+ // Mob is immune to damage at critical health.
+ if(HAS_TRAIT(suffocator, TRAIT_NOCRITDAMAGE))
+ return
+ // Reagents like Epinephrine stop suffocation at critical health.
+ if(suffocator.reagents.has_reagent(crit_stabilizing_reagent, needs_metabolizing = TRUE))
+ return
// Low pressure.
if(breath_pp)
var/ratio = safe_breath_min / breath_pp
@@ -808,47 +754,47 @@
/obj/item/organ/internal/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/breather) // called by human/life, handles temperatures
var/breath_temperature = breath.temperature
- if(breath_temperature < cold_level_warning_threshold && !HAS_TRAIT(breather, TRAIT_RESISTCOLD)) // COLD DAMAGE
- var/cold_modifier = breather.physiology.cold_mod
+ if(!HAS_TRAIT(breather, TRAIT_RESISTCOLD)) // COLD DAMAGE
+ var/cold_modifier = breather.dna.species.coldmod
var/breath_effect_prob = 0
- var/cold_message_prob = 0
- if(breath_temperature < cold_level_danger_threshold)
- breather.apply_damage(cold_level_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
+ if(breath_temperature < cold_level_3_threshold)
+ breather.apply_damage(cold_level_3_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
breath_effect_prob = 100
- cold_message_prob = 100
- else if(breath_temperature < cold_level_hazard_threshold)
- breather.apply_damage(0.5 * cold_level_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
- breath_effect_prob = 75
- cold_message_prob = 50
- else
+ if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold)
+ breather.apply_damage(cold_level_2_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
breath_effect_prob = 50
- cold_message_prob = 20
- if(prob(cold_message_prob))
- to_chat(breather, span_warning("You feel [cold_message] in your [name]!"))
- if(prob(50))
- breather.emote("shiver")
- if(prob(breath_effect_prob))
- // Breathing into your mask, no particle. We can add fogged up glasses later
- if(breather.is_mouth_covered())
- return
- // Even though breathing via internals TECHNICALLY exhales into the environment, we'll still block it
- if(breather.internal || breather.external)
- return
- emit_breath_particle(breather, /particles/fog/breath)
-
- if(breath_temperature > heat_level_warning_threshold && !HAS_TRAIT(breather, TRAIT_RESISTHEAT)) // HEAT DAMAGE
+ if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold)
+ breather.apply_damage(cold_level_1_damage * cold_modifier, cold_damage_type, spread_damage = TRUE)
+ breath_effect_prob = 25
+ if(breath_temperature < cold_level_1_threshold)
+ if(prob(sqrt(breath_effect_prob) * 4))
+ to_chat(breather, span_warning("You feel [cold_message] in your [name]!"))
+ if(prob(50))
+ breather.emote("shiver")
+ if(prob(breath_effect_prob))
+ // Breathing into your mask, no particle. We can add fogged up glasses later
+ if(breather.is_mouth_covered())
+ return
+ // Even though breathing via internals TECHNICALLY exhales into the environment, we'll still block it
+ if(breather.internal || breather.external)
+ return
+ emit_breath_particle(breather, /particles/fog/breath)
+
+ if(!HAS_TRAIT(breather, TRAIT_RESISTHEAT)) // HEAT DAMAGE
var/heat_modifier = breather.dna.species.heatmod
var/heat_message_prob = 0
- if(breath_temperature > heat_level_danger_threshold)
- breather.apply_damage(heat_level_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
+ if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
+ breather.apply_damage(heat_level_1_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
heat_message_prob = 100
- else if(breath_temperature > heat_level_hazard_threshold)
- breather.apply_damage(0.5 * heat_level_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
+ if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold)
+ breather.apply_damage(heat_level_2_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
heat_message_prob = 50
- else
- heat_message_prob = 20
- if(prob(heat_message_prob))
- to_chat(breather, span_warning("You feel [hot_message] in your [name]!"))
+ if(breath_temperature > heat_level_3_threshold)
+ breather.apply_damage(heat_level_3_damage * heat_modifier, heat_damage_type, spread_damage = TRUE)
+ heat_message_prob = 25
+ if(breath_temperature > heat_level_1_threshold)
+ if(prob(sqrt(heat_message_prob) * 4))
+ to_chat(breather, span_warning("You feel [hot_message] in your [name]!"))
// The air you breathe out should match your body temperature
breath.temperature = breather.bodytemperature
@@ -889,47 +835,18 @@
QDEL_IN(holder, breath_particle.lifespan)
-/obj/item/organ/internal/lungs/apply_organ_damage(damage_amount, maximum = maxHealth, required_organtype)
- . = ..()
- if(!.)
- return
-
- if(organ_flags & ORGAN_FAILING)
- if(!owner?.incapacitated())
- owner.visible_message(
- span_danger("[owner] grabs [owner.p_their()] throat, struggling for breath!"),
- span_userdanger("You suddenly feel like you can't breathe!"),
- )
- failed = TRUE
-
- else if(failed)
- failed = FALSE
-
/obj/item/organ/internal/lungs/on_life(seconds_per_tick, times_fired)
. = ..()
- if(damage < low_threshold)
- return
-
- var/cough_prob = 2.5
- if(damage >= high_threshold)
- cough_prob = 5
-
- if(!SPT_PROB(cough_prob, seconds_per_tick)) // between : past high
+ if(failed && !(organ_flags & ORGAN_FAILING))
+ failed = FALSE
return
-
- if((damage >= high_threshold) && prob(33))
- owner.visible_message(span_danger("[owner] coughs up blood!"), span_userdanger("You cough up blood!"))
- var/obj/item/covering = owner.is_mouth_covered()
- if(covering)
- covering.add_mob_blood(owner)
- else if(isturf(owner.loc))
- owner.add_splatter_floor()
- owner.apply_damage(3, BRUTE, BODY_ZONE_CHEST, wound_bonus = CANT_WOUND)
- owner.bleed(round(damage / 8))
- playsound(owner, 'sound/effects/splat.ogg', 33, TRUE)
- else
- owner.emote(pick("weeze", "cough"))
- owner.losebreath = min(owner.losebreath + round(damage / 100, 0.1), 4)
+ if(damage >= low_threshold)
+ var/do_i_cough = SPT_PROB((damage < high_threshold) ? 2.5 : 5, seconds_per_tick) // between : past high
+ if(do_i_cough)
+ owner.emote("cough")
+ if((organ_flags & ORGAN_FAILING) && owner.stat == CONSCIOUS && SPT_PROB(1, seconds_per_tick)) // monkestation edit: antispam
+ owner.visible_message(span_danger("[owner] grabs [owner.p_their()] throat, struggling for breath!"), span_userdanger("You suddenly feel like you can't breathe!"))
+ failed = TRUE
/obj/item/organ/internal/lungs/get_availability(datum/species/owner_species, mob/living/owner_mob)
return owner_species.mutantlungs
@@ -950,9 +867,9 @@
safe_plasma_max = 0 //We breathe this to gain POWER.
-/obj/item/organ/internal/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/breather_slime, skip_breath)
+/obj/item/organ/internal/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/breather_slime)
. = ..()
- if (breath?.gases[/datum/gas/plasma] && !skip_breath)
+ if (breath?.gases[/datum/gas/plasma])
var/plasma_pp = breath.get_breath_partial_pressure(breath.gases[/datum/gas/plasma][MOLES])
breather_slime.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.
@@ -984,9 +901,9 @@
safe_oxygen_min = 13
emp_vulnerability = 20
- cold_level_warning_threshold = CELCIUS_TO_KELVIN(-73.15 CELCIUS)
- cold_level_hazard_threshold = CELCIUS_TO_KELVIN(-133.15 CELCIUS)
- cold_level_danger_threshold = CELCIUS_TO_KELVIN(-173.15 CELCIUS)
+ cold_level_1_threshold = 200
+ cold_level_2_threshold = 140
+ cold_level_3_threshold = 100
/obj/item/organ/internal/lungs/cybernetic/emp_act(severity)
. = ..()
@@ -1063,9 +980,9 @@
name = "aeration reticulum"
desc = "These exotic lungs seem crunchier than most."
icon_state = "lungs_ethereal"
- heat_level_warning_threshold = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // 150C or 433k, in line with ethereal max safe body temperature
- heat_level_hazard_threshold = CELCIUS_TO_KELVIN(200 CELCIUS)
- heat_level_danger_threshold = CELCIUS_TO_KELVIN(800 CELCIUS)
+ heat_level_1_threshold = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // 150C or 433k, in line with ethereal max safe body temperature
+ heat_level_2_threshold = 473
+ heat_level_3_threshold = 1073
/obj/item/organ/internal/lungs/ethereal/Initialize(mapload)
. = ..()
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 69e102a1ac13..a51ad9dd1fe4 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -32,7 +32,7 @@
if((organ_flags & ORGAN_VITAL) && !special && !(organ_owner.status_flags & GODMODE))
if(organ_owner.stat != DEAD)
organ_owner.investigate_log("has been killed by losing a vital organ ([src]).", INVESTIGATE_DEATHS)
- organ_owner.death(null, "losing your [name]")
+ organ_owner.death()
START_PROCESSING(SSobj, src)
@@ -43,8 +43,6 @@
/obj/item/organ/internal/on_death(seconds_per_tick, times_fired) //runs decay when outside of a person
if(organ_flags & (ORGAN_SYNTHETIC | ORGAN_FROZEN))
return
- if(HAS_TRAIT(src, TRAIT_NO_ORGAN_DECAY) || (owner && HAS_TRAIT(owner, TRAIT_NO_ORGAN_DECAY)))
- return
apply_organ_damage(decay_factor * maxHealth * seconds_per_tick)
/// Called once every life tick on every organ in a carbon's body
diff --git a/code/modules/surgery/organs/stomach/_stomach.dm b/code/modules/surgery/organs/stomach/_stomach.dm
index f1e2db0e52b7..8e1d4a661fb2 100644
--- a/code/modules/surgery/organs/stomach/_stomach.dm
+++ b/code/modules/surgery/organs/stomach/_stomach.dm
@@ -32,11 +32,6 @@
var/operated = FALSE //whether the stomach's been repaired with surgery and can be fixed again or not
- /// Typecache of food we can eat that will never give us disease.
- var/list/disease_free_foods
- ///our hunger modifier
- var/hunger_modifier = 1
-
/obj/item/organ/internal/stomach/Initialize(mapload)
. = ..()
//None edible organs do not get a reagent holder by default
@@ -144,22 +139,23 @@
// nutrition decrease and satiety
if (human.nutrition > 0 && human.stat != DEAD)
// THEY HUNGER
- var/hunger_rate = HUNGER_FACTOR * PASSIVE_HUNGER_MULTIPLIER
- if(human.mob_mood?.sanity > SANITY_DISTURBED)
+ var/hunger_rate = HUNGER_FACTOR
+ if(human.mob_mood && human.mob_mood.sanity > SANITY_DISTURBED)
hunger_rate *= max(1 - 0.002 * human.mob_mood.sanity, 0.5) //0.85 to 0.75
// Whether we cap off our satiety or move it towards 0
- if(human.satiety > 0)
- human.adjust_satiety(-1 * seconds_per_tick)
-
+ if(human.satiety > MAX_SATIETY)
+ human.satiety = MAX_SATIETY
+ else if(human.satiety > 0)
+ human.satiety--
+ else if(human.satiety < -MAX_SATIETY)
+ human.satiety = -MAX_SATIETY
else if(human.satiety < 0)
- human.adjust_satiety(1 * seconds_per_tick)
+ human.satiety++
if(SPT_PROB(round(-human.satiety/77), seconds_per_tick))
human.set_jitter_if_lower(10 SECONDS)
- hunger_rate *= 3
-
- hunger_rate *= hunger_modifier
+ hunger_rate = 2 * HUNGER_FACTOR
hunger_rate *= human.physiology.hunger_mod
- human.adjust_nutrition(-1 * hunger_rate * seconds_per_tick)
+ human.adjust_nutrition(-hunger_rate * seconds_per_tick)
var/nutrition = human.nutrition
if(nutrition > NUTRITION_LEVEL_FULL)
@@ -340,18 +336,5 @@
if(prob(emp_vulnerability/severity)) //Chance of permanent effects
organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
-// Lizard stomach to Let Them Eat Rat
-/obj/item/organ/internal/stomach/lizard
- name = "lizardperson stomach"
- desc = "A stomach native to a Lizardperson of Tiziran... or maybe one of its colonies."
- color = COLOR_VERY_DARK_LIME_GREEN
- // Lizards don't homeostasize (they're cold blooded) so they get hungrier faster to offset that
- // Even with this modifier, note they still get hungrier like 1.5x slower than humans
- hunger_modifier = 2
-
-/obj/item/organ/internal/stomach/lizard/Initialize(mapload)
- . = ..()
- var/static/list/rat_cache = typecacheof(/obj/item/food/deadmouse)
- disease_free_foods = rat_cache
#undef STOMACH_METABOLISM_CONSTANT
diff --git a/code/modules/surgery/organs/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/stomach/stomach_ethereal.dm
index c0ff1e781111..3c82f629cb51 100644
--- a/code/modules/surgery/organs/stomach/stomach_ethereal.dm
+++ b/code/modules/surgery/organs/stomach/stomach_ethereal.dm
@@ -2,32 +2,28 @@
name = "biological battery"
icon_state = "stomach-p" //Welp. At least it's more unique in functionaliy.
desc = "A crystal-like organ that stores the electric charge of ethereals."
- hunger_modifier = 0 //they do different hunger shit
//organ_traits = list(TRAIT_NOHUNGER) // We have our own hunger mechanic. //Monkestation Removal, we have our OWN hunger mechanic.
///basically satiety but electrical
var/crystal_charge = ETHEREAL_CHARGE_FULL
///used to keep ethereals from spam draining power sources
var/drain_time = 0
+/* //Monkestation Removal
/obj/item/organ/internal/stomach/ethereal/on_life(seconds_per_tick, times_fired)
. = ..()
- adjust_charge(-ETHEREAL_CHARGE_FACTOR * seconds_per_tick * 0.5)
+ adjust_charge(-ETHEREAL_CHARGE_FACTOR * seconds_per_tick)
handle_charge(owner, seconds_per_tick, times_fired)
-
+*/
/obj/item/organ/internal/stomach/ethereal/on_insert(mob/living/carbon/stomach_owner)
. = ..()
RegisterSignal(stomach_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge))
RegisterSignal(stomach_owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute))
- RegisterSignal(stomach_owner, COMSIG_LIVING_HOMEOSTASIS, PROC_REF(handle_temp))
- RegisterSignal(stomach_owner, COMSIG_HUMAN_ON_HANDLE_BLOOD, PROC_REF(blood))
/obj/item/organ/internal/stomach/ethereal/on_remove(mob/living/carbon/stomach_owner)
. = ..()
UnregisterSignal(stomach_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT)
UnregisterSignal(stomach_owner, COMSIG_LIVING_ELECTROCUTE_ACT)
- UnregisterSignal(stomach_owner, COMSIG_LIVING_HOMEOSTASIS)
- UnregisterSignal(stomach_owner, COMSIG_HUMAN_ON_HANDLE_BLOOD)
stomach_owner.clear_mood_event("charge")
stomach_owner.clear_alert(ALERT_ETHEREAL_CHARGE)
stomach_owner.clear_alert(ALERT_ETHEREAL_OVERCHARGE)
@@ -35,26 +31,6 @@
/obj/item/organ/internal/stomach/ethereal/handle_hunger_slowdown(mob/living/carbon/human/human)
human.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (1.5 * (1 - crystal_charge / 100)))
-
-/obj/item/organ/internal/stomach/ethereal/proc/handle_temp(mob/living/carbon/human/human, natural_change, seconds_per_tick)
- SIGNAL_HANDLER
-
- adjust_charge(-0.5 * ETHEREAL_CHARGE_FACTOR * abs(natural_change * 0.1) * seconds_per_tick * 0.01)
- return HOMEOSTASIS_NO_HUNGER
-
-/obj/item/organ/internal/stomach/ethereal/proc/blood(mob/living/carbon/human/ethereal, seconds_per_tick, times_fired)
- SIGNAL_HANDLER
-
- if(ethereal.stat == DEAD)
- return NONE
-
- . = HANDLE_BLOOD_NO_NUTRITION_DRAIN|HANDLE_BLOOD_NO_EFFECTS
-
- INVOKE_ASYNC(src, PROC_REF(adjust_charge),-ETHEREAL_BLOOD_CHARGE_FACTOR * seconds_per_tick * 0.1, TRUE)
- INVOKE_ASYNC(src, PROC_REF(handle_charge), ethereal, seconds_per_tick, times_fired)
-
- return .
-
/obj/item/organ/internal/stomach/ethereal/proc/charge(datum/source, amount, repairs)
SIGNAL_HANDLER
if(!ishuman(owner))
@@ -77,87 +53,77 @@
adjust_charge(shock_damage * siemens_coeff * 2)
to_chat(owner, span_notice("You absorb some of the shock into your body!"))
-/obj/item/organ/internal/stomach/ethereal/proc/adjust_charge(amount, passive = FALSE)
+/obj/item/organ/internal/stomach/ethereal/proc/adjust_charge(amount)
//crystal_charge = clamp(crystal_charge + amount, ETHEREAL_CHARGE_NONE, ETHEREAL_CHARGE_DANGEROUS) Monkestation Removal
if(ishuman(owner))
- var/mob/living/carbon/human/ethereal = owner
- var/amount_adjusted = (BLOOD_VOLUME_NORMAL * amount)/ETHEREAL_CHARGE_FULL
- if(passive)
- if(ethereal.blood_volume < ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE) //Do not apply the clamp if its below the passive reduction level(no infinite blood sorry)
- return
- if(ethereal.blood_volume + amount_adjusted < ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE+1)
- ethereal.blood_volume = ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE+1 //bottom them off here if the end result would be less than the stopping point.
- ethereal.blood_volume = clamp(ethereal.blood_volume + amount_adjusted, ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE+1, ETHEREAL_BLOOD_CHARGE_DANGEROUS)
- return
- ethereal.blood_volume = clamp(ethereal.blood_volume + amount, ETHEREAL_BLOOD_CHARGE_NONE, ETHEREAL_BLOOD_CHARGE_DANGEROUS)
-
-/obj/item/organ/internal/stomach/ethereal/proc/handle_charge(mob/living/carbon/ethereal, seconds_per_tick, times_fired)
- var/datum/species/species = ethereal.dna.species
- species.brutemod = 1.15
- var/word = pick("like you can't breathe","your lungs locking up","extremely lethargic")
- var/blood_volume = ethereal.blood_volume
- if(HAS_TRAIT(ethereal, TRAIT_ETHEREAL_NO_OVERCHARGE))
- blood_volume = min(blood_volume, ETHEREAL_BLOOD_CHARGE_FULL)
- switch(blood_volume)
- if(-INFINITY to ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE)
- ethereal.add_mood_event("charge", /datum/mood_event/decharged)
- ethereal.clear_alert("ethereal_overcharge")
- ethereal.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/emptycell/ethereal)
- species.brutemod = 2
- if(SPT_PROB(7.5, seconds_per_tick))
- to_chat(src, span_warning("You feel [word]."))
- ethereal.adjustOxyLoss(round(0.01 * (ETHEREAL_BLOOD_CHARGE_LOW - ethereal.blood_volume) * seconds_per_tick, 1))
- if(ETHEREAL_BLOOD_CHARGE_LOWEST_PASSIVE to ETHEREAL_BLOOD_CHARGE_LOW)
- ethereal.clear_alert("ethereal_overcharge")
- ethereal.add_mood_event("charge", /datum/mood_event/decharged)
- ethereal.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 3)
- species.brutemod = 1.5
- if(ethereal.health > 10.5)
- ethereal.apply_damage(0.155 * seconds_per_tick, TOX, null, null, ethereal)
- if(ETHEREAL_BLOOD_CHARGE_LOW to ETHEREAL_BLOOD_CHARGE_NORMAL)
- ethereal.clear_alert("ethereal_overcharge")
- ethereal.add_mood_event("charge", /datum/mood_event/lowpower)
- ethereal.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 2)
- species.brutemod = 1.25
- if(ETHEREAL_BLOOD_CHARGE_ALMOSTFULL to ETHEREAL_BLOOD_CHARGE_FULL)
- ethereal.clear_alert("ethereal_overcharge")
- ethereal.clear_alert("ethereal_charge")
- ethereal.add_mood_event("charge", /datum/mood_event/charged)
- species.brutemod = 1
- if(ETHEREAL_BLOOD_CHARGE_FULL to ETHEREAL_BLOOD_CHARGE_OVERLOAD)
- ethereal.clear_alert("ethereal_charge")
- ethereal.add_mood_event("charge", /datum/mood_event/overcharged)
- ethereal.throw_alert(ALERT_ETHEREAL_OVERCHARGE, /atom/movable/screen/alert/ethereal_overcharge, 1)
- species.brutemod = 1.25
- if(ETHEREAL_BLOOD_CHARGE_OVERLOAD to ETHEREAL_BLOOD_CHARGE_DANGEROUS)
- ethereal.clear_alert("ethereal_charge")
- ethereal.add_mood_event("charge", /datum/mood_event/supercharged)
- ethereal.throw_alert(ALERT_ETHEREAL_OVERCHARGE, /atom/movable/screen/alert/ethereal_overcharge, 2)
- ethereal.apply_damage(0.2 * seconds_per_tick, TOX, null, null, ethereal)
- species.brutemod = 1.5
+ var/mob/living/carbon/human/human = owner
+ if(istype(human.dna.species, /datum/species/ethereal))
+ var/datum/species/ethereal/species = human.dna.species
+ var/amount_adjusted = (BLOOD_VOLUME_NORMAL * amount)/ETHEREAL_CHARGE_FULL
+ species.adjust_charge(human, amount_adjusted, FALSE)
+
+/obj/item/organ/internal/stomach/ethereal/proc/handle_charge(mob/living/carbon/carbon, seconds_per_tick, times_fired)
+ switch(crystal_charge)
+ if(-INFINITY to ETHEREAL_CHARGE_NONE)
+ carbon.add_mood_event("charge", /datum/mood_event/decharged)
+ carbon.clear_alert("ethereal_overcharge")
+ carbon.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/emptycell/ethereal)
+ if(carbon.health > 50)
+ carbon.apply_damage(0.65, BURN, null, null, carbon)
+ if(ETHEREAL_CHARGE_NONE to ETHEREAL_CHARGE_LOWPOWER)
+ carbon.clear_alert("ethereal_overcharge")
+ carbon.add_mood_event("charge", /datum/mood_event/decharged)
+ carbon.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 3)
+ if(carbon.health > 10.5)
+ carbon.apply_damage(0.325 * seconds_per_tick, TOX, null, null, carbon)
+ if(ETHEREAL_CHARGE_LOWPOWER to ETHEREAL_CHARGE_NORMAL)
+ carbon.clear_alert("ethereal_overcharge")
+ carbon.add_mood_event("charge", /datum/mood_event/lowpower)
+ carbon.throw_alert(ALERT_ETHEREAL_CHARGE, /atom/movable/screen/alert/lowcell/ethereal, 2)
+ carbon.blood_volume = min(carbon.blood_volume + (BLOOD_REGEN_FACTOR * 0.1 * seconds_per_tick), BLOOD_VOLUME_NORMAL) //worse than a starving human
+ if(ETHEREAL_CHARGE_ALMOSTFULL to ETHEREAL_CHARGE_FULL)
+ carbon.clear_alert("ethereal_overcharge")
+ carbon.clear_alert("ethereal_charge")
+ carbon.add_mood_event("charge", /datum/mood_event/charged)
+ carbon.blood_volume = min(carbon.blood_volume + (BLOOD_REGEN_FACTOR * 0.9 * seconds_per_tick), BLOOD_VOLUME_NORMAL) //slightly worse than a human (optimal nutrition+satiety gives 1.25)
+ if(ETHEREAL_CHARGE_FULL to ETHEREAL_CHARGE_OVERLOAD)
+ carbon.clear_alert("ethereal_charge")
+ carbon.add_mood_event("charge", /datum/mood_event/overcharged)
+ carbon.throw_alert(ALERT_ETHEREAL_OVERCHARGE, /atom/movable/screen/alert/ethereal_overcharge, 1)
+ carbon.apply_damage(0.2, TOX, null, null, carbon)
+ carbon.blood_volume = min(carbon.blood_volume + (BLOOD_REGEN_FACTOR * 1.6 * seconds_per_tick), BLOOD_VOLUME_NORMAL) //slightly better than a human, at the cost of toxic damage
+ if(ETHEREAL_CHARGE_OVERLOAD to ETHEREAL_CHARGE_DANGEROUS)
+ carbon.clear_alert("ethereal_charge")
+ carbon.add_mood_event("charge", /datum/mood_event/supercharged)
+ carbon.throw_alert(ALERT_ETHEREAL_OVERCHARGE, /atom/movable/screen/alert/ethereal_overcharge, 2)
+ carbon.apply_damage(0.325 * seconds_per_tick, TOX, null, null, carbon)
+ carbon.blood_volume = min(carbon.blood_volume + (BLOOD_REGEN_FACTOR * 2.6 * seconds_per_tick), BLOOD_VOLUME_NORMAL) //significantly better than a human, at the cost of high toxin damage and unsustainability due to discharge
if(SPT_PROB(5, seconds_per_tick)) // 5% each seacond for ethereals to explosively release excess energy if it reaches dangerous levels
- discharge_process(ethereal)
+ discharge_process(carbon)
else
- ethereal.clear_mood_event("charge")
- ethereal.clear_alert(ALERT_ETHEREAL_CHARGE)
- ethereal.clear_alert(ALERT_ETHEREAL_OVERCHARGE)
+ owner.clear_mood_event("charge")
+ carbon.clear_alert(ALERT_ETHEREAL_CHARGE)
+ carbon.clear_alert(ALERT_ETHEREAL_OVERCHARGE)
-/obj/item/organ/internal/stomach/ethereal/proc/discharge_process(mob/living/carbon/ethereal)
- to_chat(ethereal, span_warning("You begin to lose control over your charge!"))
- ethereal.visible_message(span_danger("[ethereal] begins to spark violently!"))
+/obj/item/organ/internal/stomach/ethereal/proc/discharge_process(mob/living/carbon/carbon)
+ to_chat(carbon, span_warning("You begin to lose control over your charge!"))
+ carbon.visible_message(span_danger("[carbon] begins to spark violently!"))
var/static/mutable_appearance/overcharge //shameless copycode from lightning spell
overcharge = overcharge || mutable_appearance('icons/effects/effects.dmi', "electricity", EFFECTS_LAYER)
- ethereal.add_overlay(overcharge)
-
- if(do_after(ethereal, 5 SECONDS, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED)))
- var/datum/color_palette/generic_colors/located = ethereal.dna.color_palettes[/datum/color_palette/generic_colors]
- ethereal.flash_lighting_fx(5, 7, ethereal.dna.species.fixed_mut_color ? ethereal.dna.species.fixed_mut_color : located.return_color(MUTANT_COLOR))
-
- playsound(ethereal, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
- ethereal.cut_overlay(overcharge)
- tesla_zap(ethereal, 2, ethereal.blood_volume*9, ZAP_OBJ_DAMAGE | ZAP_GENERATES_POWER | ZAP_ALLOW_DUPLICATES)
- adjust_charge(ETHEREAL_BLOOD_CHARGE_FULL - ethereal.blood_volume)
- ethereal.visible_message(span_danger("[ethereal] violently discharges energy!"), span_warning("You violently discharge energy!"))
-
- ethereal.Paralyze(100)
+ carbon.add_overlay(overcharge)
+
+ if(do_after(carbon, 5 SECONDS, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED)))
+ if(ishuman(carbon))
+ var/mob/living/carbon/human/human = carbon
+ if(human.dna?.species)
+ //fixed_mut_color is also ethereal color (for some reason)
+ carbon.flash_lighting_fx(5, 7, human.dna.species.fixed_mut_color ? human.dna.species.fixed_mut_color : human.dna.features["mcolor"])
+
+ playsound(carbon, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
+ carbon.cut_overlay(overcharge)
+ tesla_zap(carbon, 2, crystal_charge*2.5, ZAP_OBJ_DAMAGE | ZAP_LOW_POWER_GEN | ZAP_ALLOW_DUPLICATES)
+ adjust_charge(ETHEREAL_CHARGE_FULL - crystal_charge)
+ carbon.visible_message(span_danger("[carbon] violently discharges energy!"), span_warning("You violently discharge energy!"))
+
+ carbon.Paralyze(100)
diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/tongue.dm
similarity index 71%
rename from code/modules/surgery/organs/internal/tongue/_tongue.dm
rename to code/modules/surgery/organs/tongue.dm
index ac42f9344913..f5359a46b6cc 100644
--- a/code/modules/surgery/organs/internal/tongue/_tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -34,12 +34,6 @@
/// Determines how "sensitive" this tongue is to tasting things, lower is more sensitive.
/// See [/mob/living/proc/get_taste_sensitivity].
var/taste_sensitivity = 15
- /// Foodtypes this tongue likes
- var/liked_foodtypes = JUNKFOOD | FRIED //human tastes are default
- /// Foodtypes this tongue dislikes
- var/disliked_foodtypes = GROSS | RAW | CLOTH | BUGS | GORE //human tastes are default
- /// Foodtypes this tongue HATES
- var/toxic_foodtypes = TOXIC //human tastes are default
/// Whether this tongue modifies speech via signal
var/modifies_speech = FALSE
@@ -51,16 +45,6 @@
// this results in tongues with identical possible languages sharing a cached list instance
languages_possible = string_list(get_possible_languages())
-/obj/item/organ/internal/tongue/examine(mob/user)
- . = ..()
- if(HAS_TRAIT(user, TRAIT_ENTRAILS_READER) || (user.mind && HAS_TRAIT(user.mind, TRAIT_ENTRAILS_READER)) || isobserver(user))
- if(liked_foodtypes)
- . += span_info("This tongue has an affinity the taste of [english_list(bitfield_to_list(liked_foodtypes), FOOD_FLAGS_IC)].")
- if(disliked_foodtypes)
- . += span_info("This tongue has an aversion for taste of [english_list(bitfield_to_list(disliked_foodtypes), FOOD_FLAGS_IC)].")
- if(toxic_foodtypes)
- . += span_info("This tongue's physiology makes [english_list(bitfield_to_list(toxic_foodtypes), FOOD_FLAGS_IC)] toxic.")
-
/**
* Used in setting up the "languages possible" list.
*
@@ -73,7 +57,24 @@
/obj/item/organ/internal/tongue/proc/get_possible_languages()
RETURN_TYPE(/list)
// This is the default list of languages most humans should be capable of speaking
- return subtypesof(/datum/language)
+ return list(
+ /datum/language/common,
+ /datum/language/uncommon,
+ /datum/language/draconic,
+ /datum/language/codespeak,
+ /datum/language/monkey,
+ /datum/language/narsie,
+ /datum/language/beachbum,
+ /datum/language/aphasia,
+ /datum/language/piratespeak,
+ /datum/language/moffic,
+ /datum/language/sylvan,
+ /datum/language/shadowtongue,
+ /datum/language/terrum,
+ /datum/language/nekomimetic,
+ /datum/language/ratvar, //Monkestation Edit
+ /datum/language/goblin, //Monkestation Addition
+ )
/obj/item/organ/internal/tongue/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
@@ -84,56 +85,14 @@
/obj/item/organ/internal/tongue/proc/modify_speech(datum/source, list/speech_args)
return speech_args[SPEECH_MESSAGE]
-/**
- * Gets the food reaction a tongue would have from the food item,
- * assuming that no check_liked callback was used in the edible component.
- *
- * Can be overriden by subtypes for more complex behavior.
- * Does not get called if the owner has ageusia.
- **/
-/obj/item/organ/internal/tongue/proc/get_food_taste_reaction(obj/item/food, foodtypes = NONE)
- var/food_taste_reaction
- if(foodtypes & toxic_foodtypes)
- food_taste_reaction = FOOD_TOXIC
- else if(foodtypes & disliked_foodtypes)
- food_taste_reaction = FOOD_DISLIKED
- else if(foodtypes & liked_foodtypes)
- food_taste_reaction = FOOD_LIKED
- return food_taste_reaction
-
-/obj/item/organ/internal/tongue/proc/get_laugh_sound()
- if(owner.gender == MALE)
- return pick('sound/voice/human/manlaugh1.ogg', 'sound/voice/human/manlaugh2.ogg')
- else
- return 'sound/voice/human/womanlaugh.ogg'
-
-/obj/item/organ/internal/tongue/proc/get_scream_sound()
- if(owner.gender == MALE)
- if(prob(1))
- return 'sound/voice/human/wilhelm_scream.ogg'
- return pick(
- 'sound/voice/human/malescream_1.ogg',
- 'sound/voice/human/malescream_2.ogg',
- 'sound/voice/human/malescream_3.ogg',
- 'sound/voice/human/malescream_4.ogg',
- 'sound/voice/human/malescream_5.ogg',
- 'sound/voice/human/malescream_6.ogg',
- )
-
- return pick(
- 'sound/voice/human/femalescream_1.ogg',
- 'sound/voice/human/femalescream_2.ogg',
- 'sound/voice/human/femalescream_3.ogg',
- 'sound/voice/human/femalescream_4.ogg',
- 'sound/voice/human/femalescream_5.ogg',
- )
-
/obj/item/organ/internal/tongue/Insert(mob/living/carbon/tongue_owner, special = FALSE, drop_if_replaced = TRUE)
. = ..()
if(!.)
return
- if(modifies_speech)
+ ADD_TRAIT(tongue_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE)
+ if (modifies_speech)
RegisterSignal(tongue_owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+
if(!(organ_flags & ORGAN_FAILING))
ADD_TRAIT(tongue_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE)
/* This could be slightly simpler, by making the removal of the
@@ -142,35 +101,18 @@
* ageusia from having a non-tasting tongue.
*/
REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT)
- if(!sense_of_taste || (organ_flags & ORGAN_FAILING))
+ if(!sense_of_taste)
ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT)
/obj/item/organ/internal/tongue/Remove(mob/living/carbon/tongue_owner, special = FALSE)
. = ..()
+ REMOVE_TRAIT(tongue_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE)
temp_say_mod = ""
UnregisterSignal(tongue_owner, COMSIG_MOB_SAY)
- REMOVE_TRAIT(tongue_owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE)
REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT)
// Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA
ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT)
-
-/obj/item/organ/internal/tongue/apply_organ_damage(damage_amount, maximum, required_organtype)
- . = ..()
- if(!owner)
- return
- //tongues can't taste food when they are failing
- if(sense_of_taste)
- //tongues can't taste food when they are failing
- if(organ_flags & ORGAN_FAILING)
- ADD_TRAIT(owner, TRAIT_AGEUSIA, ORGAN_TRAIT)
- else
- REMOVE_TRAIT(owner, TRAIT_AGEUSIA, ORGAN_TRAIT)
- if(organ_flags & ORGAN_FAILING)
- REMOVE_TRAIT(owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE)
- else
- ADD_TRAIT(owner, TRAIT_SPEAKS_CLEARLY, SPEAKING_FROM_TONGUE)
-
/obj/item/organ/internal/tongue/could_speak_language(datum/language/language_path)
return (language_path in languages_possible)
@@ -185,35 +127,12 @@
taste_sensitivity = 10 // combined nose + tongue, extra sensitive
modifies_speech = TRUE
languages_native = list(/datum/language/draconic, /datum/language/ashtongue)
- liked_foodtypes = GORE | MEAT | SEAFOOD | NUTS | BUGS
- disliked_foodtypes = GRAIN | DAIRY | CLOTH | GROSS
//MONKESTATION EDIT START
/// How long is our hissssssss?
var/draw_length = 3
-/obj/item/organ/internal/tongue/lizard/get_scream_sound()
- if(owner.gender == MALE)
- return pick(
- 'sound/voice/lizard/lizard_scream_1.ogg',
- 'sound/voice/lizard/lizard_scream_2.ogg',
- 'sound/voice/lizard/lizard_scream_3.ogg',
- 'monkestation/sound/voice/screams/lizard/lizard_scream_4.ogg',
- )
-
- return pick(
- 'sound/voice/lizard/lizard_scream_1.ogg',
- 'sound/voice/lizard/lizard_scream_2.ogg',
- 'sound/voice/lizard/lizard_scream_3.ogg',
- 'monkestation/sound/voice/screams/lizard/lizard_scream_5.ogg',
- )
-
-/obj/item/organ/internal/tongue/lizard/get_laugh_sound()
- if(prob(1))
- return 'monkestation/sound/voice/weh.ogg'
- return 'monkestation/sound/voice/laugh/lizard/lizard_laugh.ogg'
-
/obj/item/organ/internal/tongue/lizard/Initialize(mapload)
. = ..()
draw_length = rand(2, 6)
@@ -328,13 +247,6 @@
modifies_speech = TRUE
var/mothership
-
-/obj/item/organ/internal/tongue/abductor/get_scream_sound()
- return 'sound/weather/ashstorm/inside/weak_end.ogg'
-
-/obj/item/organ/internal/tongue/abductor/get_laugh_sound()
- return 'sound/weather/ashstorm/inside/weak_end.ogg'
-
/obj/item/organ/internal/tongue/abductor/attack_self(mob/living/carbon/human/tongue_holder)
if(!istype(tongue_holder))
return
@@ -386,8 +298,6 @@
say_mod = "moans"
modifies_speech = TRUE
taste_sensitivity = 32
- liked_foodtypes = GROSS | MEAT | RAW | GORE
- disliked_foodtypes = NONE
// List of english words that translate to zombie phrases
GLOBAL_LIST_INIT(english_to_zombie, list())
@@ -480,8 +390,6 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
attack_verb_simple = list("bite", "chatter", "chomp", "enamel", "bone")
sense_of_taste = FALSE
modifies_speech = TRUE
- liked_foodtypes = GROSS | MEAT | RAW | GORE | DAIRY //skeletons eat spooky shit... and dairy, of course
- disliked_foodtypes = NONE
var/chattering = FALSE
var/phomeme_type = "sans"
var/list/phomeme_types = list("sans", "papyrus")
@@ -490,13 +398,6 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
. = ..()
phomeme_type = pick(phomeme_types)
-/obj/item/organ/internal/tongue/bone/get_laugh_sound()
- return 'monkestation/sound/voice/laugh/skeleton/skeleton_laugh.ogg'
-
-/obj/item/organ/internal/tongue/bone/get_scream_sound()
- return 'monkestation/sound/voice/screams/skeleton/scream_skeleton.ogg'
-
-
// Bone tongues can speak all default + calcic
/obj/item/organ/internal/tongue/bone/get_possible_languages()
return ..() + /datum/language/calcic
@@ -515,15 +416,6 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
desc = "Like animated skeletons, Plasmamen vibrate their teeth in order to produce speech."
icon_state = "tongueplasma"
modifies_speech = FALSE
- liked_foodtypes = VEGETABLES
- disliked_foodtypes = FRUIT | CLOTH
-
-/obj/item/organ/internal/tongue/bone/plasmaman/get_scream_sound()
- return pick(
- 'sound/voice/plasmaman/plasmeme_scream_1.ogg',
- 'sound/voice/plasmaman/plasmeme_scream_2.ogg',
- 'sound/voice/plasmaman/plasmeme_scream_3.ogg',
- )
/obj/item/organ/internal/tongue/robot
name = "robotic voicebox"
@@ -537,16 +429,6 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
modifies_speech = TRUE
taste_sensitivity = 25 // not as good as an organic tongue
-/obj/item/organ/internal/tongue/robot/get_scream_sound()
- return 'monkestation/sound/voice/screams/silicon/scream_silicon.ogg'
-
-/obj/item/organ/internal/tongue/robot/get_laugh_sound()
- return pick(
- 'monkestation/sound/voice/laugh/silicon/laugh_siliconE1M0.ogg',
- 'monkestation/sound/voice/laugh/silicon/laugh_siliconE1M1.ogg',
- 'monkestation/sound/voice/laugh/silicon/laugh_siliconM2.ogg',
- )
-
/obj/item/organ/internal/tongue/robot/can_speak_language(language)
return TRUE // THE MAGIC OF ELECTRONICS
@@ -575,23 +457,9 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
icon_state = "electrotongue"
say_mod = "crackles"
taste_sensitivity = 10 // ethereal tongues function (very loosely) like a gas spectrometer: vaporising a small amount of the food and allowing it to pass to the nose, resulting in more sensitive taste
- liked_foodtypes = NONE //no food is particularly liked by ethereals
- disliked_foodtypes = GROSS
- toxic_foodtypes = NONE //no food is particularly toxic to etherealsz
attack_verb_continuous = list("shocks", "jolts", "zaps")
attack_verb_simple = list("shock", "jolt", "zap")
-/obj/item/organ/internal/tongue/ethereal/get_scream_sound()
- return pick(
- 'sound/voice/ethereal/ethereal_scream_1.ogg',
- 'sound/voice/ethereal/ethereal_scream_2.ogg',
- 'sound/voice/ethereal/ethereal_scream_3.ogg',
- )
-
-/obj/item/organ/internal/tongue/ethereal/get_laugh_sound()
- return 'monkestation/sound/voice/laugh/ethereal/ethereal_laugh_1.ogg'
-
-
// Ethereal tongues can speak all default + voltaic
/obj/item/organ/internal/tongue/ethereal/get_possible_languages()
return ..() + /datum/language/voltaic
@@ -600,8 +468,6 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
name = "felinid tongue"
desc = "A fleshy muscle mostly used for meowing."
say_mod = "meows"
- liked_foodtypes = SEAFOOD | ORANGES | BUGS | GORE
- disliked_foodtypes = GROSS | CLOTH | RAW
/obj/item/organ/internal/tongue/bananium
name = "bananium tongue"
@@ -616,54 +482,16 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
name = "jelly tongue"
desc = "Ah... That's not the sound I expected it to make. Sounds like a Space Autumn Bird."
say_mod = "chirps"
- liked_foodtypes = MEAT | BUGS
- disliked_foodtypes = GROSS
- toxic_foodtypes = NONE
-
-/obj/item/organ/internal/tongue/jelly/get_food_taste_reaction(obj/item/food, foodtypes = NONE)
- // a silver slime created this? what a delicacy!
- if(HAS_TRAIT(food, TRAIT_FOOD_SILVER))
- return FOOD_LIKED
- return ..()
/obj/item/organ/internal/tongue/monkey
name = "primitive tongue"
desc = "For aggressively chimpering. And consuming bananas."
say_mod = "chimpers"
- liked_foodtypes = MEAT | FRUIT | BUGS
- disliked_foodtypes = CLOTH
-
-/obj/item/organ/internal/tongue/monkey/get_scream_sound()
- return pick(
- 'sound/creatures/monkey/monkey_screech_1.ogg',
- 'sound/creatures/monkey/monkey_screech_2.ogg',
- 'sound/creatures/monkey/monkey_screech_3.ogg',
- 'sound/creatures/monkey/monkey_screech_4.ogg',
- 'sound/creatures/monkey/monkey_screech_5.ogg',
- 'sound/creatures/monkey/monkey_screech_6.ogg',
- 'sound/creatures/monkey/monkey_screech_7.ogg',
- )
-
-/obj/item/organ/internal/tongue/monkey/get_laugh_sound()
- return 'monkestation/sound/voice/laugh/simian/monkey_laugh_1.ogg'
/obj/item/organ/internal/tongue/moth
name = "moth tongue"
desc = "Moths don't have tongues. Someone get god on the phone, tell them I'm not happy."
say_mod = "flutters"
- liked_foodtypes = VEGETABLES | DAIRY | CLOTH
- disliked_foodtypes = FRUIT | GROSS | BUGS | GORE
- toxic_foodtypes = MEAT | RAW | SEAFOOD
-
-/obj/item/organ/internal/tongue/moth/get_scream_sound()
- return 'sound/voice/moth/scream_moth.ogg'
-
-/obj/item/organ/internal/tongue/moth/get_laugh_sound()
- return pick(
- 'monkestation/sound/voice/laugh/moth/mothchitter.ogg',
- 'monkestation/sound/voice/laugh/moth/mothlaugh.ogg',
- 'monkestation/sound/voice/laugh/moth/mothsqueak.ogg',
- )
/obj/item/organ/internal/tongue/zombie
name = "rotting tongue"
@@ -673,31 +501,7 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
/obj/item/organ/internal/tongue/mush
name = "mush-tongue-room"
desc = "You poof with this. Got it?"
- icon = 'icons/obj/hydroponics/seeds.dmi'
- icon_state = "mycelium-angel"
say_mod = "poofs"
-/obj/item/organ/internal/tongue/pod
- name = "pod tongue"
- desc = "A plant-like organ used for speaking and eating."
- say_mod = "whistles"
- liked_foodtypes = VEGETABLES | FRUIT | GRAIN
- disliked_foodtypes = GORE | MEAT | DAIRY | SEAFOOD | BUGS
-
-/obj/item/organ/internal/tongue/floran
- name = "floran tongue"
- desc = "A plant-like organ used for speaking and eating."
- say_mod = "whistles"
- liked_foodtypes = GORE | MEAT | DAIRY | SEAFOOD | BUGS
- disliked_foodtypes = VEGETABLES
-
-/obj/item/organ/internal/tongue/floran/get_scream_sound()
- return pick(
- 'sound/voice/lizard/lizard_scream_1.ogg',
- 'sound/voice/lizard/lizard_scream_2.ogg',
- 'sound/voice/lizard/lizard_scream_3.ogg',
- 'monkestation/sound/voice/screams/lizard/lizard_scream_5.ogg',
- )
-
-/obj/item/organ/internal/tongue/floran/get_laugh_sound()
- return 'monkestation/sound/voice/laugh/lizard/lizard_laugh.ogg'
+ icon = 'icons/obj/hydroponics/seeds.dmi'
+ icon_state = "mycelium-angel"
diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm
index 8097ad9490b3..c61eeeaa8bdd 100644
--- a/code/modules/surgery/repair_puncture.dm
+++ b/code/modules/surgery/repair_puncture.dm
@@ -26,8 +26,14 @@
/datum/surgery_step/close,
)
-/datum/surgery/repair_puncture/is_valid_wound(datum/wound/wound)
- return ..() && wound.blood_flow > 0
+/datum/surgery/repair_puncture/can_start(mob/living/user, mob/living/carbon/target)
+ if(!istype(target))
+ return FALSE
+ . = ..()
+ if(.)
+ var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected)
+ var/datum/wound/burn/flesh/pierce_wound = targeted_bodypart.get_wound_type(targetable_wound)
+ return(pierce_wound && pierce_wound.blood_flow > 0)
//SURGERY STEPS
diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm
index 8cc37c3a08f4..ebd965414578 100644
--- a/code/modules/surgery/revival.dm
+++ b/code/modules/surgery/revival.dm
@@ -3,8 +3,7 @@
desc = "An experimental surgical procedure which involves reconstruction and reactivation of the patient's brain even long after death. \
The body must still be able to sustain life."
requires_bodypart_type = NONE
- possible_locs = list(BODY_ZONE_CHEST)
- target_mobtypes = list(/mob/living)
+ possible_locs = list(BODY_ZONE_HEAD)
steps = list(
/datum/surgery_step/incise,
/datum/surgery_step/retract_skin,
@@ -15,22 +14,15 @@
/datum/surgery_step/close,
)
-/datum/surgery/revival/can_start(mob/user, mob/living/target)
+/datum/surgery/revival/can_start(mob/user, mob/living/carbon/target)
if(!..())
return FALSE
if(target.stat != DEAD)
return FALSE
if(HAS_TRAIT(target, TRAIT_SUICIDED) || HAS_TRAIT(target, TRAIT_HUSK) || HAS_TRAIT(target, TRAIT_DEFIB_BLACKLISTED))
return FALSE
- if(!is_valid_target(target))
- return FALSE
- return TRUE
-
-/// Extra checks which can be overridden
-/datum/surgery/revival/proc/is_valid_target(mob/living/patient)
- if (iscarbon(patient))
- return FALSE
- if (!(patient.mob_biotypes & (MOB_ORGANIC|MOB_HUMANOID)))
+ var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN)
+ if(!target_brain)
return FALSE
return TRUE
@@ -66,7 +58,7 @@
to_chat(user, span_warning("You need an electrode for this!"))
return FALSE
-/datum/surgery_step/revive/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)
+/datum/surgery_step/revive/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
display_results(
user,
target,
@@ -94,18 +86,15 @@
target.adjustOxyLoss(-50, 0)
target.updatehealth()
if(target.revive())
- on_revived(user, target)
+ target.visible_message(span_notice("...[target] wakes up, alive and aware!"))
+ target.emote("gasp")
+ target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 50, 199) //MAD SCIENCE
return TRUE
+ else
+ target.visible_message(span_warning("...[target.p_they()] convulses, then lies still."))
+ return FALSE
- target.visible_message(span_warning("...[target.p_they()] convulse[target.p_s()], then lie[target.p_s()] still."))
- return FALSE
-
-/// Called when you have been successfully raised from the dead
-/datum/surgery_step/revive/proc/on_revived(mob/surgeon, mob/living/patient)
- patient.visible_message(span_notice("...[patient] wakes up, alive and aware!"))
- patient.emote("gasp")
-
-/datum/surgery_step/revive/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery)
+/datum/surgery_step/revive/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
display_results(
user,
target,
@@ -113,23 +102,5 @@
span_notice("[user] send a powerful shock to [target]'s brain with [tool], but [target.p_they()] doesn't react."),
span_notice("[user] send a powerful shock to [target]'s brain with [tool], but [target.p_they()] doesn't react."),
)
- return FALSE
-
-/// Additional revival effects if the target has a brain
-/datum/surgery/revival/carbon
- possible_locs = list(BODY_ZONE_HEAD)
- target_mobtypes = list(/mob/living/carbon)
-
-/datum/surgery/revival/carbon/is_valid_target(mob/living/carbon/patient)
- var/obj/item/organ/internal/brain/target_brain = patient.get_organ_slot(ORGAN_SLOT_BRAIN)
- return !isnull(target_brain)
-
-/datum/surgery_step/revive/carbon
-
-/datum/surgery_step/revive/carbon/on_revived(mob/surgeon, mob/living/patient)
- . = ..()
- patient.adjustOrganLoss(ORGAN_SLOT_BRAIN, 50, 199) // MAD SCIENCE
-
-/datum/surgery_step/revive/carbon/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- . = ..()
target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 180)
+ return FALSE
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 3f01d7fe981b..3f30cd9244a1 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -67,28 +67,15 @@
operated_bodypart = null
return ..()
-/datum/surgery/proc/is_valid_wound(datum/wound/wound)
- return istype(wound, targetable_wound)
/datum/surgery/proc/can_start(mob/user, mob/living/patient) //FALSE to not show in list
+ . = TRUE
if(replaced_by == /datum/surgery)
return FALSE
- if(targetable_wound)
- var/any_wound = FALSE
- var/obj/item/bodypart/targeted_bodypart = patient.get_bodypart(user.zone_selected)
- for(var/datum/wound/found_wound as anything in targeted_bodypart?.wounds)
- if(is_valid_wound(found_wound))
- any_wound = TRUE
- break
-
- if(!any_wound)
- return FALSE
-
if(!requires_tech && !replaced_by)
return TRUE
- . = TRUE
if(requires_tech)
. = FALSE
@@ -105,15 +92,16 @@
else
return TRUE
+ var/turf/patient_turf = get_turf(patient)
+
//Get the relevant operating computer
- var/obj/machinery/computer/operating/opcomputer = locate_operating_computer(get_turf(patient))
+ var/obj/machinery/computer/operating/opcomputer = locate_operating_computer(patient_turf)
if (isnull(opcomputer))
return .
if(replaced_by in opcomputer.advanced_surgeries)
return FALSE
if(type in opcomputer.advanced_surgeries)
return TRUE
- return .
/datum/surgery/proc/next_step(mob/living/user, modifiers)
if(location != user.zone_selected)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 857c440d242b..d442cd16c9c0 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -118,8 +118,6 @@
/datum/asset/simple/namespaced/fontawesome))
flush_queue |= window.send_asset(get_asset_datum(
/datum/asset/simple/namespaced/tgfont))
- flush_queue |= window.send_asset(get_asset_datum(
- /datum/asset/json/icon_ref_map))
for(var/datum/asset/asset in src_object.ui_assets(user))
flush_queue |= window.send_asset(asset)
if (flush_queue)
diff --git a/code/modules/tgui_input/color.dm b/code/modules/tgui_input/color.dm
index fcc3f80d9c99..fe161b2e6a92 100644
--- a/code/modules/tgui_input/color.dm
+++ b/code/modules/tgui_input/color.dm
@@ -118,10 +118,6 @@
closed = TRUE
SStgui.close_uis(src)
return TRUE
- if("null")
- set_choice(null)
- SStgui.close_uis(src)
- return TRUE
/datum/tgui_color_picker/proc/set_choice(choice)
src.choice = choice
diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm
index 300b0e58f2dc..9fb8b02b0196 100644
--- a/code/modules/tgui_panel/tgui_panel.dm
+++ b/code/modules/tgui_panel/tgui_panel.dm
@@ -61,7 +61,7 @@
*/
/datum/tgui_panel/proc/on_initialize_timed_out()
// Currently does nothing but sending a message to old chat.
- SEND_TEXT(client, "
Failed to load fancy chat, click HERE to attempt to reload it.")
+ SEND_TEXT(client, "
Failed to load fancy chat, click HERE to attempt to reload it.")
/**
* private
diff --git a/code/modules/unit_tests/bloody_footprints.dm b/code/modules/unit_tests/bloody_footprints.dm
index 2a786414fa20..76b86590861e 100644
--- a/code/modules/unit_tests/bloody_footprints.dm
+++ b/code/modules/unit_tests/bloody_footprints.dm
@@ -21,8 +21,9 @@
blood_master.forceMove(run_loc_floor_bottom_left)
var/datum/component/bloodysoles/soles = holds_blood.GetComponent(/datum/component/bloodysoles)
+ var/blood_type = pool.blood_state
- TEST_ASSERT(soles.total_bloodiness, "Shoes didn't become stained after stepping in a pool of blood")
+ TEST_ASSERT(soles.bloody_shoes[blood_type], "Shoes didn't become stained after stepping in a pool of [blood_type]")
//The bloody soles component handles the order of stepping on blood/stepping on a bloody tile in a constranating way
//Which means it needs to check and see if any time has passed between steps, so it can be sure the player is stepping onto a new tile (that should become bloody)
@@ -38,9 +39,10 @@
var/footprint_total = 0
for(var/obj/effect/decal/cleanable/blood/footprints/print_set in move_to)
- footprint_total += 1
+ if(print_set.blood_state == blood_type)
+ footprint_total += 1
- TEST_ASSERT(footprint_total, "The floor didn't get covered in blood after being walked over")
+ TEST_ASSERT(footprint_total, "The floor didn't get covered in [blood_type] after being walked over")
soles.last_pickup -= 1
@@ -52,7 +54,8 @@
footprint_total = 0
for(var/obj/effect/decal/cleanable/blood/footprints/print_set in move_to)
- footprint_total += 1
+ if(print_set.blood_state == blood_type)
+ footprint_total += 1
TEST_ASSERT(footprint_total, "The floor somehow lost its footprints after being walked over")
TEST_ASSERT_EQUAL(footprint_total, 1, "The floor had more than one set of footprints in it, something is fucked")
diff --git a/code/modules/unit_tests/lesserform.dm b/code/modules/unit_tests/lesserform.dm
index 1c7e2bfdcc23..a719b11dc523 100644
--- a/code/modules/unit_tests/lesserform.dm
+++ b/code/modules/unit_tests/lesserform.dm
@@ -3,7 +3,6 @@
/datum/unit_test/lesserform/Run()
var/mob/living/carbon/human/changeling = allocate(/mob/living/carbon/human/consistent)
- var/name = changeling.name
changeling.mind_initialize()
var/datum/mind/mind = changeling.mind
var/datum/antagonist/changeling/changeling_datum = mind.add_antag_datum(/datum/antagonist/changeling)
@@ -14,14 +13,11 @@
transform_ability.Trigger()
TEST_ASSERT(ismonkey(changeling), "Changeling failed to turn into a monkey after voluntarily transforming using lesser form.")
- TEST_ASSERT_NOTEQUAL(name, changeling.name, "Monkeyisation failed to anonymise changeling's name.")
changeling.humanize(instant = TRUE)
transform_ability.Trigger()
- changeling_datum.adjust_chemicals(INFINITY)
TEST_ASSERT(ismonkey(changeling), "Changeling failed to turn into a monkey after involuntarily being made into a human.")
transform_ability.Trigger()
TEST_ASSERT(!ismonkey(changeling), "Changeling failed to stop being a monkey after voluntarily transforming using lesser form.")
- TEST_ASSERT_EQUAL(name, changeling.name, "Returning from monkey form failed to restore original name.")
changeling.monkeyize(instant = TRUE)
transform_ability.Trigger()
TEST_ASSERT(!ismonkey(changeling), "Changeling failed to stop being a monkey after being involuntarily turned into one.")
diff --git a/code/modules/unit_tests/screenshot_humanoids.dm b/code/modules/unit_tests/screenshot_humanoids.dm
index cab447f9ea3f..a0e7abc1633e 100644
--- a/code/modules/unit_tests/screenshot_humanoids.dm
+++ b/code/modules/unit_tests/screenshot_humanoids.dm
@@ -4,8 +4,7 @@
/datum/unit_test/screenshot_humanoids/Run()
// Test lizards as their own thing so we can get more coverage on their features
var/mob/living/carbon/human/lizard = allocate(/mob/living/carbon/human/dummy/consistent)
- var/datum/color_palette/generic_colors/located = lizard.dna.color_palettes[/datum/color_palette/generic_colors]
- located.mutant_color = "#099"
+ lizard.dna.features["mcolor"] = "#099"
lizard.dna.features["tail_lizard"] = "Light Tiger"
lizard.dna.features["snout"] = "Sharp + Light"
lizard.dna.features["horns"] = "Simple"
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png
index 0a7fdd7fb774..399627ac15de 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsucker.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsucker.png
index 786f195c0aeb..27a91f8f14c2 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsucker.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsucker.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckerbreakout.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckerbreakout.png
index 786f195c0aeb..27a91f8f14c2 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckerbreakout.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodsuckerbreakout.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_vampiricaccident.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_vampiricaccident.png
index 786f195c0aeb..27a91f8f14c2 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_vampiricaccident.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_vampiricaccident.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mush.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mush.png
index b0058fbe135b..6755b4792e0f 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mush.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mush.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ornithid.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ornithid.png
deleted file mode 100644
index b3fcb82247ff..000000000000
Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ornithid.png and /dev/null differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_satyr.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_satyr.png
index 2a70c26d0ad2..6b25f9aad79c 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_satyr.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_satyr.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png
index 8d1cdfd9c396..e7bea2e1bb64 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_werewolf.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_werewolf.png
deleted file mode 100644
index dce4b390b828..000000000000
Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_werewolf.png and /dev/null differ
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index e3446e24618a..8647b026adc4 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -254,7 +254,6 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
/obj/machinery/ocean_elevator,
/atom/movable/outdoor_effect,
/turf/closed/mineral/random/regrowth,
- /obj/effect/abstract/signboard_holder, // monkestation addition: shouldn't exist outside of signboards
)
//Say it with me now, type template
ignore += typesof(/obj/effect/mapping_helpers)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index 4ddd46c6f2cf..9e6adc5a877f 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -66,9 +66,7 @@
///Just stop the mech from doing anything
var/completely_disabled = FALSE
///Whether this mech is allowed to move diagonally
- var/allow_diagonal_movement = TRUE
- ///Whether this mech moves into a direct as soon as it goes to move. Basically, turn and step in the same key press.
- var/pivot_step = FALSE
+ var/allow_diagonal_movement = FALSE
///Whether or not the mech destroys walls by running into it.
var/bumpsmash = FALSE
diff --git a/code/modules/vehicles/mecha/combat/gygax.dm b/code/modules/vehicles/mecha/combat/gygax.dm
index 027da68dc9bf..fff840647837 100644
--- a/code/modules/vehicles/mecha/combat/gygax.dm
+++ b/code/modules/vehicles/mecha/combat/gygax.dm
@@ -3,6 +3,7 @@
name = "\improper Gygax"
icon_state = "gygax"
base_icon_state = "gygax"
+ allow_diagonal_movement = TRUE
movedelay = 3
max_integrity = 250
armor_type = /datum/armor/mecha_gygax
diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
index 14c2b73d69a2..84b224173a2e 100644
--- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
@@ -161,11 +161,12 @@
t1 = "*dead*"
else
t1 = "Unknown"
- var/skin_temp = patient.get_skin_temperature()
- var/body_temp = patient.bodytemperature
+ var/core_temp = ""
+ if(ishuman(patient))
+ var/mob/living/carbon/human/humi = patient
+ core_temp = {"
Body Temperature: [humi.bodytemperature-T0C]°C ([humi.bodytemperature*1.8-459.67]°F)"}
return {"
Health: [patient.stat > 1 ? "[t1]" : "[patient.health]% ([t1])"]
-
Skin Temperature: [KELVIN_TO_CELCIUS(skin_temp)]°C ([KELVIN_TO_FAHRENHEIT(skin_temp)]°F)
-
Body Temperature: [KELVIN_TO_CELCIUS(body_temp)]°C ([KELVIN_TO_FAHRENHEIT(body_temp)]°F)
+ [core_temp]
Body Temperature: [patient.bodytemperature-T0C]°C ([patient.bodytemperature*1.8-459.67]°F)
Brute Damage: [patient.getBruteLoss()]%
Respiratory Damage: [patient.getOxyLoss()]%
@@ -189,7 +190,7 @@
if(SG && SG.reagents && islist(SG.reagents.reagent_list))
for(var/datum/reagent/R in SG.reagents.reagent_list)
if(R.volume > 0)
- output += "
Inject [R.name]"
+ output += "
Inject [R.name]"
return output
@@ -423,9 +424,9 @@
var/output
for(var/datum/reagent/R in reagents.reagent_list)
if(R.volume > 0)
- output += "[R]: [round(R.volume,0.001)] -
Purge Reagent"
+ output += "[R]: [round(R.volume,0.001)] -
Purge Reagent"
if(output)
- output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] -
Purge All"
+ output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] -
Purge All"
return output || "None"
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/reagent_containers/syringe/S, mob/user)
diff --git a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
index 0e147ec37665..cadccb6fe86c 100644
--- a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
@@ -130,7 +130,11 @@
target.apply_damage(10, BRUTE, BODY_ZONE_CHEST, target.run_armor_check(target_part, MELEE))
//blood splatters
- target.do_splatter_effect(get_dir(chassis, target))
+ var/splatter_dir = get_dir(chassis, target)
+ if(isalien(target))
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target.drop_location(), splatter_dir, COLOR_DARK_PURPLE)
+ else
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir, COLOR_DARK_RED)
//organs go everywhere
if(target_part && prob(10 * drill_level))
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index 9a503c6cf240..3d8cc1d02044 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -58,7 +58,6 @@
var/obj/projectile/projectile_obj = new projectile(get_turf(src))
projectile_obj.log_override = TRUE //we log being fired ourselves a little further down.
projectile_obj.firer = chassis
- projectile_obj.fired_from = src
projectile_obj.preparePixelProjectile(target, source, modifiers, spread)
if(source.client && isliving(source)) //dont want it to happen from syndie mecha npc mobs, they do direct fire anyways
var/mob/living/shooter = source
diff --git a/code/modules/vehicles/mecha/mecha_ai_interaction.dm b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
index 6b0fa8d6d24d..9c0570004fe1 100644
--- a/code/modules/vehicles/mecha/mecha_ai_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
@@ -9,7 +9,7 @@
to_chat(user, "[B.get_mecha_info()]")
break
//Nothing like a big, red link to make the player feel powerful!
- to_chat(user, "
[span_userdanger("ASSUME DIRECT CONTROL?")]")
+ to_chat(user, "
[span_userdanger("ASSUME DIRECT CONTROL?")]")
return
examine(user)
if(length(return_drivers()) > 0)
@@ -23,7 +23,7 @@
if(!can_control_mech)
to_chat(user, span_warning("You cannot control exosuits without AI control beacons installed."))
return
- to_chat(user, "
[span_boldnotice("Take control of exosuit?")]")
+ to_chat(user, "
[span_boldnotice("Take control of exosuit?")]")
/obj/vehicle/sealed/mecha/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
. = ..()
diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
index c63958a03c67..c3571d62c6a4 100644
--- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
@@ -158,16 +158,12 @@
/obj/vehicle/sealed/mecha/add_occupant(mob/M, control_flags)
RegisterSignal(M, COMSIG_MOB_CLICKON, PROC_REF(on_mouseclick), TRUE)
RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(display_speech_bubble), TRUE)
- RegisterSignal(M, COMSIG_MOVABLE_KEYBIND_FACE_DIR, PROC_REF(on_turn), TRUE)
. = ..()
update_appearance()
/obj/vehicle/sealed/mecha/remove_occupant(mob/M)
- UnregisterSignal(M, list(
- COMSIG_MOB_CLICKON,
- COMSIG_MOB_SAY,
- COMSIG_MOVABLE_KEYBIND_FACE_DIR,
- ))
+ UnregisterSignal(M, COMSIG_MOB_CLICKON)
+ UnregisterSignal(M, COMSIG_MOB_SAY)
M.clear_alert(ALERT_CHARGE)
M.clear_alert(ALERT_MECH_DAMAGE)
if(M.client)
diff --git a/code/modules/vehicles/mecha/mecha_movement.dm b/code/modules/vehicles/mecha/mecha_movement.dm
index 43ad7a1b2fbe..4b0b81177fda 100644
--- a/code/modules/vehicles/mecha/mecha_movement.dm
+++ b/code/modules/vehicles/mecha/mecha_movement.dm
@@ -41,11 +41,6 @@
return TRUE
return FALSE
-///Called when the driver turns with the movement lock key
-/obj/vehicle/sealed/mecha/proc/on_turn(mob/living/driver, direction)
- SIGNAL_HANDLER
- return COMSIG_IGNORE_MOVEMENT_LOCK
-
/obj/vehicle/sealed/mecha/relaymove(mob/living/user, direction)
. = TRUE
if(!canmove || !(user in return_drivers()))
@@ -118,12 +113,11 @@
break
//if we're not facing the way we're going rotate us
- if(dir != direction && (!strafe || forcerotate || keyheld))
+ if(dir != direction && !strafe || forcerotate || keyheld)
if(dir != direction && !(mecha_flags & QUIET_TURNS) && !step_silent)
playsound(src,turnsound,40,TRUE)
setDir(direction)
- if(keyheld || !pivot_step) //If we pivot step, we don't return here so we don't just come to a stop
- return TRUE
+ return TRUE
set_glide_size(DELAY_TO_GLIDE_SIZE(get_movedelay()))
//Otherwise just walk normally
diff --git a/code/modules/vehicles/mecha/medical/odysseus.dm b/code/modules/vehicles/mecha/medical/odysseus.dm
index 0d571e0fa3e2..e79a5374bd03 100644
--- a/code/modules/vehicles/mecha/medical/odysseus.dm
+++ b/code/modules/vehicles/mecha/medical/odysseus.dm
@@ -3,6 +3,7 @@
name = "\improper Odysseus"
icon_state = "odysseus"
base_icon_state = "odysseus"
+ allow_diagonal_movement = TRUE
movedelay = 2
encumbrance_gap = 1
max_temperature = 15000
@@ -10,8 +11,6 @@
wreckage = /obj/structure/mecha_wreckage/odysseus
mech_type = EXOSUIT_MODULE_ODYSSEUS
step_energy_drain = 6
- internals_req_access = list(ACCESS_MECH_SCIENCE, ACCESS_MECH_MEDICAL)
- pivot_step = TRUE
/obj/vehicle/sealed/mecha/odysseus/moved_inside(mob/living/carbon/human/H)
. = ..()
diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm
index 990c95d94616..cbfb39073f1c 100644
--- a/code/modules/vehicles/mecha/working/clarke.dm
+++ b/code/modules/vehicles/mecha/working/clarke.dm
@@ -28,9 +28,6 @@
mech_type = EXOSUIT_MODULE_CLARKE
enter_delay = 40
mecha_flags = ADDING_ACCESS_POSSIBLE | IS_ENCLOSED | HAS_LIGHTS | MMI_COMPATIBLE | OMNIDIRECTIONAL_ATTACKS
- internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING)
- allow_diagonal_movement = FALSE
- pivot_step = TRUE
/datum/armor/working_clarke
melee = 20
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 0639c7684624..a31d2354dbf5 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -194,8 +194,6 @@
/obj/item/clothing/mask/animal/cowmask = 1,
/obj/item/clothing/mask/animal/horsehead = 1,
/obj/item/clothing/head/lizard = 1,
- /obj/item/clothing/head/costume/bunnyhead/regular = 1,
- /obj/item/clothing/suit/costume/bunnysuit/regular = 1,
),
),
list(
@@ -283,6 +281,7 @@
/obj/item/clothing/suit/costume/drfreeze_coat = 1,
/obj/item/clothing/under/costume/drfreeze = 1,
/obj/item/clothing/head/costume/drfreezehat = 1,
+ /obj/item/clothing/head/costume/minicrown = 1, // //MONKESTATION EDIT ADDITION
)
refill_canister = /obj/item/vending_refill/autodrobe
default_price = PAYCHECK_CREW * 0.8 //Default of 40.
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index a5fa9303690e..ddcfd9bb244d 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -18,8 +18,6 @@
)
contraband = list(
/obj/item/clothing/mask/vape = 5,
- /obj/item/storage/fancy/cigarettes/cigpack_cannabis = 5,
- /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 4
)
premium = list(
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 490fdfbbd7bf..3de82c5e6ceb 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -140,7 +140,6 @@
/obj/item/clothing/suit/hooded/ethereal_raincoat = 3,
/obj/item/clothing/under/ethereal_tunic = 3,
- /obj/item/clothing/mask/kitsune = 3,
/obj/item/clothing/suit/costume/ianshirt = 1,
/obj/item/clothing/suit/hooded/dinojammies = 3,
/obj/item/clothing/suit/costume/irs = 20,
diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm
index adc4aa89de2e..29fd14a8c1b8 100644
--- a/code/modules/wiremod/shell/brain_computer_interface.dm
+++ b/code/modules/wiremod/shell/brain_computer_interface.dm
@@ -224,7 +224,7 @@
SIGNAL_HANDLER
if (isobserver(mob))
- examine_text += span_notice("[source.p_they(capitalized = TRUE)] [source.p_have()]
\a [parent] implanted in [source.p_them()].")
+ examine_text += span_notice("[source.p_they(capitalized = TRUE)] [source.p_have()]
\a [parent] implanted in [source.p_them()].")
/obj/item/circuit_component/bci_core/Topic(href, list/href_list)
..()
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index f933f14854a7..464bf9f3740c 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -29,7 +29,7 @@
if(!target.get_bodypart(BODY_ZONE_HEAD))
return
- if(HAS_TRAIT(target, TRAIT_NO_ZOMBIFY))
+ if((NOZOMBIE in target.dna.species.species_traits) || HAS_TRAIT(target, TRAIT_NO_ZOMBIFY))
// cannot infect any NOZOMBIE subspecies (such as high functioning
// zombies)
return
diff --git a/config/admins.txt b/config/admins.txt
index 704fa538c332..f48ff5bc03c3 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -4,4 +4,148 @@
#Ranks will match to those with the same name in admin_ranks.txt, if a match isn't found the user won't be adminned.
#If SQL-based admin loading is enabled, admins listed here will always be loaded first and will override any duplicate entries in the database.
-dwasint = Host
+Optimumtact = Host
+CitrusGender = Game Master
+NewSta = Game Master
+Expletives = Game Master
+kingofkosmos = Game Master
+MrStonedOne = Lazy Master
+microscopics = Game Master
+Gun Hog = Game Master
+KorPhaeron = Game Master
+razharas = Game Master
+Lordpidey = Game Master
+Niknakflak = Game Master
+rolan7 = Game Master
+quarxink = Game Master
+adrix89 = Game Master
+tle = Game Master
+xsi = Game Master
+scaredofshadows = Game Master
+neofite = Game Master
+trubblebass = Game Master
+mport2004 = Game Master
+deuryn = Game Master
+agouri = Game Master
+errorage = Game Master
+superxpdude = Game Master
+petethegoat = Game Master
+nodrak = Game Master
+carnwennan = Game Master
+ikarrus = Game Master
+cheridan = Game Master
+giacomand = Game Master
+rockdtben = Game Master
+sieve = Game Master
+aranclanos = Game Master
+intigracy = Game Master
+dumpdavidson = Game Master
+kazeespada = Game Master
+malkevin = Game Master
+incoming = Game Master
+demas = Game Master
+fleure = Game Master
+ricotez = Game Master
+misterperson = Game Master
+crimsonvision = Game Master
+iamgoofball = Game Master
+zelacks = Game Master
+androidsfv = Game Master
+miggles = Game Master
+jordie0608 = Game Master
+s0ldi3rkr4s0 = Game Master
+ergovisavi = Game Master
+vistapowa = Game Master
+miauw62 = Game Master
+rumia29 = Game Master
+bobylein = Game Master
+sirbayer = Game Master
+hornygranny = Game Master
+yota = Game Master
+firecage = Game Master
+donkieyo = Game Master
+argoneus = Game Master
+paprka = Game Master
+cookingboy3 = Game Master
+limeliz = Game Master
+steelpoint = Game Master
+phil235 = Game Master
+CorruptComputer = Game Master
+xxnoob = Game Master
+tkdrg = Game Master
+Cuboos = Game Master
+thunder12345 = Game Master
+wjohnston = Game Master
+mandurrh = Game Master
+thurgatar = Game Master
+xerux = Game Master
+dannno = Game Master
+lo6a4evskiy = Game Master
+vekter = Game Master
+Ahammer18 = Game Master
+ACCount12 = Game Master
+fayrik = Game Master
+shadowlight213 = Game Master
+drovidicorv = Game Master
+Dunc = Game Master
+MMMiracles = Game Master
+bear1ake = Game Master
+CoreOverload = Game Master
+Jalleo = Game Master
+ChangelingRain = Game Master
+FoxPMcCloud = Game Master
+Xhuis = Game Master
+Astralenigma = Game Master
+Tokiko1 = Game Master
+SuperSayu = Game Master
+Lzimann = Game Master
+As334 = Game Master
+neersighted = Game Master
+Swankcookie = Game Master
+Ressler = Game Master
+Folix = Game Master
+Bawhoppennn = Game Master
+Anturke = Host
+Lumipharon = Game Master
+bgobandit = Game Master
+coiax = Game Master
+RandomMarine = Game Master
+PKPenguin321 = Game Master
+TechnoAlchemist = Game Master
+Aloraydrel = Game Master
+Quiltyquilty = Game Master
+SnipeDragon = Game Master
+Fjeld = Game Master
+kevinz000 = Game Master
+Tacolizard = Game Master
+TrustyGun = Game Master
+Cyberboss = Game Master
+PJB3005 = Game Master
+Sweaterkittens = Game Master
+Feemjmeem = Game Master
+JStheguy = Game Master
+excessiveuseofcobby = Game Master
+Plizzard = Game Master
+octareenroon91 = Game Master
+Serpentarium = Game Master
+Averagejoe82 = Game Master
+The Dreamweaver = Game Master
+Denton-30 = Game Master
+Naksuasdf = Game Master
+MrDoomBringer = Game Master
+shizcalev = Game Master
+NicBR = Game Master
+LoserWasTaken = Game Master
+Fikou = Game Master
+Magatsuchi = Game Master
+Skoglol = Game Master
+4dplanner = Game Master
+Time-Green = Game Master
+StyleMistake = Game Master
+actioninja = Game Master
+bobbahbrown = Game Master
+Jaredfogle = Game Master+Coder
+WaylandSmithy = Game Master
+NamelessFairy = Game Master
+WalterMeldron = Game Master
+san7890 = Game Master
diff --git a/config/config.txt b/config/config.txt
index 464b95aa5078..a15291b8953e 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -528,7 +528,7 @@ MOTD motd.txt
## The cache is assumed to be cleared by TGS recompiling, which deletes `tmp`.
## This should be disabled (through `CACHE_ASSETS 0`) on development,
## but enabled on production (the default).
-CACHE_ASSETS 1
+CACHE_ASSETS 0
## If this remains commented out, we will allow players to download their own preferences as a JSON file to do whatever they wish.
## This does require the game code to read (and only read) the /data folder where these files are stored, and then use the BYOND FTP Function to send the file to the client.
diff --git a/config/contributors.dmi b/config/contributors.dmi
deleted file mode 100644
index 800803a01ea2..000000000000
Binary files a/config/contributors.dmi and /dev/null differ
diff --git a/config/contributors.txt b/config/contributors.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/config/game_options.txt b/config/game_options.txt
index 6d24745d76f5..66448be8ea59 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -357,7 +357,6 @@ ROUNDSTART_RACES simian
ROUNDSTART_RACES arachnid
ROUNDSTART_RACES apid
ROUNDSTART_RACES satyr
-ROUNDSTART_RACES ornithid
## Races that are better than humans in some ways, but worse in others
ROUNDSTART_RACES ethereal
diff --git a/config/maps.txt b/config/maps.txt
index 8ca6982fe8a7..e7426ff87e7d 100644
--- a/config/maps.txt
+++ b/config/maps.txt
@@ -34,11 +34,6 @@ map icebox
votable
endmap
-map theseus
- minplayers 5
- votable
-endmap
-
map tramstation
minplayers 35
votable
diff --git a/config/title_music/sounds/exclude b/config/title_music/sounds/exclude
index 0967ef424bce..e69de29bb2d1 100644
--- a/config/title_music/sounds/exclude
+++ b/config/title_music/sounds/exclude
@@ -1 +0,0 @@
-{}
diff --git a/goon/ATTRIBUTION.txt b/goon/ATTRIBUTION.txt
deleted file mode 100644
index b1b34ec4422a..000000000000
--- a/goon/ATTRIBUTION.txt
+++ /dev/null
@@ -1,281 +0,0 @@
-openlootcrate.ogg -
- Compressed in 2023 by virvatuli sound/misc/openlootcrate.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/openlootcrate.ogg
-
-openlootcrate2.ogg -
- Compressed in 2023 by virvatuli sound/misc/openlootcrate2.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/openlootcrate2.ogg
-
-ArtifactAnc1.ogg -
- OG Commit sound/machines/ArtifactAnc1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/ArtifactAnc1.ogg
-
-ArtifactEld1.ogg -
- OG Commit sound/machines/ArtifactEld1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/ArtifactEld1.ogg
-
-ArtifactEld2.ogg -
- OG Commit sound/machines/ArtifactEld2.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/ArtifactEld2.ogg
-
-ArtifactMar1.ogg -
- OG Commit sound/machines/ArtifactMar1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/ArtifactMar1.ogg
-
-ArtifactMar2.ogg -
- OG Commit sound/machines/ArtifactMar2.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/ArtifactMar2.ogg
-
-ArtifactPre1.ogg -
- OG Commit sound/machines/ArtifactPre1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/ArtifactPre1.ogg
-
-ArtifactWiz1.ogg -
- OG Commit sound/machines/ArtifactWiz1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/ArtifactWiz1.ogg
-
-elec_bzzz.ogg -
- OG Commit sound/effects/elec_bzzz.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/effects/elec_bzzz.ogg
-
-electric_shock.ogg -
- OG Commit sound/effects/electric_shock.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/effects/electric_shock.ogg
-
-electric_shock_short.ogg -
- OG Commit sound/effects/electric_shock_short.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/effects/electric_shock_short.ogg
-
-bellalert.ogg -
- OG Commit sound/machines/bellalert.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/bellalert.ogg
-
-engine_alert1.ogg -
- OG Commit sound/machines/engine_alert1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_alert1.ogg
-
-engine_alert2.ogg -
- OG Commit sound/machines/engine_alert2.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_alert2.ogg
-
-engine_alert3.ogg -
- OG Commit sound/machines/engine_alert3.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_alert3.ogg
-
-engine_grump1.ogg -
- OG Commit sound/machines/engine_grump1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_grump1.ogg
-
-engine_grump2.ogg -
- OG Commit sound/machines/engine_grump2.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_grump2.ogg
-
-engine_grump3.ogg -
- OG Commit sound/machines/engine_grump3.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_grump3.ogg
-
-engine_grump4.ogg -
- OG Commit sound/machines/engine_grump4.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_grump4.ogg
-
-engine_highpower.ogg -
- OG Commit sound/machines/engine_highpower.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/engine_highpower.ogg
-
-tractor_running.ogg -
- OG Commit sound/machines/tractor_running1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/tractor_running.ogg
-
-tractor_running2.ogg -
- OG Commit sound/machines/tractor_running2.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/tractor_running2.ogg
-
-tractor_running3.ogg -
- OG Commit sound/machines/tractor_running3.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/tractor_running3.ogg
-
-tractorrev.ogg -
- OG Commit sound/machines/tractorrev.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/machines/tractorrev.ogg
-
-
-babynoise.ogg -
- OG Commit goonstation/sound/babynoise.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/voice/babynoise.ogg
-
-body_thud.ogg -
- OG Commit goonstation/sound/misc/body_thud.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/body_thud.ogg
-
-
-speak_1.ogg -
- OG Commit goonstation/sound/misc/talk/speak_1.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_1.ogg
-
-speak_1_exclaim.ogg -
- OG Commit goonstation/sound/misc/talk/speak_1_exclaim.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_1_exclaim.ogg
-
-speak_1_ask.ogg -
- OG Commit goonstation/sound/misc/talk/speak_1_ask.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_1_ask.ogg
-
-speak_2.ogg -
- OG Commit goonstation/sound/misc/talk/speak_2.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_2.ogg
-
-speak_2_exclaim.ogg -
- OG Commit goonstation/sound/misc/talk/speak_2_exclaim.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_2_exclaim.ogg
-
-speak_2_ask.ogg -
- OG Commit goonstation/sound/misc/talk/speak_2_ask.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_2_ask.ogg
-
-speak_3.ogg -
- OG Commit goonstation/sound/misc/talk/speak_3.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_3.ogg
-
-speak_3_exclaim.ogg -
- OG Commit goonstation/sound/misc/talk/speak_3_exclaim.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_3_exclaim.ogg
-
-speak_3_ask.ogg -
- OG Commit goonstation/sound/misc/talk/speak_3_ask.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_3_ask.ogg
-
-speak_4.ogg -
- OG Commit goonstation/sound/misc/talk/speak_4.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_4.ogg
-
-speak_4_exclaim.ogg -
- OG Commit goonstation/sound/misc/talk/speak_4_exclaim.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_4_exclaim.ogg
-
-speak_4_ask.ogg -
- OG Commit goonstation/sound/misc/talk/speak_4_ask.ogg
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/speak_4_ask.ogg
-
-
-
-radio_ai.ogg
- mybluecorners (8ec37f12e282492a5e7aeb4ec1d5cfa2f1df7460
-https://github.com/goonstation/goonstation/blob/master/sound/misc/talk/radio_ai.ogg
-
-
-neon_lining.dmi
- Nebulacrity https://github.com/goonstation/goonstation/pull/1731
-https://github.com/goonstation/goonstation/blob/9470d5bbb76afa2ffdee6bddf8b97a68092d8b01/icons/obj/decals/neon_lining.dmi
-
-pt_laser.dmi
- gannets
-https://github.com/goonstation/goonstation/blob/master/icons/obj/pt_laser.dmi
-
-
-teg.dmi - https://github.com/goonstation/goonstation/pull/3408 Azrun blower indication, Inital Commit (circulator's
- Azrun https://github.com/goonstation/goonstation/pull/3408 blower indication
- gannets - main teg sprite
- Azrun https://github.com/goonstation/goonstation/pull/2902, open states
-https://github.com/goonstation/goonstation/blob/master/icons/obj/power.dmi
-https://github.com/goonstation/goonstation/blob/master/icons/obj/atmospherics/atmos.dmi
-
-slasher.dmi
- Zonespace27 https://github.com/goonstation/goonstation/pull/6094
-https://github.com/Zonespace27/goonstation/blob/d9a36b8ae0203788683a38c0b8546c14b0e0f656/icons/mob/slasher.dmi
-
-electile.dmi
- mybluecorners https://github.com/goonstation/goonstation/pull/1425/files#diff-cc282396fd85af02912a95be13420419cc7a433cfb2280c362f3c3cf4451ad2c
-https://github.com/goonstation/goonstation/blob/master/icons/effects/electile.dmi
-
-320x320.dmi
- goonstation/icons/effect/320x320.dmi (lootbox sprites),
-https://github.com/goonstation/goonstation/blob/master/icons/effects/320x320.dmi
-
-displacements.dmi
- pali6 (inital commit)
-https://github.com/goonstation/goonstation/blob/master/icons/effects/distort.dmi
-
-particle.dmi
- Azrun - https://github.com/goonstation/goonstation/commit/0f11103f910db33e05482a21f567ae8ef01237f1
- flrsh - https://github.com/goonstation/goonstation/commit/9ffc312e1b66aad4810dbf449c60b2b027b38898
- Sovexe - https://github.com/goonstation/goonstation/commit/ad6e662ae7547efff964ff6b39085621162761d8
- TobleroneSwordfish - https://github.com/goonstation/goonstation/commit/01f361fc560da88ab6cca050dd265bac420658f4
-https://github.com/goonstation/goonstation/blame/master/icons/effects/particles.dmi
-
-
-multi_hit.dmi
- goonstation/icons/effects/96x96 - swipe
- goonstation/icons/effects/96x96 - stab
-https://github.com/goonstation/goonstation/blob/master/icons/effects/96x96.dmi
-
-
-networked.dmi
- binarysudoku https://github.com/goonstation/goonstation/pull/750
-https://github.com/goonstation/goonstation/blob/master/icons/obj/networked.dmi
-
-
-plants_alien.dmi
- binarysudoku https://github.com/goonstation/goonstation/commit/9fb6d4c8df6ca51bbd6178cc703ffbeb5ae64be7
- sovexe https://github.com/goonstation/goonstation/commit/54f6c5b1b825ebf65647a510195e8ec93154b7a1
- sovexe https://github.com/goonstation/goonstation/commit/b5145abcde8113ce371f842ed4c12c6e2e7944c7
- azrun https://github.com/goonstation/goonstation/commit/3100dbc7c3d69f4d1744d9ffa1b9ded1e9f2c126
- m-earthfire, tobleroneswordfish https://github.com/goonstation/goonstation/commit/08c48c389012d17c8bbf735a6bc0f0fec684dd54
-https://github.com/goonstation/goonstation/blob/master/icons/obj/hydroponics/plants_alien.dmi
-
-plants_crop.dmi
- binarysudoku https://github.com/goonstation/goonstation/commit/9fb6d4c8df6ca51bbd6178cc703ffbeb5ae64be7
- binarysudoku https://github.com/goonstation/goonstation/commit/a2bfa53e05fd18fd44d5d8bf9f8c3e4261e10fe6
- emily https://github.com/goonstation/goonstation/commit/6dde7025cf5ffaabc47f264638f90f92b116fbd7
- yellow-mushroom https://github.com/goonstation/goonstation/commit/df3347bf103e30354e1b45f5cea888d5c433be34
- DimWhat https://github.com/goonstation/goonstation/commit/306343902279aad64147a7d95fcb405ca95989af
- sovexe https://github.com/goonstation/goonstation/commit/d3e97cde29fef8047983b66c09f6bf5a62449a20
- crackaduck https://github.com/goonstation/goonstation/commit/32e09c6a1834f1042cf49571476117e38c680cdc
- crackaduck https://github.com/goonstation/goonstation/commit/350bf56e85732399329d9631485c45519951cf10
- wolfolotl https://github.com/goonstation/goonstation/commit/c0a09331cb7a3841030cd7991144cf92a826b5e1
- tobleroneswordfish https://github.com/goonstation/goonstation/commit/524eaf8aaf84b00920c7013fc5c6385f47b09be5
- flappybatpal https://github.com/goonstation/goonstation/commit/c09ca907184df4861b23a0df5df917d6505ea684
- tobleroneswordfish https://github.com/goonstation/goonstation/commit/1aa16631c7443140fdcf427bb9a04df5eeff8663
- sovexe https://github.com/goonstation/goonstation/commit/d3e97cde29fef8047983b66c09f6bf5a62449a20
-https://github.com/goonstation/goonstation/blob/master/icons/obj/hydroponics/plants_crop.dmi
-
-plants_flower.dmi
- binarysudoku https://github.com/goonstation/goonstation/commit/9fb6d4c8df6ca51bbd6178cc703ffbeb5ae64be7
- janonas, jigjagboi45 tarmunora https://github.com/goonstation/goonstation/commit/243d0bfade03e14829d3c50fee5d09c938f97d41
- munien7 https://github.com/goonstation/goonstation/commit/5b27507352cb4f2c5988018c04e47f26f09ab116
- flrsh https://github.com/goonstation/goonstation/commit/9ffc312e1b66aad4810dbf449c60b2b027b38898
- eggcereal https://github.com/goonstation/goonstation/commit/9198822090a3dad530df408d6cc77b7e77406551
-https://github.com/goonstation/goonstation/blob/master/icons/obj/hydroponics/plants_flower.dmi
-
-plants_fruit.dmi
- binarysudoku https://github.com/goonstation/goonstation/commit/9fb6d4c8df6ca51bbd6178cc703ffbeb5ae64be7
- jan-antilles https://github.com/goonstation/goonstation/commit/85c5d02771d900f72e32cd1ec9b5a85a7f01b9d1
- t-toasted https://github.com/goonstation/goonstation/commit/de386a2b86395f445c7a6ddba7cda039635c2605
- flappybatpal https://github.com/goonstation/goonstation/commit/c09ca907184df4861b23a0df5df917d6505ea684
- tanker4390 https://github.com/goonstation/goonstation/commit/4691dabb8b940bbd9c441af1e6916bd9f0bcd32c
-https://github.com/goonstation/goonstation/blob/master/icons/obj/hydroponics/plants_fruit.dmi
-
-plant_herb.dmi
- binarysudoku https://github.com/goonstation/goonstation/commit/9fb6d4c8df6ca51bbd6178cc703ffbeb5ae64be7
- mordent-goonstation https://github.com/goonstation/goonstation/commit/fdf70ea6bbcbde998d616b431328cb6770035524
- binarysudoku https://github.com/goonstation/goonstation/commit/a2bfa53e05fd18fd44d5d8bf9f8c3e4261e10fe6
- Janonas https://github.com/goonstation/goonstation/commit/a6291454d8210c29939c812a432b72f4aa394e62
- WALPVRGIS https://github.com/goonstation/goonstation/commit/4dc053670dc868888030d440feb4b3050370da00
- avimour, tobleroneswordfish https://github.com/goonstation/goonstation/commit/6a5b97afb44e2da544fffe2126e6cf9640089ee8
- colossusqw https://github.com/goonstation/goonstation/commit/114f0262462c4247578b308a4fba04e9350aa4ce
- flrsh https://github.com/goonstation/goonstation/commit/9ffc312e1b66aad4810dbf449c60b2b027b38898
- temthrush https://github.com/goonstation/goonstation/commit/a2d3c6262172fa44eafd9071bba0364cf90cac09
- colossusqw https://github.com/goonstation/goonstation/commit/530ef545c793232ba2a57832f17c8deaf6a3cbfb
-https://github.com/goonstation/goonstation/blob/master/icons/obj/hydroponics/plants_herb.dmi
-
-plant_veg.dmi
- binarysudoku https://github.com/goonstation/goonstation/commit/9fb6d4c8df6ca51bbd6178cc703ffbeb5ae64be7
- wolfolotl, tarmunora, zewaka, mordent-goonstation https://github.com/goonstation/goonstation/commit/a941272744132922382940516cd83af2259f1ed9
- flappybatpal https://github.com/goonstation/goonstation/commit/c09ca907184df4861b23a0df5df917d6505ea684
- M-Earthfire https://github.com/goonstation/goonstation/commit/8ea2eb4b124dd7bd2c4a689e0bd1895dbe55d024
- Glamurio https://github.com/goonstation/goonstation/commit/d62440d0ecf4bb6380e2484f9ffc0251b2f31bf5
-https://github.com/goonstation/goonstation/blob/master/icons/obj/hydroponics/plants_veg.dmi
-
-plant_weed.dmi
- binarysudoku https://github.com/goonstation/goonstation/commit/9fb6d4c8df6ca51bbd6178cc703ffbeb5ae64be7
- M-earthfire, tobleroneswordfish https://github.com/goonstation/goonstation/commit/08c48c389012d17c8bbf735a6bc0f0fec684dd54
-https://github.com/goonstation/goonstation/blob/master/icons/obj/hydroponics/plants_weed.dmi
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
index c3b69b6f4d85..82bf8d2bb7a9 100644
--- a/html/changelogs/archive/2024-09.yml
+++ b/html/changelogs/archive/2024-09.yml
@@ -636,16 +636,5 @@
2024-09-30:
Gw0sty:
- bugfix: Removed the second windoor on delta botany.
- - rscadd: adds missing medipen refiller to Kilo
- - qol: Ensures all surgical tools in robotics are in a container of some sort.
- - rscadd: Added disk compartmentalizers to most stations virology and hydroponics.
- - qol: Made Bio bags able to hold GNA disks. (Disease disks)
- - qol: Moves botany and chicken lexicons into a single bookshelf
- - rscadd: Added an auto lathe, morgue, and plasteel to Blueshift's robotics
- KnigTheThrasher:
- - rscadd: Added a shower to kilo engi
- - rscadd: Added a windoor to medbay storage on kilo
Shoddd:
- balance: syndicate bible can now provide anti-magic from pocket and belt
- t-toasted:
- - rscadd: Theseus
diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml
deleted file mode 100644
index d5891b207614..000000000000
--- a/html/changelogs/archive/2024-10.yml
+++ /dev/null
@@ -1,278 +0,0 @@
-2024-10-01:
- flleeppyy:
- - admin: '"Play Internet Sound" now has a "Custom Title" option'
-2024-10-02:
- dravo:
- - rscadd: Expanded CC with additional office space and a more useful fishing spot
-2024-10-03:
- Absolucy:
- - bugfix: Fixes sentient slimes getting taken over by AI when splitting/vaccumed.
- - qol: Malkavian bloodsucker ramblings now have a proper cooldown.
- - qol: Moved the plant dna disk design from Botanical Engineering to roundstart
- tech.
- - bugfix: Fix the icebox magbar being spaced roundstart.
- Absolucy, ancient-engineer:
- - rscadd: Added signboards, player craftable signs that display text above them
- in the world that everyone can see!
- - rscadd: Wooden signboards can be crafted with 5 wooden planks, but need a pen
- to edit/clear.
- - rscadd: Holographic signboards can be crafted with 5 iron, 5 cables, and 1 micro-laser,
- and can change color, alongside allowing you to lock it to your ID, so that
- only you can edit or clear it. An emag will permanently break the lock, tho!
- - image: Signboard sprites by @ancient-engineer.
- - admin: Admins can see logs about signboard edits/changes via the "Signboards"
- investigate log category.
- DexeeXI:
- - admin: corrected exploitive issues on CC.
- GoldenAlpharex:
- - bugfix: Biogenerators now display the accurate price of their products after having
- been upgraded, as they no longer visually apply the efficiency discount twice.
- Shoddd:
- - bugfix: frontier modsuit helmet now airtight
- SirNightKnight:
- - rscadd: Frying pans and flyswatters can be sharpened.
- Veth-s:
- - rscadd: ITS VETH'S BIRTHDAY HECK YES
- manray:
- - rscadd: atmos holofan to engiborg's default toolkit
- ven1883:
- - rscdel: Removes bunnywand from wiz item selection
-2024-10-05:
- Gw0sty:
- - rscadd: Blueshield's headset and Blueshield's bowman headset added to their private
- locker
- - bugfix: Changed the Blueshield alt head set name to a bowman headset and added
- descriptions to both.
- - qol: Cleaned the locker a bit by moving all the items that can fit into blueshields
- belt into the belt.
- - rscadd: Made frontier satchels and messenger bags actual satchel types
- - rscadd: Ported Joint Torsion Ratchet module
- - rscadd: Made mirage grenade module researchable.
- - rscadd: Made mirage grenade modules useable while mod suit is depowered
- - bugfix: Makes ablative trench coat properly hide hair and ears.
- Hardly:
- - rscadd: Pets can now be worn as a hat
- - rscadd: Hamsters, obtainable through pet beacons
- Meowosers:
- - rscadd: Space Cleaner can now be made with Urine and Water
- - bugfix: Satchel Medical kits and First Responder Surgical kits have their intended
- storages now (For better or worse).
- PotatoTomahto:
- - rscadd: The lizard and bee plushies can now be worn in the head slot.
- Shoddd:
- - image: New sprites for Godslayer, Beserker, Ash drake, and adamantine armor
- - balance: AIs can no longer track nearly fully invisible people
- - bugfix: AIs can no longer track people in vents or objects such as lockers
- SirNightKnight:
- - rscadd: Added emergency EVA suits to emergency closets.
- - rscadd: Implemented oxygen candles, they can be found in emergency toolboxes.
- - rscadd: Added the Emergency EVA crate and Liquid Pump crate to Cargo
- - qol: Made emergency closet contents more consistent.
- - qol: Oxygen candles are more potent.
- - qol: Hazard vests can hold large oxygen tanks.
- - balance: Cybersun Juggernaut Suit now has shove protection akin to riot armour.
- - bugfix: Helmets no longer have the flammable quality.
- ThePooba:
- - bugfix: zompies no feel pain
- necromanceranne, SapphicOverload:
- - bugfix: Restores a lost feature, Clarkes and Odysseus mechs once again can pivot
- on a dime and step in the same button press.
- - qol: Mechs universally have diagonal movement as to avoid unresponsive movement,
- as block diagonal movement was having unintended side effects and was actually
- intended for pivot step mechs.
- - bugfix: You can once again use alt to turn while strafing in a mech
-2024-10-06:
- Absolucy:
- - qol: Monster Hunters can now see rabbits through walls.
- - qol: Monster Hunters interacting with a rabbit will now automatically pickup the
- loot if they have room in their hands.
- - refactor: Made the rabbit code a bit less shit (in exchange for some annoyingly
- necessary jank)
- - qol: The slowdown from bloodsilver bullets is now a status effect, and will be
- refreshed if another bullet hits before it finishes.
- Glyphee:
- - rscadd: Vault at CC
- Shoddd:
- - bugfix: falling in a chasm no longer breaks your ghost
-2024-10-07:
- Absolucy:
- - bugfix: Reworks the loadout store UI to use a spritesheet, fixing a major source
- of lag.
- - bugfix: Fixed some errors related to picking roundstart spawn points.
- - bugfix: (Hopefully) fixed runtimes related to NIF persistence.
- Gw0sty:
- - rscadd: Adds borer cages as a medical express order.
- - bugfix: fixed A/S maintenance APC being unconnected on Theseus.
- Shoddd:
- - qol: Report Issues is now Report bugs
- - rscadd: Gives hos a gun beacon, choose from multiphase, law bringer, or a combat
- shotgun
- - rscadd: Gives multiphase a bigger battery and tase option
- - rscadd: Compact combat shotgun from TG
- - balance: Beanbags and rubbershot now account for 250 stamina
- ThePooba:
- - rscadd: added Kams office back to centcom and Fortunes office
- Wisemonster:
- - balance: Turned off telecomms and SM air conditioning, and lowered the cold room
- air conditioning temperature to prevent the rooms from heating up too much.
-2024-10-08:
- MomoBerri:
- - bugfix: Fixed several issues on theseus, including mismatched IDs on buttons and
- access issues on doors. Also fixes the engine gas filter to filter nitrogen.
- AI Upload turrets now function properly.
- Syndicat-Meow:
- - rscadd: Many kinds of mobs can now be brought back to life through revival surgery.
- - rscadd: Dogs can wear eyepatches.
- Veth-s:
- - rscadd: Added Veth's Plantery to the Admin Offices.
-2024-10-09:
- Absolucy:
- - bugfix: Experimental fix for the numerous pathology symptom-related errors.
- - balance: The job overflow station trait no longer affects the Head of Security
- or Blueshield.
- - balance: The bureaucratic error event will no longer affect Blueshield slots.
- Gw0sty:
- - rscadd: Gives all the blueshield's head options which didnt have armor, armor.
- RikuTheKiller:
- - rscadd: Added the C.C.M.S dual wielding implant available on the black market
- and traitor uplinks.
- - spellcheck: There are now better descriptions for some traitor uplink implant
- bundles.
- ThePooba:
- - rscadd: floridaman now randomizes character and name
- - bugfix: abductee now has very clear instructions to not remember aliens at all
- Yarinoi:
- - rscdel: Removes degeneracy from the bunny wand.
- - rscadd: Adds silly easter costumes to the bunny wand.
- - rscadd: Adds silly easter costume to the autodrobe.
- - balance: Plasmamen can now remove the bunny costumes added by the bunny wand because
- i dont really feel like making easter bunny envirosuits
-2024-10-10:
- Absolucy:
- - bugfix: Speech artifact faults no longer make the dead speak.
- - refactor: Refactored the paranoia/stalking phantoms trauma. In-game behavior should
- be the same.
- - qol: The curator's radio channel frequency is now reserved, and can only be broadcast
- to by the radio booth's mic.
- Gw0sty:
- - rscadd: Adds hairbrush, comb, and the gothic coat to the Monke shop
- - spellcheck: Fixes the name of ornate coat
- - rscadd: Adjusts psychologists' primary door to a solid airlock and their access.
- - rscadd: Made it so the void cloak stops pressure damage when hooded.
- - rscadd: Adds the 'Unmarked Takbok Revolver', a variation of the Trapiste Takbok
- revolver that has less recoil and fires slightly faster.
- - rscadd: ' Replaces the Takbok revolver in the BlueShield''s gun beacon with a
- new addition, the ''Unmarked Takbok Revolver'''
- - rscadd: Camera system to meta virology
- - rscadd: Added sink to Theseus's garden
- - bugfix: Adjusted the windows of meta morgue chute to not block the chute.
- - bugfix: Fixed upside engi map in blueshift's bridge so the captain pilots the
- ship in the right direction
- RikuTheKiller:
- - balance: Inverse reagents no longer cause toxin damage unless it's explicitly
- one of their effects.
- Veth-s:
- - bugfix: Fixed some of the doors in CC showing as "Veth's Plantery" (against my
- will).
- - bugfix: Fixed Fortune's CC office.
- catmanpop:
- - bugfix: fixed a mapping issue in void raptor regarding an area of maints and the
- prison not having rad storm protection
-2024-10-11:
- DexeeXI:
- - rscadd: Component printer now in the pharmacy.
- - rscdel: Removed useless chromatography machines (no fermichem)
- - bugfix: spooky
- Gw0sty:
- - rscadd: Added robotic versions of the organ repair surgeries
- - qol: Made eye/ear surgery only appears if the organ is damaged.
- KnigTheThrasher:
- - bugfix: fixed tram disposals around science
- ven1883:
- - bugfix: fixed lobby music exclude being broken
-2024-10-12:
- Absolucy:
- - bugfix: Fixed more roundstart active turfs at centcom.
- - bugfix: Fixed some items (primarily greyscale/recolorable items) having incorrect
- icons in the loadout shop UI.
- - qol: Made the loadout shop UI slightly wider, to better fit the category names
- at the top.
- - bugfix: Fixed a runtime error when a player logged out while having the loadout
- shop open.
-2024-10-13:
- Absolucy:
- - bugfix: Fixed the radio mic being delayed by 2 seconds.
-2024-10-14:
- Absolucy:
- - bugfix: Fixed speech artifacts EXCLUSIVELY making dead/mute mobs speak.
- - bugfix: Plant splicers and DNA manipulators can now be (un)wrenched and deconstructed.
- - rscadd: Plant splicers can now be constructed.
- - bugfix: Fixed magic mirrors requiring you to select hair first, before being able
- to change anything else.
- Absolucy, Aylong, jlsnow301:
- - refactor: Added a better system of displaying object icons in tgui.
- - refactor: Botany seed extractors now use aforementioned system to display seed
- icons.
- Absolucy, LT3:
- - bugfix: Ctrl+click on equipped uniforms enables suit sensors as expected.
- Absolucy, mc-oofert:
- - bugfix: Fixed the xeno resin floor layer.
- CannibalHunter:
- - rscadd: Added new wield keybind to hold firearms in both hands!
- DexeeXI:
- - rscdel: removes a series of plushies that should have not been added to the codebase.
- Gw0sty:
- - rscadd: Adds new greyscale kitsune mask to vendors and the monkeshop.
- - bugfix: Fixed the visuals of radio frequency showing on its old frequency spot.
- t-toasted:
- - image: Resprited the Centcom Officer Turtleneck.
- - rscadd: Added the NT Rep Office to Meta, Delta, and Icebox.
- - qol: Moved Gateway on Meta above arrivals.
- - bugfix: Various minor fixes.
-2024-10-15:
- Absolucy:
- - rscdel: Removed mood change indicator huds for ghosts due to potential major lag.
- Gw0sty:
- - rscadd: Gives yellow clown bridge access during Clown Bridge Access station trait.
- - rscadd: Adds Blueshields and brig physicians to the kidnapping objectives target
- lists.
- - rscadd: Added Nanite room to Void Raptor.
- - rscadd: Added nanite chamber & console to Ouroboros.
- - qol: Added a box of nanite remotes.
- - bugfix: Redefined circuit lab to circuit lab from aux lab,
- - rscadd: Added a new PDA for the Psychlogist with mass messaging.
- - rscadd: Gave Blueshield's PDA's Lifeline predownloaded
- - rscadd: Gave Robotistic's PDA's Silliconnect Predownloaded
- - rscadd: Gave Engineers's PDA Canary predownloaded
- - qol: moved all the Psychlogist round start pills into a pill box in their inventory.
- KnigTheThrasher:
- - rscadd: Updated kilostation atmospherics
- - rscadd: Added Nanotrasen Consultant's office to kilo
- - rscdel: Tweaked the amount of decals in kilostation
- Meowosers:
- - bugfix: Blueshields no longer have a missing security HUD icon.
- MomoBerri:
- - bugfix: meta's engi security post can now use the cam viewer with a singularity.
- MrBagHead:
- - bugfix: The Bioterror foam grenade now uses a large grenade casing to fit its
- bluespace beakers.
- RafRoq:
- - bugfix: Plant reagent genes no longer take all the plant volume if there are other
- reagents
- Shoddd:
- - balance: beanbags now properly two shot stam crit
- - bugfix: Beanbags no longer stam crit in one shot
- Sylphily:
- - rscadd: more contraband to the cig vendors
- Wisemonster:
- - rscadd: Gives the Blueshield 5 new alt titles
- YehnBeep:
- - rscadd: Secasses can now select the "Correctional Officer" alt title
- ven1883:
- - bugfix: character and inherent armor have been fixed. unknown how many things
- this will affect, but includes nanite armor
- - code_imp: modified carbon/human/proc/check_armor() to check src.armor during calculations
- - code_imp: you can now use "set_armor" on human subtypes
- - refactor: for people using debuggers, you can watch "inherent_armor_rating" to
- see the inherent armor stats of a character being damaged.
- - refactor: uses / 100 instead of * 0.01. No change in function as far as I know
diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi
index 3d8e46c3837f..9bf25b8de2bb 100644
Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ
diff --git a/icons/effects/digi_filters.dmi b/icons/effects/digi_filters.dmi
deleted file mode 100644
index c17ff0e13a0b..000000000000
Binary files a/icons/effects/digi_filters.dmi and /dev/null differ
diff --git a/icons/effects/footprints.dmi b/icons/effects/footprints.dmi
index 8cefa901bc23..a00c6a0f780d 100644
Binary files a/icons/effects/footprints.dmi and b/icons/effects/footprints.dmi differ
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index 33a1ef4d0288..f65f56e58c96 100755
Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ
diff --git a/icons/mob/actions/actions_items.dmi b/icons/mob/actions/actions_items.dmi
index 681e7da89d5f..9b357963e267 100644
Binary files a/icons/mob/actions/actions_items.dmi and b/icons/mob/actions/actions_items.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 91587ca799c3..fe203910d5c6 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi
index b578f32d0078..f819ab43592b 100644
Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ
diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi
index 67ebed270fbf..69d4d6c2b8fb 100644
Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index a659c38261a1..69b79fa06a23 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
index 4c9c39bed485..d026ac57ba68 100644
Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/clothing/under/centcom.dmi b/icons/mob/clothing/under/centcom.dmi
index 77330f884fb5..f0fb26126d40 100644
Binary files a/icons/mob/clothing/under/centcom.dmi and b/icons/mob/clothing/under/centcom.dmi differ
diff --git a/icons/mob/effects/dam_mob.dmi b/icons/mob/effects/dam_mob.dmi
index 51883685fb4c..6390a1b34d64 100644
Binary files a/icons/mob/effects/dam_mob.dmi and b/icons/mob/effects/dam_mob.dmi differ
diff --git a/icons/mob/huds/hud.dmi b/icons/mob/huds/hud.dmi
index 80331ddc1845..5d9ab7cdfd19 100644
Binary files a/icons/mob/huds/hud.dmi and b/icons/mob/huds/hud.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_righthand.dmi b/icons/mob/inhands/clothing/gloves_righthand.dmi
index 7479dd8c505c..52458d30f57e 100644
Binary files a/icons/mob/inhands/clothing/gloves_righthand.dmi and b/icons/mob/inhands/clothing/gloves_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index 590e3ff2ed06..de4aa57a5657 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index 5980b17fbe4a..ffaafc7ba51c 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/mob/simple/corgi_head.dmi b/icons/mob/simple/corgi_head.dmi
index cd7e93579b36..601cfb62fbbf 100644
Binary files a/icons/mob/simple/corgi_head.dmi and b/icons/mob/simple/corgi_head.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 1ff6795956c5..025fb64c94e7 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi
index 6b6ed4a8aea2..1282e6caf760 100644
Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 485bc22a2d65..86fdcf786e14 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
index 60c4b71349e4..69bcca4b7f65 100644
Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ
diff --git a/icons/obj/clothing/under/centcom.dmi b/icons/obj/clothing/under/centcom.dmi
index 9e9d0c5d5528..8773e8743a54 100644
Binary files a/icons/obj/clothing/under/centcom.dmi and b/icons/obj/clothing/under/centcom.dmi differ
diff --git a/icons/obj/previews.dmi b/icons/obj/previews.dmi
index e03a396beb8a..c62b055f71ef 100644
Binary files a/icons/obj/previews.dmi and b/icons/obj/previews.dmi differ
diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi
index eef39df6dcca..0f2ca2698644 100644
Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ
diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi
index b40c7cc1d48d..d994d9aef200 100644
Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index a1f2e93c8d00..a07ed21500f6 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -211,7 +211,7 @@ window "infowindow"
anchor1 = 71,0
anchor2 = 85,0
saved-params = "is-checked"
- text = "Report Bugs"
+ text = "Report Issue"
command = "report-issue"
elem "fullscreen-toggle"
type = BUTTON
diff --git a/monkestation/code/controllers/subsystem/profiler.dm b/monkestation/code/controllers/subsystem/profiler.dm
index 2497f0b3ce7a..f3445536588d 100644
--- a/monkestation/code/controllers/subsystem/profiler.dm
+++ b/monkestation/code/controllers/subsystem/profiler.dm
@@ -9,8 +9,8 @@
/datum/controller/subsystem/profiler/proc/DumpFile()
var/timer = TICK_USAGE_REAL
- var/current_profile_data = world.Profile(PROFILE_REFRESH, format = "json")
- //current_profile_data = json_decode(current_profile_data) // yes this is stupid but this gets us a list in a non-awful format
+ var/list/current_profile_data = world.Profile(PROFILE_REFRESH, format = "json")
+ current_profile_data = json_decode(current_profile_data) // yes this is stupid but this gets us a list in a non-awful format
var/current_sendmaps_data = world.Profile(PROFILE_REFRESH, type = "sendmaps", format = "json")
fetch_cost = MC_AVERAGE(fetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
CHECK_TICK
@@ -18,9 +18,9 @@
if(!length(current_profile_data)) //Would be nice to have explicit proc to check this
stack_trace("Warning, profiling stopped manually before dump.")
- /*timer = TICK_USAGE_REAL
+ timer = TICK_USAGE_REAL
sortTim(current_profile_data, GLOBAL_PROC_REF(sort_overtime_dsc))
- sort_cost = MC_AVERAGE(sort_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))*/
+ sort_cost = MC_AVERAGE(sort_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
var/timestamp = time2text(world.timeofday, "YYYY-MM-DD_hh-mm-ss")
var/prof_file = "[GLOB.log_directory]/profiler/profiler-[timestamp].json"
@@ -29,7 +29,7 @@
var/sendmaps_file = "[GLOB.log_directory]/profiler/sendmaps-[timestamp].json"
timer = TICK_USAGE_REAL
- rustg_file_write(current_profile_data, prof_file)
+ rustg_file_write(json_encode(current_profile_data), prof_file)
rustg_file_write(current_sendmaps_data, sendmaps_file)
write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
diff --git a/monkestation/code/datums/announcers/vethday.dm b/monkestation/code/datums/announcers/vethday.dm
deleted file mode 100644
index ff8a45265113..000000000000
--- a/monkestation/code/datums/announcers/vethday.dm
+++ /dev/null
@@ -1,34 +0,0 @@
-/datum/centcom_announcer/vethday
- welcome_sounds = list('monkestation/sound/ai/vethbirthday/welcome/ccveth.ogg')
-
- alert_sounds = list('monkestation/sound/ai/vethbirthday/alerts/chenAlerts5.ogg',
- 'monkestation/sound/ai/vethbirthday/alerts/fortuneMiaow.ogg',
- 'monkestation/sound/ai/vethbirthday/alerts/mpg40Cakes.ogg',
- 'monkestation/sound/ai/vethbirthday/alerts/mpg500rods.ogg',
- 'monkestation/sound/ai/vethbirthday/alerts/mpgStartRoleplaying.ogg',
- 'monkestation/sound/ai/vethbirthday/alerts/ookJpegs.ogg',
- 'monkestation/sound/ai/vethbirthday/alerts/sneakyBonkNoisesHere.ogg',
- 'monkestation/sound/ai/vethbirthday/alerts/sneakyListenup.ogg')
-
- command_report_sounds = list('monkestation/sound/ai/vethbirthday/commandreport/chenCommandreport1.ogg',
- 'monkestation/sound/ai/vethbirthday/commandreport/chenCommandreport2.ogg',
- 'monkestation/sound/ai/vethbirthday/commandreport/abCentcomMessage.ogg')
-
- event_sounds = list(ANNOUNCER_AIMALF = 'monkestation/sound/ai/vethbirthday/sneakyAimalf.ogg',
- ANNOUNCER_ALIENS = 'monkestation/sound/ai/vethbirthday/abAliens.ogg',
- ANNOUNCER_ANIMES = 'monkestation/sound/ai/vethbirthday/sneakyAnimes.ogg',
- ANNOUNCER_GRANOMALIES = 'monkestation/sound/ai/vethbirthday/abGravAnom.ogg',
- ANNOUNCER_INTERCEPT = 'monkestation/sound/ai/vethbirthday/abEnemyCommunications.ogg',
- ANNOUNCER_IONSTORM = 'monkestation/sound/ai/vethbirthday/abIonStorm.ogg',
- ANNOUNCER_METEORS = 'monkestation/sound/ai/vethbirthday/abMeteors.ogg',
- ANNOUNCER_OUTBREAK5 = 'monkestation/sound/ai/vethbirthday/vethBiohazard5.ogg',
- ANNOUNCER_OUTBREAK7 = 'monkestation/sound/ai/vethbirthday/chenVirus.ogg',
- ANNOUNCER_POWEROFF = 'monkestation/sound/ai/vethbirthday/chenPoweroff.ogg',
- ANNOUNCER_POWERON = 'monkestation/sound/ai/vethbirthday/poobsPowerOn.ogg',
- ANNOUNCER_RADIATION = 'monkestation/sound/ai/vethbirthday/chenRadiation.ogg',
- ANNOUNCER_SHUTTLECALLED = 'monkestation/sound/ai/vethbirthday/abShuttleCalled.ogg',
- ANNOUNCER_SHUTTLEDOCK = 'monkestation/sound/ai/vethbirthday/abShuttleDocked.ogg',
- ANNOUNCER_SHUTTLERECALLED = 'monkestation/sound/ai/vethbirthday/abShuttleRecalled.ogg',
- ANNOUNCER_SPANOMALIES = 'monkestation/sound/ai/vethbirthday/chenSpanomalies.ogg')
-
-
diff --git a/monkestation/code/datums/brain_damage/magic.dm b/monkestation/code/datums/brain_damage/magic.dm
index 83c591314bd6..2ced19ca79ca 100644
--- a/monkestation/code/datums/brain_damage/magic.dm
+++ b/monkestation/code/datums/brain_damage/magic.dm
@@ -1,91 +1,70 @@
-/datum/brain_trauma/magic/stalker
- name = "Stalking Phantom"
- desc = "Patient is stalked by a phantom only they can see."
- scan_desc = "extra-sensory paranoia"
- gain_text = span_warning("You feel like something wants to kill you...")
- lose_text = span_notice("You no longer feel eyes on your back.")
- var/max_stalkers = 1
- var/list/obj/effect/client_image_holder/stalker_phantom/stalkers = list()
- var/close_stalker = FALSE //For heartbeat
+/datum/brain_trauma/magic/stalker_multiple
+ name = "Stalking Phantoms"
+ desc = "Patient is stalked by multiple phantoms only they can see."
+ scan_desc = "extra-EXTRA-sensory paranoia"
+ gain_text = span_warning("You feel like the gods have released the hounds...")
+ lose_text = span_notice("You no longer feel the wrath of the gods watching you.")
-/datum/brain_trauma/magic/stalker/Destroy()
- QDEL_LIST(stalkers)
- return ..()
+ var/list/stalkers = list()
-/datum/brain_trauma/magic/stalker/on_gain()
- create_stalkers()
- return ..()
+ var/close_stalker = FALSE //For heartbeat
-/datum/brain_trauma/magic/stalker/on_lose()
- QDEL_LIST(stalkers)
+/datum/brain_trauma/magic/stalker_multiple/Destroy()
+ for (var/stalker in stalkers)
+ stalkers -= stalker
+ qdel(stalker)
return ..()
-/datum/brain_trauma/magic/stalker/on_life(seconds_per_tick, times_fired)
- . = ..()
- if(owner.stat != CONSCIOUS || !isturf(owner.loc))
- QDEL_LIST(stalkers)
- return
-
- var/any_stalkers_close = FALSE
- for(var/obj/effect/client_image_holder/stalker_phantom/stalker as anything in stalkers)
- if(QDELETED(stalker))
- continue
- if(stalk_tick(stalker, seconds_per_tick))
- any_stalkers_close ||= (get_dist(owner, stalker) <= 8)
- CHECK_TICK
- if(any_stalkers_close)
- if(!close_stalker)
- var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE)
- owner.playsound_local(owner, slowbeat, vol = 40, vary = FALSE, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
- close_stalker = TRUE
- else if(close_stalker)
- owner.stop_sound_channel(CHANNEL_HEARTBEAT)
- close_stalker = FALSE
-
- create_stalkers()
+/datum/brain_trauma/magic/stalker_multiple/on_gain()
+ create_stalker_multiple(10)
+ return ..()
-/datum/brain_trauma/magic/stalker/proc/create_single_stalker(turf/stalker_source)
- if(!stalker_source)
- stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, 12), owner.z) //random corner
+/datum/brain_trauma/magic/stalker_multiple/proc/create_stalker()
+ var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, -6, 0, 6, 12), owner.z) //random corner
var/obj/effect/client_image_holder/stalker_phantom/stalker = new(stalker_source, owner)
- RegisterSignal(stalker, COMSIG_QDELETING, PROC_REF(on_phantom_destroyed))
stalkers += stalker
+ stalker.host = src
-/datum/brain_trauma/magic/stalker/proc/create_stalkers()
- if(!isturf(owner?.loc))
- return
- var/amount_to_create = max_stalkers - length(stalkers)
- if(amount_to_create <= 0)
- return
- var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, 12), owner.z)
- for(var/i = 1 to amount_to_create)
- create_single_stalker(stalker_source)
+/datum/brain_trauma/magic/stalker_multiple/proc/create_stalker_multiple(count)
+ var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, -6, 0, 6, 12), owner.z) //random corner
-/datum/brain_trauma/magic/stalker/proc/on_phantom_destroyed(obj/effect/client_image_holder/stalker_phantom/source)
- SIGNAL_HANDLER
- UnregisterSignal(source, COMSIG_QDELETING)
- stalkers -= source
+ for (var/x = 0; x < count; x++)
+ var/obj/effect/client_image_holder/stalker_phantom/stalker = new(stalker_source, owner)
+ stalkers += stalker
+ stalker.host = src
-/datum/brain_trauma/magic/stalker/proc/stalk_tick(obj/effect/client_image_holder/stalker_phantom/stalker, seconds_per_tick)
- if(QDELETED(owner) || !isturf(owner.loc) || !isturf(stalker.loc) || owner.z != stalker.z)
+/datum/brain_trauma/magic/stalker_multiple/on_lose()
+ for (var/stalker in stalkers)
+ stalkers -= stalker
qdel(stalker)
- return FALSE
- if(get_dist(owner, stalker) <= 1)
- playsound(owner, 'sound/magic/demon_attack1.ogg', vol = 50)
- owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_userdanger("Ghostly claws tear your body apart!"))
- owner.take_bodypart_damage(rand(20, 45), wound_bonus = CANT_WOUND)
- else if(SPT_PROB(30, seconds_per_tick))
- var/turf/next_step = get_step_towards(stalker, owner)
- if(!isturf(next_step) || QDELING(next_step))
+ return ..()
+
+/datum/brain_trauma/magic/stalker_multiple/on_life(seconds_per_tick, times_fired)
+ // Dead and unconscious people are not interesting to the psychic stalker.
+ if(owner.stat != CONSCIOUS)
+ return
+
+ // Not even nullspace will keep it at bay.
+ for (var/obj/effect/client_image_holder/stalker_phantom/stalker in stalkers)
+ if(!stalker || !stalker.loc || stalker.z != owner.z)
+ stalkers -= stalker
qdel(stalker)
- return FALSE
- stalker.forceMove(next_step)
- return TRUE
+ create_stalker()
-/datum/brain_trauma/magic/stalker/multiple
- name = "Stalking Phantoms"
- desc = "Patient is stalked by multiple phantoms only they can see."
- scan_desc = "extra-EXTRA-sensory paranoia"
- gain_text = span_warning("You feel like the gods have released the hounds...")
- lose_text = span_notice("You no longer feel the wrath of the gods watching you.")
- max_stalkers = 10
+ for (var/obj/effect/client_image_holder/stalker_phantom/stalker in stalkers)
+ if(get_dist(owner, stalker) <= 1)
+ playsound(owner, 'sound/magic/demon_attack1.ogg', 10)
+ owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_userdanger("Ghostly claws tear your body apart!"))
+ owner.take_bodypart_damage(rand(20, 45), wound_bonus=CANT_WOUND)
+ else if(SPT_PROB(30, seconds_per_tick))
+ stalker.forceMove(get_step_towards(stalker, owner))
+ if(get_dist(owner, stalker) <= 8)
+ if(!close_stalker)
+ var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE)
+ owner.playsound_local(owner, slowbeat, 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE)
+ close_stalker = TRUE
+ else
+ if(close_stalker)
+ owner.stop_sound_channel(CHANNEL_HEARTBEAT)
+ close_stalker = FALSE
+ ..()
diff --git a/monkestation/code/datums/keybinding/living.dm b/monkestation/code/datums/keybinding/living.dm
index df0d3db23caf..3cb95168c68a 100644
--- a/monkestation/code/datums/keybinding/living.dm
+++ b/monkestation/code/datums/keybinding/living.dm
@@ -100,19 +100,3 @@
/datum/keybinding/living/pixel_shift/up(client/user)
. = ..()
SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_PIXEL_SHIFT_UP)
-
-/datum/keybinding/living/interaction_toggle_wield
- hotkey_keys = list("ShiftX")
- name = "keybinding_living_toggle_wield"
- full_name = "Wield"
- description = "Wield an object in two hands, such as a gun."
- keybind_signal = COMSIG_KB_LIVING_TOGGLE_WIELD
-
-/datum/keybinding/living/interaction_toggle_wield/down(client/user)
- . = ..()
- if(.)
- return
- var/mob/mob = user.mob
- var/obj/item/item = mob?.get_active_held_item()
- if(item?.GetComponent(/datum/component/two_handed)) // does our active item have a two_handed component? if so let's ctrl click it!
- item.CtrlClick(mob)
diff --git a/monkestation/code/datums/stamina_container.dm b/monkestation/code/datums/stamina_container.dm
index 29dd479f6fff..28a3c9aa76ce 100644
--- a/monkestation/code/datums/stamina_container.dm
+++ b/monkestation/code/datums/stamina_container.dm
@@ -75,13 +75,11 @@
COOLDOWN_START(src, stamina_grace_period, time)
///Adjust stamina by an amount.
-/datum/stamina_container/proc/adjust(amt as num, forced, base_modify = FALSE)
+/datum/stamina_container/proc/adjust(amt as num, forced)
if((!amt || !COOLDOWN_FINISHED(src, stamina_grace_period)) && !forced)
return
///Our parent might want to fuck with these numbers
var/modify = parent.pre_stamina_change(amt, forced)
- if(base_modify)
- modify = amt
current = round(clamp(current + modify, 0, maximum), DAMAGE_PRECISION)
update(1)
if((amt < 0) && is_regenerating)
diff --git a/monkestation/code/datums/station_traits/negative_traits.dm b/monkestation/code/datums/station_traits/negative_traits.dm
index 0e31a8ba8144..83daa150e2a9 100644
--- a/monkestation/code/datums/station_traits/negative_traits.dm
+++ b/monkestation/code/datums/station_traits/negative_traits.dm
@@ -5,14 +5,3 @@
show_in_report = TRUE
report_message = "The Clown Planet has discovered a weakness in the ID scanners of specific airlocks."
trait_to_give = STATION_TRAIT_CLOWN_BRIDGE
-
-/datum/station_trait/overflow_job_bureaucracy/proc/set_overflow_job_override(datum/source)
- SIGNAL_HANDLER
- var/datum/job/picked_job
- var/list/possible_jobs = SSjob.joinable_occupations.Copy()
- while(length(possible_jobs) && !picked_job?.allow_overflow)
- picked_job = pick_n_take(possible_jobs)
- if(!picked_job)
- CRASH("Failed to find valid job to pick for overflow!")
- chosen_job_name = lowertext(picked_job.title) // like Chief Engineers vs like chief engineers
- SSjob.set_overflow_role(picked_job.type)
diff --git a/monkestation/code/datums/station_traits/neutral_traits.dm b/monkestation/code/datums/station_traits/neutral_traits.dm
index 2a68afb010c6..033392f10fcc 100644
--- a/monkestation/code/datums/station_traits/neutral_traits.dm
+++ b/monkestation/code/datums/station_traits/neutral_traits.dm
@@ -29,17 +29,3 @@
/datum/station_trait/announcement_dagoth/New()
. = ..()
SSstation.announcer = /datum/centcom_announcer/dagoth
-
-/datum/station_trait/announcement_veth_birthday
- name = "Announcement Veth's Birthday"
- trait_type = STATION_TRAIT_NEUTRAL
- weight = 0
- show_in_report = TRUE
- report_message = "It's my birthday hehe"
- blacklist = list(/datum/station_trait/announcement_medbot, /datum/station_trait/birthday, /datum/station_trait/announcement_duke, /datum/station_trait/announcement_dagoth, /datum/station_trait/announcement_intern)
-
-/datum/station_trait/announcement_veth_birthday/New()
- . = ..()
- SSstation.announcer = /datum/centcom_announcer/vethday
-
-
diff --git a/monkestation/code/game/machinery/computer/cloning.dm b/monkestation/code/game/machinery/computer/cloning.dm
index 12ce94de0135..fcd93b7712f6 100644
--- a/monkestation/code/game/machinery/computer/cloning.dm
+++ b/monkestation/code/game/machinery/computer/cloning.dm
@@ -529,10 +529,11 @@
if(ishuman(mob_occupant))
dna = C.has_dna()
+ var/mob/living/carbon/human/human_occupant = mob_occupant
var/obj/item/card/id/I = C.get_idcard(TRUE)
if(I)
has_bank_account = I.registered_account
- if(!istype(dna) || HAS_TRAIT(mob_occupant, TRAIT_NO_DNA_COPY))
+ if(!istype(dna) || (NO_DNA_COPY in human_occupant.dna.species.species_traits))
scantemp = "
Unable to locate valid genetic data."
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
return
@@ -576,7 +577,7 @@
R.fields["UE"] = dna.unique_enzymes
R.fields["UI"] = dna.unique_identity
R.fields["SE"] = dna.mutation_index
- R.fields["blood_type"] = dna.human_blood_type
+ R.fields["blood_type"] = dna.blood_type
R.fields["features"] = dna.features
R.fields["factions"] = mob_occupant.faction
R.fields["quirks"] = list()
diff --git a/monkestation/code/game/machinery/exp_cloner.dm b/monkestation/code/game/machinery/exp_cloner.dm
index 1dd46217facd..46bb81111d4c 100644
--- a/monkestation/code/game/machinery/exp_cloner.dm
+++ b/monkestation/code/game/machinery/exp_cloner.dm
@@ -404,6 +404,6 @@
temp = "
Cloning cycle already in progress."
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
else
- pod.growclone(mob_occupant.real_name, dna.unique_identity, dna.mutation_index, null, dna.human_blood_type, clone_species, dna.features, mob_occupant.faction)
+ pod.growclone(mob_occupant.real_name, dna.unique_identity, dna.mutation_index, null, dna.blood_type, clone_species, dna.features, mob_occupant.faction)
temp = "[mob_occupant.real_name] =>
Cloning data sent to pod."
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm
index e205fb74ded6..9b3640913404 100644
--- a/monkestation/code/game/objects/items/choice_beacon.dm
+++ b/monkestation/code/game/objects/items/choice_beacon.dm
@@ -37,8 +37,7 @@
/mob/living/basic/pet/dog/pug,
/mob/living/basic/pet/dog/bullterrier,
/mob/living/basic/lizard,
- /mob/living/basic/ant,
- /mob/living/simple_animal/pet/hamster
+ /mob/living/basic/ant
)
for(var/mob/living/basic_mob as anything in selectable_pets)
diff --git a/monkestation/code/game/objects/items/circuitboards/machine_circuitboards.dm b/monkestation/code/game/objects/items/circuitboards/machine_circuitboards.dm
index ee3dd22d6f44..ffc5fe574103 100644
--- a/monkestation/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/monkestation/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -95,17 +95,10 @@
/obj/item/circuitboard/machine/composters
name = "NT-Brand Auto Composter (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_SERVICE
+ greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+ desc = "Comes with a small amount solder of arranged in the corner: \"If you can read this, you're too close.\""
build_path = /obj/machinery/composters
req_components = list(
/datum/stock_part/matter_bin = 1,
/datum/stock_part/manipulator = 1,
)
-
-/obj/item/circuitboard/machine/splicer
- name = "Splicer (Machine Board)"
- greyscale_colors = CIRCUIT_COLOR_SERVICE
- build_path = /obj/machinery/splicer
- req_components = list(
- /datum/stock_part/manipulator = 1,
- )
diff --git a/monkestation/code/game/objects/items/storage/boxes.dm b/monkestation/code/game/objects/items/storage/boxes.dm
index 06eb721945d2..841d07c1f004 100644
--- a/monkestation/code/game/objects/items/storage/boxes.dm
+++ b/monkestation/code/game/objects/items/storage/boxes.dm
@@ -24,31 +24,3 @@
/obj/item/storage/fancy/popsiclestick_pack/Initialize(mapload)
. = ..()
atom_storage.set_holdable(list(/obj/item/popsicle_stick))
-
-/obj/item/storage/box/pillbottles/psych_pills
- name = "Box of psychiatric pills bottles"
- desc = "A box full of pills bottles for various psychiartic uses"
-
-/obj/item/storage/box/pillbottles/psych_pills/PopulateContents()
- var/static/items_inside = list(
- /obj/item/storage/pill_bottle/happinesspsych = 1,
- /obj/item/storage/pill_bottle/lsdpsych = 1,
- /obj/item/storage/pill_bottle/mannitol = 1,
- /obj/item/storage/pill_bottle/paxpsych = 1,
- /obj/item/storage/pill_bottle/psicodine = 1,
- )
- generate_items_inside(items_inside,src)
-
-/obj/item/storage/box/nanitecontrol
- name = "Nanite Controller Box"
- illustration = "disk_kit"
-
-/obj/item/storage/box/nanitecontrol/PopulateContents()
- new /obj/item/nanite_remote(src)
- new /obj/item/nanite_remote(src)
- new /obj/item/nanite_remote(src)
- new /obj/item/nanite_scanner(src)
- new /obj/item/nanite_scanner(src)
- new /obj/item/nanite_scanner(src)
- ///obj/item/nanite_injector(src)
- //coded out as its been on blueshift and noones had issues with it but there probably should be a discussion before added everywhere.
diff --git a/monkestation/code/modules/a_medical_day/internal_bleeding.dm b/monkestation/code/modules/a_medical_day/internal_bleeding.dm
deleted file mode 100644
index aa6db29e32e1..000000000000
--- a/monkestation/code/modules/a_medical_day/internal_bleeding.dm
+++ /dev/null
@@ -1,49 +0,0 @@
-/datum/wound_pregen_data/internal_bleeding
- abstract = FALSE
- wound_path_to_generate = /datum/wound/bleed_internal
- ignore_cannot_bleed = FALSE
- required_limb_biostate = BIO_BLOODED
- required_wounding_types = list(WOUND_BLUNT, WOUND_SLASH, WOUND_PIERCE)
- threshold_minimum = 45
-
-/datum/wound/bleed_internal
- name = "Internal Bleeding"
- desc = "The patient is bleeding internally, causing severe pain and difficulty breathing."
- treat_text = "Surgical repair of the affected vein is necessary."
- treat_text_short = "Surgical repair required."
- examine_desc = ""
- scar_keyword = ""
- severity = WOUND_SEVERITY_MODERATE
- simple_treat_text = "Surgery."
- homemade_treat_text = "Taking a
blood clotting pill may help slow the bleeding, \
- or an
iron supplement to help your body recover."
- processes = TRUE
- wound_flags = NONE
- regen_ticks_needed = 120 //around 4 minutes
- /// How much blood lost per life tick, gets modified by severity.
- var/bleed_amount = 0.25
- /// Cooldown between when the wound can be allowed to worsen
- COOLDOWN_DECLARE(worsen_cd)
-
-/datum/wound/bleed_internal/get_self_check_description(mob/user)
- return span_warning("You can see dark bruising.") // same as rib fracture!
-
-/datum/wound/bleed_internal/handle_process(seconds_per_tick, times_fired)
- . = ..()
- regen_ticks_current++
- if(!victim || victim.stat == DEAD || HAS_TRAIT(victim, TRAIT_STASIS) || !victim.needs_heart())
- return
- victim.bleed(min(bleed_amount * severity * seconds_per_tick, 3))
-
-/datum/wound/bleed_internal/wound_injury(datum/wound/old_wound, attack_direction)
- COOLDOWN_START(src, worsen_cd, 5 SECONDS)
-
-/datum/wound/bleed_internal/receive_damage(wounding_type, wounding_dmg, wound_bonus, attack_direction, damage_source)
- if(wounding_type == WOUND_BURN || wound_bonus == CANT_WOUND)
- return
- if(!COOLDOWN_FINISHED(src, worsen_cd))
- return
- if(wounding_dmg + wound_bonus + rand(-10, 30) - victim.getarmor(limb, WOUND) < 45)
- return
- severity = min(severity + 1, WOUND_SEVERITY_CRITICAL)
- COOLDOWN_START(src, worsen_cd, 6 SECONDS)
diff --git a/monkestation/code/modules/a_medical_day/lungless.dm b/monkestation/code/modules/a_medical_day/lungless.dm
deleted file mode 100644
index 3611d366aa00..000000000000
--- a/monkestation/code/modules/a_medical_day/lungless.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-/datum/status_effect/lungless
- id = "no_lungs"
- alert_type = null
- duration = -1
- tick_interval = -1
-
-/datum/status_effect/lungless/on_apply()
- if(!iscarbon(owner))
- return FALSE
- var/mob/living/carbon/carbon_owner = owner
- if(isnull(carbon_owner.dna?.species?.mutantlungs))
- return FALSE
-
- RegisterSignal(owner, COMSIG_CARBON_ATTEMPT_BREATHE, PROC_REF(block_breath))
- RegisterSignal(owner, COMSIG_SPECIES_GAIN, PROC_REF(check_new_species))
- return TRUE
-
-/datum/status_effect/lungless/on_remove()
- UnregisterSignal(owner, list(COMSIG_CARBON_ATTEMPT_BREATHE, COMSIG_SPECIES_GAIN))
-
-/datum/status_effect/lungless/proc/block_breath(...)
- SIGNAL_HANDLER
- owner.apply_damage(HUMAN_MAX_OXYLOSS, OXY)
- return BREATHE_SKIP_BREATH
-
-/datum/status_effect/lungless/proc/check_new_species(...)
- SIGNAL_HANDLER
- var/mob/living/carbon/carbon_owner = owner
- if(isnull(carbon_owner.dna?.species?.mutantlungs))
- qdel(src)
diff --git a/monkestation/code/modules/a_medical_day/surgery.dm b/monkestation/code/modules/a_medical_day/surgery.dm
deleted file mode 100644
index 90ca00ff3327..000000000000
--- a/monkestation/code/modules/a_medical_day/surgery.dm
+++ /dev/null
@@ -1,121 +0,0 @@
-/datum/surgery_step/heal/proc/get_perfect_information(mob/user, mob/target)
- if(issilicon(user))
- return TRUE
- if(user.is_holding_item_of_type(/obj/item/healthanalyzer))
- return TRUE
- for(var/obj/machinery/computer/puter in range(2, target))
- if(istype(puter, /obj/machinery/computer/operating))
- var/obj/machinery/computer/operating/op_comp = puter
- if(op_comp.table?.patient == target)
- return TRUE
- if(istype(puter, /obj/machinery/computer/vitals_reader))
- var/obj/machinery/computer/vitals_reader/vr_comp = puter
- if(vr_comp.patient == target)
- return TRUE
- // melbert todo : add modsuit health analyzer to this
- return FALSE
-
-/datum/surgery/repair_broken_rib
- name = "Repair fractured rib (hairline)"
- surgery_flags = SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB | SURGERY_REQUIRES_REAL_LIMB
- targetable_wound = /datum/wound/blunt/bone/rib_break
- possible_locs = list(
- BODY_ZONE_CHEST,
- )
- steps = list(
- /datum/surgery_step/incise,
- /datum/surgery_step/retract_skin,
- /datum/surgery_step/clamp_bleeders,
- /datum/surgery_step/repair_bone_hairline,
- /datum/surgery_step/close,
- )
-
-/// Repair internal bleeding
-/datum/surgery/internal_bleeding
- name = "Repair Internal Bleeding"
- surgery_flags = SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB | SURGERY_REQUIRES_REAL_LIMB
- targetable_wound = /datum/wound/bleed_internal
- target_mobtypes = list(/mob/living/carbon)
- possible_locs = list(
- BODY_ZONE_R_ARM,
- BODY_ZONE_L_ARM,
- BODY_ZONE_R_LEG,
- BODY_ZONE_L_LEG,
- BODY_ZONE_CHEST,
- BODY_ZONE_HEAD,
- )
- steps = list(
- /datum/surgery_step/incise,
- /datum/surgery_step/retract_skin,
- /datum/surgery_step/clamp_bleeders,
- /datum/surgery_step/repair_veins,
- /datum/surgery_step/close,
- )
-
-/datum/surgery_step/repair_veins
- name = "repair arterial bleeding (hemostat/blood filter)"
- implements = list(
- TOOL_HEMOSTAT = 100,
- TOOL_BLOODFILTER = 100,
- TOOL_WIRECUTTER = 40,
- /obj/item/stack/sticky_tape/surgical = 30,
- /obj/item/stack/cable_coil = 10,
- /obj/item/stack/sticky_tape = 10,
- )
- preop_sound = 'sound/surgery/hemostat1.ogg'
- success_sound = 'sound/surgery/organ2.ogg'
- time = 6 SECONDS
- repeatable = TRUE
- pain_amount = 12
-
-/datum/surgery_step/repair_veins/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- var/in_where = "[target]'s [parse_zone(target_zone)]"
- display_results(
- user,
- target,
- span_notice("You begin repair the arteries in [in_where]..."),
- span_notice("[user] begins to repair the arteries in [in_where] with [tool]."),
- span_notice("[user] begins to repair the arteries in [in_where]."),
- )
- display_pain(
- target,
- "You feel a horrible stabbing pain in your [parse_zone(target_zone)]!",
- target_zone = target_zone,
- )
-
-/datum/surgery_step/repair_veins/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
- var/in_where = "[target]'s [parse_zone(target_zone)]"
- if((surgery.operated_wound?.severity - 1) <= WOUND_SEVERITY_TRIVIAL)
- qdel(surgery.operated_wound)
- display_results(
- user,
- target,
- span_green("You've finishes repairing all the arterial damage in [in_where]."),
- span_green("[user] finishes repaiing all the arterial damage in [in_where] with [tool]!"),
- span_green("[user] finishes repaiing all the arterial damage in [in_where]!"),
- )
- repeatable = FALSE
- return ..()
-
- surgery.operated_wound.severity--
- display_results(
- user,
- target,
- span_notice("You successfully repair some of the arteries in [in_where] with [tool]."),
- span_notice("[user] successfully repairs some of the arteries in [in_where] with [tool]!"),
- span_notice("[user] successfully repairs some of the arteries in [in_where]!"),
- )
- target.apply_damage(3, BRUTE, surgery.operated_bodypart, wound_bonus = CANT_WOUND, attacking_item = tool)
- return ..()
-
-/datum/surgery_step/repair_veins/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob = 0)
- var/in_where = "[target]'s [parse_zone(target_zone)]"
- display_results(
- user,
- target,
- span_warning("You tear some of the arteries in [in_where]!"),
- span_warning("[user] tears some of the arteries in [in_where] with [tool]!"),
- span_warning("[user] tears some of the arteries in [in_where]!"),
- )
- target.apply_damage(rand(4, 8), BRUTE, surgery.operated_bodypart, wound_bonus = 10, sharpness = SHARP_EDGED, attacking_item = tool)
- return FALSE
diff --git a/monkestation/code/modules/a_medical_day/thermics.dm b/monkestation/code/modules/a_medical_day/thermics.dm
deleted file mode 100644
index 9c4af98dd405..000000000000
--- a/monkestation/code/modules/a_medical_day/thermics.dm
+++ /dev/null
@@ -1,94 +0,0 @@
-/// Hypo and Hyperthermia status effects.
-/datum/status_effect/thermia
- id = "thermia"
- alert_type = null
- status_type = STATUS_EFFECT_REPLACE
- tick_interval = 3 SECONDS
- processing_speed = STATUS_EFFECT_NORMAL_PROCESS
- /// Flat penalty of consciousness applied over time
- var/consciousness_mod = 0
- var/max_consciousness_mod = 0
- var/datum/weakref/alert_ref
- COOLDOWN_DECLARE(update_cd)
-
-/datum/status_effect/thermia/on_apply()
-
- give_alert()
- COOLDOWN_START(src, update_cd, 6 SECONDS)
- return TRUE
-
-/datum/status_effect/thermia/on_remove()
- owner.clear_alert(ALERT_TEMPERATURE)
- owner.clear_mood_event(id)
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/cold)
-
-/datum/status_effect/thermia/tick(seconds_between_ticks)
- if(!COOLDOWN_FINISHED(src, update_cd))
- return
-
- owner.adjust_pain_shock(1 * (consciousness_mod * 0.1))
-
- COOLDOWN_START(src, update_cd, 9 SECONDS)
-
-/// Manually applying alerts, rather than using the api for it, becuase we need to apply "severity" argument
-/datum/status_effect/thermia/proc/give_alert()
- return
-
-/datum/status_effect/thermia/hypo
- var/slowdown_mod
-
-/datum/status_effect/thermia/hypo/on_creation(mob/living/new_owner, slowdown_mod = 1)
- src.slowdown_mod = slowdown_mod
- return ..()
-
-/datum/status_effect/thermia/hypo/on_apply()
- . = ..()
- owner.add_mood_event(id, /datum/mood_event/cold)
- // Apply cold slow down
- owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/cold, multiplicative_slowdown = slowdown_mod)
-
-/datum/status_effect/thermia/hypo/one
- consciousness_mod = 5
-
-/datum/status_effect/thermia/hypo/one/give_alert()
- return owner.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 1)
-
-/datum/status_effect/thermia/hypo/two
- consciousness_mod = 10
-
-/datum/status_effect/thermia/hypo/two/give_alert()
- return owner.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 2)
-
-/datum/status_effect/thermia/hypo/three
- consciousness_mod = 20
- max_consciousness_mod = 30
-
-/datum/status_effect/thermia/hypo/three/give_alert()
- return owner.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/cold, 3)
-
-/datum/status_effect/thermia/hyper
-
-/datum/status_effect/thermia/hyper/on_apply()
- . = ..()
- owner.add_mood_event(id, /datum/mood_event/hot)
- //Remove any slowdown from the cold.
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/cold)
-
-/datum/status_effect/thermia/hyper/one
- consciousness_mod = 5
-
-/datum/status_effect/thermia/hyper/one/give_alert()
- return owner.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 1)
-
-/datum/status_effect/thermia/hyper/two
- consciousness_mod = 10
-
-/datum/status_effect/thermia/hyper/two/give_alert()
- return owner.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 2)
-
-/datum/status_effect/thermia/hyper/three
- consciousness_mod = 20
- max_consciousness_mod = 30
-
-/datum/status_effect/thermia/hyper/three/give_alert()
- return owner.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 3)
diff --git a/monkestation/code/modules/and_roll_credits/_credits.dm b/monkestation/code/modules/and_roll_credits/_credits.dm
deleted file mode 100644
index de37f7c4d0fe..000000000000
--- a/monkestation/code/modules/and_roll_credits/_credits.dm
+++ /dev/null
@@ -1,179 +0,0 @@
-#define CREDIT_ROLL_SPEED 9 SECONDS
-#define CREDIT_SPAWN_SPEED 1 SECONDS
-#define CREDIT_ANIMATE_HEIGHT (16 * world.icon_size)
-#define CREDIT_EASE_DURATION 2.2 SECONDS
-#define CREDITS_PATH "[global.config.directory]/contributors.dmi"
-
-/client/proc/RollCredits()
- set waitfor = FALSE
- if(!fexists(CREDITS_PATH))
- return
- LAZYINITLIST(credits)
- var/list/_credits = credits
- add_verb(src, /client/proc/ClearCredits)
- var/static/list/credit_order_for_this_round
- if(isnull(credit_order_for_this_round))
- SScredits.draft()
- SScredits.finalize()
- credit_order_for_this_round = list()
- credit_order_for_this_round += SScredits.episode_string
- credit_order_for_this_round += SScredits.producers_string
- credit_order_for_this_round += SScredits.disclaimers_string
- credit_order_for_this_round += SScredits.cast_string
- credit_order_for_this_round += "
The Admin Bus"
- var/list/admins = shuffle(SScredits.admin_pref_images)
-
- var/y_offset = 0
- var/admin_length = length(admins)
- for(var/i in 1 to admin_length)
- var/x_offset = -40
- for(var/b in 1 to 8)
- var/atom/movable/screen/map_view/char_preview/picked = pick_n_take(admins)
- if(!picked)
- break
- picked.pixel_x = x_offset
- picked.pixel_y = y_offset
- x_offset += 70
- credit_order_for_this_round += picked
-
- credit_order_for_this_round += "
Our Lovely Contributors"
- var/list/contributors = shuffle(SScredits.contributer_pref_images)
-
- var/contributors_length = length(contributors)
- for(var/i in 1 to contributors_length)
- var/x_offset = -40
- for(var/b in 1 to 8)
- if(b == 1)
- y_offset = 0
- var/atom/movable/screen/map_view/char_preview/picked = pick_n_take(contributors)
- if(!picked)
- break
- picked.pixel_x = x_offset
- picked.pixel_y = y_offset
- x_offset += 70
- credit_order_for_this_round += picked
-
- for(var/i in SScredits.major_event_icons)
- credit_order_for_this_round += i
- var/list/returned_images = SScredits.resolve_clients(SScredits.major_event_icons[i], i)
- for(var/y in 1 to length(returned_images))
- var/x_offset = -40
- for(var/b in 1 to 8)
- var/atom/movable/screen/map_view/char_preview/client_image = pick_n_take(returned_images)
- if(!client_image)
- break
- client_image.pixel_x = x_offset
- client_image.pixel_y = y_offset
- x_offset += 70
- credit_order_for_this_round += client_image
-
- var/count = 0
- for(var/I in credit_order_for_this_round)
- if(!credits)
- return
- if(istype(I, /obj/effect/title_card_object)) //huge image sleep
- sleep(CREDIT_SPAWN_SPEED * 3.3)
- count = 0
- if(count && !istype(I, /atom/movable/screen/map_view/char_preview))
- sleep(CREDIT_SPAWN_SPEED)
-
- _credits += new /atom/movable/screen/credit(null, I, src)
- if(istype(I, /atom/movable/screen/map_view/char_preview))
- count++
- if(count >= 8)
- count = 0
- sleep(CREDIT_SPAWN_SPEED)
- if(!istype(I, /atom/movable/screen/map_view/char_preview))
- sleep(CREDIT_SPAWN_SPEED)
- count = 0
- sleep(CREDIT_ROLL_SPEED - CREDIT_SPAWN_SPEED)
- remove_verb(src, /client/proc/ClearCredits)
-
-/client/proc/ClearCredits()
- set name = "Hide Credits"
- set category = "OOC"
- remove_verb(src, /client/proc/ClearCredits)
- QDEL_LIST(credits)
- credits = null
-
-/atom/movable/screen/credit
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- alpha = 0
- plane = SPLASHSCREEN_PLANE
- screen_loc = "3,1"
- var/client/parent
- var/matrix/target
-
-/atom/movable/screen/credit/Initialize(mapload, credited, client/P)
- . = ..()
- icon = CREDITS_PATH
- parent = P
- var/view = P?.view
- var/list/offsets = screen_loc_to_offset("3,1", view)
-
- if(istype(credited, /atom/movable/screen/map_view/char_preview))
- var/atom/movable/screen/map_view/char_preview/choice = credited
- choice.plane = plane
- choice.screen_loc = screen_loc
- choice.alpha = alpha
- maptext_width = choice.maptext_width
- maptext = choice.maptext
- appearance = choice.appearance
- screen_loc = offset_to_screen_loc(offsets[1] + choice.pixel_x, offsets[2] + choice.pixel_y)
- add_overlay(choice)
-
- if(istype(credited, /mutable_appearance))
- var/mutable_appearance/choice = credited
- choice.plane = plane
- choice.screen_loc = screen_loc
- choice.alpha = alpha
- maptext_width = choice.maptext_width
- maptext = choice.maptext
- appearance = choice.appearance
- screen_loc = offset_to_screen_loc(offsets[1] + choice.pixel_x, offsets[2] + choice.pixel_y)
- add_overlay(choice)
-
- if(istype(credited, /obj/effect/title_card_object))
- var/obj/effect/title_card_object/choice = credited
- choice.plane = plane
- choice.screen_loc = screen_loc
- choice.alpha = alpha
- maptext_width = choice.maptext_width
- maptext = choice.maptext
- appearance = choice.appearance
- screen_loc = offset_to_screen_loc(offsets[1] + choice.pixel_x, offsets[2] + choice.pixel_y)
- add_overlay(choice)
-
- if(istext(credited))
- maptext = MAPTEXT_PIXELLARI(credited)
- maptext_x = world.icon_size + 8
- maptext_y = (world.icon_size / 2) - 4
- maptext_width = world.icon_size * 12
- maptext_height = world.icon_size * 2
-
- var/matrix/M = matrix(transform)
- M.Translate(0, CREDIT_ANIMATE_HEIGHT)
- animate(src, transform = M, time = CREDIT_ROLL_SPEED)
- target = M
- animate(src, alpha = 255, time = CREDIT_EASE_DURATION, flags = ANIMATION_PARALLEL)
- addtimer(CALLBACK(src, PROC_REF(FadeOut)), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION)
- QDEL_IN(src, CREDIT_ROLL_SPEED)
- if(parent)
- parent.screen += src
-
-/atom/movable/screen/credit/Destroy()
- icon = null
- if(parent)
- parent.screen -= src
- LAZYREMOVE(parent.credits, src)
- parent = null
- return ..()
-
-/atom/movable/screen/credit/proc/FadeOut()
- animate(src, alpha = 0, transform = target, time = CREDIT_EASE_DURATION)
-
-#undef CREDIT_ANIMATE_HEIGHT
-#undef CREDIT_EASE_DURATION
-#undef CREDIT_ROLL_SPEED
-#undef CREDIT_SPAWN_SPEED
-#undef CREDITS_PATH
diff --git a/monkestation/code/modules/and_roll_credits/credits_subsystem.dm b/monkestation/code/modules/and_roll_credits/credits_subsystem.dm
deleted file mode 100644
index f3d4360f9ee4..000000000000
--- a/monkestation/code/modules/and_roll_credits/credits_subsystem.dm
+++ /dev/null
@@ -1,240 +0,0 @@
-SUBSYSTEM_DEF(credits)
- name = "Credits Screen Storage"
- flags = SS_NO_FIRE
- init_order = INIT_ORDER_CREDITS
-
- var/director = "Some monkey we found on the street"
- var/star = ""
- var/ss = ""
- var/list/disclaimers = list()
- var/list/datum/episode_name/episode_names = list()
-
- var/episode_name = ""
- var/episode_reason = ""
- var/producers_string = ""
- var/list/episode_string
- var/list/disclaimers_string
- var/list/cast_string
-
- //If any of the following five are modified, the episode is considered "not a rerun".
- var/customized_name = ""
- var/customized_star = ""
- var/customized_ss = ""
- var/rare_episode_name = FALSE
- var/theme = "NT"
-
- var/js_args = list()
-
- var/list/contributer_pref_images = list()
- var/list/admin_pref_images = list()
- var/list/major_event_icons = list()
- var/list/contributors = list()
-
-/datum/controller/subsystem/credits/Initialize()
- load_contributors()
- generate_pref_images()
- return SS_INIT_SUCCESS
-
-/datum/controller/subsystem/credits/proc/load_contributors()
- contributors = list()
- var/list/lines = world.file2list("[global.config.directory]/contributors.txt")
- for(var/line in lines)
- if(!length(line))
- continue
- if(findtextEx(line, "#", 1, 2))
- continue
- contributors |= line
-
-/datum/controller/subsystem/credits/proc/draft()
- draft_episode_names()
- draft_disclaimers()
- draft_caststring()
-
-/datum/controller/subsystem/credits/proc/finalize()
- finalize_name()
- finalize_episodestring()
- finalize_disclaimerstring()
-
-/datum/controller/subsystem/credits/proc/generate_pref_images()
-
- for(var/ckey in contributors)
- var/datum/client_interface/interface = new(ckey)
- var/datum/preferences/mocked = new(interface)
-
- var/mob/living/carbon/human/dummy/extra_tall/dummy = new
- dummy.appearance_flags &= ~TILE_BOUND
-
- var/atom/movable/screen/map_view/char_preview/appereance = new(null, mocked)
- appereance.update_body()
- appereance.maptext_width = 120
- appereance.maptext_y = -8
- appereance.maptext_x = -42
- appereance.maptext = "
[ckey]"
- contributer_pref_images += appereance
-
- for(var/ckey in GLOB.admin_datums)
- var/datum/client_interface/interface = new(ckey(ckey))
- var/datum/preferences/mocked = new(interface)
-
- var/mob/living/carbon/human/dummy/extra_tall/dummy = new
- dummy.appearance_flags &= ~TILE_BOUND
-
- var/atom/movable/screen/map_view/char_preview/appereance = new(null, mocked)
- appereance.update_body()
- appereance.maptext_width = 120
- appereance.maptext_x = -42
- appereance.maptext_y = -8
- appereance.maptext = "
[ckey]"
- admin_pref_images += appereance
-
-/datum/controller/subsystem/credits/proc/draft_star()
- var/mob/living/carbon/human/most_talked
- for(var/mob/living/carbon/human/H in GLOB.player_list)
- if(!H.ckey || H.stat == DEAD)
- continue
- if(!most_talked || H.talkcount > most_talked.talkcount)
- most_talked = H
- star = thebigstar(most_talked)
-
-
-/datum/controller/subsystem/credits/proc/finalize_name()
- if(customized_name)
- episode_name = customized_name
- return
- var/list/drafted_names = list()
- var/list/name_reasons = list()
- var/list/is_rare_assoc_list = list()
- for(var/datum/episode_name/N as anything in episode_names)
- drafted_names["[N.thename]"] = N.weight
- name_reasons["[N.thename]"] = N.reason
- is_rare_assoc_list["[N.thename]"] = N.rare
- episode_name = pick_weight(drafted_names)
- episode_reason = name_reasons[episode_name]
- if(is_rare_assoc_list[episode_name] == TRUE)
- rare_episode_name = TRUE
-
-/datum/controller/subsystem/credits/proc/finalize_episodestring()
- var/season = time2text(world.timeofday,"YY")
- var/episodenum = GLOB.round_id || 1
- episode_string = list("
SEASON [season] EPISODE [episodenum]")
- episode_string += "
[episode_name]"
-
-/datum/controller/subsystem/credits/proc/finalize_disclaimerstring()
- disclaimers_string = list()
- for(var/disclaimer in disclaimers)
- disclaimers_string += "
[disclaimer]"
-/datum/controller/subsystem/credits/proc/draft_disclaimers()
- disclaimers += "Filmed on Location at [station_name()].
"
- disclaimers += "Filmed with BYOND© cameras and lenses. Outer space footage provided by NASA.
"
- disclaimers += "Additional special visual effects by LUMMOX® JR. Motion Picture Productions.
"
- disclaimers += "Unofficially Sponsored by The United States Navy.
"
- disclaimers += "All rights reserved.
"
- disclaimers += "
"
- disclaimers += pick("All stunts were performed by underpaid and expendable interns. Do NOT try at home.
", "[director] does not endorse behaviour depicted. Attempt at your own risk.
")
- disclaimers += "This motion picture is (not) protected under the copyright laws of the United States and all countries throughout the universe"
- disclaimers += "Country of first publication: United States of America."
- disclaimers += "Any unauthorized exhibition, distribution, or copying of this picture or any part thereof (including soundtrack)"
- disclaimers += "is an infringement of the relevant copyright and will subject the infringer to civil liability and criminal prosecution."
- disclaimers += "The story, all names, characters, and incidents portrayed in this production are fictitious."
- disclaimers += "No identification with actual persons (living or deceased), places, buildings, and products is intended or should be inferred."
-
-/datum/controller/subsystem/credits/proc/draft_caststring()
- cast_string = list("
CAST:")
- var/cast_num = 0
- for(var/mob/living/carbon/human/H in GLOB.player_list)
- if(!H.ckey && !(H.stat == DEAD))
- continue
- var/assignment = H.get_assignment(if_no_id = "", if_no_job = "")
- cast_string += "
| [uppertext(H.mind.key)] | as | [H.real_name][assignment == "" ? "" : ", [assignment]"] |
"
- cast_num++
-
- for(var/mob/living/silicon/S in GLOB.silicon_mobs)
- if(!S.ckey)
- continue
- cast_string += "
[uppertext(S.mind.key)] as [S.name]"
- cast_num++
-
- if(!cast_num)
- cast_string += "
Nobody! | "
-
- var/list/corpses = list()
- for(var/mob/living/carbon/human/H in GLOB.dead_mob_list)
- if(!H.mind)
- continue
- if(H.real_name)
- corpses += H.real_name
- if(corpses.len)
- var/true_story_bro = "
[pick("BASED ON","INSPIRED BY","A RE-ENACTMENT OF")] [pick("A TRUE STORY","REAL EVENTS","THE EVENTS ABOARD [uppertext(station_name())]")]"
- cast_string += "
[true_story_bro]
In memory of those that did not make it.
[english_list(corpses)].
"
- cast_string += "