" break_counter++ diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index f5958a127f4..f708ec696e0 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -1,4 +1,5 @@ /obj/item/antag_spawner + abstract_type = /obj/item/antag_spawner throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm index b056ecbef30..febfa8758a4 100644 --- a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm +++ b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm @@ -2,6 +2,7 @@ icon = 'icons/obj/antags/abductor.dmi' lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi' + abstract_type = /obj/item/abductor /obj/item/proc/AbductorCheck(mob/user) if (HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING)) diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index 85fa4b53780..82b0120a7b6 100644 --- a/code/modules/antagonists/changeling/changeling_power.dm +++ b/code/modules/antagonists/changeling/changeling_power.dm @@ -3,6 +3,7 @@ */ /datum/action/changeling + abstract_type = /datum/action/changeling name = "Prototype Sting - Debug button, ahelp this" background_icon_state = "bg_changeling" overlay_icon_state = "bg_changeling_border" diff --git a/code/modules/antagonists/changeling/powers/mimic_voice.dm b/code/modules/antagonists/changeling/powers/mimic_voice.dm index 99f54304580..e1d895d2b14 100644 --- a/code/modules/antagonists/changeling/powers/mimic_voice.dm +++ b/code/modules/antagonists/changeling/powers/mimic_voice.dm @@ -8,11 +8,11 @@ req_human = TRUE // Fake Voice -/datum/action/changeling/mimicvoice/sting_action(mob/user) +/datum/action/changeling/mimicvoice/sting_action(mob/living/carbon/human/user) var/datum/antagonist/changeling/changeling = IS_CHANGELING(user) - if(changeling.mimicing) - changeling.mimicing = "" + if(user.override_voice) changeling.chem_recharge_slowdown -= 0.25 + user.override_voice = "" to_chat(user, span_notice("We return our vocal glands to their original position.")) return @@ -20,16 +20,16 @@ if(!mimic_voice) return ..() - changeling.mimicing = mimic_voice changeling.chem_recharge_slowdown += 0.25 + user.override_voice = mimic_voice to_chat(user, span_notice("We shape our glands to take the voice of [mimic_voice], this will slow down regenerating chemicals while active.")) to_chat(user, span_notice("Use this power again to return to our original voice and return chemical production to normal levels.")) return TRUE -/datum/action/changeling/mimicvoice/Remove(mob/user) +/datum/action/changeling/mimicvoice/Remove(mob/living/carbon/human/user) var/datum/antagonist/changeling/changeling = IS_CHANGELING(user) - if(changeling?.mimicing) - changeling.chem_recharge_slowdown = max(0, changeling.chem_recharge_slowdown - 0.25) - changeling.mimicing = "" + if(user.override_voice) + changeling?.chem_recharge_slowdown = max(0, changeling.chem_recharge_slowdown - 0.25) + user.override_voice = "" to_chat(user, span_notice("Our vocal glands return to their original position.")) . = ..() diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 028ba5aaa96..dbf97c2f6f4 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -11,6 +11,7 @@ //Parent to shields and blades because muh copypasted code. /datum/action/changeling/weapon + abstract_type = /datum/action/changeling/weapon name = "Organic Weapon" desc = "Go tell a coder if you see this" helptext = "Yell at Miauw and/or Perakp" @@ -87,6 +88,7 @@ //Parent to space suits and armor. /datum/action/changeling/suit + abstract_type = /datum/action/changeling/suit name = "Organic Suit" desc = "Go tell a coder if you see this" helptext = "Yell at Miauw and/or Perakp" diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm index 20519d2d8b7..81b62be3df7 100644 --- a/code/modules/antagonists/changeling/powers/transform.dm +++ b/code/modules/antagonists/changeling/powers/transform.dm @@ -9,6 +9,7 @@ /obj/item/clothing/glasses/changeling name = "flesh" + spawn_blacklisted = TRUE item_flags = DROPDEL //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -24,6 +25,7 @@ /obj/item/clothing/under/changeling name = "flesh" + spawn_blacklisted = TRUE item_flags = DROPDEL //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -39,6 +41,7 @@ /obj/item/clothing/suit/changeling name = "flesh" + spawn_blacklisted = TRUE allowed = list(/obj/item/changeling) item_flags = DROPDEL @@ -56,6 +59,7 @@ /obj/item/clothing/head/changeling name = "flesh" icon_state = null + spawn_blacklisted = TRUE item_flags = DROPDEL //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -71,6 +75,7 @@ /obj/item/clothing/shoes/changeling name = "flesh" + spawn_blacklisted = TRUE item_flags = DROPDEL //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -86,6 +91,7 @@ /obj/item/clothing/gloves/changeling name = "flesh" + spawn_blacklisted = TRUE item_flags = DROPDEL //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -101,6 +107,7 @@ /obj/item/clothing/mask/changeling name = "flesh" + spawn_blacklisted = TRUE item_flags = DROPDEL //ATTACK HAND IGNORING PARENT RETURN VALUE @@ -116,6 +123,7 @@ /obj/item/changeling name = "flesh" + spawn_blacklisted = TRUE slot_flags = ALL item_flags = DROPDEL diff --git a/code/modules/antagonists/heretic/magic/shadow_cloak.dm b/code/modules/antagonists/heretic/magic/shadow_cloak.dm index 0012495867a..825e1874c78 100644 --- a/code/modules/antagonists/heretic/magic/shadow_cloak.dm +++ b/code/modules/antagonists/heretic/magic/shadow_cloak.dm @@ -141,7 +141,7 @@ animate(cloak_image, alpha = 255, 0.2 SECONDS) owner.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, id, cloak_image) // Add the relevant traits and modifiers - owner.add_traits(list(TRAIT_UNKNOWN, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) + owner.add_traits(list(TRAIT_UNKNOWN_APPEARANCE, TRAIT_UNKNOWN_VOICE, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) owner.add_movespeed_modifier(/datum/movespeed_modifier/shadow_cloak) owner.add_actionspeed_modifier(/datum/actionspeed_modifier/shadow_cloak) // Register signals to cause effects @@ -157,7 +157,7 @@ owner.remove_alt_appearance(id) QDEL_NULL(cloak_image) // Remove traits and modifiers - owner.remove_traits(list(TRAIT_UNKNOWN, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) + owner.remove_traits(list(TRAIT_UNKNOWN_APPEARANCE, TRAIT_UNKNOWN_VOICE, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) owner.remove_movespeed_modifier(/datum/movespeed_modifier/shadow_cloak) owner.remove_actionspeed_modifier(/datum/actionspeed_modifier/shadow_cloak) // Clear signals diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm index 2300f2db041..97792dd3df7 100644 --- a/code/modules/antagonists/heretic/status_effects/buffs.dm +++ b/code/modules/antagonists/heretic/status_effects/buffs.dm @@ -346,11 +346,11 @@ alert_type = /atom/movable/screen/alert/status_effect/moon_grasp_hide /datum/status_effect/moon_grasp_hide/on_apply() - owner.add_traits(list(TRAIT_UNKNOWN, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) + owner.add_traits(list(TRAIT_UNKNOWN_APPEARANCE, TRAIT_UNKNOWN_VOICE, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) return TRUE /datum/status_effect/moon_grasp_hide/on_remove() - owner.remove_traits(list(TRAIT_UNKNOWN, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) + owner.remove_traits(list(TRAIT_UNKNOWN_APPEARANCE, TRAIT_UNKNOWN_VOICE, TRAIT_SILENT_FOOTSTEPS), TRAIT_STATUS_EFFECT(id)) /atom/movable/screen/alert/status_effect/moon_grasp_hide name = "Blessing of The Moon" diff --git a/code/modules/antagonists/ninja/ninja_stars.dm b/code/modules/antagonists/ninja/ninja_stars.dm index 2e5817f05df..07928907592 100644 --- a/code/modules/antagonists/ninja/ninja_stars.dm +++ b/code/modules/antagonists/ninja/ninja_stars.dm @@ -1,18 +1,48 @@ -/** - * # Ninja Throwing Star - * - * a throwing star which specifically makes sure you know it came from a real ninja. - * - * The most important item in the entire codebase, as without it we would all cease to exist. - * Inherits everything that makes it interesting the stamina throwing star, but the most - * important change made is that its name specifically has the prefix, 'ninja' in it. - * This provides the detective role with information to play off of by ensuring that his - * assumption that a space ninja is aboard the ship to be true when he find 20 of these in - * the captain's back. Along with this, its throwforce is 10 instead of the 5 of the stamina - * throwing star, meaning it'll do a little more damage than the stamina throwing star does as well. - * Changes to this item need to be approved by all maintainers, so if you do change it, make sure - * you go through the proper channels, lest you get permabanned. Do I make myself clear? - */ /obj/item/throwing_star/stamina/ninja - name = "ninja throwing star" - throwforce = 10 + name = "energy throwing star" + desc = "An evolution of the traditional steel shuriken, commonly used by Spider Clan initiates. \ + When thrown or embedded, its internal energy emitter releases an electromagnetic pulse." + icon_state = "eshuriken" + force = 8 + throwforce = 12 + armour_penetration = 75 + item_flags = DROPDEL + embed_type = /datum/embedding/throwing_star/stamina/energy + custom_materials = null + resistance_flags = FIRE_PROOF | ACID_PROOF | UNACIDABLE + +/obj/item/throwing_star/stamina/ninja/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_UNCATCHABLE, INNATE_TRAIT) + +/obj/item/throwing_star/stamina/ninja/on_thrown(mob/living/carbon/user, atom/target) + item_flags &= ~DROPDEL // Throwing = dropping = dropdel, not ideal. Remove it before that happens + return ..() + +/obj/item/throwing_star/stamina/ninja/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + . = ..() + item_flags |= DROPDEL // Just in case, re-apply drop del now + hit_atom.emp_act(EMP_HEAVY) + new /obj/effect/temp_visual/emp/pulse(get_turf(src)) + new /obj/effect/temp_visual/emp(get_turf(hit_atom)) + playsound(src, 'sound/effects/empulse.ogg', 60, TRUE, MEDIUM_RANGE_SOUND_EXTRARANGE) + visible_message("[src] emits an electromagnetic pulse upon impact!") + if(isturf(loc)) // if we didn't embed in anything, go away + qdel(src) + +/datum/embedding/throwing_star/stamina/energy + COOLDOWN_DECLARE(emp_cd) + +/datum/embedding/throwing_star/stamina/energy/on_successful_embed(mob/living/carbon/victim, obj/item/bodypart/target_limb) + COOLDOWN_START(src, emp_cd, 6 SECONDS) + parent.item_flags |= DROPDEL // Just in case again, re-apply drop del now + +/datum/embedding/throwing_star/stamina/energy/process_effect(seconds_per_tick) + if(!COOLDOWN_FINISHED(src, emp_cd)) + return + + owner.emp_act(EMP_LIGHT) + COOLDOWN_START(src, emp_cd, 6 SECONDS) + playsound(owner, 'sound/effects/empulse.ogg', 30, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + owner.show_message("[parent] flares brightly, releasing an electromagnetic pulse!", MSG_VISUAL) + new /obj/effect/temp_visual/emp(get_turf(owner)) diff --git a/code/modules/antagonists/paradox_clone/paradox_clone.dm b/code/modules/antagonists/paradox_clone/paradox_clone.dm index c5100bed01b..d009d9b5d48 100644 --- a/code/modules/antagonists/paradox_clone/paradox_clone.dm +++ b/code/modules/antagonists/paradox_clone/paradox_clone.dm @@ -8,9 +8,6 @@ suicide_cry = "THERE CAN BE ONLY ONE!!" preview_outfit = /datum/outfit/paradox_clone - ///Weakref to the mind of the original, the clone's target. - var/datum/weakref/original_ref - /datum/antagonist/paradox_clone/get_preview_icon() var/icon/final_icon = render_preview_outfit(preview_outfit) @@ -28,27 +25,27 @@ return clone_icon -/datum/antagonist/paradox_clone/Destroy() - original_ref = null - return ..() +/datum/antagonist/paradox_clone/proc/setup_clone(datum/mind/original_mind) + if(isnull(original_mind)) + CRASH("Tried to set up a paradox clone without an original mind!") -/datum/antagonist/paradox_clone/proc/setup_clone() - var/datum/mind/original_mind = original_ref?.resolve() - - var/datum/objective/assassinate/paradox_clone/kill = new + var/datum/objective/accept_no_substitutes/kill = new() kill.owner = owner - kill.target = original_mind - kill.update_explanation_text() + kill.set_target_name(original_mind.name || "Unknown") objectives += kill + var/datum/objective/paradox_clone_replace/replace = new() + replace.owner = owner + replace.name_and_job = "[original_mind.name], the [original_mind.assigned_role.title]" + replace.update_explanation_text() + objectives += replace + owner.set_assigned_role(SSjob.get_job_type(/datum/job/paradox_clone)) //clone doesnt show up on message lists var/obj/item/modular_computer/pda/messenger = locate() in owner.current - if(messenger) - var/datum/computer_file/program/messenger/message_app = locate() in messenger.stored_files - if(message_app) - message_app.invisible = TRUE + var/datum/computer_file/program/messenger/message_app = locate() in messenger?.stored_files + message_app?.invisible = TRUE //dont want anyone noticing there's two now var/mob/living/carbon/human/clone_human = owner.current @@ -64,6 +61,17 @@ /datum/antagonist/paradox_clone/roundend_report_header() return span_header("A paradox clone appeared on the station!
") +/datum/objective/paradox_clone_replace + name = "clone replace" + /// Name and job of the original to replace + var/name_and_job + +/datum/objective/paradox_clone_replace/update_explanation_text() + explanation_text = "Take [name_and_job || "someone's"]'s place. Avoid collateral damage - remember, your mission is to blend in!" + +/datum/objective/paradox_clone_replace/check_completion() + return completed || considered_alive(owner) + /datum/outfit/paradox_clone name = "Paradox Clone (Preview only)" @@ -71,20 +79,6 @@ gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/soft/purple -/** - * Paradox clone assassinate objective - * Similar to the original, but with a different flavortext. - */ -/datum/objective/assassinate/paradox_clone - name = "clone assassinate" - -/datum/objective/assassinate/paradox_clone/update_explanation_text() - . = ..() - if(!target?.current) - explanation_text = "Free Objective" - CRASH("WARNING! [ADMIN_LOOKUPFLW(owner)] paradox clone objectives forged without an original!") - explanation_text = "Murder and replace [target.name], the [!target_role_type ? target.assigned_role.title : english_list(target.get_special_roles())]. Remember, your mission is to blend in, do not kill anyone else unless you have to!" - ///Static bluespace stream used in its ghost poll icon. /obj/effect/bluespace_stream name = "bluespace stream" diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index 7f467a411b4..7a2fc5a8f5a 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -7,6 +7,8 @@ desc = "Placeholder. Yell at Firecage if you SOMEHOW see this." icon = 'icons/obj/art/statue.dmi' icon_state = "" + /// Abstract root type + abstract_type = /obj/structure/statue density = TRUE anchored = FALSE max_integrity = 100 @@ -18,8 +20,6 @@ var/impressiveness = 15 /// Art component subtype added to this statue var/art_type = /datum/element/art - /// Abstract root type - var/abstract_type = /obj/structure/statue /obj/structure/statue/Initialize(mapload) . = ..() diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index ffe5eab54ce..62375dc0643 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -62,7 +62,7 @@ listening = FALSE say("Activation message is '[recorded]'.", sanitize = FALSE, language = message_language) if(RECOGNIZER_MODE) - recorded = speaker.GetVoice() + recorded = speaker.get_voice() listening = FALSE say("Your voice pattern is saved.", language = message_language) if(VOICE_SENSOR_MODE) @@ -81,7 +81,7 @@ if(raw_message == recorded) return TRUE if(RECOGNIZER_MODE) - if(speaker.GetVoice() == recorded) + if(speaker.get_voice() == recorded) return TRUE if(VOICE_SENSOR_MODE) if(length(raw_message)) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index a50cefb34dc..b9f59c3208d 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -87,16 +87,14 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) /datum/gas_mixture/proc/heat_capacity(data = MOLES) var/list/cached_gases = gases . = 0 - for(var/id in cached_gases) - var/gas_data = cached_gases[id] + for(var/_id, gas_data in cached_gases) . += gas_data[data] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT] /// Same as above except vacuums return HEAT_CAPACITY_VACUUM /datum/gas_mixture/turf/heat_capacity(data = MOLES) var/list/cached_gases = gases . = 0 - for(var/id in cached_gases) - var/gas_data = cached_gases[id] + for(var/_id, gas_data in cached_gases) . += gas_data[data] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT] if(!.) . += HEAT_CAPACITY_VACUUM //we want vacuums in turfs to have the same heat capacity as space diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 220ed589d69..8e1e4ad1f5e 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -144,13 +144,15 @@ /datum/gas_reaction/miaster/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases + var/list/water_vapor = cached_gases[/datum/gas/water_vapor] + var/list/miasma = cached_gases[/datum/gas/miasma] // As the name says it, it needs to be dry - if(cached_gases[/datum/gas/water_vapor] && cached_gases[/datum/gas/water_vapor][MOLES] / air.total_moles() > MIASTER_STERILIZATION_MAX_HUMIDITY) + if(water_vapor && water_vapor[MOLES] / air.total_moles() > MIASTER_STERILIZATION_MAX_HUMIDITY) return NO_REACTION //Replace miasma with oxygen - var/cleaned_air = min(cached_gases[/datum/gas/miasma][MOLES], MIASTER_STERILIZATION_RATE_BASE + (air.temperature - MIASTER_STERILIZATION_TEMP) / MIASTER_STERILIZATION_RATE_SCALE) - cached_gases[/datum/gas/miasma][MOLES] -= cleaned_air + var/cleaned_air = min(miasma[MOLES], MIASTER_STERILIZATION_RATE_BASE + (air.temperature - MIASTER_STERILIZATION_TEMP) / MIASTER_STERILIZATION_RATE_SCALE) + miasma[MOLES] -= cleaned_air ASSERT_GAS(/datum/gas/oxygen, air) cached_gases[/datum/gas/oxygen][MOLES] += cleaned_air @@ -200,22 +202,24 @@ var/plasma_burn_rate = 0 var/super_saturation = FALSE // Whether we should make tritium. var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow - switch(cached_gases[/datum/gas/oxygen][MOLES] / cached_gases[/datum/gas/plasma][MOLES]) + var/list/oxygen = cached_gases[/datum/gas/oxygen] + var/list/plasma = cached_gases[/datum/gas/plasma] + switch(oxygen[MOLES] / plasma[MOLES]) if(SUPER_SATURATION_THRESHOLD to INFINITY) - plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES] / PLASMA_BURN_RATE_DELTA) * temperature_scale + plasma_burn_rate = (plasma[MOLES] / PLASMA_BURN_RATE_DELTA) * temperature_scale super_saturation = TRUE // Begin to form tritium if(PLASMA_OXYGEN_FULLBURN to SUPER_SATURATION_THRESHOLD) - plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES] / PLASMA_BURN_RATE_DELTA) * temperature_scale + plasma_burn_rate = (plasma[MOLES] / PLASMA_BURN_RATE_DELTA) * temperature_scale else - plasma_burn_rate = ((cached_gases[/datum/gas/oxygen][MOLES] / PLASMA_OXYGEN_FULLBURN) / PLASMA_BURN_RATE_DELTA) * temperature_scale + plasma_burn_rate = ((oxygen[MOLES] / PLASMA_OXYGEN_FULLBURN) / PLASMA_BURN_RATE_DELTA) * temperature_scale if(plasma_burn_rate < MINIMUM_HEAT_CAPACITY) return var/old_heat_capacity = air.heat_capacity() - plasma_burn_rate = min(plasma_burn_rate, cached_gases[/datum/gas/plasma][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(oxygen_burn_ratio)) //Ensures matter is conserved properly - cached_gases[/datum/gas/plasma][MOLES] = QUANTIZE(cached_gases[/datum/gas/plasma][MOLES] - plasma_burn_rate) - cached_gases[/datum/gas/oxygen][MOLES] = QUANTIZE(cached_gases[/datum/gas/oxygen][MOLES] - (plasma_burn_rate * oxygen_burn_ratio)) + plasma_burn_rate = min(plasma_burn_rate, plasma[MOLES], oxygen[MOLES] * INVERSE(oxygen_burn_ratio)) //Ensures matter is conserved properly + plasma[MOLES] = QUANTIZE(plasma[MOLES] - plasma_burn_rate) + oxygen[MOLES] = QUANTIZE(oxygen[MOLES] - (plasma_burn_rate * oxygen_burn_ratio)) if (super_saturation) ASSERT_GAS(/datum/gas/tritium, air) cached_gases[/datum/gas/tritium][MOLES] += plasma_burn_rate @@ -265,15 +269,17 @@ /datum/gas_reaction/h2fire/react(datum/gas_mixture/air, datum/holder) . = NO_REACTION var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow + var/hydrogen = cached_gases[/datum/gas/hydrogen] + var/oxygen = cached_gases[/datum/gas/oxygen] var/old_heat_capacity = air.heat_capacity() var/temperature = air.temperature - var/burned_fuel = min(cached_gases[/datum/gas/hydrogen][MOLES] / FIRE_HYDROGEN_BURN_RATE_DELTA, cached_gases[/datum/gas/oxygen][MOLES] / (FIRE_HYDROGEN_BURN_RATE_DELTA * HYDROGEN_OXYGEN_FULLBURN), cached_gases[/datum/gas/hydrogen][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(0.5)) - if(burned_fuel <= 0 || cached_gases[/datum/gas/hydrogen][MOLES] - burned_fuel < 0 || cached_gases[/datum/gas/oxygen][MOLES] - burned_fuel * 0.5 < 0) //Shouldn't produce gas from nothing. + var/burned_fuel = min(hydrogen[MOLES] / FIRE_HYDROGEN_BURN_RATE_DELTA, oxygen[MOLES] / (FIRE_HYDROGEN_BURN_RATE_DELTA * HYDROGEN_OXYGEN_FULLBURN), hydrogen[MOLES], oxygen[MOLES] * INVERSE(0.5)) + if(burned_fuel <= 0 || hydrogen[MOLES] - burned_fuel < 0 || oxygen[MOLES] - burned_fuel * 0.5 < 0) //Shouldn't produce gas from nothing. return - cached_gases[/datum/gas/hydrogen][MOLES] -= burned_fuel - cached_gases[/datum/gas/oxygen][MOLES] -= burned_fuel * 0.5 + hydrogen[MOLES] -= burned_fuel + oxygen[MOLES] -= burned_fuel * 0.5 ASSERT_GAS(/datum/gas/water_vapor, air) cached_gases[/datum/gas/water_vapor][MOLES] += burned_fuel @@ -320,15 +326,17 @@ /datum/gas_reaction/tritfire/react(datum/gas_mixture/air, datum/holder) . = NO_REACTION var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow + var/tritium = cached_gases[/datum/gas/tritium] + var/oxygen = cached_gases[/datum/gas/oxygen] var/old_heat_capacity = air.heat_capacity() var/temperature = air.temperature - var/burned_fuel = min(cached_gases[/datum/gas/tritium][MOLES] / FIRE_TRITIUM_BURN_RATE_DELTA, cached_gases[/datum/gas/oxygen][MOLES] / (FIRE_TRITIUM_BURN_RATE_DELTA * TRITIUM_OXYGEN_FULLBURN), cached_gases[/datum/gas/tritium][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(0.5)) - if(burned_fuel <= 0 || cached_gases[/datum/gas/tritium][MOLES] - burned_fuel < 0 || cached_gases[/datum/gas/oxygen][MOLES] - burned_fuel * 0.5 < 0) //Shouldn't produce gas from nothing. + var/burned_fuel = min(tritium[MOLES] / FIRE_TRITIUM_BURN_RATE_DELTA, oxygen[MOLES] / (FIRE_TRITIUM_BURN_RATE_DELTA * TRITIUM_OXYGEN_FULLBURN), tritium[MOLES], oxygen[MOLES] * INVERSE(0.5)) + if(burned_fuel <= 0 || tritium[MOLES] - burned_fuel < 0 || oxygen[MOLES] - burned_fuel * 0.5 < 0) //Shouldn't produce gas from nothing. return - cached_gases[/datum/gas/tritium][MOLES] -= burned_fuel - cached_gases[/datum/gas/oxygen][MOLES] -= burned_fuel * 0.5 + tritium[MOLES] -= burned_fuel + oxygen[MOLES] -= burned_fuel * 0.5 ASSERT_GAS(/datum/gas/water_vapor, air) cached_gases[/datum/gas/water_vapor][MOLES] += burned_fuel @@ -397,8 +405,10 @@ var/oxygen_burn_ratio = OXYGEN_BURN_RATIO_BASE - temperature_scale var/freon_burn_rate var/list/cached_gases = air.gases - if(cached_gases[/datum/gas/oxygen][MOLES] < cached_gases[/datum/gas/freon][MOLES] * FREON_OXYGEN_FULLBURN) - freon_burn_rate = ((cached_gases[/datum/gas/oxygen][MOLES] / FREON_OXYGEN_FULLBURN) / FREON_BURN_RATE_DELTA) * temperature_scale + var/freon = cached_gases[/datum/gas/freon] + var/oxygen = cached_gases[/datum/gas/oxygen] + if(oxygen[MOLES] < freon[MOLES] * FREON_OXYGEN_FULLBURN) + freon_burn_rate = ((oxygen[MOLES] / FREON_OXYGEN_FULLBURN) / FREON_BURN_RATE_DELTA) * temperature_scale else freon_burn_rate = (cached_gases[/datum/gas/freon][MOLES] / FREON_BURN_RATE_DELTA) * temperature_scale @@ -406,9 +416,9 @@ return var/old_heat_capacity = air.heat_capacity() - freon_burn_rate = min(freon_burn_rate, cached_gases[/datum/gas/freon][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(oxygen_burn_ratio)) //Ensures matter is conserved properly - cached_gases[/datum/gas/freon][MOLES] = QUANTIZE(cached_gases[/datum/gas/freon][MOLES] - freon_burn_rate) - cached_gases[/datum/gas/oxygen][MOLES] = QUANTIZE(cached_gases[/datum/gas/oxygen][MOLES] - (freon_burn_rate * oxygen_burn_ratio)) + freon_burn_rate = min(freon_burn_rate, freon[MOLES], oxygen[MOLES] * INVERSE(oxygen_burn_ratio)) //Ensures matter is conserved properly + freon[MOLES] = QUANTIZE(freon[MOLES] - freon_burn_rate) + oxygen[MOLES] = QUANTIZE(oxygen[MOLES] - (freon_burn_rate * oxygen_burn_ratio)) ASSERT_GAS(/datum/gas/carbon_dioxide, air) cached_gases[/datum/gas/carbon_dioxide][MOLES] += freon_burn_rate @@ -456,13 +466,15 @@ /datum/gas_reaction/nitrousformation/react(datum/gas_mixture/air) var/list/cached_gases = air.gases - var/heat_efficiency = min(cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(0.5), cached_gases[/datum/gas/nitrogen][MOLES]) - if ((cached_gases[/datum/gas/oxygen][MOLES] - heat_efficiency * 0.5 < 0 ) || (cached_gases[/datum/gas/nitrogen][MOLES] - heat_efficiency < 0)) + var/oxygen = cached_gases[/datum/gas/oxygen] + var/nitrogen = cached_gases[/datum/gas/nitrogen] + var/heat_efficiency = min(oxygen[MOLES] * INVERSE(0.5), nitrogen[MOLES]) + if ((oxygen[MOLES] - heat_efficiency * 0.5 < 0 ) || (nitrogen[MOLES] - heat_efficiency < 0)) return NO_REACTION // Shouldn't produce gas from nothing. var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficiency * 0.5 - cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficiency + oxygen[MOLES] -= heat_efficiency * 0.5 + nitrogen[MOLES] -= heat_efficiency ASSERT_GAS(/datum/gas/nitrous_oxide, air) cached_gases[/datum/gas/nitrous_oxide][MOLES] += heat_efficiency @@ -495,15 +507,14 @@ /datum/gas_reaction/nitrous_decomp/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow + var/nitrous_oxide = cached_gases[/datum/gas/nitrous_oxide] var/temperature = air.temperature - var/burned_fuel = (cached_gases[/datum/gas/nitrous_oxide][MOLES] / N2O_DECOMPOSITION_RATE_DIVISOR) * ((temperature - N2O_DECOMPOSITION_MIN_SCALE_TEMP) * (temperature - N2O_DECOMPOSITION_MAX_SCALE_TEMP) / (N2O_DECOMPOSITION_SCALE_DIVISOR)) - if(burned_fuel <= 0) - return - if(cached_gases[/datum/gas/nitrous_oxide][MOLES] - burned_fuel < 0) - return + var/burned_fuel = (nitrous_oxide[MOLES] / N2O_DECOMPOSITION_RATE_DIVISOR) * ((temperature - N2O_DECOMPOSITION_MIN_SCALE_TEMP) * (temperature - N2O_DECOMPOSITION_MAX_SCALE_TEMP) / (N2O_DECOMPOSITION_SCALE_DIVISOR)) + if(burned_fuel <= 0 || nitrous_oxide[MOLES] - burned_fuel < 0) + return NO_REACTION var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/nitrous_oxide][MOLES] -= burned_fuel + nitrous_oxide[MOLES] -= burned_fuel ASSERT_GAS(/datum/gas/nitrogen, air) cached_gases[/datum/gas/nitrogen][MOLES] += burned_fuel ASSERT_GAS(/datum/gas/oxygen, air) @@ -540,14 +551,16 @@ /datum/gas_reaction/bzformation/react(datum/gas_mixture/air) var/list/cached_gases = air.gases + var/nitrous_oxide = cached_gases[/datum/gas/nitrous_oxide] + var/plasma = cached_gases[/datum/gas/plasma] var/pressure = air.return_pressure() var/volume = air.return_volume() var/environment_effciency = volume/pressure //More volume and less pressure gives better rates - var/ratio_efficency = min(cached_gases[/datum/gas/nitrous_oxide][MOLES]/cached_gases[/datum/gas/plasma][MOLES], 1) //Less n2o than plasma give lower rates - var/nitrous_oxide_decomposed_factor = max(4 * (cached_gases[/datum/gas/plasma][MOLES] / (cached_gases[/datum/gas/nitrous_oxide][MOLES] + cached_gases[/datum/gas/plasma][MOLES]) - 0.75), 0) // Nitrous oxide decomposes when there are more than 3 parts plasma per n2o. - var/bz_formed = min(0.01 * ratio_efficency * environment_effciency, cached_gases[/datum/gas/nitrous_oxide][MOLES] * INVERSE(0.4), cached_gases[/datum/gas/plasma][MOLES] * INVERSE(0.8 * (1 - nitrous_oxide_decomposed_factor))) + var/ratio_efficency = min(nitrous_oxide[MOLES]/plasma[MOLES], 1) //Less n2o than plasma give lower rates + var/nitrous_oxide_decomposed_factor = max(4 * (plasma[MOLES] / (nitrous_oxide[MOLES] + plasma[MOLES]) - 0.75), 0) // Nitrous oxide decomposes when there are more than 3 parts plasma per n2o. + var/bz_formed = min(0.01 * ratio_efficency * environment_effciency, nitrous_oxide[MOLES] * INVERSE(0.4), plasma[MOLES] * INVERSE(0.8 * (1 - nitrous_oxide_decomposed_factor))) - if (cached_gases[/datum/gas/nitrous_oxide][MOLES] - bz_formed * 0.4 < 0 || cached_gases[/datum/gas/plasma][MOLES] - 0.8 * bz_formed * (1 - nitrous_oxide_decomposed_factor) < 0 || bz_formed <= 0) + if (nitrous_oxide[MOLES] - bz_formed * 0.4 < 0 || plasma[MOLES] - 0.8 * bz_formed * (1 - nitrous_oxide_decomposed_factor) < 0 || bz_formed <= 0) return NO_REACTION var/old_heat_capacity = air.heat_capacity() @@ -567,8 +580,8 @@ ASSERT_GAS(/datum/gas/bz, air) cached_gases[/datum/gas/bz][MOLES] += bz_formed * (1-nitrous_oxide_decomposed_factor) - cached_gases[/datum/gas/nitrous_oxide][MOLES] -= 0.4 * bz_formed - cached_gases[/datum/gas/plasma][MOLES] -= 0.8 * bz_formed * (1-nitrous_oxide_decomposed_factor) + nitrous_oxide[MOLES] -= 0.4 * bz_formed + plasma[MOLES] -= 0.8 * bz_formed * (1-nitrous_oxide_decomposed_factor) SET_REACTION_RESULTS(bz_formed) var/energy_released = bz_formed * (BZ_FORMATION_ENERGY + nitrous_oxide_decomposed_factor * (N2O_DECOMPOSITION_ENERGY - BZ_FORMATION_ENERGY)) @@ -603,14 +616,17 @@ /datum/gas_reaction/pluox_formation/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases - var/produced_amount = min(PLUOXIUM_FORMATION_MAX_RATE, cached_gases[/datum/gas/carbon_dioxide][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(0.5), cached_gases[/datum/gas/tritium][MOLES] * INVERSE(0.01)) - if (produced_amount <= 0 || cached_gases[/datum/gas/carbon_dioxide][MOLES] - produced_amount < 0 || cached_gases[/datum/gas/oxygen][MOLES] - produced_amount * 0.5 < 0 || cached_gases[/datum/gas/tritium][MOLES] - produced_amount * 0.01 < 0) + var/list/carbon_dioxide = cached_gases[/datum/gas/carbon_dioxide] + var/list/oxygen = cached_gases[/datum/gas/oxygen] + var/list/tritium = cached_gases[/datum/gas/tritium] + var/produced_amount = min(PLUOXIUM_FORMATION_MAX_RATE, carbon_dioxide[MOLES], oxygen[MOLES] * INVERSE(0.5), tritium[MOLES] * INVERSE(0.01)) + if (produced_amount <= 0 || carbon_dioxide[MOLES] - produced_amount < 0 || oxygen[MOLES] - produced_amount * 0.5 < 0 || tritium[MOLES] - produced_amount * 0.01 < 0) return NO_REACTION var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/carbon_dioxide][MOLES] -= produced_amount - cached_gases[/datum/gas/oxygen][MOLES] -= produced_amount * 0.5 - cached_gases[/datum/gas/tritium][MOLES] -= produced_amount * 0.01 + carbon_dioxide[MOLES] -= produced_amount + oxygen[MOLES] -= produced_amount * 0.5 + tritium[MOLES] -= produced_amount * 0.01 ASSERT_GAS(/datum/gas/pluoxium, air) cached_gases[/datum/gas/pluoxium][MOLES] += produced_amount ASSERT_GAS(/datum/gas/hydrogen, air) @@ -649,17 +665,20 @@ /datum/gas_reaction/nitrium_formation/react(datum/gas_mixture/air) var/list/cached_gases = air.gases + var/list/tritium = cached_gases[/datum/gas/tritium] + var/list/nitrogen = cached_gases[/datum/gas/nitrogen] + var/list/bz = cached_gases[/datum/gas/bz] var/temperature = air.temperature - var/heat_efficiency = min(temperature / NITRIUM_FORMATION_TEMP_DIVISOR, cached_gases[/datum/gas/tritium][MOLES], cached_gases[/datum/gas/nitrogen][MOLES], cached_gases[/datum/gas/bz][MOLES] * INVERSE(0.05)) + var/heat_efficiency = min(temperature / NITRIUM_FORMATION_TEMP_DIVISOR, tritium[MOLES], nitrogen[MOLES], bz[MOLES] * INVERSE(0.05)) - if( heat_efficiency <= 0 || (cached_gases[/datum/gas/tritium][MOLES] - heat_efficiency < 0 ) || (cached_gases[/datum/gas/nitrogen][MOLES] - heat_efficiency < 0) || (cached_gases[/datum/gas/bz][MOLES] - heat_efficiency * 0.05 < 0)) //Shouldn't produce gas from nothing. + if( heat_efficiency <= 0 || (tritium[MOLES] - heat_efficiency < 0 ) || (nitrogen[MOLES] - heat_efficiency < 0) || (bz[MOLES] - heat_efficiency * 0.05 < 0)) //Shouldn't produce gas from nothing. return NO_REACTION var/old_heat_capacity = air.heat_capacity() ASSERT_GAS(/datum/gas/nitrium, air) - cached_gases[/datum/gas/tritium][MOLES] -= heat_efficiency - cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficiency - cached_gases[/datum/gas/bz][MOLES] -= heat_efficiency * 0.05 //bz gets consumed to balance the nitrium production and not make it too common and/or easy + tritium[MOLES] -= heat_efficiency + nitrogen[MOLES] -= heat_efficiency + bz[MOLES] -= heat_efficiency * 0.05 //bz gets consumed to balance the nitrium production and not make it too common and/or easy cached_gases[/datum/gas/nitrium][MOLES] += heat_efficiency SET_REACTION_RESULTS(heat_efficiency) @@ -692,17 +711,18 @@ /datum/gas_reaction/nitrium_decomposition/react(datum/gas_mixture/air) var/list/cached_gases = air.gases + var/list/nitrium = cached_gases[/datum/gas/nitrium] var/temperature = air.temperature //This reaction is aggressively slow. like, a tenth of a mole per fire slow. Keep that in mind - var/heat_efficiency = min(temperature / NITRIUM_DECOMPOSITION_TEMP_DIVISOR, cached_gases[/datum/gas/nitrium][MOLES]) + var/heat_efficiency = min(temperature / NITRIUM_DECOMPOSITION_TEMP_DIVISOR, nitrium[MOLES]) - if (heat_efficiency <= 0 || (cached_gases[/datum/gas/nitrium][MOLES] - heat_efficiency < 0)) //Shouldn't produce gas from nothing. + if (heat_efficiency <= 0 || (nitrium[MOLES] - heat_efficiency < 0)) //Shouldn't produce gas from nothing. return NO_REACTION var/old_heat_capacity = air.heat_capacity() air.assert_gases(/datum/gas/nitrogen, /datum/gas/hydrogen) - cached_gases[/datum/gas/nitrium][MOLES] -= heat_efficiency + nitrium[MOLES] -= heat_efficiency cached_gases[/datum/gas/hydrogen][MOLES] += heat_efficiency cached_gases[/datum/gas/nitrogen][MOLES] += heat_efficiency @@ -736,22 +756,25 @@ /datum/gas_reaction/freonformation/react(datum/gas_mixture/air) var/list/cached_gases = air.gases + var/list/plasma = cached_gases[/datum/gas/plasma] + var/list/carbon_dioxide = cached_gases[/datum/gas/carbon_dioxide] + var/list/bz = cached_gases[/datum/gas/bz] var/temperature = air.temperature - var/minimal_mole_factor = min(cached_gases[/datum/gas/plasma][MOLES] * INVERSE(0.6), cached_gases[/datum/gas/bz][MOLES] * INVERSE(0.1), cached_gases[/datum/gas/carbon_dioxide][MOLES] * INVERSE(0.3)) + var/minimal_mole_factor = min(plasma[MOLES] * INVERSE(0.6), bz[MOLES] * INVERSE(0.1), carbon_dioxide[MOLES] * INVERSE(0.3)) var/equation_first_part = NUM_E ** (-(((temperature - 800) / 200) ** 2)) var/equation_second_part = 3 / (1 + NUM_E ** (-0.001 * (temperature - 6000))) var/heat_factor = equation_first_part + equation_second_part - var/freon_formed = min(heat_factor * minimal_mole_factor * 0.05, cached_gases[/datum/gas/plasma][MOLES] * INVERSE(0.6), cached_gases[/datum/gas/carbon_dioxide][MOLES] * INVERSE(0.3), cached_gases[/datum/gas/bz][MOLES] * INVERSE(0.1)) - if (freon_formed <= 0 || (cached_gases[/datum/gas/plasma][MOLES] - freon_formed * 0.6 < 0 ) || (cached_gases[/datum/gas/carbon_dioxide][MOLES] - freon_formed * 0.3 < 0) || (cached_gases[/datum/gas/bz][MOLES] - freon_formed * 0.1 < 0)) //Shouldn't produce gas from nothing. + var/freon_formed = min(heat_factor * minimal_mole_factor * 0.05, plasma[MOLES] * INVERSE(0.6), carbon_dioxide[MOLES] * INVERSE(0.3), bz[MOLES] * INVERSE(0.1)) + if (freon_formed <= 0 || (plasma[MOLES] - freon_formed * 0.6 < 0 ) || (carbon_dioxide[MOLES] - freon_formed * 0.3 < 0) || (bz[MOLES] - freon_formed * 0.1 < 0)) //Shouldn't produce gas from nothing. return NO_REACTION var/old_heat_capacity = air.heat_capacity() ASSERT_GAS(/datum/gas/freon, air) - cached_gases[/datum/gas/plasma][MOLES] -= freon_formed * 0.6 - cached_gases[/datum/gas/carbon_dioxide][MOLES] -= freon_formed * 0.3 - cached_gases[/datum/gas/bz][MOLES] -= freon_formed * 0.1 + plasma[MOLES] -= freon_formed * 0.6 + carbon_dioxide[MOLES] -= freon_formed * 0.3 + bz[MOLES] -= freon_formed * 0.1 cached_gases[/datum/gas/freon][MOLES] += freon_formed SET_REACTION_RESULTS(freon_formed) @@ -788,23 +811,26 @@ /datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air) . = NO_REACTION var/list/cached_gases = air.gases + var/list/nitrogen = cached_gases[/datum/gas/nitrogen] + var/list/tritium = cached_gases[/datum/gas/tritium] /// List of gases we will assert, and possibly garbage collect. var/list/asserted_gases = list(/datum/gas/hypernoblium, /datum/gas/bz) + var/list/bz = cached_gases[/datum/gas/bz] air.assert_gases(arglist(asserted_gases)) - var/reduction_factor = clamp(cached_gases[/datum/gas/tritium][MOLES] / (cached_gases[/datum/gas/tritium][MOLES] + cached_gases[/datum/gas/bz][MOLES]), 0.001 , 1) //reduces trit consumption in presence of bz upward to 0.1% reduction - var/nob_formed = min((cached_gases[/datum/gas/nitrogen][MOLES] + cached_gases[/datum/gas/tritium][MOLES]) * 0.01, cached_gases[/datum/gas/tritium][MOLES] * INVERSE(5 * reduction_factor), cached_gases[/datum/gas/nitrogen][MOLES] * INVERSE(10)) + var/reduction_factor = clamp(tritium[MOLES] / (tritium[MOLES] + bz[MOLES]), 0.001 , 1) //reduces trit consumption in presence of bz upward to 0.1% reduction + var/nob_formed = min((nitrogen[MOLES] + tritium[MOLES]) * 0.01, tritium[MOLES] * INVERSE(5 * reduction_factor), nitrogen[MOLES] * INVERSE(10)) //calling QUANTIZE on results to round very small floating point values. - if (QUANTIZE(nob_formed) <= 0 || (QUANTIZE(cached_gases[/datum/gas/tritium][MOLES] - 5 * nob_formed * reduction_factor) < 0) || (QUANTIZE(cached_gases[/datum/gas/nitrogen][MOLES] - 10 * nob_formed) < 0)) + if (QUANTIZE(nob_formed) <= 0 || (QUANTIZE(tritium[MOLES] - 5 * nob_formed * reduction_factor) < 0) || (QUANTIZE(nitrogen[MOLES] - 10 * nob_formed) < 0)) air.garbage_collect(arglist(asserted_gases)) return var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/tritium][MOLES] -= 5 * nob_formed * reduction_factor - cached_gases[/datum/gas/nitrogen][MOLES] -= 10 * nob_formed + tritium[MOLES] -= 5 * nob_formed * reduction_factor + nitrogen[MOLES] -= 10 * nob_formed cached_gases[/datum/gas/hypernoblium][MOLES] += nob_formed // I'm not going to nitpick, but N20H10 feels like it should be an explosive more than anything. SET_REACTION_RESULTS(nob_formed) - var/energy_released = nob_formed * (NOBLIUM_FORMATION_ENERGY / (max(cached_gases[/datum/gas/bz][MOLES], 1))) + var/energy_released = nob_formed * NOBLIUM_FORMATION_ENERGY / max(bz[MOLES], 1) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) air.temperature = max(((air.temperature * old_heat_capacity + energy_released) / new_heat_capacity), TCMB) @@ -836,16 +862,18 @@ /datum/gas_reaction/halon_o2removal/react(datum/gas_mixture/air, datum/holder) . = NO_REACTION var/list/cached_gases = air.gases + var/list/halon = cached_gases[/datum/gas/halon] + var/list/oxygen = cached_gases[/datum/gas/oxygen] var/temperature = air.temperature - var/heat_efficiency = min(temperature / HALON_COMBUSTION_TEMPERATURE_SCALE, cached_gases[/datum/gas/halon][MOLES], cached_gases[/datum/gas/oxygen][MOLES] * INVERSE(20)) - if (heat_efficiency <= 0 || (cached_gases[/datum/gas/halon][MOLES] - heat_efficiency < 0 ) || (cached_gases[/datum/gas/oxygen][MOLES] - heat_efficiency * 20 < 0)) //Shouldn't produce gas from nothing. + var/heat_efficiency = min(temperature / HALON_COMBUSTION_TEMPERATURE_SCALE, halon[MOLES], oxygen[MOLES] * INVERSE(20)) + if (heat_efficiency <= 0 || (halon[MOLES] - heat_efficiency < 0 ) || (oxygen[MOLES] - heat_efficiency * 20 < 0)) //Shouldn't produce gas from nothing. return var/old_heat_capacity = air.heat_capacity() ASSERT_GAS(/datum/gas/pluoxium, air) - cached_gases[/datum/gas/halon][MOLES] -= heat_efficiency - cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficiency * 20 + halon[MOLES] -= heat_efficiency + oxygen[MOLES] -= heat_efficiency * 20 cached_gases[/datum/gas/pluoxium][MOLES] += heat_efficiency * 2.5 SET_REACTION_RESULTS(heat_efficiency * 5) @@ -890,15 +918,17 @@ /datum/gas_reaction/healium_formation/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases + var/list/bz = cached_gases[/datum/gas/bz] + var/list/freon = cached_gases[/datum/gas/freon] var/temperature = air.temperature - var/heat_efficiency = min(temperature * 0.3, cached_gases[/datum/gas/freon][MOLES] * INVERSE(2.75), cached_gases[/datum/gas/bz][MOLES] * INVERSE(0.25)) - if (heat_efficiency <= 0 || (cached_gases[/datum/gas/freon][MOLES] - heat_efficiency * 2.75 < 0 ) || (cached_gases[/datum/gas/bz][MOLES] - heat_efficiency * 0.25 < 0)) //Shouldn't produce gas from nothing. + var/heat_efficiency = min(temperature * 0.3, freon[MOLES] * INVERSE(2.75), bz[MOLES] * INVERSE(0.25)) + if (heat_efficiency <= 0 || (freon[MOLES] - heat_efficiency * 2.75 < 0 ) || (bz[MOLES] - heat_efficiency * 0.25 < 0)) //Shouldn't produce gas from nothing. return NO_REACTION var/old_heat_capacity = air.heat_capacity() ASSERT_GAS(/datum/gas/healium, air) - cached_gases[/datum/gas/freon][MOLES] -= heat_efficiency * 2.75 - cached_gases[/datum/gas/bz][MOLES] -= heat_efficiency * 0.25 + freon[MOLES] -= heat_efficiency * 2.75 + bz[MOLES] -= heat_efficiency * 0.25 cached_gases[/datum/gas/healium][MOLES] += heat_efficiency * 3 SET_REACTION_RESULTS(heat_efficiency * 3) @@ -930,16 +960,18 @@ /datum/gas_reaction/zauker_formation/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases + var/list/hypernoblium = cached_gases[/datum/gas/hypernoblium] + var/list/nitrium = cached_gases[/datum/gas/nitrium] var/temperature = air.temperature - var/heat_efficiency = min(temperature * ZAUKER_FORMATION_TEMPERATURE_SCALE, cached_gases[/datum/gas/hypernoblium][MOLES] * INVERSE(0.01), cached_gases[/datum/gas/nitrium][MOLES] * INVERSE(0.5)) - if (heat_efficiency <= 0 || (cached_gases[/datum/gas/hypernoblium][MOLES] - heat_efficiency * 0.01 < 0 ) || (cached_gases[/datum/gas/nitrium][MOLES] - heat_efficiency * 0.5 < 0)) //Shouldn't produce gas from nothing. + var/heat_efficiency = min(temperature * ZAUKER_FORMATION_TEMPERATURE_SCALE, hypernoblium[MOLES] * INVERSE(0.01), nitrium[MOLES] * INVERSE(0.5)) + if (heat_efficiency <= 0 || (hypernoblium[MOLES] - heat_efficiency * 0.01 < 0 ) || (nitrium[MOLES] - heat_efficiency * 0.5 < 0)) //Shouldn't produce gas from nothing. return NO_REACTION var/old_heat_capacity = air.heat_capacity() ASSERT_GAS(/datum/gas/zauker, air) - cached_gases[/datum/gas/hypernoblium][MOLES] -= heat_efficiency * 0.01 - cached_gases[/datum/gas/nitrium][MOLES] -= heat_efficiency * 0.5 + hypernoblium[MOLES] -= heat_efficiency * 0.01 + nitrium[MOLES] -= heat_efficiency * 0.5 cached_gases[/datum/gas/zauker][MOLES] += heat_efficiency * 0.5 SET_REACTION_RESULTS(heat_efficiency * 0.5) @@ -970,16 +1002,17 @@ /datum/gas_reaction/zauker_decomp/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow - var/burned_fuel = min(ZAUKER_DECOMPOSITION_MAX_RATE, cached_gases[/datum/gas/nitrogen][MOLES], cached_gases[/datum/gas/zauker][MOLES]) - if (burned_fuel <= 0 || cached_gases[/datum/gas/zauker][MOLES] - burned_fuel < 0) + var/list/nitrogen = cached_gases[/datum/gas/nitrogen] + var/list/zauker = cached_gases[/datum/gas/zauker] + var/burned_fuel = min(ZAUKER_DECOMPOSITION_MAX_RATE, nitrogen[MOLES], zauker[MOLES]) + if (burned_fuel <= 0 || zauker[MOLES] - burned_fuel < 0) return NO_REACTION var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/zauker][MOLES] -= burned_fuel + zauker[MOLES] -= burned_fuel ASSERT_GAS(/datum/gas/oxygen, air) cached_gases[/datum/gas/oxygen][MOLES] += burned_fuel * 0.3 - ASSERT_GAS(/datum/gas/nitrogen, air) - cached_gases[/datum/gas/nitrogen][MOLES] += burned_fuel * 0.7 + nitrogen[MOLES] += burned_fuel * 0.7 SET_REACTION_RESULTS(burned_fuel) var/energy_released = ZAUKER_DECOMPOSITION_ENERGY * burned_fuel @@ -1012,16 +1045,18 @@ /datum/gas_reaction/proto_nitrate_formation/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases + var/list/pluoxium = cached_gases[/datum/gas/pluoxium] + var/list/hydrogen = cached_gases[/datum/gas/hydrogen] var/temperature = air.temperature - var/heat_efficiency = min(temperature * 0.005, cached_gases[/datum/gas/pluoxium][MOLES] * INVERSE(0.2), cached_gases[/datum/gas/hydrogen][MOLES] * INVERSE(2)) - if (heat_efficiency <= 0 || (cached_gases[/datum/gas/pluoxium][MOLES] - heat_efficiency * 0.2 < 0 ) || (cached_gases[/datum/gas/hydrogen][MOLES] - heat_efficiency * 2 < 0)) //Shouldn't produce gas from nothing. + var/heat_efficiency = min(temperature * 0.005, pluoxium[MOLES] * INVERSE(0.2), hydrogen[MOLES] * INVERSE(2)) + if (heat_efficiency <= 0 || (pluoxium[MOLES] - heat_efficiency * 0.2 < 0 ) || (hydrogen[MOLES] - heat_efficiency * 2 < 0)) //Shouldn't produce gas from nothing. return NO_REACTION var/old_heat_capacity = air.heat_capacity() ASSERT_GAS(/datum/gas/proto_nitrate, air) - cached_gases[/datum/gas/hydrogen][MOLES] -= heat_efficiency * 2 - cached_gases[/datum/gas/pluoxium][MOLES] -= heat_efficiency * 0.2 + hydrogen[MOLES] -= heat_efficiency * 2 + pluoxium[MOLES] -= heat_efficiency * 0.2 cached_gases[/datum/gas/proto_nitrate][MOLES] += heat_efficiency * 2.2 SET_REACTION_RESULTS(heat_efficiency * 2.2) @@ -1051,13 +1086,15 @@ /datum/gas_reaction/proto_nitrate_hydrogen_response/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases - var/produced_amount = min(PN_HYDROGEN_CONVERSION_MAX_RATE, cached_gases[/datum/gas/hydrogen][MOLES], cached_gases[/datum/gas/proto_nitrate][MOLES]) - if (produced_amount <= 0 || cached_gases[/datum/gas/hydrogen][MOLES] - produced_amount < 0) + var/list/proto_nitrate = cached_gases[/datum/gas/proto_nitrate] + var/list/hydrogen = cached_gases[/datum/gas/hydrogen] + var/produced_amount = min(PN_HYDROGEN_CONVERSION_MAX_RATE, hydrogen[MOLES], proto_nitrate[MOLES]) + if (produced_amount <= 0 || hydrogen[MOLES] - produced_amount < 0) return NO_REACTION var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/hydrogen][MOLES] -= produced_amount - cached_gases[/datum/gas/proto_nitrate][MOLES] += produced_amount * 0.5 + hydrogen[MOLES] -= produced_amount + proto_nitrate[MOLES] += produced_amount * 0.5 SET_REACTION_RESULTS(produced_amount * 0.5) var/energy_used = produced_amount * PN_HYDROGEN_CONVERSION_ENERGY @@ -1090,14 +1127,16 @@ /datum/gas_reaction/proto_nitrate_tritium_response/react(datum/gas_mixture/air, datum/holder) . = NO_REACTION var/list/cached_gases = air.gases + var/list/proto_nitrate = cached_gases[/datum/gas/proto_nitrate] + var/list/tritium = cached_gases[/datum/gas/tritium] var/temperature = air.temperature - var/produced_amount = min(air.temperature / 34 * (cached_gases[/datum/gas/tritium][MOLES] * cached_gases[/datum/gas/proto_nitrate][MOLES]) / (cached_gases[/datum/gas/tritium][MOLES] + 10 * cached_gases[/datum/gas/proto_nitrate][MOLES]), cached_gases[/datum/gas/tritium][MOLES], cached_gases[/datum/gas/proto_nitrate][MOLES] * INVERSE(0.01)) - if(cached_gases[/datum/gas/tritium][MOLES] - produced_amount < 0 || cached_gases[/datum/gas/proto_nitrate][MOLES] - produced_amount * 0.01 < 0) + var/produced_amount = min(air.temperature / 34 * (tritium[MOLES] * proto_nitrate[MOLES]) / (tritium[MOLES] + 10 * proto_nitrate[MOLES]), tritium[MOLES], proto_nitrate[MOLES] * INVERSE(0.01)) + if(tritium[MOLES] - produced_amount < 0 || proto_nitrate[MOLES] - produced_amount * 0.01 < 0) return var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/proto_nitrate][MOLES] -= produced_amount * 0.01 - cached_gases[/datum/gas/tritium][MOLES] -= produced_amount + proto_nitrate[MOLES] -= produced_amount * 0.01 + tritium[MOLES] -= produced_amount ASSERT_GAS(/datum/gas/hydrogen, air) cached_gases[/datum/gas/hydrogen][MOLES] += produced_amount @@ -1142,13 +1181,15 @@ /datum/gas_reaction/proto_nitrate_bz_response/react(datum/gas_mixture/air, datum/holder) . = NO_REACTION var/list/cached_gases = air.gases + var/list/proto_nitrate = cached_gases[/datum/gas/proto_nitrate] + var/list/bz = cached_gases[/datum/gas/bz] var/temperature = air.temperature - var/consumed_amount = min(air.temperature / 2240 * cached_gases[/datum/gas/bz][MOLES] * cached_gases[/datum/gas/proto_nitrate][MOLES] / (cached_gases[/datum/gas/bz][MOLES] + cached_gases[/datum/gas/proto_nitrate][MOLES]), cached_gases[/datum/gas/bz][MOLES], cached_gases[/datum/gas/proto_nitrate][MOLES]) - if (consumed_amount <= 0 || cached_gases[/datum/gas/bz][MOLES] - consumed_amount < 0) + var/consumed_amount = min(air.temperature / 2240 * bz[MOLES] * proto_nitrate[MOLES] / (bz[MOLES] + proto_nitrate[MOLES]), bz[MOLES], proto_nitrate[MOLES]) + if (consumed_amount <= 0 || bz[MOLES] - consumed_amount < 0) return var/old_heat_capacity = air.heat_capacity() - cached_gases[/datum/gas/bz][MOLES] -= consumed_amount + bz[MOLES] -= consumed_amount ASSERT_GAS(/datum/gas/nitrogen, air) cached_gases[/datum/gas/nitrogen][MOLES] += consumed_amount * 0.4 ASSERT_GAS(/datum/gas/helium, air) @@ -1207,10 +1248,9 @@ if(total_not_antinoblium_moles < MINIMUM_MOLE_COUNT) // Clear up the remaining gases if this condition is met. . = NO_REACTION reaction_rate = total_not_antinoblium_moles - for(var/id in cached_gases) + for(var/id,gas in cached_gases) if(id == /datum/gas/antinoblium) continue - var/list/gas = cached_gases[id] if(. == NO_REACTION) // Let the gases get properly cleared while avoiding potential division by 0. gas[MOLES] = 0 continue diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index c1837bbf509..f281fee74f2 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -128,6 +128,10 @@ piping_layer = 4 icon_state= "pump_on_map-4" +/obj/machinery/atmospherics/components/binary/pump/on/layer5 + piping_layer = 5 + icon_state = "pump_on_map-5" + /obj/item/circuit_component/atmos_pump display_name = "Atmospheric Binary Pump" desc = "The interface for communicating with a pump." diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index b12ee087494..7d1d6106430 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -71,7 +71,16 @@ /datum/reagent/consumable/ethanol/demonsblood,\ /datum/reagent/consumable/ethanol/crevice_spike,\ /datum/reagent/consumable/ethanol/singulo,\ - /datum/reagent/consumable/ethanol/whiskey_sour) + /datum/reagent/consumable/ethanol/whiskey_sour,\ + /datum/reagent/consumable/ethanol/boston_sour,\ + /datum/reagent/consumable/ethanol/old_fashioned,\ + /datum/reagent/consumable/ethanol/sazerac,\ + /datum/reagent/consumable/ethanol/hot_toddy,\ + /datum/reagent/consumable/ethanol/daiquiri,\ + /datum/reagent/consumable/ethanol/blue_blazer,\ + /datum/reagent/consumable/ethanol/flip_cocktail,\ + /datum/reagent/consumable/ethanol/bitters_soda,\ + /datum/chemical_reaction/drink/star) var/reagent_type = pick(possible_reagents) wanted_reagent = new reagent_type @@ -104,7 +113,11 @@ /datum/reagent/consumable/ethanol/silencer,\ /datum/reagent/consumable/ethanol/peppermint_patty,\ /datum/reagent/consumable/ethanol/aloe,\ - /datum/reagent/consumable/pumpkin_latte) + /datum/reagent/consumable/pumpkin_latte,\ + /datum/reagent/consumable/ethanol/ramos_gin_fizz,\ + /datum/reagent/consumable/ethanol/sangria,\ + /datum/reagent/consumable/ethanol/tizirian_sour,\ + /datum/chemical_reaction/drink/suffering_bastard) var/reagent_type = pick(possible_reagents) wanted_reagent = new reagent_type diff --git a/code/modules/cargo/markets/market_items/misc.dm b/code/modules/cargo/markets/market_items/misc.dm index 69bfef56fe0..7f1ede77d53 100644 --- a/code/modules/cargo/markets/market_items/misc.dm +++ b/code/modules/cargo/markets/market_items/misc.dm @@ -72,7 +72,7 @@ /datum/market_item/misc/hat_stabilizer name = "MOD Hat Stabilizer Module" desc = "Don't sacrifice style for substance with this module! Hats not included." - item = /obj/item/mod/module/tanner + item = /obj/item/mod/module/hat_stabilizer price_min = CARGO_CRATE_VALUE * 2 price_max = CARGO_CRATE_VALUE * 3 stock_max = 2 diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm index 8e9af6e29c0..56d9a1427aa 100644 --- a/code/modules/client/preferences/_preference.dm +++ b/code/modules/client/preferences/_preference.dm @@ -79,6 +79,9 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// Represents an individual preference. /datum/preference + /// Do not instantiate if type matches this. + abstract_type = /datum/preference + /// The key inside the savefile to use. /// This is also sent to the UI. /// Once you pick this, don't change it. @@ -89,9 +92,6 @@ GLOBAL_LIST_INIT(preference_entries_by_key, init_preference_entries_by_key()) /// It is up to the PreferencesMenu UI itself to interpret it. var/category = "misc" - /// Do not instantiate if type matches this. - var/abstract_type = /datum/preference - /// What savefile should this preference be read from? /// Valid values are PREFERENCE_CHARACTER and PREFERENCE_PLAYER. /// See the documentation in [code/__DEFINES/preferences.dm]. diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index ca7d441920b..79e8f76e361 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -201,7 +201,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/data_validity_integer = check_savedata_version(savefile.get_entry()) if(load_and_save && IS_DATA_OBSOLETE(data_validity_integer)) //fatal, can't load any data - var/bacpath = "[path].updatebac" //todo: if the savefile version is higher then the server, check the backup, and give the player a prompt to load the backup + var/bacpath = PREFS_BACKUP_PATH(path) //todo: if the savefile version is higher then the server, check the backup, and give the player a prompt to load the backup if (fexists(bacpath)) fdel(bacpath) //only keep 1 version of backup fcopy(savefile.path, bacpath) //byond helpfully lets you use a savefile for the first arg. @@ -236,7 +236,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //try to fix any outdated data if necessary if(SHOULD_UPDATE_DATA(data_validity_integer)) - var/bacpath = "[path].updatebac" //todo: if the savefile version is higher then the server, check the backup, and give the player a prompt to load the backup + var/bacpath = PREFS_BACKUP_PATH(path) //todo: if the savefile version is higher then the server, check the backup, and give the player a prompt to load the backup if (fexists(bacpath)) fdel(bacpath) //only keep 1 version of backup fcopy(savefile.path, bacpath) //byond helpfully lets you use a savefile for the first arg. diff --git a/code/modules/clothing/chameleon/generic_chameleon_clothing.dm b/code/modules/clothing/chameleon/generic_chameleon_clothing.dm index 3749f84d670..a8f03b0b3f9 100644 --- a/code/modules/clothing/chameleon/generic_chameleon_clothing.dm +++ b/code/modules/clothing/chameleon/generic_chameleon_clothing.dm @@ -185,12 +185,15 @@ do { \ w_class = WEIGHT_CLASS_SMALL actions_types = list(/datum/action/item_action/chameleon/change/mask) action_slots = ALL - /// Is our voice changer enabled or disabled? - var/voice_change = TRUE + clothing_traits = list(TRAIT_VOICE_MATCHES_ID) /obj/item/clothing/mask/chameleon/attack_self(mob/user) - voice_change = !voice_change - to_chat(user, span_notice("The voice changer is now [voice_change ? "on" : "off"]!")) + var/was_on = (TRAIT_VOICE_MATCHES_ID in clothing_traits) + if(was_on) + attach_clothing_traits(TRAIT_VOICE_MATCHES_ID) + else + detach_clothing_traits(TRAIT_VOICE_MATCHES_ID) + to_chat(user, span_notice("The voice changer is now [was_on ? "off" : "on"]!")) /obj/item/clothing/mask/chameleon/broken @@ -203,7 +206,7 @@ do { \ item_flags = DROPDEL //Same as the drone chameleon hat, undroppable and no protection armor_type = /datum/armor/none - voice_change = FALSE + clothing_traits = null /obj/item/clothing/mask/chameleon/drone/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f388cea8805..50204df47b1 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1,5 +1,6 @@ /obj/item/clothing name = "clothing" + abstract_type = /obj/item/clothing resistance_flags = FLAMMABLE max_integrity = 200 integrity_failure = 0.4 @@ -85,6 +86,7 @@ /obj/item/food/clothing name = "temporary moth clothing snack item" desc = "If you're reading this it means I messed up. This is related to moths eating clothes and I didn't know a better way to do it than making a new food object. <--- stinky idiot wrote this" + spawn_blacklisted = TRUE bite_consumption = 1 // sigh, ok, so it's not ACTUALLY infinite nutrition. this is so you can eat clothes more than...once. // bite_consumption limits how much you actually get, and the take_damage in after eat makes sure you can't abuse this. diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index e14fb8a13dd..a5a654687c5 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -4,6 +4,7 @@ name = "ears" lefthand_file = 'icons/mob/inhands/clothing/ears_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/ears_righthand.dmi' + abstract_type = /obj/item/clothing/ears w_class = WEIGHT_CLASS_TINY throwforce = 0 slot_flags = ITEM_SLOT_EARS diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 7e444bc3e76..394a085f9b4 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/clothing/glasses.dmi' lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi' + abstract_type = /obj/item/clothing/glasses w_class = WEIGHT_CLASS_SMALL slot_flags = ITEM_SLOT_EYES strip_delay = 2 SECONDS diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index f1c7785e323..20b321592b7 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -6,6 +6,7 @@ inhand_icon_state = "greyscale_gloves" lefthand_file = 'icons/mob/inhands/clothing/gloves_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/gloves_righthand.dmi' + abstract_type = /obj/item/clothing/gloves greyscale_colors = null greyscale_config_inhand_left = /datum/greyscale_config/gloves_inhand_left greyscale_config_inhand_right = /datum/greyscale_config/gloves_inhand_right diff --git a/code/modules/clothing/gloves/insulated.dm b/code/modules/clothing/gloves/insulated.dm index df1e00cf3a8..c3d44c9c760 100644 --- a/code/modules/clothing/gloves/insulated.dm +++ b/code/modules/clothing/gloves/insulated.dm @@ -1,4 +1,5 @@ /obj/item/clothing/gloves/color + abstract_type = /obj/item/clothing/gloves/color dying_key = DYE_REGISTRY_GLOVES greyscale_colors = null diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index a732613edf7..71e3b789a6c 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -4,6 +4,7 @@ worn_icon = 'icons/mob/clothing/head/default.dmi' lefthand_file = 'icons/mob/inhands/clothing/hats_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/hats_righthand.dmi' + abstract_type = /obj/item/clothing/head body_parts_covered = HEAD slot_flags = ITEM_SLOT_HEAD diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index ef9385f40ef..8c10a3126d5 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -7,6 +7,7 @@ icon = 'icons/obj/clothing/head/costume.dmi' worn_icon = 'icons/mob/clothing/head/costume.dmi' icon_state = null + abstract_type = /obj/item/clothing/head/collectable /obj/item/clothing/head/collectable/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm index 971470bdf1d..7607dc8631c 100644 --- a/code/modules/clothing/head/costume.dm +++ b/code/modules/clothing/head/costume.dm @@ -1,6 +1,7 @@ /obj/item/clothing/head/costume icon = 'icons/obj/clothing/head/costume.dmi' worn_icon = 'icons/mob/clothing/head/costume.dmi' + abstract_type = /obj/item/clothing/head/costume /obj/item/clothing/head/costume/powdered_wig name = "powdered wig" diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 904a905c877..65c076005a0 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -1,6 +1,7 @@ /obj/item/clothing/head/hats icon = 'icons/obj/clothing/head/hats.dmi' worn_icon = 'icons/mob/clothing/head/hats.dmi' + abstract_type = /obj/item/clothing/head/hats /obj/item/clothing/head/hats/centhat name = "\improper CentCom hat" @@ -327,7 +328,13 @@ /obj/item/clothing/head/costume/ushanka name = "ushanka" desc = "Perfect for winter in Siberia, da?" - icon_state = "ushankadown" + icon = 'icons/map_icons/clothing/head/_head.dmi' + icon_state = "/obj/item/clothing/head/costume/ushanka" + post_init_icon_state = "ushanka_gagdown" + greyscale_config = /datum/greyscale_config/ushanka + greyscale_config_worn = /datum/greyscale_config/ushanka/worn + greyscale_colors = "#C7B08B#5A4E44" + flags_1 = IS_PLAYER_COLORABLE_1 inhand_icon_state = null flags_inv = HIDEEARS //SKYRAT EDIT (Original: HIDEEARS|HIDEHAIR) cold_protection = HEAD @@ -335,9 +342,9 @@ dog_fashion = /datum/dog_fashion/head/ushanka var/earflaps = TRUE ///Sprite visible when the ushanka flaps are folded up. - var/upsprite = "ushankaup" + var/upsprite = "ushanka_gagup" ///Sprite visible when the ushanka flaps are folded down. - var/downsprite = "ushankadown" + var/downsprite = "ushanka_gagdown" /obj/item/clothing/head/costume/ushanka/attack_self(mob/user) if(earflaps) @@ -353,9 +360,20 @@ /obj/item/clothing/head/costume/ushanka/polar name = "bear hunter's ushanka" desc = "Handcrafted in Siberia from real polar bears." - icon_state = "ushankadown_polar" - upsprite = "ushankaup_polar" - downsprite = "ushankadown_polar" + icon_state = "/obj/item/clothing/head/costume/ushanka/polar" + greyscale_colors = "#FCFCFD#CCCED1" + flags_1 = null + +/obj/item/clothing/head/costume/ushanka/sec + name = "security ushanka" + icon_state = "/obj/item/clothing/head/costume/ushanka/sec" + desc = "A warm and comfortable ushanka, dyed with 'all natural flavors' according to the tag." + greyscale_colors = "#C7B08B#A52F29" + armor_type = /datum/armor/head_helmet + flags_1 = null + +/obj/item/clothing/head/costume/nightcap + abstract_type = /obj/item/clothing/head/costume/nightcap /obj/item/clothing/head/costume/nightcap/blue name = "blue nightcap" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index d593119dafe..be5c86740c3 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -398,6 +398,7 @@ /obj/item/clothing/head/hats/hos name = "generic head of security hat" desc = "Please contact the Nanotrasen Costuming Department if found." + abstract_type = /obj/item/clothing/head/hats/hos armor_type = /datum/armor/hats_hos strip_delay = 8 SECONDS diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index bed6d8afab7..8682dc4a927 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -3,6 +3,7 @@ icon = 'icons/obj/clothing/masks.dmi' lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi' + abstract_type = /obj/item/clothing/mask body_parts_covered = HEAD slot_flags = ITEM_SLOT_MASK strip_delay = 4 SECONDS diff --git a/code/modules/clothing/masks/animal_masks.dm b/code/modules/clothing/masks/animal_masks.dm index d3482a2c39e..2913ae101ff 100644 --- a/code/modules/clothing/masks/animal_masks.dm +++ b/code/modules/clothing/masks/animal_masks.dm @@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( )) /obj/item/clothing/mask/animal + abstract_type = /obj/item/clothing/mask w_class = WEIGHT_CLASS_SMALL clothing_flags = VOICEBOX_TOGGLABLE var/modifies_speech = TRUE @@ -193,6 +194,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( /obj/item/clothing/mask/animal/small name = "A small animal mask" desc = "If you're seeing this, yell at a coder." + abstract_type = /obj/item/clothing/mask/animal/small flags_inv = HIDEFACE|HIDESNOUT /obj/item/clothing/mask/animal/small/make_cursed() diff --git a/code/modules/clothing/masks/costume.dm b/code/modules/clothing/masks/costume.dm index 41e4e48dd6b..8ddfcf5520f 100644 --- a/code/modules/clothing/masks/costume.dm +++ b/code/modules/clothing/masks/costume.dm @@ -68,7 +68,9 @@ w_class = WEIGHT_CLASS_SMALL flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT custom_price = PAYCHECK_CREW + visor_flags = MASKINTERNALS greyscale_colors = COLOR_VERY_LIGHT_GRAY + alternate_worn_layer = BENEATH_HAIR_LAYER icon = 'icons/map_icons/clothing/mask.dmi' icon_state = "/obj/item/clothing/mask/rebellion" post_init_icon_state = "rebellion_mask" diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 7cfdbfeb8d0..4af712a6b3a 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -1,6 +1,7 @@ /obj/item/clothing/neck name = "necklace" icon = 'icons/obj/clothing/neck.dmi' + abstract_type = /obj/item/clothing/neck body_parts_covered = NECK slot_flags = ITEM_SLOT_NECK interaction_flags_click = NEED_DEXTERITY diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 52216c269d2..ff7a81b9c54 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -3,6 +3,7 @@ icon = 'icons/obj/clothing/shoes.dmi' lefthand_file = 'icons/mob/inhands/clothing/shoes_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/shoes_righthand.dmi' + abstract_type = /obj/item/clothing/shoes desc = "Comfortable-looking shoes." pickup_sound = 'sound/items/handling/shoes/sneakers_pickup1.ogg' drop_sound = 'sound/items/handling/shoes/sneakers_drop1.ogg' diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index b112828e390..675ea6d8352 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -3,6 +3,7 @@ icon = 'icons/obj/clothing/suits/default.dmi' lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' + abstract_type = /obj/item/clothing/suit var/fire_resist = T0C+100 allowed = list( /obj/item/tank/internals/emergency_oxygen, diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7f936df4291..a8eb872bca3 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -2,6 +2,7 @@ name = "armor" icon = 'icons/obj/clothing/suits/armor.dmi' worn_icon = 'icons/mob/clothing/suits/armor.dmi' + abstract_type = /obj/item/clothing/suit/armor allowed = null body_parts_covered = CHEST cold_protection = CHEST|GROIN @@ -779,6 +780,9 @@ acid = 50 wound = 30 +/obj/item/clothing/suit/armor/durability + abstract_type = /obj/item/clothing/suit/armor/durability + /obj/item/clothing/suit/armor/durability/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE) take_damage(1, BRUTE, 0, 0) diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index fdc510e3e1c..685d38745ee 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -1,6 +1,7 @@ /obj/item/clothing/suit/costume icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' + abstract_type = /obj/item/clothing/suit/costume /obj/item/clothing/suit/hooded/flashsuit name = "flashy costume" @@ -77,6 +78,10 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT armor_type = /datum/armor/costume_justice +/obj/item/clothing/suit/costume/justice/Initialize(mapload) + . = ..() + allowed = GLOB.security_vest_allowed + /datum/armor/costume_justice melee = 35 bullet = 30 @@ -122,7 +127,10 @@ inhand_icon_state = "imperium_monk" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDEBELT - allowed = list(/obj/item/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/cup/glass/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/flashlight/flare/candle, /obj/item/tank/internals/emergency_oxygen) + +/obj/item/clothing/suit/costume/imperium_monk/Initialize(mapload) + . = ..() + allowed = GLOB.chaplain_suit_allowed /obj/item/clothing/suit/costume/chickensuit name = "chicken suit" @@ -354,8 +362,6 @@ worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS|LEGS|FEET - //cold_protection = CHEST|GROIN|ARMS - //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT allowed = list() hoodtype = /obj/item/clothing/head/hooded/ian_hood dog_fashion = /datum/dog_fashion/back @@ -367,8 +373,6 @@ worn_icon = 'icons/mob/clothing/head/costume.dmi' icon_state = "ian" body_parts_covered = HEAD - //cold_protection = HEAD - //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT flags_inv = HIDEHAIR|HIDEEARS /obj/item/clothing/suit/hooded/bee_costume // It's Hip! @@ -619,6 +623,7 @@ /obj/item/clothing/suit/costume/hawaiian/Initialize(mapload) . = ..() AddComponent(/datum/component/adjust_fishing_difficulty, -5) + allowed += GLOB.personal_carry_allowed /obj/item/clothing/suit/costume/football_armor name = "football protective gear" @@ -637,6 +642,10 @@ desc = "I mean, don’t you have to be funny to be a comedian?" icon_state = "joker_coat" +/obj/item/clothing/suit/costume/joker/Initialize(mapload) + . = ..() + allowed += GLOB.personal_carry_allowed + /obj/item/clothing/suit/costume/deckers name = "decker hoodie" desc = "Based? Based on what?" diff --git a/code/modules/clothing/suits/ghostsheet.dm b/code/modules/clothing/suits/ghostsheet.dm index 52c19be3bd1..d5d9c370ae9 100644 --- a/code/modules/clothing/suits/ghostsheet.dm +++ b/code/modules/clothing/suits/ghostsheet.dm @@ -28,8 +28,9 @@ desc = "This is obviously just a bedsheet, but maybe try it on?" icon = 'icons/obj/clothing/suits/costume.dmi' worn_icon = 'icons/mob/clothing/suits/costume.dmi' - user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150) + icon_state = "ghost_sheet" inhand_icon_state = null + user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost", "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150) throwforce = 0 throw_speed = 1 throw_range = 2 diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm index ddd05bf5ab6..820aeba2e14 100644 --- a/code/modules/clothing/suits/jacket.dm +++ b/code/modules/clothing/suits/jacket.dm @@ -1,6 +1,7 @@ /obj/item/clothing/suit/jacket icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' + abstract_type = /obj/item/clothing/suit/jacket allowed = list( /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, @@ -9,31 +10,39 @@ /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio, - /obj/item/storage/belt/holster, ) body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT species_exception = list(/datum/species/golem) +/obj/item/clothing/suit/jacket/Initialize(mapload) + . = ..() + allowed += GLOB.personal_carry_allowed + /obj/item/clothing/suit/toggle/jacket icon = 'icons/obj/clothing/suits/jacket.dmi' worn_icon = 'icons/mob/clothing/suits/jacket.dmi' + abstract_type = /obj/item/clothing/suit/toggle/jacket allowed = list( /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, + /obj/item/tank/jetpack/oxygen/captain, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio, - /obj/item/storage/belt/holster, ) body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT species_exception = list(/datum/species/golem) +/obj/item/clothing/suit/toggle/jacket/Initialize(mapload) + . = ..() + allowed += GLOB.personal_carry_allowed + /obj/item/clothing/suit/toggle/jacket/sweater name = "sweater jacket" desc = "A sweater jacket." @@ -58,6 +67,10 @@ blood_overlay_type = "coat" flags_inv = HIDEBELT +/obj/item/clothing/suit/toggle/jacket/trenchcoat/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed + /obj/item/clothing/suit/jacket/blazer name = "blazer jacket" desc = "A blazer jacket." @@ -100,17 +113,10 @@ desc = "Aviators not included." icon_state = "bomberjacket" inhand_icon_state = "brownjsuit" - allowed = list( - /obj/item/flashlight, - /obj/item/tank/internals/emergency_oxygen, - /obj/item/tank/internals/plasmaman, - /obj/item/toy, - /obj/item/storage/fancy/cigarettes, - /obj/item/lighter, - /obj/item/gun/ballistic/rifle/boltaction/pipegun, - /obj/item/gun/energy/laser/musket, - /obj/item/radio, - ) + +/obj/item/clothing/suit/jacket/bomber/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed /obj/item/clothing/suit/jacket/leather name = "leather jacket" @@ -119,20 +125,10 @@ inhand_icon_state = "hostrench" resistance_flags = NONE max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT - allowed = list( - /obj/item/flashlight, - /obj/item/tank/internals/emergency_oxygen, - /obj/item/tank/internals/plasmaman, - /obj/item/toy, - /obj/item/storage/fancy/cigarettes, - /obj/item/lighter, - /obj/item/gun/ballistic/automatic/pistol, - /obj/item/gun/ballistic/revolver, - /obj/item/gun/ballistic/revolver/c38/detective, - /obj/item/gun/ballistic/rifle/boltaction/pipegun, - /obj/item/gun/energy/laser/musket, - /obj/item/radio, - ) + +/obj/item/clothing/suit/jacket/leather/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed /obj/item/clothing/suit/jacket/leather/biker name = "biker jacket" @@ -166,20 +162,10 @@ desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." icon_state = "militaryjacket" inhand_icon_state = null - allowed = list( - /obj/item/flashlight, - /obj/item/tank/internals/emergency_oxygen, - /obj/item/tank/internals/plasmaman, - /obj/item/toy, - /obj/item/storage/fancy/cigarettes, - /obj/item/lighter, - /obj/item/gun/ballistic/automatic/pistol, - /obj/item/gun/ballistic/revolver, - /obj/item/gun/ballistic/revolver/c38/detective, - /obj/item/gun/ballistic/rifle/boltaction/pipegun, - /obj/item/gun/energy/laser/musket, - /obj/item/radio, - ) + +/obj/item/clothing/suit/jacket/miljacket/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed /obj/item/clothing/suit/jacket/letterman name = "letterman jacket" @@ -188,6 +174,10 @@ inhand_icon_state = null species_exception = list(/datum/species/golem) +/obj/item/clothing/suit/jacket/letterman/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed + /obj/item/clothing/suit/jacket/letterman_red name = "red letterman jacket" desc = "A letterman jacket in a sick red color. Radical." @@ -195,26 +185,20 @@ inhand_icon_state = null species_exception = list(/datum/species/golem) +/obj/item/clothing/suit/jacket/letterman_red/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed + /obj/item/clothing/suit/jacket/letterman_syndie name = "blood-red letterman jacket" desc = "Oddly, this jacket seems to have a large S on the back..." icon_state = "letterman_s" inhand_icon_state = null species_exception = list(/datum/species/golem) - allowed = list( - /obj/item/flashlight, - /obj/item/tank/internals/emergency_oxygen, - /obj/item/tank/internals/plasmaman, - /obj/item/toy, - /obj/item/storage/fancy/cigarettes, - /obj/item/lighter, - /obj/item/gun/ballistic/automatic/pistol, - /obj/item/gun/ballistic/revolver, - /obj/item/gun/ballistic/revolver/c38/detective, - /obj/item/gun/ballistic/rifle/boltaction/pipegun, - /obj/item/gun/energy/laser/musket, - /obj/item/radio, - ) + +/obj/item/clothing/suit/jacket/letterman_syndie/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed /obj/item/clothing/suit/jacket/letterman_nanotrasen name = "blue letterman jacket" @@ -222,3 +206,7 @@ icon_state = "letterman_n" inhand_icon_state = null species_exception = list(/datum/species/golem) + +/obj/item/clothing/suit/jacket/letterman_nanotrasen/Initialize(mapload) + . = ..() + allowed += GLOB.improvised_firearm_allowed diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 1040bc03120..12ba36c89eb 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -58,9 +58,13 @@ return /obj/item/clothing/suit/toggle + abstract_type = /obj/item/clothing/suit/toggle /// The noun that is displayed to the user on toggle. EX: "Toggles the suit's [buttons]". var/toggle_noun = "buttons" /obj/item/clothing/suit/toggle/Initialize(mapload) . = ..() AddComponent(/datum/component/toggle_icon, toggle_noun) + +/obj/item/clothing/head/hooded + abstract_type = /obj/item/clothing/head/hooded diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 94cfb678d1e..266cc59bb2d 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -4,6 +4,7 @@ worn_icon = 'icons/mob/clothing/under/default.dmi' lefthand_file = 'icons/mob/inhands/clothing/suits_lefthand.dmi' righthand_file = 'icons/mob/inhands/clothing/suits_righthand.dmi' + abstract_type = /obj/item/clothing/under body_parts_covered = CHEST|GROIN|LEGS|ARMS slot_flags = ITEM_SLOT_ICLOTHING interaction_flags_click = NEED_DEXTERITY @@ -296,9 +297,6 @@ BUBBERSTATION CHANGE END */ LAZYADD(attached_accessories, accessory) accessory.forceMove(src) - if(isnull(accessory_overlay)) - create_accessory_overlay() - // Allow for accessories to react to the acccessory list now accessory.successful_attach(src) @@ -321,35 +319,25 @@ BUBBERSTATION CHANGE END */ popped_accessory.balloon_alert(user, "accessory removed") /// Removes the passed accesory from our accessories list -/obj/item/clothing/under/proc/remove_accessory(obj/item/clothing/accessory/removed) - if(removed == attached_accessories[1]) - accessory_overlay = null +/obj/item/clothing/under/proc/remove_accessory(obj/item/clothing/accessory/removed, update = TRUE) + // Remove it from the list before detaching LAZYREMOVE(attached_accessories, removed) - if(isnull(accessory_overlay) && LAZYLEN(attached_accessories)) - create_accessory_overlay() - removed.detach(src) - update_appearance() + if(update) + update_accessory_overlay() -/// Handles creating the worn overlay mutable appearance -/// Only the first accessory attached is displayed (currently) -/obj/item/clothing/under/proc/create_accessory_overlay() - var/obj/item/clothing/accessory/prime_accessory = attached_accessories[1] - accessory_overlay = mutable_appearance(prime_accessory.worn_icon, prime_accessory.icon_state) - accessory_overlay.alpha = prime_accessory.alpha - accessory_overlay.color = prime_accessory.color - -/// Updates the accessory's worn overlay mutable appearance +/// Handles creating, updating and cutting the worn overlay mutable appearance. /obj/item/clothing/under/proc/update_accessory_overlay() - if(isnull(accessory_overlay)) + if(!length(attached_accessories)) + accessory_overlay = null return - - cut_overlay(accessory_overlay) - create_accessory_overlay() + accessory_overlay = mutable_appearance() + for(var/obj/item/clothing/accessory/accessory as anything in attached_accessories) + accessory_overlay.overlays += accessory.generate_accessory_overlay(src) update_appearance() // so we update the suit inventory overlay too /obj/item/clothing/under/Exited(atom/movable/gone, direction) @@ -361,8 +349,9 @@ BUBBERSTATION CHANGE END */ /// Helper to remove all attachments to the passed location /obj/item/clothing/under/proc/dump_attachments(atom/drop_to = drop_location()) for(var/obj/item/clothing/accessory/worn_accessory as anything in attached_accessories) - remove_accessory(worn_accessory) + remove_accessory(worn_accessory, update = FALSE) worn_accessory.forceMove(drop_to) + update_accessory_overlay() /obj/item/clothing/under/atom_destruction(damage_flag) dump_attachments() @@ -539,4 +528,5 @@ BUBBERSTATION CHANGE END */ return ..() /obj/item/clothing/under/rank + abstract_type = /obj/item/clothing/under/rank dying_key = DYE_REGISTRY_UNDER diff --git a/code/modules/clothing/under/accessories/_accessories.dm b/code/modules/clothing/under/accessories/_accessories.dm index 60fcbf97e5c..0e4e2f98190 100644 --- a/code/modules/clothing/under/accessories/_accessories.dm +++ b/code/modules/clothing/under/accessories/_accessories.dm @@ -15,6 +15,7 @@ worn_icon = 'icons/mob/clothing/accessories.dmi' icon_state = "plasma" inhand_icon_state = "" //no inhands + abstract_type = /obj/item/clothing/accessory slot_flags = NONE w_class = WEIGHT_CLASS_SMALL item_flags = NOBLUDGEON @@ -111,6 +112,10 @@ /obj/item/clothing/accessory/proc/successful_attach(obj/item/clothing/under/attached_to) SHOULD_CALL_PARENT(TRUE) + if(!attached_to.accessory_overlay) + attached_to.accessory_overlay = mutable_appearance() + attached_to.accessory_overlay.overlays += generate_accessory_overlay(attached_to) //uniform appearance will be updated by the caller + // Do on-equip effects if we're already equipped var/mob/worn_on = attached_to.loc if(istype(worn_on)) @@ -119,6 +124,13 @@ SEND_SIGNAL(src, COMSIG_ACCESSORY_ATTACHED, attached_to) SEND_SIGNAL(attached_to, COMSIG_CLOTHING_ACCESSORY_ATTACHED, src) +/obj/item/clothing/accessory/proc/generate_accessory_overlay(obj/item/clothing/under/attached_to) + SHOULD_CALL_PARENT(TRUE) + var/mutable_appearance/appearance = mutable_appearance(worn_icon, icon_state) + appearance.alpha = alpha + appearance.color = color + return appearance + /** * Detach this accessory from the passed clothing article * diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index 1d39d2f1ad7..c2c1325d4aa 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -1,6 +1,7 @@ /obj/item/clothing/under/rank/cargo icon = 'icons/obj/clothing/under/cargo.dmi' worn_icon = 'icons/mob/clothing/under/cargo.dmi' + abstract_type = /obj/item/clothing/under/rank/cargo /obj/item/clothing/under/rank/cargo/qm name = "quartermaster's uniform" diff --git a/code/modules/clothing/under/jobs/centcom.dm b/code/modules/clothing/under/jobs/centcom.dm index ccd268eb764..38bcafe1211 100644 --- a/code/modules/clothing/under/jobs/centcom.dm +++ b/code/modules/clothing/under/jobs/centcom.dm @@ -1,6 +1,7 @@ /obj/item/clothing/under/rank/centcom icon = 'icons/obj/clothing/under/centcom.dmi' worn_icon = 'icons/mob/clothing/under/centcom.dmi' + abstract_type = /obj/item/clothing/under/rank/centcom /obj/item/clothing/under/rank/centcom/commander name = "\improper CentCom commander's suit" diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index d906bc3d879..923cfbaa74c 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -3,6 +3,7 @@ /obj/item/clothing/under/rank/civilian icon = 'icons/obj/clothing/under/civilian.dmi' worn_icon = 'icons/mob/clothing/under/civilian.dmi' + abstract_type = /obj/item/clothing/under/rank/civilian /obj/item/clothing/under/rank/civilian/purple_bartender desc = "It looks like it has lots of flair!" @@ -113,6 +114,7 @@ desc = "Slick threads." icon = 'icons/obj/clothing/under/suits.dmi' worn_icon = 'icons/mob/clothing/under/suits.dmi' + abstract_type = /obj/item/clothing/under/rank/civilian/lawyer can_adjust = FALSE /obj/item/clothing/under/rank/civilian/lawyer/dye_item(dye_color, dye_key_override) diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 85ce2c2976f..257312ffff8 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -3,6 +3,7 @@ /obj/item/clothing/under/rank/engineering icon = 'icons/obj/clothing/under/engineering.dmi' worn_icon = 'icons/mob/clothing/under/engineering.dmi' + abstract_type = /obj/item/clothing/under/rank/engineering armor_type = /datum/armor/clothing_under/rank_engineering resistance_flags = NONE diff --git a/code/modules/clothing/under/jobs/medical.dm b/code/modules/clothing/under/jobs/medical.dm index 9937e23929a..6cf86c8770e 100644 --- a/code/modules/clothing/under/jobs/medical.dm +++ b/code/modules/clothing/under/jobs/medical.dm @@ -1,6 +1,7 @@ /obj/item/clothing/under/rank/medical icon = 'icons/obj/clothing/under/medical.dmi' worn_icon = 'icons/mob/clothing/under/medical.dmi' + abstract_type = /obj/item/clothing/under/rank/medical armor_type = /datum/armor/clothing_under/rank_medical /datum/armor/clothing_under/rank_medical diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm index bb65ef5801f..b5731ac06a4 100644 --- a/code/modules/clothing/under/jobs/rnd.dm +++ b/code/modules/clothing/under/jobs/rnd.dm @@ -1,6 +1,7 @@ /obj/item/clothing/under/rank/rnd icon = 'icons/obj/clothing/under/rnd.dmi' worn_icon = 'icons/mob/clothing/under/rnd.dmi' + abstract_type = /obj/item/clothing/under/rank/rnd armor_type = /datum/armor/clothing_under/science /datum/armor/clothing_under/science diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 10e323e113e..f7c7f869e32 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -12,6 +12,7 @@ /obj/item/clothing/under/rank/security icon = 'icons/obj/clothing/under/security.dmi' worn_icon = 'icons/mob/clothing/under/security.dmi' + abstract_type = /obj/item/clothing/under/rank/security armor_type = /datum/armor/clothing_under/rank_security strip_delay = 5 SECONDS sensor_mode = SENSOR_COORDS diff --git a/code/modules/clothing/under/jobs/station_trait.dm b/code/modules/clothing/under/jobs/station_trait.dm index 034641d35b1..b351bd2a17e 100644 --- a/code/modules/clothing/under/jobs/station_trait.dm +++ b/code/modules/clothing/under/jobs/station_trait.dm @@ -4,6 +4,7 @@ /obj/item/clothing/under/rank/station_trait icon = 'icons/obj/clothing/under/station_trait.dmi' worn_icon = 'icons/mob/clothing/under/station_trait.dmi' + abstract_type = /obj/item/clothing/under/rank/station_trait /obj/item/clothing/under/rank/station_trait/human_ai name = "ai's uniform" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index ba7a6b8c0ba..91ca031837f 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -1,6 +1,7 @@ /obj/item/clothing/under/misc icon = 'icons/obj/clothing/under/misc.dmi' worn_icon = 'icons/mob/clothing/under/misc.dmi' + abstract_type = /obj/item/clothing/under/misc /obj/item/clothing/under/misc/pj name = "\improper PJs" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 0e7caf0e772..db0ad0aaa7d 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -6,6 +6,7 @@ custom_price = PAYCHECK_CREW icon = 'icons/obj/clothing/under/shorts_pants_shirts.dmi' worn_icon = 'icons/mob/clothing/under/shorts_pants_shirts.dmi' + abstract_type = /obj/item/clothing/under/pants species_exception = list(/datum/species/golem) /obj/item/clothing/under/pants/slacks diff --git a/code/modules/explorer_drone/exploration_events/_exploration_event.dm b/code/modules/explorer_drone/exploration_events/_exploration_event.dm index 5385a48fbb4..d60b730e07d 100644 --- a/code/modules/explorer_drone/exploration_events/_exploration_event.dm +++ b/code/modules/explorer_drone/exploration_events/_exploration_event.dm @@ -1,7 +1,7 @@ /// Exploration event /datum/exploration_event /// These types will be ignored in event creation - var/root_abstract_type = /datum/exploration_event + abstract_type = /datum/exploration_event ///This name will show up in exploration list if it's repeatable var/name = "Something interesting" /// encountered at least once @@ -40,7 +40,7 @@ /// Simple events, not a full fledged adventure, consist only of single encounter screen /datum/exploration_event/simple - root_abstract_type = /datum/exploration_event/simple + abstract_type = /datum/exploration_event/simple var/ui_image = "default" /// Show ignore button. var/skippable = TRUE diff --git a/code/modules/explorer_drone/exploration_events/adventure.dm b/code/modules/explorer_drone/exploration_events/adventure.dm index bdf9b62c10b..f7127d67778 100644 --- a/code/modules/explorer_drone/exploration_events/adventure.dm +++ b/code/modules/explorer_drone/exploration_events/adventure.dm @@ -2,7 +2,7 @@ /datum/exploration_event/adventure discovery_log = "Encountered something unexpected" var/datum/adventure/adventure - root_abstract_type = /datum/exploration_event/adventure + abstract_type = /datum/exploration_event/adventure /datum/exploration_event/adventure/encounter(obj/item/exodrone/drone) . = ..() diff --git a/code/modules/explorer_drone/exploration_events/danger.dm b/code/modules/explorer_drone/exploration_events/danger.dm index 605974fa828..5a4d7020742 100644 --- a/code/modules/explorer_drone/exploration_events/danger.dm +++ b/code/modules/explorer_drone/exploration_events/danger.dm @@ -1,6 +1,6 @@ /// Danger event - unskippable, if you have appriopriate tool you can mitigate damage. /datum/exploration_event/simple/danger - root_abstract_type = /datum/exploration_event/simple/danger + abstract_type = /datum/exploration_event/simple/danger description = "You encounter a giant error." var/required_tool = EXODRONE_TOOL_LASER var/has_tool_action_text = "Fight" @@ -88,7 +88,7 @@ required_tool = EXODRONE_TOOL_MULTITOOL deep_scan_description = "Site is exposed to space radiation. Using self-diagnostic multiool attachment advised." description = "The drone feed suddenly goes haywire! It seems that the drone got hit by a burst of cosmic rays! You'll have to wait for the signal to be restored." - has_tool_description = "Your multitool should allow a significant amount of the damage to be repaired on its own." //wait, what? + has_tool_description = "Your multitool should allow a significant amount of the damage to be repaired on its own." //wait, what? no_tool_description = "Nothing more to be done than to wait and assess the damage." has_tool_action_text = "Wait" no_tool_action_text = "Wait" diff --git a/code/modules/explorer_drone/exploration_events/resource.dm b/code/modules/explorer_drone/exploration_events/resource.dm index 14f6a5f2a3d..fcbd104e91c 100644 --- a/code/modules/explorer_drone/exploration_events/resource.dm +++ b/code/modules/explorer_drone/exploration_events/resource.dm @@ -1,7 +1,7 @@ /// Simple event type that checks if you have a tool and after a retrieval delay adds loot to drone. /datum/exploration_event/simple/resource name = "retrievable resource" - root_abstract_type = /datum/exploration_event/simple/resource + abstract_type = /datum/exploration_event/simple/resource discovery_log = "Encountered recoverable resource." action_text = "Extract" /// Tool type required to recover this resource diff --git a/code/modules/explorer_drone/exploration_events/trader.dm b/code/modules/explorer_drone/exploration_events/trader.dm index 0367eb71516..ba0bbdf22ed 100644 --- a/code/modules/explorer_drone/exploration_events/trader.dm +++ b/code/modules/explorer_drone/exploration_events/trader.dm @@ -1,6 +1,6 @@ /// Trader events - If drone is loaded with X exchanges it for Y, might require translator tool. /datum/exploration_event/simple/trader - root_abstract_type = /datum/exploration_event/simple/trader + abstract_type = /datum/exploration_event/simple/trader action_text = "Trade" /// Obj path we'll take or list of paths ,one path will be picked from it at init var/required_path diff --git a/code/modules/explorer_drone/exploration_site.dm b/code/modules/explorer_drone/exploration_site.dm index 9a21203d596..4a8be99417e 100644 --- a/code/modules/explorer_drone/exploration_site.dm +++ b/code/modules/explorer_drone/exploration_site.dm @@ -120,7 +120,7 @@ GLOBAL_LIST_EMPTY(exploration_sites) . = list() for(var/event_type in subtypesof(/datum/exploration_event)) var/datum/exploration_event/event = event_type - if(initial(event.root_abstract_type) == event_type) + if(initial(event.abstract_type) == event_type) continue event = new event_type .[event_type] = list("required" = event.required_site_traits,"blacklisted" = event.blacklisted_site_traits) diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm index 600313c8383..225e8d86865 100644 --- a/code/modules/food_and_drinks/plate.dm +++ b/code/modules/food_and_drinks/plate.dm @@ -26,8 +26,7 @@ /obj/item/plate/item_interaction(mob/living/user, obj/item/tool, list/modifiers) if(!IS_EDIBLE(tool)) - balloon_alert(user, "not food!") - return ITEM_INTERACT_BLOCKING + return NONE if(tool.w_class > biggest_w_class) balloon_alert(user, "too big!") return ITEM_INTERACT_BLOCKING diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm index 78b9623c3a0..2b3cefec7db 100644 --- a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm +++ b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm @@ -656,3 +656,70 @@ /datum/chemical_reaction/drink/blue_hawaiian results = list(/datum/reagent/consumable/ethanol/blue_hawaiian = 5) required_reagents = list(/datum/reagent/consumable/ethanol/coconut_rum = 2, /datum/reagent/consumable/pineapplejuice = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/ethanol/curacao = 1) + +/datum/chemical_reaction/drink/boston_sour + results = list(/datum/reagent/consumable/ethanol/boston_sour = 15) + required_reagents = list(/datum/reagent/consumable/ethanol/whiskey_sour = 15, /datum/reagent/consumable/eggwhite = 2, /datum/reagent/consumable/ethanol/bitters = 1) + mix_message = "A frothy head forms over the mixture." + +/datum/chemical_reaction/drink/star + results = list(/datum/reagent/consumable/ethanol/star = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/applejack = 5, /datum/reagent/consumable/ethanol/vermouth = 5, /datum/reagent/consumable/ethanol/bitters = 1) + +/datum/chemical_reaction/drink/old_fashioned + results = list(/datum/reagent/consumable/ethanol/old_fashioned = 30) + required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 25, /datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/ethanol/bitters = 2) + mix_message = "The sugar dissolves into the bitters and whiskey." + +/datum/chemical_reaction/drink/sazerac + results = list(/datum/reagent/consumable/ethanol/sazerac = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/old_fashioned = 10, /datum/reagent/consumable/ethanol/absinthe = 1) + mix_message = "The mixture takes on a pleasing pink hue." + +/datum/chemical_reaction/drink/amaretto_sour + results = list(/datum/reagent/consumable/ethanol/amaretto_sour = 15) + required_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 10, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/eggwhite = 2) + mix_message = "A frothy head forms over the mixture." + +/datum/chemical_reaction/drink/ramos_gin_fizz + results = list(/datum/reagent/consumable/ethanol/ramos_gin_fizz = 25) + //yes, this is intentionally a pain in the ass + required_reagents = list(/datum/reagent/consumable/ethanol/ginfizz = 12, /datum/reagent/consumable/lemonjuice = 3, /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/eggwhite = 3, /datum/reagent/consumable/cream = 3, /datum/reagent/consumable/ethanol/triple_sec = 1) + mix_message = "The drink forms a rising head of foam that begins to creep out of the top of the glass." + +/datum/chemical_reaction/drink/french_75 + results = list(/datum/reagent/consumable/ethanol/french_75 = 10) + required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 5, /datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/sugar = 1) + +/datum/chemical_reaction/drink/sangria + results = list(/datum/reagent/consumable/ethanol/sangria = 20) + required_reagents = list(/datum/reagent/consumable/ethanol/wine = 10, /datum/reagent/consumable/ethanol/cognac = 3, /datum/reagent/consumable/triple_citrus = 3, /datum/reagent/consumable/sodawater = 3, /datum/reagent/consumable/sugar = 1) + +/datum/chemical_reaction/drink/suffering_bastard + results = list(/datum/reagent/consumable/ethanol/suffering_bastard = 20) + required_reagents = list(/datum/reagent/consumable/sol_dry = 10, /datum/reagent/consumable/ethanol/cognac = 3, /datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/consumable/limejuice = 2, /datum/reagent/consumable/ethanol/bitters = 1, /datum/reagent/consumable/sugar = 1) + +/datum/chemical_reaction/drink/hot_toddy + results = list(/datum/reagent/consumable/ethanol/hot_toddy = 10) + required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/ethanol/cognac = 3, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/lemonjuice = 1) + mix_message = "The scent of warm cognac fills the air." + required_temp = 320 //Pour 100c water into other ingredients + +/datum/chemical_reaction/drink/tizirian_sour + results = list(/datum/reagent/consumable/ethanol/tizirian_sour = 8) + required_reagents = list(/datum/reagent/consumable/ethanol/bitters = 3, /datum/reagent/consumable/lemonjuice = 2, /datum/reagent/consumable/korta_nectar = 2, /datum/reagent/consumable/sugar = 1) + +/datum/chemical_reaction/drink/daiquiri + results = list(/datum/reagent/consumable/ethanol/daiquiri = 6) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 3, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ice = 1) + +/datum/chemical_reaction/drink/flip_cocktail + results=list(/datum/reagent/consumable/ethanol/flip_cocktail = 25) + required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 15, /datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/eggwhite = 4, /datum/reagent/consumable/eggyolk = 2) + mix_message = "The egg emulsifies into a smooth mixture." + +/datum/chemical_reaction/drink/blue_blazer + results=list(/datum/reagent/consumable/ethanol/blue_blazer = 9) + required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 4, /datum/reagent/water = 4, /datum/reagent/consumable/sugar = 1) + mix_message = "The whiskey ignites in a brilliant blue flame!" + required_temp = 365 //autoignition temp of ethanol diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm index 3790c7a3100..9b4f82d0c34 100644 --- a/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm +++ b/code/modules/food_and_drinks/recipes/drinks/drinks_non-alcoholic.dm @@ -177,3 +177,7 @@ /datum/chemical_reaction/drink/t_letter results = list(/datum/reagent/consumable/t_letter = 2) required_reagents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/tea = 1) + +/datum/chemical_reaction/drink/bitters_soda + results = list(/datum/reagent/consumable/ethanol/bitters_soda = 15) + required_reagents = list(/datum/reagent/consumable/sodawater = 10, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/ethanol/bitters = 1) diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm index f8258dca0f4..7ecdfaa60b6 100644 --- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm +++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm @@ -95,6 +95,7 @@ /datum/reagent/consumable/ethanol/beer = 25, /datum/reagent/consumable/ethanol/b52 = 6, /datum/reagent/consumable/ethanol/manhattan = 3, + /datum/reagent/consumable/ethanol/old_fashioned = 3, /datum/reagent/consumable/ethanol/atomicbomb = 1, ), ) @@ -141,6 +142,7 @@ /datum/reagent/consumable/ethanol/wine = 3, /datum/reagent/consumable/ethanol/grappa = 3, /datum/reagent/consumable/ethanol/amaretto = 5, + /datum/reagent/consumable/ethanol/amaretto_sour = 3, /datum/reagent/consumable/cucumberlemonade = 2, ), ) @@ -178,6 +180,7 @@ /datum/reagent/consumable/ethanol/beer = 5, /datum/reagent/consumable/ethanol/wine = 5, /datum/reagent/consumable/ethanol/gin_garden = 2, + /datum/reagent/consumable/ethanol/french_75 = 5, ), ) @@ -396,6 +399,7 @@ /datum/reagent/consumable/ethanol/martini = 5, /datum/reagent/consumable/ethanol/gintonic = 5, /datum/reagent/consumable/tea = 10, + /datum/reagent/consumable/ethanol/hot_toddy = 5, ), ) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index a254241d1fd..3a819bf9941 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -11,10 +11,11 @@ // Base type. Subtypes are found in /grown dir. Lavaland-based subtypes can be found in mining/ash_flora.dm /obj/item/food/grown + name = "fresh produce" // so recipe text doesn't say 'snack' icon = 'icons/obj/service/hydroponics/harvest.dmi' icon_state = "berrypile" worn_icon = 'icons/mob/clothing/head/hydroponics.dmi' - name = "fresh produce" // so recipe text doesn't say 'snack' + abstract_type = /obj/item/food/grown max_volume = PLANT_REAGENT_VOLUME w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index f23bb43305b..93be3a4a05f 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -1,11 +1,12 @@ // Citrus - base type /obj/item/food/grown/citrus - seed = /obj/item/seeds/lime name = "citrus" desc = "It's so sour, your face will twist." icon_state = "lime" + abstract_type = /obj/item/food/grown/citrus foodtypes = FRUIT wine_power = 30 + seed = /obj/item/seeds/lime // Lime /obj/item/seeds/lime diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index d15e9664854..8fb4c974f1c 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -15,23 +15,10 @@ growing_icon = 'icons/obj/service/hydroponics/growing_flowers.dmi' icon_grow = "poppy-grow" icon_dead = "poppy-dead" - genes = list(/datum/plant_gene/trait/preserved) + genes = list(/datum/plant_gene/trait/preserved, /datum/plant_gene/trait/opium_production) mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily) reagents_add = list(/datum/reagent/medicine/c2/libital = 0.2, /datum/reagent/consumable/nutriment = 0.05) -/obj/item/seeds/poppy/interact_with_atom(obj/item/I, mob/user, obj/machinery/hydroponics/tray) - if(I.sharpness && !src.extracted && tray.age >= 10 && tray.age <= 19) - src.extracted = TRUE - var/seed_yield = tray.myseed?.potency - new /obj/item/food/drug/opium/raw(get_turf(src), seed_yield) - playsound(src, 'sound/effects/bubbles/bubbles.ogg', 30, TRUE) - playsound(loc, 'sound/items/weapons/bladeslice.ogg', 30, TRUE) - user.visible_message( - span_notice("You carefully slice the poppy's pod, collecting the fragrant, alluring sap.") - ) - return ITEM_INTERACT_SUCCESS - return NONE - /obj/item/food/grown/poppy seed = /obj/item/seeds/poppy name = "poppy" @@ -55,6 +42,7 @@ growing_icon = 'icons/obj/service/hydroponics/growing_flowers.dmi' icon_grow = "lily-grow" icon_dead = "lily-dead" + genes = list(/datum/plant_gene/trait/preserved) mutatelist = list(/obj/item/seeds/poppy/lily/trumpet) /obj/item/food/grown/poppy/lily @@ -84,7 +72,7 @@ icon_grow = "spacemanstrumpet-grow" icon_dead = "spacemanstrumpet-dead" mutatelist = null - genes = list(/datum/plant_gene/reagent/preset/polypyr, /datum/plant_gene/trait/preserved) + genes = list(/datum/plant_gene/trait/preserved, /datum/plant_gene/reagent/preset/polypyr) reagents_add = list(/datum/reagent/consumable/nutriment = 0.05) rarity = 30 graft_gene = /datum/plant_gene/reagent/preset/polypyr @@ -109,6 +97,7 @@ growing_icon = 'icons/obj/service/hydroponics/growing_flowers.dmi' icon_grow = "geranium-grow" icon_dead = "geranium-dead" + genes = list(/datum/plant_gene/trait/preserved) mutatelist = list(/obj/item/seeds/poppy/geranium/fraxinella) /obj/item/food/grown/poppy/geranium diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 9d0e465d033..7a1003ed2ad 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -1,5 +1,6 @@ /obj/item/food/grown/mushroom name = "mushroom" + abstract_type = /obj/item/food/grown/mushroom // This is a prototype that should never be spawned // but we'll default it to SOME seed if it does end up spawning just so we don't runtime horribly seed = /obj/item/seeds/chanter diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index f0db7a02282..f2d611b1aef 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -42,7 +42,11 @@ throw_range = 3 attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks") attack_verb_simple = list("bash", "batter", "bludgeon", "whack") + /// Type of plank you can get from this type of log var/plank_type = /obj/item/stack/sheet/mineral/wood + /// How many planks you can get from this type of log, without counting seed potency + var/plank_count = 1 + /// Name of plank, shown in context tips and balloon alerts when cutting the log var/plank_name = "wooden planks" var/static/list/accepted = typecacheof(list( /obj/item/food/grown/tobacco, @@ -56,6 +60,8 @@ /obj/item/grown/log/Initialize(mapload, obj/item/seeds/new_seed) . = ..() register_context() + if(seed) + plank_count += round(seed.potency / 25) /obj/item/grown/log/add_context( atom/source, @@ -80,9 +86,6 @@ /obj/item/grown/log/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers) if(attacking_item.get_sharpness()) - var/plank_count = 1 - if(seed) - plank_count += round(seed.potency / 25) user.balloon_alert(user, "made [plank_count] [plank_name]") new plank_type(user.loc, plank_count) @@ -111,6 +114,7 @@ seed = null name = "wood log" desc = "TIMMMMM-BERRRRRRRRRRR!" + plank_count = 10 /obj/item/grown/log/steel seed = /obj/item/seeds/tower/steel diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 2b2556790e2..1565c3113ac 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -6,6 +6,7 @@ name = "grown_weapon" icon = 'icons/obj/service/hydroponics/harvest.dmi' worn_icon = 'icons/mob/clothing/head/hydroponics.dmi' + abstract_type = /obj/item/grown resistance_flags = FLAMMABLE var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item. /// Should we pixel offset ourselves at init? for mapping @@ -13,7 +14,7 @@ /// The reagent this plant distill to. If NULL, it uses a generic fruit_wine reagent and adjusts its variables. var/distill_reagent -// This may look like it's doing nothing but it's necessary, we do this to have kwargs work in New (for passing into Initialize) +// This may look like it's doing nothing but it's necessary, we do this to have kwargs work in New (for passing into Initialize) /obj/item/grown/New(loc, obj/item/seeds/new_seed) return ..() diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 3f2d31bca35..00d01c9732d 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -529,19 +529,24 @@ ///Sets a new value for the myseed variable, which is the seed of the plant that's growing inside the tray. /obj/machinery/hydroponics/proc/set_seed(obj/item/seeds/new_seed, delete_old_seed = TRUE) - var/old_seed = myseed + var/obj/item/seeds/old_seed = myseed myseed = new_seed + for(var/datum/plant_gene/trait/gene in old_seed?.genes) + gene.on_unplanted_from_tray(src, old_seed) if(old_seed && delete_old_seed) qdel(old_seed) set_plant_status(new_seed ? HYDROTRAY_PLANT_GROWING : HYDROTRAY_NO_PLANT) //To make sure they can't just put in another seed and insta-harvest it if(myseed && myseed.loc != src) myseed.forceMove(src) SEND_SIGNAL(src, COMSIG_HYDROTRAY_SET_SEED, new_seed) + for(var/datum/plant_gene/trait/gene in myseed?.genes) + gene.on_plant_in_tray(src, myseed) age = 0 update_appearance() if(isnull(myseed)) remove_shared_particles(/particles/pollen) + /* * Setter proc to set a tray to a new self_sustaining state and update all values associated with it. * @@ -938,12 +943,6 @@ to_chat(user, span_warning("This plot is completely devoid of weeds! It doesn't need uprooting.")) return - else if(O.sharpness) // Allows for the extraction (for opium or sap) interaction if a seed has it. - if(myseed && !myseed.extracted) - myseed.interact_with_atom(O, user, src) - else - return ..() - else if(istype(O, /obj/item/secateurs)) if(!myseed) to_chat(user, span_notice("This plot is empty.")) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index fa367a33188..96650e9b82f 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -122,7 +122,7 @@ /// Flag - Traits that share an ID cannot be placed on the same plant. var/trait_ids /// Flag - Modifications made to the final product. - var/trait_flags + var/trait_flags = TRAIT_SHOW_EXAMINE /// A blacklist of seeds that a trait cannot be attached to. var/list/obj/item/seeds/seed_blacklist @@ -177,10 +177,29 @@ return FALSE // Add on any bonus lines on examine - if(description) + if(description && (trait_flags & TRAIT_SHOW_EXAMINE)) RegisterSignal(our_plant, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) return TRUE +/** + * on_plant_in_tray is called when a seed with this trait is placed in a hydroponics tray + * + * * tray - the hydroponics tray the seed is placed in + * * seed - the seed being placed in the tray + */ +/datum/plant_gene/trait/proc/on_plant_in_tray(obj/machinery/hydroponics/tray, obj/item/seeds/seed) + return + +/** + * on_unplanted_from_tray is called when a seed with this trait is removed from a hydroponics tray + * (this can be done from being harvested, being uprooted, etc.) + * + * * tray - the hydroponics tray the seed is removed from + * * seed - the seed being removed from the tray + */ +/datum/plant_gene/trait/proc/on_unplanted_from_tray(obj/machinery/hydroponics/tray, obj/item/seeds/seed) + return + /// Add on any unique examine text to the plant's examine text. /datum/plant_gene/trait/proc/examine(obj/item/our_plant, mob/examiner, list/examine_list) SIGNAL_HANDLER @@ -334,7 +353,7 @@ to_chat(eater, span_notice("You feel energized as you bite into [our_plant].")) var/batteries_recharged = FALSE var/obj/item/seeds/our_seed = our_plant.get_plant_seed() - for(var/obj/item/stock_parts/power_store/found_cell in eater.get_all_contents()) + for(var/obj/item/stock_parts/power_store/found_cell in eater.get_all_cells()) var/newcharge = min(our_seed.potency * 0.01 * found_cell.maxcharge, found_cell.maxcharge) if(found_cell.charge < newcharge) found_cell.charge = newcharge @@ -498,7 +517,7 @@ description = "The reagent volume is doubled, halving the plant yield instead." icon = FA_ICON_FLASK_VIAL rate = 2 - trait_flags = TRAIT_HALVES_YIELD + trait_flags = TRAIT_SHOW_EXAMINE|TRAIT_HALVES_YIELD mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE /datum/plant_gene/trait/maxchem/on_new_plant(obj/item/our_plant, newloc) @@ -894,7 +913,7 @@ description = "It consumes nutriments to heat up other reagents, halving the yield." icon = FA_ICON_TEMPERATURE_ARROW_UP trait_ids = TEMP_CHANGE_ID - trait_flags = TRAIT_HALVES_YIELD + trait_flags = TRAIT_SHOW_EXAMINE|TRAIT_HALVES_YIELD mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE /** @@ -906,7 +925,7 @@ description = "It consumes nutriments to cool down other reagents, halving the yield." icon = FA_ICON_TEMPERATURE_ARROW_DOWN trait_ids = TEMP_CHANGE_ID - trait_flags = TRAIT_HALVES_YIELD + trait_flags = TRAIT_SHOW_EXAMINE|TRAIT_HALVES_YIELD mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE /// Prevents species mutation, while still allowing wild mutation harvest and Floral Somatoray species mutation. Trait acts as a tag for hydroponics.dm to recognise. diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index d0360769cee..64939d4ac87 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/service/hydroponics/seeds.dmi' icon_state = "seed" // Unknown plant seed - these shouldn't exist in-game. worn_icon_state = "seed" + abstract_type = /obj/item/seeds w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE /// Name of plant when planted. @@ -63,8 +64,6 @@ var/graft_gene ///Determines if the plant should be allowed to mutate early at 30+ instability. var/seed_flags = MUTATE_EARLY - ///Determines if the plant has been sliced with a sharp tool to extract substances like saps. - var/extracted = 0 /obj/item/seeds/Initialize(mapload, nogenes = FALSE) . = ..() @@ -672,3 +671,11 @@ plant_overlay.icon_state = "[icon_grow][t_growthstate]" plant_overlay.pixel_z = plant_icon_offset return plant_overlay + +/// Called when the seed is set in a tray +/obj/item/seeds/proc/on_planted(obj/machinery/hydroponics/parent) + return + +/// Called when the seed is removed from a tray - possibly from being harvested, possibly from being uprooted +/obj/item/seeds/proc/on_unplanted(obj/machinery/hydroponics/parent) + return diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index faddad29b1a..9f2083f8869 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -685,9 +685,53 @@ name = "Complex Harvest" description = "Halves the maximum yield of the plant, and prevents it from benefiting from pollination's yield bonus." icon = FA_ICON_SLASH - trait_flags = TRAIT_HALVES_YIELD|TRAIT_NO_POLLINATION + trait_flags = TRAIT_SHOW_EXAMINE|TRAIT_HALVES_YIELD|TRAIT_NO_POLLINATION mutability_flags = NONE +/// Poppy's unique trait that allows slicing for sap +/datum/plant_gene/trait/opium_production + name = "Sap Buds" + description = "Using a knife or other sharp object on the plant between ages 200 seconds to 400 seconds will yield a sap." + trait_flags = NONE + icon = FA_ICON_PILLS + /// Has parent plant been harvested for sap already? + var/extracted = FALSE + +/datum/plant_gene/trait/opium_production/on_plant_in_tray(obj/machinery/hydroponics/tray, obj/item/seeds/seed) + RegisterSignal(tray, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(try_extract)) + extracted = FALSE // just in case... + +/datum/plant_gene/trait/opium_production/on_unplanted_from_tray(obj/machinery/hydroponics/tray, obj/item/seeds/seed) + UnregisterSignal(tray, COMSIG_ATOM_ITEM_INTERACTION) + +/// Redirect tray item interaction so we can have custom extracting behavior +/datum/plant_gene/trait/opium_production/proc/try_extract(obj/machinery/hydroponics/source, mob/living/user, obj/item/tool, ...) + SIGNAL_HANDLER + + if(!tool.sharpness || tool.tool_behaviour == TOOL_SHOVEL) + return NONE + + if(source.age < 10) + to_chat(user, span_warning("The [LOWER_TEXT(source.myseed.plantname)] are too young to extract sap from!")) + return ITEM_INTERACT_FAILURE + if(source.age > 19) + to_chat(user, span_warning("The [LOWER_TEXT(source.myseed.plantname)] are too old to extract sap from!")) + return ITEM_INTERACT_FAILURE + if(extracted) + to_chat(user, span_warning("The [LOWER_TEXT(source.myseed.plantname)] have already been harvested for sap!")) + return ITEM_INTERACT_FAILURE + + extracted = TRUE + new /obj/item/food/drug/opium/raw(source.drop_location(), source.myseed.potency) + playsound(src, 'sound/effects/bubbles/bubbles.ogg', 30, TRUE) + playsound(tool, 'sound/items/weapons/bladeslice.ogg', 30, TRUE) + user.visible_message( + span_notice("[user] carefully slices open a [source.myseed.species] pod, extracting a sap."), + span_notice("You carefully slice the [source.myseed.species]'s pod, collecting the fragrant, alluring sap."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + ) + return ITEM_INTERACT_SUCCESS + /// Starthistle's essential invasive spreading /datum/plant_gene/trait/invasive/galaxythistle mutability_flags = PLANT_GENE_GRAFTABLE diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm index 12a4b17062a..2f3929fdfaa 100644 --- a/code/modules/instruments/instrument_data/_instrument_data.dm +++ b/code/modules/instruments/instrument_data/_instrument_data.dm @@ -17,14 +17,14 @@ * Since songs cache them while playing, there isn't realistic issues regarding performance from accessing. */ /datum/instrument + /// Used for categorization subtypes + abstract_type = /datum/instrument /// Name of the instrument var/name = "Generic instrument" /// Uniquely identifies this instrument so runtime changes are possible as opposed to paths. If this is unset, things will use path instead. var/id /// Category var/category = "Unsorted" - /// Used for categorization subtypes - var/abstract_type = /datum/instrument /// Write here however many samples, follow this syntax: "%note num%"='%sample file%' eg. "27"='synthesizer/e2.ogg'. Key must never be lower than 0 and higher than 127 var/list/real_samples /// assoc list key = /datum/instrument_key. do not fill this yourself! diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index de6ae2d0bbf..cde0adbdc94 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -7,6 +7,7 @@ icon = 'icons/obj/art/musician.dmi' lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi' + abstract_type = /obj/item/instrument /// Our song datum. var/datum/song/handheld/song /// Our allowed list of instrument ids. This is nulled on initialize. diff --git a/code/modules/jobs/departments/departments.dm b/code/modules/jobs/departments/departments.dm index c87e1dc31c5..3d974366cd8 100644 --- a/code/modules/jobs/departments/departments.dm +++ b/code/modules/jobs/departments/departments.dm @@ -43,6 +43,10 @@ job_datum.spawn_positions = 0 job_datum.total_positions = 0 +/// Returns all jobs that are in this category for jobbans +/datum/job_department/proc/get_jobban_jobs() + return department_jobs.Copy() + /// Returns a nation name for this department. /datum/job_department/proc/generate_nation_name() var/static/list/nation_suffixes = list("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotzka") @@ -93,6 +97,10 @@ head_of_staff_access = ACCESS_HOS department_access = REGION_ACCESS_SECURITY +/datum/job_department/security/get_jobban_jobs() + // Captains often fulfill security duties so they are considered part of the security department for jobbans + return ..() | SSjob.get_job_type(/datum/job/captain) + /datum/job_department/engineering department_name = DEPARTMENT_ENGINEERING department_bitflags = DEPARTMENT_BITFLAG_ENGINEERING diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index c8e140ab145..c4d26aa5509 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -30,7 +30,6 @@ department_for_prefs = /datum/job_department/captain departments_list = list( /datum/job_department/command, - /datum/job_department/security, ) family_heirlooms = list(/obj/item/reagent_containers/cup/glass/flask/gold, /obj/item/toy/captainsaid/collector) diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm index 112f75aa402..0478989ee51 100644 --- a/code/modules/library/bibles.dm +++ b/code/modules/library/bibles.dm @@ -235,7 +235,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( built_in_his_image.add_mood_event("blessing", /datum/mood_event/blessing) return BLESSING_SUCCESS -/obj/item/book/bible/attack(mob/living/target_mob, mob/living/carbon/human/user, params, heal_mode = TRUE) +/obj/item/book/bible/attack(mob/living/target_mob, mob/living/carbon/human/user, list/modifiers, list/attack_modifiers, heal_mode = TRUE) if(!ISADVANCEDTOOLUSER(user)) balloon_alert(user, "not dextrous enough!") return @@ -393,7 +393,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list( if(uses) return "Read" -/obj/item/book/bible/syndicate/attack(mob/living/target_mob, mob/living/carbon/human/user, params, heal_mode = TRUE) +/obj/item/book/bible/syndicate/attack(mob/living/target_mob, mob/living/carbon/human/user, list/modifiers, list/attack_modifiers, heal_mode = TRUE) if(!user.combat_mode) return ..() - return ..(target_mob, user, heal_mode = FALSE) + return ..(target_mob, user, modifiers, attack_modifiers, heal_mode = FALSE) diff --git a/code/modules/library/skill_learning/generic_skillchips/misc.dm b/code/modules/library/skill_learning/generic_skillchips/misc.dm index 92c024c4732..083f67cb4a0 100644 --- a/code/modules/library/skill_learning/generic_skillchips/misc.dm +++ b/code/modules/library/skill_learning/generic_skillchips/misc.dm @@ -1,15 +1,5 @@ //Contains generic skillchips that are fairly short and simple -/obj/item/skillchip/basketweaving - name = "Basketsoft 3000 skillchip" - desc = "Underwater edition." - auto_traits = list(TRAIT_UNDERWATER_BASKETWEAVING_KNOWLEDGE) - skill_name = "Underwater Basketweaving" - skill_description = "Master intricate art of using twine to create perfect baskets while submerged." - skill_icon = "shopping-basket" - activate_message = span_notice("You're one with the twine and the sea.") - deactivate_message = span_notice("Higher mysteries of underwater basketweaving leave your mind.") - /obj/item/skillchip/wine_taster name = "WINE skillchip" desc = "Wine.Is.Not.Equal version 5." diff --git a/code/modules/library/skill_learning/generic_skillchips/point.dm b/code/modules/library/skill_learning/generic_skillchips/point.dm index 3adb2811aae..517fbe1853e 100644 --- a/code/modules/library/skill_learning/generic_skillchips/point.dm +++ b/code/modules/library/skill_learning/generic_skillchips/point.dm @@ -26,7 +26,7 @@ /obj/item/skillchip/big_pointer/proc/fancier_pointer(mob/living/user, atom/pointed, obj/effect/temp_visual/point/point) SIGNAL_HANDLER - if(HAS_TRAIT(user, TRAIT_UNKNOWN)) + if(HAS_TRAIT(user, TRAIT_UNKNOWN_APPEARANCE)) return point.cut_overlays() var/datum/action/change_pointer_color/action = locate() in actions diff --git a/code/modules/library/skill_learning/generic_skillchips/underwater_basketweaving.dm b/code/modules/library/skill_learning/generic_skillchips/underwater_basketweaving.dm new file mode 100644 index 00000000000..eb83bffdad0 --- /dev/null +++ b/code/modules/library/skill_learning/generic_skillchips/underwater_basketweaving.dm @@ -0,0 +1,43 @@ + +/obj/item/skillchip/basketweaving + name = "Basketsoft 3000 skillchip" + desc = "Underwater edition." + skill_name = "Underwater Basketweaving" + skill_description = "Master intricate art of using twine to create perfect baskets while submerged." + skill_icon = "shopping-basket" + activate_message = span_notice("You're one with the twine and the sea.") + deactivate_message = span_notice("Higher mysteries of underwater basketweaving leave your mind.") + +/obj/item/skillchip/basketweaving/has_mob_incompatibility(mob/living/carbon/target) + . = ..() + if(.) + return + + if(!target.mind) + return "Target incapable of learning recipe." + +/obj/item/skillchip/basketweaving/on_activate(mob/living/carbon/user, silent=FALSE) + . = ..() + if(!user.mind) + return + learn_recipes(user) + //Prevent the skill from being transferred via mindswap. What an edge case + RegisterSignal(user.mind, COMSIG_MIND_TRANSFERRED, PROC_REF(forget_recipes)) + RegisterSignal(user, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(learn_recipes)) + +/obj/item/skillchip/basketweaving/proc/learn_recipes(mob/source) + SIGNAL_HANDLER + for(var/recipe_type in typesof(/datum/crafting_recipe/underwater_basket)) + source.mind.teach_crafting_recipe(recipe_type) + +/obj/item/skillchip/basketweaving/proc/forget_recipes(datum/mind/source, mob/previous_body) + SIGNAL_HANDLER + for(var/recipe_type in typesof(/datum/crafting_recipe/underwater_basket)) + source.forget_crafting_recipe(recipe_type) + +/obj/item/skillchip/basketweaving/on_deactivate(mob/living/carbon/user, silent=FALSE) + if(user.mind) + forget_recipes(user.mind) + UnregisterSignal(user.mind, COMSIG_MIND_TRANSFERRED) + UnregisterSignal(user, COMSIG_MOB_MIND_TRANSFERRED_INTO) + return ..() diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm index de4ce9965f0..39d0e834c7a 100644 --- a/code/modules/loadout/loadout_items.dm +++ b/code/modules/loadout/loadout_items.dm @@ -30,6 +30,8 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) * Singleton that holds all the information about each loadout items, and how to equip them. */ /datum/loadout_item + /// The abstract parent of this loadout item, to determine which items to not instantiate + abstract_type = /datum/loadout_item /// The category of the loadout item. Set automatically in New VAR_FINAL/datum/loadout_category/category /// Displayed name of the loadout item. @@ -49,8 +51,6 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) /// Whether this item can be reskinned. /// Only works if the item has a "unique reskin" list set. var/can_be_reskinned = FALSE - /// The abstract parent of this loadout item, to determine which items to not instantiate - var/abstract_type = /datum/loadout_item /// The actual item path of the loadout item. var/obj/item/item_path /// Icon file (DMI) for the UI to use for preview icons. diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index a77131e73ce..418a4b8e509 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -333,6 +333,14 @@ new /obj/effect/decal/cleanable/blood/gibs/old(src) new /obj/item/book/granter/crafting_recipe/boneyard_notes(src) +/obj/structure/closet/crate/grave/skeleton + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF + affect_mood = TRUE + +/obj/structure/closet/crate/grave/skeleton/PopulateContents() + . = ..() + new /mob/living/carbon/human/species/skeleton(src) + //***Fluff items for lore/intrigue /obj/item/paper/crumpled/muddy/fluff/elephant_graveyard name = "posted warning" diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index cb6dd212f3e..6d0b7e58167 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -179,7 +179,7 @@ qdel(src) return if(9 to 11) - airlock.lights = FALSE + airlock.feedback = FALSE // These do not use airlock.bolt() because we want to pretend it was always locked. That means no sound effects. airlock.locked = TRUE if(12 to 15) diff --git a/code/modules/mapping/space_management/space_transition.dm b/code/modules/mapping/space_management/space_transition.dm index 7f2eafe0099..9e303111d94 100644 --- a/code/modules/mapping/space_management/space_transition.dm +++ b/code/modules/mapping/space_management/space_transition.dm @@ -161,7 +161,8 @@ point.set_neigbours(grid, grid_diameter) var/center = round(grid_diameter / 2) - point = grid[CHORDS_TO_1D(grid_diameter, center, center)] + if(transition_levels.len) + point = grid[CHORDS_TO_1D(center, center, grid_diameter)] grid.Cut() var/list/transition_pick = transition_levels.Copy() diff --git a/code/modules/mining/boulder_processing/boulder.dm b/code/modules/mining/boulder_processing/boulder.dm index 41e69d27654..61de5688898 100644 --- a/code/modules/mining/boulder_processing/boulder.dm +++ b/code/modules/mining/boulder_processing/boulder.dm @@ -1,4 +1,5 @@ +#define PLATFORM_WARNING_MODIFIER 5 SECONDS /** * The objects that ore vents produce, which is refined into minerals. @@ -25,6 +26,8 @@ var/boulder_size = BOULDER_SIZE_SMALL /// Used in inheriting the icon_state from our parent vent in update_icon. var/boulder_string = "boulder" + /// If the boulder is converted into a platform, how long will it last? Default is 10 seconds unless overwritten by a vent. + var/platform_lifespan = PLATFORM_LIFE_DEFAULT /obj/item/boulder/Initialize(mapload) . = ..() @@ -108,6 +111,30 @@ if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER)) manual_process(null, user, INATE_BOULDER_SPEED_MULTIPLIER) //A little hacky but it works around the speed of the blackboard task selection process for now. +/obj/item/boulder/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + . = ..() + if(istype(interacting_with, /turf/open/lava)) + if(!create_platform(interacting_with, user, interacting_with)) + return ITEM_INTERACT_BLOCKING + return ITEM_INTERACT_SUCCESS + +/obj/item/boulder/throw_at(atom/target, range, speed, mob/thrower, spin, diagonals_first, datum/callback/callback, force, gentle, quickstart, throw_type_path) + . = ..() + if(istype(target, /turf/open/lava)) + if(!create_platform(target, thrower)) + return FALSE + +/obj/item/boulder/proc/create_platform(atom/interacting_with, mob/living/user) + if(locate(/obj/structure/lattice/catwalk/boulder, interacting_with)) + to_chat(user, span_warning("There is already a boulder platform here!")) + return FALSE + + var/obj/structure/lattice/catwalk/boulder/platform = new(interacting_with) + addtimer(CALLBACK(platform, TYPE_PROC_REF(/obj/structure/lattice/catwalk/boulder, pre_self_destruct)), platform_lifespan) + // See Lattice.dm for more info + visible_message(span_notice("\The [src] floats on \the [interacting_with], forming a temporary platform!")) + qdel(src) + return TRUE /** * This is called when a boulder is processed by a mob or tool, and reduces the durability of the boulder. * @param obj/item/weapon The weapon that is being used to process the boulder, that we pull toolspeed from. If null, we use the override_speed_multiplier instead. @@ -190,3 +217,5 @@ for(var/obj/item/content as anything in contents) content.forceMove(get_turf(src)) qdel(src) + +#undef PLATFORM_WARNING_MODIFIER diff --git a/code/modules/mining/boulder_processing/boulder_types.dm b/code/modules/mining/boulder_processing/boulder_types.dm index 6298bb98139..ec67648fe2a 100644 --- a/code/modules/mining/boulder_processing/boulder_types.dm +++ b/code/modules/mining/boulder_processing/boulder_types.dm @@ -69,10 +69,9 @@ /datum/material/titanium = 8, /datum/material/uranium = 3, ) - set_custom_materials(list(pick_weight(expanded_gulag_minerals) = SHEET_MATERIAL_AMOUNT)) -///lowgrade boulder, most commonly spawned +///lowgrade boulder, Exists as an admin spawn for testing /obj/item/boulder/shabby name = "shabby boulder" desc = "A bizarre, twisted boulder. Wait, wait no, it's just a rock." diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index b662242fb84..420aad1ceaa 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -27,9 +27,10 @@ /obj/item/mining_scanner/admin /obj/item/mining_scanner/admin/attack_self(mob/user) - for(var/turf/closed/mineral/M in world) - if(M.scan_state) - M.icon_state = M.scan_state + for(var/turf/closed/mineral/mineral_turf in world) + if(mineral_turf.scan_state) + mineral_turf.icon = mineral_turf.scan_icon + mineral_turf.icon_state = mineral_turf.scan_state qdel(src) /obj/item/t_scanner/adv_mining_scanner @@ -91,6 +92,7 @@ var/obj/effect/temp_visual/mining_overlay/scan_overlay = locate(/obj/effect/temp_visual/mining_overlay) in mineral if(!scan_overlay) scan_overlay = new(mineral) + scan_overlay.icon = mineral.scan_icon scan_overlay.icon_state = mineral.scan_state continue diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 5d1d9926e1e..6075149a595 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -185,6 +185,7 @@ desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl." icon = 'icons/obj/mining_zones/ash_flora.dmi' icon_state = "mushroom_shavings" + abstract_type = /obj/item/food/grown/ash_flora w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE max_integrity = 100 diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 1c0c7315150..d3d05077b7e 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -151,6 +151,28 @@ )) signal.send_to_receivers() +/obj/machinery/mineral/ore_redemption/base_item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!materials.mat_container || panel_open || !powered()) + return ..() + + var/list/obj/item/stack/ore/gathered_ores = list() + if(istype(tool, /obj/item/stack/ore)) + gathered_ores += tool + else if(tool.atom_storage && !tool.atom_storage.locked) + tool.atom_storage.remove_type(/obj/item/stack/ore, src, check_adjacent = TRUE, user = user, inserted = gathered_ores) + if(!gathered_ores.len) + return ..() + + for(var/obj/item/stack/ore/gathered_ore as anything in gathered_ores) + var/obj/item/smelted_ore = gathered_ore.on_orm_collection() + if(isnull(smelted_ore)) + continue + + if(materials.insert_item(smelted_ore, ore_multiplier) <= 0) + unload_mineral(smelted_ore) + + return ITEM_INTERACT_SUCCESS + /obj/machinery/mineral/ore_redemption/pickup_item(datum/source, atom/movable/target, direction) if(QDELETED(target)) return @@ -170,14 +192,13 @@ //smelting the ore for(var/obj/item/stack/ore/gathered_ore as anything in ore_list) - var/obj/item/smelted_ore = gathered_ore.on_orm_collection(src) + var/obj/item/smelted_ore = gathered_ore.on_orm_collection() if(isnull(smelted_ore)) continue if(materials.insert_item(smelted_ore, ore_multiplier) <= 0) unload_mineral(smelted_ore) //if rejected unload - if(!console_notify_timer) // gives 5 seconds for a load of ores to be sucked up by the ORM before it sends out request console notifications. This should be enough time for most deposits that people make console_notify_timer = addtimer(CALLBACK(src, PROC_REF(send_console_message)), 5 SECONDS) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 0e852e6e374..8582a1c3c86 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -49,9 +49,7 @@ * It can also be overriden for more specific behavior (for example, sand is smelted into glass beforehand because of different mats). */ /obj/item/stack/ore/proc/on_orm_collection() - if(isnull(refined_type)) - return null - return src + return isnull(refined_type) ? null : src /obj/item/stack/ore/welder_act(mob/living/user, obj/item/I) ..() diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 94dfa1ce0eb..ff93ac7fa35 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -180,7 +180,7 @@ SET_PLANE_EXPLICIT(I, ABOVE_HUD_PLANE, src) if(I.pulledby) I.pulledby.stop_pulling() - if(!I.on_equipped(src, ITEM_SLOT_HANDS, initial = visuals_only)) + if(!has_equipped(I, ITEM_SLOT_HANDS, initial = visuals_only)) return FALSE update_held_items() I.pixel_x = I.base_pixel_x @@ -690,3 +690,19 @@ . += item else if(del_if_nodrop && !(item.item_flags & ABSTRACT)) qdel(item) + +/** + * Iterates over all contents of the mob to find all items with a cell (or loose cells) + * Useful instead of iterating contents for cells, as it recurses storage and avoids returning abstract cells (like Ethereals) + * + * * max_percent: The maximum charge percent (0.0-1.0) the cell can have to be included in the results + * + * Returns an assoc list of item - its cell + */ +/mob/living/proc/get_all_cells(max_percent = 1.0) + var/list/cell_items = list() + for(var/obj/item/stored in get_all_gear()) + var/obj/item/stock_parts/power_store/stored_cell = stored.get_cell() + if(stored_cell && stored_cell.charge <= (stored_cell.maxcharge * max_percent)) + cell_items[stored] = stored_cell + return cell_items diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index bbf8688dd90..1cdbb3c39e3 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -2,6 +2,7 @@ /mob/living/basic name = "basic mob" icon = 'icons/mob/simple/animal.dmi' + abstract_type = /mob/living/basic health = 20 maxHealth = 20 max_stamina = BASIC_MOB_STAMINA_MATCH_HEALTH diff --git a/code/modules/mob/living/basic/drone/inventory.dm b/code/modules/mob/living/basic/drone/inventory.dm index 37f61b2b208..c6c7aa5da95 100644 --- a/code/modules/mob/living/basic/drone/inventory.dm +++ b/code/modules/mob/living/basic/drone/inventory.dm @@ -74,7 +74,7 @@ return //Call back for item being equipped to drone - equipping.on_equipped(src, slot) + has_equipped(equipping, slot) /mob/living/basic/drone/getBackSlot() return ITEM_SLOT_DEX_STORAGE diff --git a/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm b/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm index a5e0a9c0272..138d09cf324 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/dextrous.dm @@ -81,7 +81,7 @@ internal_storage = equipping update_inv_internal_storage() - equipping.on_equipped(src, slot) + has_equipped(equipping, slot) return TRUE /mob/living/basic/guardian/dextrous/getBackSlot() diff --git a/code/modules/mob/living/basic/pets/parrot/poly.dm b/code/modules/mob/living/basic/pets/parrot/poly.dm index 93308852a52..f79df7e8dec 100644 --- a/code/modules/mob/living/basic/pets/parrot/poly.dm +++ b/code/modules/mob/living/basic/pets/parrot/poly.dm @@ -16,7 +16,7 @@ name = "Poly" desc = "Poly the Parrot. An expert on quantum cracker theory." gold_core_spawnable = NO_SPAWN - speech_probability_rate = 13 + speech_probability_rate = 6 /// Callback to save our memory at the end of the round. var/datum/callback/roundend_callback = null diff --git a/code/modules/mob/living/basic/snails/snail.dm b/code/modules/mob/living/basic/snails/snail.dm index 259bce0d5c4..0cbdaf9f113 100644 --- a/code/modules/mob/living/basic/snails/snail.dm +++ b/code/modules/mob/living/basic/snails/snail.dm @@ -11,6 +11,8 @@ butcher_results = list(/obj/item/food/meat/slab/bugmeat = 1) mob_biotypes = MOB_ORGANIC density = FALSE + mob_size = MOB_SIZE_TINY + held_w_class = WEIGHT_CLASS_TINY pass_flags = PASSTABLE | PASSMOB health = 30 maxHealth = 30 diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm index 9acddd1c860..738a711d3c9 100644 --- a/code/modules/mob/living/basic/vermin/mouse.dm +++ b/code/modules/mob/living/basic/vermin/mouse.dm @@ -142,9 +142,19 @@ if(!gibbed) var/make_a_corpse = TRUE var/place_to_make_corpse = loc + var/must_equip = FALSE + var/equip_slot + var/mob/holding_mob + var/obj/item/mob_holder/found_holder if(istype(loc, /obj/item/mob_holder))//If our mouse is dying in place holder we want to put the dead mouse where the place holder was - var/obj/item/mob_holder/found_holder = loc + found_holder = loc place_to_make_corpse = found_holder.loc + if(istype(found_holder.loc,/mob/living/carbon)) + holding_mob = found_holder.loc + place_to_make_corpse = get_turf(holding_mob) + equip_slot = holding_mob.get_slot_by_item(found_holder) + if(equip_slot == ITEM_SLOT_HANDS || equip_slot == ITEM_SLOT_RPOCKET || equip_slot == ITEM_SLOT_LPOCKET) + must_equip = TRUE if(istype(found_holder.loc, /obj/machinery/microwave))//Microwaves gib things that die when cooked, so we don't need to make a dead body too make_a_corpse = FALSE if(make_a_corpse) @@ -153,6 +163,11 @@ if(HAS_TRAIT(src, TRAIT_BEING_SHOCKED)) mouse.desc = "They're toast." mouse.add_atom_colour("#3A3A3A", FIXED_COLOUR_PRIORITY) + found_holder?.release(FALSE) + if(must_equip) + if(equip_slot == ITEM_SLOT_HANDS) + holding_mob.dropItemToGround(found_holder) + holding_mob.equip_to_slot(mouse,equip_slot) qdel(src) /mob/living/basic/mouse/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers) diff --git a/code/modules/mob/living/blood_types.dm b/code/modules/mob/living/blood_types.dm index e46c1834954..de779583bb7 100644 --- a/code/modules/mob/living/blood_types.dm +++ b/code/modules/mob/living/blood_types.dm @@ -15,8 +15,6 @@ var/datum/reagent/reagent_type = /datum/reagent/blood /// What chem is used to restore this blood type (outside of itself, of course)? var/datum/reagent/restoration_chem = /datum/reagent/iron - /// Exclude abstract root types from being initialized by defining them here - var/root_abstract_type /// If this blood type is meant to persist across species changes var/is_species_universal /// Splash and expose behaviors for this blood type's reagent, to prevent water-blood covered items, as well as information transfer flags @@ -165,7 +163,7 @@ /datum/blood_type/human desc = "Blood cells suspended in plasma, the most abundant of which being the hemoglobin-containing red blood cells." dna_string = "Human DNA" - root_abstract_type = /datum/blood_type/human + abstract_type = /datum/blood_type/human /datum/blood_type/human/a_minus name = BLOOD_TYPE_A_MINUS @@ -384,7 +382,7 @@ /// An abstract-ish blood type used particularly for species with blood set to random reagents, such as podpeople /datum/blood_type/random_chemical - root_abstract_type = /datum/blood_type/random_chemical + abstract_type = /datum/blood_type/random_chemical /datum/blood_type/random_chemical/New(datum/reagent/reagent) name = initial(reagent.name) @@ -393,7 +391,7 @@ id = type_key() color = initial(reagent.color) reagent_type = reagent - root_abstract_type = null + abstract_type = null /datum/blood_type/random_chemical/type_key() return reagent_type diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index a461273d345..f0b160b1f55 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -1,4 +1,5 @@ /mob/living/carbon + abstract_type = /mob/living/carbon blood_volume = BLOOD_VOLUME_NORMAL gender = MALE pressure_resistance = 15 diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 376ab2f354e..1cb33d3442b 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -6,7 +6,7 @@ return null /mob/living/carbon/examine(mob/user) - if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE)) return list(span_warning("You're struggling to make out any details...")) var/t_He = p_They() @@ -643,7 +643,7 @@ if(undershirt.has_sensor == BROKEN_SENSORS) . += list(span_notice("\The [undershirt]'s medical sensors are sparking.")) - if(HAS_TRAIT(src, TRAIT_UNKNOWN) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) return var/limbs_text = get_mismatched_limb_text() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index f9ccf3d7f10..0f98dbe0c0c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -114,7 +114,7 @@ if(!same_id || (text2num(href_list["examine_time"]) + viable_time) < world.time) to_chat(viewer, span_notice("You don't have that good of a memory. Examine [p_them()] again.")) return - if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE)) to_chat(viewer, span_notice("You can't make out that ID anymore.")) return if(!isobserver(viewer) && get_dist(viewer, src) > ID_EXAMINE_DISTANCE + 1) // leeway, ignored if the viewer is a ghost @@ -1201,11 +1201,8 @@ /mob/living/carbon/human/species/lizard/silverscale race = /datum/species/lizard/silverscale -/mob/living/carbon/human/species/spirit - race = /datum/species/spirit - /mob/living/carbon/human/species/ghost - race = /datum/species/spirit/ghost + race = /datum/species/ghost /mob/living/carbon/human/species/ethereal race = /datum/species/ethereal diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 023ecb8801f..cbb7dace00d 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -14,6 +14,7 @@ initial_language_holder = /datum/language_holder/empty // We get stuff from our species flags_1 = PREVENT_CONTENTS_EXPLOSION_1 max_grab = GRAB_KILL + examine_thats = "This is" maxHealth = HUMAN_MAXHEALTH //SKYRAT EDIT ADDITION health = HUMAN_MAXHEALTH //SKYRAT EDIT ADDITION @@ -77,7 +78,8 @@ var/obj/item/l_store = null var/obj/item/s_store = null - var/special_voice = "" // For changing our voice. Used by a symptom. + /// Allows for special overrides of voice + var/override_voice = "" var/datum/physiology/physiology diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 8be20a72be9..5a9003ca44b 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -8,7 +8,7 @@ //Useful when player do something with computers /mob/living/carbon/human/proc/get_assignment(if_no_id = "No id", if_no_job = "No job", hand_first = TRUE) var/obj/item/card/id/id = get_idcard(hand_first) - if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE)) return if_no_id if(id) . = id.assignment @@ -25,7 +25,7 @@ //Useful when player do something with computers /mob/living/carbon/human/proc/get_authentification_name(if_no_id = "Unknown") var/obj/item/card/id/id = get_idcard(FALSE) - if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE)) return if_no_id if(id) return id.registered_name @@ -48,64 +48,66 @@ var/force_set = LAZYACCESS(identity, VISIBLE_NAME_FORCED) if(force_set) // our name is overriden by something return signal_face // no need to null-check, because force_set will always set a signal_face - var/face_name = !isnull(signal_face) ? signal_face : get_face_name("") - var/id_name = !isnull(signal_id) ? signal_id : get_id_name("") - if(force_real_name) - var/fake_name - if (face_name && face_name != real_name) - fake_name = face_name - if(add_id_name && id_name && id_name != real_name) - if (!isnull(fake_name) && id_name != face_name) - fake_name = "[fake_name]/[id_name]" - else - fake_name = id_name - if (HAS_TRAIT(src, TRAIT_UNKNOWN) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN) || (!face_name && !id_name)) - fake_name = "Unknown" - return "[real_name][fake_name ? " (as [fake_name])" : ""]" - if(HAS_TRAIT(src, TRAIT_UNKNOWN) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) - return "Unknown" - if(face_name) - if(add_id_name && id_name && (id_name != face_name)) - return "[face_name] (as [id_name])" - return face_name - if(id_name) - return id_name - return "Unknown" -/// Returns "Unknown" if facially disfigured and real_name if not. -/// Useful for setting name when Fluacided or when updating a human's name variable + var/face_name = isnull(signal_face) ? get_face_name("") : signal_face + var/id_name = isnull(signal_id) ? get_id_name("", honorifics = TRUE) : signal_id + + // We need to account for real name + if(force_real_name) + var/disguse_name = get_visible_name(add_id_name = TRUE, force_real_name = FALSE) + return "[real_name][disguse_name == real_name ? "" : " (as [disguse_name])"]" + + // We're just some unknown guy + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) + return "Unknown" + + // We have a face and an ID + if(face_name && id_name) + var/normal_id_name = get_id_name("") // need to check base ID name to avoid "John (as Captain John)" + if(normal_id_name == face_name) + return id_name // (this turns "John" into "Captain John") + if(add_id_name) + return "[face_name] (as [id_name])" + + // Just go down the list of stuff we recorded + return face_name || id_name || "Unknown" + +/** + * Gets what the face of this mob looks like + * + * * if_no_face - What to return if we have no face or our face is obscured/disfigured + */ /mob/living/carbon/proc/get_face_name(if_no_face = "Unknown") return real_name /mob/living/carbon/human/get_face_name(if_no_face = "Unknown") - if(HAS_TRAIT(src, TRAIT_UNKNOWN)) + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE)) return if_no_face //We're Unknown, no face information for you if(obscured_slots & HIDEFACE) return if_no_face var/obj/item/bodypart/head = get_bodypart(BODY_ZONE_HEAD) - if(isnull(head) || (HAS_TRAIT(src, TRAIT_DISFIGURED)) || (head.brutestate + head.burnstate) > 2 || !real_name || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) //disfigured. use id-name if possible + if(isnull(head) || !real_name || HAS_TRAIT(src, TRAIT_DISFIGURED) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) //disfigured. use id-name if possible return if_no_face return real_name -//gets name from ID or PDA itself, ID inside PDA doesn't matter -//Useful when player is being seen by other mobs -/mob/living/carbon/proc/get_id_name(if_no_id = "Unknown") +/** + * Gets whatever name is in our ID or PDA + * + * * if_no_id - What to return if we have no ID or PDA + * * honorifics - Whether to include honorifics in the returned name (if the found ID has any set) + */ +/mob/living/carbon/proc/get_id_name(if_no_id = "Unknown", honorifics = FALSE) return -/mob/living/carbon/human/get_id_name(if_no_id = "Unknown") - if(HAS_TRAIT(src, TRAIT_UNKNOWN)) - . = if_no_id //You get NOTHING, no id name, good day sir +/mob/living/carbon/human/get_id_name(if_no_id = "Unknown", honorifics = FALSE) + if(HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE)) var/list/identity = list(null, null, null) SEND_SIGNAL(src, COMSIG_HUMAN_GET_FORCED_NAME, identity) - if(identity[VISIBLE_NAME_FORCED]) - return identity[VISIBLE_NAME_FACE] // to return forced names when unknown, instead of ID - else - var/obj/item/card/id/id = astype(wear_id, /obj/item/card/id) \ - || astype(wear_id, /obj/item/storage/wallet)?.front_id \ - || astype(wear_id, /obj/item/modular_computer)?.stored_id - . = id?.registered_name - if(!.) - . = if_no_id //to prevent null-names making the mob unclickable + return identity[VISIBLE_NAME_FORCED] ? identity[VISIBLE_NAME_FACE] : if_no_id + + // either results in an ID card, a generic card, or null + var/obj/item/card/id = wear_id?.GetID() || astype(wear_id, /obj/item/card) + return id?.get_displayed_name(honorifics) || if_no_id /mob/living/carbon/human/get_idcard(hand_first = TRUE) . = ..() diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index f31f0595f7c..a962b5d33cc 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -29,39 +29,22 @@ return "gurgles" return tongue.temp_say_mod || tongue.say_mod || ..() -/mob/living/carbon/human/GetVoice() - if(HAS_TRAIT(src, TRAIT_UNKNOWN)) - return ("Unknown") - - if(istype(wear_mask, /obj/item/clothing/mask/chameleon)) - var/obj/item/clothing/mask/chameleon/V = wear_mask - if(V.voice_change && wear_id) - var/obj/item/card/id/idcard = wear_id.GetID() - if(istype(idcard)) - return idcard.registered_name - else - return real_name - else - return real_name - if(mind) - var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling) - if(changeling?.mimicing) - return changeling.mimicing - if(GetSpecialVoice()) - return GetSpecialVoice() +/mob/living/carbon/human/get_voice() + if(HAS_TRAIT(src, TRAIT_UNKNOWN_VOICE)) + return "Unknown" + var/id_name = get_id_name("") + if(HAS_TRAIT(src, TRAIT_VOICE_MATCHES_ID) && id_name) + return id_name + if(override_voice) + return override_voice + if(real_name == id_name) // Allows for "Captain John" to have the voice "Captain Join" and not "John" + return get_id_name("", honorifics = TRUE) return real_name -/mob/living/carbon/human/proc/SetSpecialVoice(new_voice) - if(new_voice) - special_voice = new_voice - return - -/mob/living/carbon/human/proc/UnsetSpecialVoice() - special_voice = "" - return - -/mob/living/carbon/human/proc/GetSpecialVoice() - return special_voice +/mob/living/carbon/human/get_message_voice(visible_name) + . = ..() + if(. != name) + . += " (as [get_id_name("Unknown", honorifics = TRUE)])" /mob/living/carbon/human/binarycheck() if(stat >= SOFT_CRIT) diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm index 06016b7a07c..827716b91a6 100644 --- a/code/modules/mob/living/carbon/human/init_signals.dm +++ b/code/modules/mob/living/carbon/human/init_signals.dm @@ -1,10 +1,9 @@ /mob/living/carbon/human/register_init_signals() . = ..() - RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_UNKNOWN), SIGNAL_REMOVETRAIT(TRAIT_UNKNOWN)), PROC_REF(update_ID_card)) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_UNKNOWN_APPEARANCE), SIGNAL_REMOVETRAIT(TRAIT_UNKNOWN_APPEARANCE)), PROC_REF(update_ID_card)) RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_DWARF), SIGNAL_REMOVETRAIT(TRAIT_DWARF)), PROC_REF(on_dwarf_trait)) RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_TOO_TALL), SIGNAL_REMOVETRAIT(TRAIT_TOO_TALL)), PROC_REF(on_tootall_trait)) - RegisterSignal(src, COMSIG_MOVABLE_MESSAGE_GET_NAME_PART, PROC_REF(get_name_part)) RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_FAT), SIGNAL_REMOVETRAIT(TRAIT_FAT)), PROC_REF(on_fat)) RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_NOHUNGER), SIGNAL_REMOVETRAIT(TRAIT_NOHUNGER)), PROC_REF(on_nohunger)) @@ -33,21 +32,6 @@ SIGNAL_HANDLER update_mob_height() -///From compose_message(). Snowflake code converted into its own signal proc -/mob/living/carbon/human/proc/get_name_part(datum/source, list/stored_name, visible_name) - SIGNAL_HANDLER - /** - * For if the message can be seen but not heard, shows our visible identity (like when using sign language) - * Also used by hallucinations, so it doesn't give source's identity away. - */ - if(visible_name) - stored_name[NAME_PART_INDEX] = get_visible_name() - return - var/voice_name = GetVoice() - if(name != voice_name) - voice_name += " (as [get_id_name("Unknown")])" - stored_name[NAME_PART_INDEX] = voice_name - /mob/living/carbon/human/proc/on_fat(datum/source) SIGNAL_HANDLER hud_used?.hunger?.update_hunger_bar() diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm index f3361ee7a72..eca9383698f 100644 --- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm @@ -28,17 +28,17 @@ /datum/species/fly/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons) . = ..() - RegisterSignal(human_who_gained_species, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) + RegisterSignal(human_who_gained_species, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) /datum/species/fly/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) . = ..() - UnregisterSignal(C, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS) + UnregisterSignal(C, COMSIG_ATOM_ATTACKBY) -/datum/species/fly/proc/damage_weakness(datum/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) +/datum/species/fly/proc/on_attackby(mob/living/source, obj/item/attacking_item, mob/living/attacker, list/modifiers, list/attack_modifiers) SIGNAL_HANDLER if(istype(attacking_item, /obj/item/melee/flyswatter)) - damage_mods += 30 // Yes, a 30x damage modifier + MODIFY_ATTACK_FORCE_MULTIPLIER(attack_modifiers, 30) // Yes, a 30x damage modifier /datum/species/fly/get_physical_attributes() return "These hideous creatures suffer from pesticide immensely, eat waste, and are incredibly vulnerable to bright lights. They do have wings though." diff --git a/code/modules/mob/living/carbon/human/species_types/ghost.dm b/code/modules/mob/living/carbon/human/species_types/ghost.dm index 7e54ce26196..e1653c9f3b4 100644 --- a/code/modules/mob/living/carbon/human/species_types/ghost.dm +++ b/code/modules/mob/living/carbon/human/species_types/ghost.dm @@ -1,22 +1,23 @@ ///Spirit mob that lacks legs but still roams the station as part of the unliving. -/datum/species/spirit - name = "Spirit" - id = SPECIES_SPIRIT +/datum/species/ghost + name = "Ghost" + id = SPECIES_GHOST inherent_traits = list( TRAIT_GENELESS, + TRAIT_MOVE_FLYING, TRAIT_NEVER_WOUNDED, TRAIT_NOBLOOD, TRAIT_NODISMEMBER, TRAIT_NO_DNA_COPY, + TRAIT_NO_FLOATING_ANIM, TRAIT_NO_PLASMA_TRANSFORM, TRAIT_NO_UNDERWEAR, + TRAIT_RESISTLOWPRESSURE, TRAIT_UNHUSKABLE, - TRAIT_NO_FLOATING_ANIM, - TRAIT_MOVE_FLYING, ) - inherent_biotypes = MOB_SPIRIT | MOB_UNDEAD + inherent_biotypes = MOB_HUMANOID | MOB_SPIRIT | MOB_UNDEAD no_equip_flags = ITEM_SLOT_FEET - changesource_flags = MIRROR_BADMIN | WABBAJACK | SLIME_EXTRACT + changesource_flags = MIRROR_BADMIN | WABBAJACK | SLIME_EXTRACT | MIRROR_PRIDE | MIRROR_MAGIC sexes = FALSE meat = /obj/item/ectoplasm @@ -32,34 +33,45 @@ bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/ghost, - BODY_ZONE_CHEST = /obj/item/bodypart/chest/ghost/spirit, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/ghost, BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/ghost, BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/ghost, ) - ///Boolean on whether this species type is available at roundstart during halloween, used to deny subtypes. - var/halloween_exclusive = TRUE + ///Innate passthrough ability given to ghosts that allows them to phase but drops their stuff. + var/datum/action/innate/toggle_passthrough/passthrough_ability -/datum/species/spirit/check_roundstart_eligible() - if(check_holidays(HALLOWEEN) && halloween_exclusive) +/datum/species/ghost/check_roundstart_eligible() + if(check_holidays(HALLOWEEN)) return TRUE return ..() -/datum/species/spirit/get_physical_attributes() - return "Spirits are the spiritual remains of long-passed entities. They lack legs, can fly, but still eat, breathe, hear and see." +/datum/species/ghost/on_species_gain(mob/living/carbon/human/new_ghost, datum/species/old_species, pref_load, regenerate_icons) + . = ..() + passthrough_ability = new(src) + passthrough_ability.Grant(new_ghost) -/datum/species/spirit/get_species_description() +/datum/species/ghost/on_species_loss(mob/living/carbon/human/former_ghost, datum/species/new_species, pref_load) + QDEL_NULL(passthrough_ability) + return ..() + +/datum/species/ghost/get_physical_attributes() + return "Ghosts are the spiritual remains of long-passed entities. They lack legs, can fly, and phase through walls, \ + but still eat, breathe, hear and see." + +/datum/species/ghost/get_species_description() return "Spirits are spirits of long-dead creatures whom, for one reason or another, still roam around." -/datum/species/spirit/get_species_lore() +/datum/species/ghost/get_species_lore() return list( - "Spirits are the non-physical remains that linger onto their mortal coil. \ - They still need their protein and organs to keep themselves \"alive\", \ - which leads to many of them still believing they are still part of the living, \ - whether or not they are is a very open-ended debate between philosophers.", + "Ghosts are one of the spookiest creatures known in the galaxy. \ + While they still need their protein to sustain themselves, they are able to control their own bodies, \ + going through walls and getting rid of all their posessions at will. \ + Most knowledge known about them is kept secret by Nanotrasen's top Chaplains, who are keen \ + to keep it private.", ) -/datum/species/spirit/create_pref_unique_perks() +/datum/species/ghost/create_pref_unique_perks() var/list/to_add = list() to_add += list(list( @@ -69,6 +81,14 @@ SPECIES_PERK_DESC = "Ghosts lack legs and float, preventing you from falling into holes in the ground.", )) + to_add += list(list( + SPECIES_PERK_TYPE = SPECIES_NEUTRAL_PERK, + SPECIES_PERK_ICON = "ghost", + SPECIES_PERK_NAME = "Incorporeal", + SPECIES_PERK_DESC = "Ghost carry their tombstones with them and are directly tied to it. \ + dropping the tombstone will allow you to phase through solid matter, but leaves you vulnerable.", + )) + to_add += list(list( SPECIES_PERK_TYPE = SPECIES_NEGATIVE_PERK, SPECIES_PERK_ICON = "shoe-prints", @@ -78,102 +98,35 @@ return to_add -/** - * Ghost subtype - * This is the type of ghost that can actually phase through walls, - * exclusive to magic mirrors & admins, as roundstart-ability to phase anywhere - * is not something that is generally fun to play against. - */ -/datum/species/spirit/ghost - name = "Ghost" - id = SPECIES_GHOST - inherent_traits = list( - TRAIT_GENELESS, - TRAIT_NEVER_WOUNDED, - TRAIT_NOBLOOD, - TRAIT_NODISMEMBER, - TRAIT_NO_DNA_COPY, - TRAIT_NO_PLASMA_TRANSFORM, - TRAIT_NO_UNDERWEAR, - TRAIT_UNHUSKABLE, - TRAIT_NO_FLOATING_ANIM, - TRAIT_MOVE_FLYING, - //ghost-unique - TRAIT_SEE_BLESSED_TILES, - ) - //they have a different chest. - bodypart_overrides = list( - BODY_ZONE_HEAD = /obj/item/bodypart/head/ghost, - BODY_ZONE_CHEST = /obj/item/bodypart/chest/ghost, - BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/ghost, - BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/ghost, - ) - changesource_flags = MIRROR_BADMIN | MIRROR_PRIDE | MIRROR_MAGIC - halloween_exclusive = FALSE - - ///Innate passthrough ability given to ghosts that allows them to phase but drops their stuff. - var/datum/action/innate/toggle_passthrough/passthrough_ability - -/datum/species/spirit/ghost/get_physical_attributes() - return "Ghosts are the spiritual remains of long-passed entities. They lack legs, can fly, can choose at will to become incorporeal, \ - but still eat, breathe, hear and see." - -/datum/species/spirit/ghost/get_species_lore() - return list( - "Ghosts are one of the spookiest creatures known in the galaxy. \ - While they still need their protein to sustain themselves, they are able to control their own bodies, \ - going through walls and getting rid of all their posessions at will. \ - Most knowledge known about them is kept secret by Nanotrasen's top Chaplains, who are keen \ - to keep it private.", - ) - -/datum/species/spirit/ghost/on_species_gain(mob/living/carbon/human/new_ghost, datum/species/old_species, pref_load, regenerate_icons) - . = ..() - passthrough_ability = new(src) - passthrough_ability.Grant(new_ghost) - for(var/datum/atom_hud/alternate_appearance/basic/blessed_aware/blessed_hud in GLOB.active_alternate_appearances) - blessed_hud.check_hud(new_ghost) - -/datum/species/spirit/ghost/on_species_loss(mob/living/carbon/human/former_ghost, datum/species/new_species, pref_load) - . = ..() - QDEL_NULL(passthrough_ability) - //this has to be called after parent so inherent traits is cleared before we update our HUDs - for(var/datum/atom_hud/alternate_appearance/basic/blessed_aware/blessed_hud in GLOB.active_alternate_appearances) - blessed_hud.check_hud(former_ghost) - -/datum/species/spirit/ghost/create_pref_unique_perks() - var/list/to_add = ..() - - to_add += list(list( - SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, - SPECIES_PERK_ICON = "ghost", - SPECIES_PERK_NAME = "Incorporeal", - SPECIES_PERK_DESC = "Ghost are able to control their body to the extent where you can willingly make yourself able \ - to phase through anything, including your own equipment.", - )) - - return to_add - /** * Passthrough ability * * Ghost innate ability that allows them to enter ghost mode, - * which gives them the phasing ability, but makes them drop everything - * and completely unable to wear anything. + * which gives them the phasing ability, but makes them unable to use anything, + * and they will be tied to a tombstone that, if dug up, will kill them and turn them + * into a skeleton. */ /datum/action/innate/toggle_passthrough name = "Toggle passthrough" - desc = "Toggles your ability to phase through everything, including your gear and any incompatible organs/limbs." + desc = "Toggles phasing through everything, including your hands. You are tied to your tombstone while this is active. \ + At least you know how to keep your clothes on." button_icon = 'icons/hud/actions.dmi' button_icon_state = "ghost" + ///Grave that appears when we're passing through, which we are also tied to. + var/obj/structure/closet/crate/grave/skeleton/grave + /datum/action/innate/toggle_passthrough/Grant(mob/grant_to) . = ..() - RegisterSignal(grant_to, COMSIG_CARBON_POST_ATTACH_LIMB, PROC_REF(on_new_limb)) + grave = new() + //contents are initialized when the grave is robbed as that's when the crate is opened for the first time. + RegisterSignal(grave, COMSIG_CLOSET_CONTENTS_INITIALIZED, PROC_REF(on_grave_robbed)) + RegisterSignal(grave, COMSIG_CLOSET_POST_OPEN, PROC_REF(post_grave_robbed)) /datum/action/innate/toggle_passthrough/Remove(mob/remove_from) - swap_mode(force_off = TRUE) - UnregisterSignal(remove_from, COMSIG_CARBON_POST_ATTACH_LIMB) + if(!QDELING(remove_from)) + swap_mode(force_off = TRUE) + QDEL_NULL(grave) return ..() /datum/action/innate/toggle_passthrough/Activate() @@ -182,30 +135,6 @@ return swap_mode() -/datum/action/innate/toggle_passthrough/IsAvailable(feedback) - if(!isliving(owner)) - return FALSE - var/mob/living/living_owner = owner - if(living_owner.has_reagent(/datum/reagent/water/holywater)) - return FALSE - //technically you can trap a ghost by blessing them as theyre phasing, - //but they can still be dragged out. - if(locate(/obj/effect/blessing) in get_turf(owner)) - return FALSE - var/obj/item/bodypart/chest/their_chest = living_owner.get_bodypart(BODY_ZONE_CHEST) - if(!their_chest || !(their_chest.bodytype & BODYTYPE_GHOST)) - return FALSE - return ..() - -///Called when the owner of this action gets a new limb, if it isn't a ghost-limb -///the action will turn itself off, and you'll lose said limb if you try using this action again. -/datum/action/innate/toggle_passthrough/proc/on_new_limb(mob/source, obj/item/bodypart/new_part, special) - SIGNAL_HANDLER - if(!iscarbon(owner)) - return - if(!(new_part.bodytype & BODYTYPE_GHOST)) - swap_mode(force_off = TRUE) - ///Swaps the mode, allowing us to phase through stuff but drops everything. Optional 'force_off' arg to prevent being able to turn it on. /datum/action/innate/toggle_passthrough/proc/swap_mode(force_off) //we can only turn off, early return if we're trying to turn it on instead. @@ -213,17 +142,9 @@ return var/mob/living/carbon/carbon_owner = owner - var/datum/species/carbon_species = carbon_owner.dna.species - - //drop any limbs & organs that can't phase, now that you're phasing. - for(var/obj/item/bodypart/bodypart as anything in carbon_owner.bodyparts) - if(!(bodypart.bodytype & BODYTYPE_GHOST)) - bodypart.drop_limb(special = FALSE, dismembered = FALSE, move_to_floor = TRUE) - for(var/obj/item/organ/organ as anything in carbon_owner.organs) - if(!(organ.organ_flags & ORGAN_GHOST)) - organ.Remove(owner, special = FALSE) - if(HAS_TRAIT_FROM(carbon_owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT)) + grave.forceMove(get_turf(carbon_owner)) + carbon_owner.AddComponent(/datum/component/leash, grave, distance = 7) REMOVE_TRAIT(carbon_owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT) carbon_owner.add_traits(list( TRAIT_MOVE_PHASING, @@ -232,10 +153,11 @@ TRAIT_HANDS_BLOCKED, //MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_STORAGE TRAIT_PULL_BLOCKED, //MOBILITY_PULL TRAIT_UI_BLOCKED, //MOBILITY_UI - ), SPECIES_TRAIT) - carbon_species.update_no_equip_flags(carbon_owner, ALL) - RegisterSignal(carbon_owner, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(attempt_move)) + ), SPECIES_TRAIT) else + qdel(carbon_owner.GetComponent(/datum/component/leash)) + carbon_owner.forceMove(get_turf(grave)) + grave.moveToNullspace() ADD_TRAIT(carbon_owner, TRAIT_NO_FLOATING_ANIM, SPECIES_TRAIT) carbon_owner.remove_traits(list( TRAIT_MOVE_PHASING, @@ -244,13 +166,16 @@ TRAIT_HANDS_BLOCKED, TRAIT_PULL_BLOCKED, TRAIT_UI_BLOCKED, - ), SPECIES_TRAIT) - carbon_species.update_no_equip_flags(carbon_owner, initial(carbon_species.no_equip_flags)) - UnregisterSignal(carbon_owner, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE) + ), SPECIES_TRAIT) -///Called when attempting to move to a new tile while the action is active, returns to cancel moving. -/datum/action/innate/toggle_passthrough/proc/attempt_move(mob/source, new_loc, direct) +///Called when the contents are made, which means the grave has been 'opened', therefore robbed. +/datum/action/innate/toggle_passthrough/proc/on_grave_robbed(obj/structure/closet/crate/grave/skeleton/source) SIGNAL_HANDLER - if(locate(/obj/effect/blessing) in new_loc) - to_chat(source, span_warning("Holy energies block your path!")) - return COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE + var/mob/living/carbon/human/species/skeleton/skeletons_in_the_closet = locate() in source.contents + owner.mind.transfer_to(skeletons_in_the_closet, force_key_move = TRUE) + skeletons_in_the_closet.death(gibbed = FALSE) + +///Called AFTER the contents have been spit out, which means the owner is now in the skeleton. Let's clean up. +/datum/action/innate/toggle_passthrough/proc/post_grave_robbed(obj/structure/closet/crate/grave/skeleton/source) + SIGNAL_HANDLER + qdel(owner) diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 88f8d218e20..61d5cd0133c 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -29,17 +29,17 @@ /datum/species/moth/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons) . = ..() - RegisterSignal(human_who_gained_species, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) + RegisterSignal(human_who_gained_species, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) /datum/species/moth/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) . = ..() - UnregisterSignal(C, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS) + UnregisterSignal(C, COMSIG_ATOM_ATTACKBY) -/datum/species/moth/proc/damage_weakness(datum/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) +/datum/species/moth/proc/on_attackby(mob/living/source, obj/item/attacking_item, mob/living/attacker, list/modifiers, list/attack_modifiers) SIGNAL_HANDLER if(istype(attacking_item, /obj/item/melee/flyswatter)) - damage_mods += 10 // Yes, a 10x damage modifier + MODIFY_ATTACK_FORCE_MULTIPLIER(attack_modifiers, 10) // Yes, a 10x damage modifier /datum/species/moth/randomize_features() var/list/features = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index 68dcc4ea89e..3fd0212c284 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -37,7 +37,7 @@ to_chat(new_vampire, "[info_text]") new_vampire.skin_tone = "albino" new_vampire.update_body(0) - RegisterSignal(new_vampire, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, PROC_REF(damage_weakness)) + RegisterSignal(new_vampire, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) if(new_vampire.hud_used) on_hud_created(new_vampire) else @@ -45,7 +45,7 @@ /datum/species/human/vampire/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) . = ..() - UnregisterSignal(C, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS) + UnregisterSignal(C, COMSIG_ATOM_ATTACKBY) QDEL_NULL(blood_display) /datum/species/human/vampire/spec_life(mob/living/carbon/human/vampire, seconds_per_tick, times_fired) @@ -78,11 +78,11 @@ blood_hud.infodisplay += blood_display blood_hud.show_hud(blood_hud.hud_version) -/datum/species/human/vampire/proc/damage_weakness(datum/source, list/damage_mods, damage_amount, damagetype, def_zone, sharpness, attack_direction, obj/item/attacking_item) +/datum/species/human/vampire/proc/on_attackby(mob/living/source, obj/item/attacking_item, mob/living/attacker, list/modifiers, list/attack_modifiers) SIGNAL_HANDLER if(istype(attacking_item, /obj/item/nullrod/whip)) - damage_mods += 2 + MODIFY_ATTACK_FORCE_MULTIPLIER(attack_modifiers, 2) /datum/species/human/vampire/get_physical_attributes() return "Vampires are afflicted with the Thirst, needing to sate it by draining the blood out of another living creature. However, they do not need to breathe or eat normally. \ diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index f4cf1757d9a..8ab03201807 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -160,7 +160,7 @@ //Item has been handled at this point and equipped callback can be safely called //We cannot call it for items that have not been handled as they are not yet correctly //in a slot (handled further down inheritance chain, probably living/carbon/human/equip_to_slot - if(!not_handled) + if(!not_handled && slot != ITEM_SLOT_HANDS) // put in hands calls equipped on its own, annoyingly has_equipped(equipping, slot, initial) return not_handled @@ -175,6 +175,10 @@ update_equipment_speed_mods() hud_used?.update_locked_slots() + if(!(slot & item.slot_flags)) // Things below only update if slotted in (ie: not held) + return + if(item.hair_mask) + update_body() add_item_coverage(item) /mob/living/carbon/has_unequipped(obj/item/item) @@ -184,6 +188,8 @@ update_equipment_speed_mods() hud_used?.update_locked_slots() + if(item.hair_mask) + update_body() remove_item_coverage(item) /mob/living/carbon/doUnEquip(obj/item/item_dropping, force, newloc, no_move, invdrop = TRUE, silent = FALSE) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b491c72ae54..50742b1fa89 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -3028,7 +3028,7 @@ GLOBAL_LIST_EMPTY(fire_appearances) /// Create a report string about how strong this person looks, generated in a somewhat arbitrary fashion /mob/living/proc/compare_fitness(mob/living/scouter) - if (HAS_TRAIT(src, TRAIT_UNKNOWN)) + if (HAS_TRAIT(src, TRAIT_UNKNOWN_APPEARANCE)) return span_warning("It's impossible to tell whether this person lifts.") var/our_fitness_level = calculate_fitness() diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 17cd87b61e5..1add46217ee 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -1,5 +1,6 @@ /mob/living see_invisible = SEE_INVISIBLE_LIVING + abstract_type = /mob/living hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,DNR_HUD,NANITE_HUD,DIAG_NANITE_FULL_HUD) // BUBBER EDIT ADDITION - DNR_HUD / NANITE_HUD pressure_resistance = 10 hud_type = /datum/hud/living diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 12f97e9a4ce..400b3a4c5f6 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -434,7 +434,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( if(!M.client.prefs.read_preference(/datum/preference/toggle/enable_runechat) || (SSlag_switch.measures[DISABLE_RUNECHAT] && !HAS_TRAIT(src, TRAIT_BYPASS_MEASURES))) speech_bubble_recipients.Add(M.client) found_client = TRUE - if(SStts.tts_enabled && voice && found_client && !message_mods[MODE_CUSTOM_SAY_ERASE_INPUT] && !HAS_TRAIT(src, TRAIT_SIGN_LANG) && !HAS_TRAIT(src, TRAIT_UNKNOWN)) + if(SStts.tts_enabled && voice && found_client && !message_mods[MODE_CUSTOM_SAY_ERASE_INPUT] && !HAS_TRAIT(src, TRAIT_SIGN_LANG) && !HAS_TRAIT(src, TRAIT_UNKNOWN_VOICE)) var/tts_message_to_use = tts_message if(!tts_message_to_use) tts_message_to_use = message_raw diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 50819133958..3b66d4c7eff 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -811,14 +811,14 @@ var/treated_message = source.generate_messagepart(raw_translation, spans, message_mods) var/start = "Relayed Speech: " - var/namepart - var/list/stored_name = list(null) - SEND_SIGNAL(speaker, COMSIG_MOVABLE_MESSAGE_GET_NAME_PART, stored_name, FALSE) - namepart = stored_name[NAME_PART_INDEX] || "[speaker.GetVoice()]" + var/namepart = speaker.get_message_voice() var/hrefpart = "" var/jobpart = "Unknown" - if(!HAS_TRAIT(speaker, TRAIT_UNKNOWN)) //don't fetch the speaker's job in case they have something that conseals their identity completely + // if voice is concealed, job is concealed + // on the other hand we don't care about TRAIT_UNKNOWN_APPEARANCE + // (AI can associate voice -> name -> crew record -> job) + if(!HAS_TRAIT(speaker, TRAIT_UNKNOWN_VOICE)) if (isliving(speaker)) var/mob/living/living_speaker = speaker if(living_speaker.job) @@ -1093,7 +1093,7 @@ . = ..() .[/datum/job/ai::title] = minutes -/mob/living/silicon/ai/GetVoice() +/mob/living/silicon/ai/get_voice() . = ..() if(ai_voicechanger && ai_voicechanger.changing_voice) return ai_voicechanger.say_name diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7cc17afe31a..3ae1063cc78 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -326,7 +326,13 @@ eye_lights.layer = -2 //Bubber edit add_overlay(eye_lights) - if(opened && !(TRAIT_R_UNIQUEPANEL in model.model_features)) + var/obj/item/shield_module/shield_module = locate(/obj/item/shield_module) in src + if(shield_module && shield_module.active) + add_overlay(shield_module.shield_overlay) + else if (shield_module && !shield_module.active) + cut_overlay(shield_module.shield_overlay) + + if(opened && !(TRAIT_R_UNIQUEPANEL in model.model_features)) // BUBBER EDIT - ADDITION if(wiresexposed) add_overlay("ov-opencover +w") else if(cell) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index de44d58803f..1e8bd0de09c 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -109,6 +109,24 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real return ITEM_INTERACT_SUCCESS return ITEM_INTERACT_BLOCKING + if(istype(tool, /obj/item/storage/part_replacer)) + var/obj/item/storage/part_replacer/replacer = tool + if(!opened) + balloon_alert(user, "chassis cover is closed!") + return ITEM_INTERACT_BLOCKING + if(!istype(model, /obj/item/robot_model/engineering)) + balloon_alert(user, "wrong cyborg model!") + return ITEM_INTERACT_BLOCKING + if(locate(/obj/item/borg/upgrade/rped) in src) + balloon_alert(user, "already has a RPED!") + return ITEM_INTERACT_BLOCKING + qdel(tool) + var/obj/item/borg/upgrade/smallrped/lilrped = new + if(apply_upgrade(lilrped, user)) + balloon_alert(user, "[replacer] installed") + return ITEM_INTERACT_SUCCESS + return ITEM_INTERACT_BLOCKING + if(istype(tool, /obj/item/ai_module)) if(!opened) balloon_alert(user, "chassis cover is closed!") @@ -522,3 +540,25 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real spark_system.start() . = TRUE return ..() || . + +/mob/living/silicon/robot/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item) + var/mob/living/silicon/robot/borg = src + var/obj/item/shield_module/shield = locate() in borg + if(!shield) + return ..() + if(borg.cell.charge <= 0.4 * STANDARD_CELL_CHARGE) + balloon_alert(borg, "not enough energy!") + if(shield.active) + shield.active = FALSE + playsound(src, 'sound/vehicles/mecha/mech_shield_drop.ogg', 50, FALSE) + borg.cut_overlay(shield.shield_overlay) + return + if(shield && shield.active) + if(!lavaland_equipment_pressure_check(get_turf(borg))) + balloon_alert(borg, "the shield didn't absorb the damage!") + return ..() + playsound(src, 'sound/vehicles/mecha/mech_shield_deflect.ogg', 100, TRUE) + balloon_alert(borg, "absorbed!") + borg.cell.use(damage * (STANDARD_CELL_CHARGE / 15), force = TRUE) + damage *= 0.5 + return ..() diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index 3a2ef37f720..c7327e89eb7 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -19,6 +19,7 @@ mouse_drop_zone = TRUE held_items = list(null, null, null) //we use held_items for the module holding, because that makes sense to do! default_hand_amount = 3 + examine_thats = "This is" ///Represents the cyborg's model (engineering, medical, etc.) var/obj/item/robot_model/model = null diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 4254270fdbc..e99a07c052a 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -419,7 +419,6 @@ name = "Engineering" basic_modules = list( /obj/item/assembly/flash/cyborg, - /obj/item/borg/sight/meson, /obj/item/construction/rcd/borg, /obj/item/pipe_dispenser, /obj/item/extinguisher, @@ -442,6 +441,7 @@ /obj/item/lightreplacer, // Skyrat Edit - Surprised Engie borgs don't get these /obj/item/construction/rtd/borg, /obj/item/stack/cable_coil, + /obj/item/airlock_painter/decal/cyborg, ) radio_channels = list(RADIO_CHANNEL_ENGINEERING) emag_modules = list( @@ -451,6 +451,36 @@ model_select_icon = "engineer" model_traits = list(TRAIT_NEGATES_GRAVITY) hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(4, -4), "west" = list(-4, -4)) + var/datum/weakref/night_vision_ref + +/datum/action/cooldown/borg_meson + name = "Toggle Meson Vision" + button_icon = 'icons/mob/actions/actions_mecha.dmi' + button_icon_state = "meson" + +/datum/action/cooldown/borg_meson/Activate() + if(usr.sight & SEE_TURFS) + usr.clear_sight(SEE_TURFS) + owner.lighting_cutoff_red += 5 + owner.lighting_cutoff_green += 15 + owner.lighting_cutoff_blue += 5 + else + usr.add_sight(SEE_TURFS) + owner.lighting_cutoff_red -= 5 + owner.lighting_cutoff_green -= 15 + owner.lighting_cutoff_blue -= 5 + +/obj/item/robot_model/engineering/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE) + var/datum/action/cooldown/borg_meson/night_vision = new(loc) + . = ..() + if(!.) + return + night_vision.Grant(loc) + night_vision_ref = WEAKREF(night_vision) + +/obj/item/robot_model/engineering/Destroy() + QDEL_NULL(night_vision_ref) + return ..() /obj/item/robot_model/janitor name = "Janitor" @@ -739,6 +769,8 @@ /obj/item/stack/medical/bone_gel, /obj/item/borg/apparatus/organ_storage, /obj/item/borg/lollipop, + /obj/item/storage/bag/chemistry, + ) radio_channels = list(RADIO_CHANNEL_MEDICAL) emag_modules = list( @@ -756,7 +788,6 @@ name = "Miner" basic_modules = list( /obj/item/assembly/flash/cyborg, - /obj/item/borg/sight/meson, /obj/item/storage/bag/ore/cyborg, /obj/item/pickaxe/drill, /obj/item/shovel, @@ -769,6 +800,7 @@ /obj/item/gps/cyborg, /obj/item/stack/marker_beacon, /obj/item/t_scanner/adv_mining_scanner/cyborg, + /obj/item/shield_module, ) radio_channels = list(RADIO_CHANNEL_SCIENCE, RADIO_CHANNEL_SUPPLY) emag_modules = list( @@ -782,6 +814,19 @@ "Spider Miner" = list(SKIN_ICON_STATE = "spidermin", SKIN_HAT_OFFSET = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(-2, -2), "west" = list(2, -2))), "Lavaland Miner" = list(SKIN_ICON_STATE = "miner"), ) + var/datum/weakref/night_vision_ref + +/obj/item/robot_model/miner/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE) + var/datum/action/cooldown/borg_meson/night_vision = new(loc) + . = ..() + if(!.) + return + night_vision.Grant(loc) + night_vision_ref = WEAKREF(night_vision) + +/obj/item/robot_model/miner/Destroy() + QDEL_NULL(night_vision_ref) + return ..() /obj/item/robot_model/peacekeeper name = "Peacekeeper" @@ -960,6 +1005,7 @@ /obj/item/stack/medical/bone_gel, /obj/item/gun/medbeam, /obj/item/borg/apparatus/organ_storage, + /obj/item/storage/bag/chemistry, ) cyborg_base_icon = "synd_medical" model_select_icon = "malf" @@ -970,7 +1016,6 @@ name = "Syndicate Saboteur" basic_modules = list( /obj/item/assembly/flash/cyborg, - /obj/item/borg/sight/thermal, /obj/item/construction/rcd/borg/syndicate, /obj/item/pipe_dispenser, /obj/item/restraints/handcuffs/cable/zipties, @@ -984,6 +1029,7 @@ /obj/item/borg/apparatus/sheet_manipulator, /obj/item/stack/rods/cyborg, /obj/item/construction/rtd/borg, + /obj/item/airlock_painter/decal/cyborg, /obj/item/dest_tagger/borg, /obj/item/stack/cable_coil, /obj/item/pinpointer/syndicate_cyborg, @@ -995,6 +1041,33 @@ model_traits = list(TRAIT_PUSHIMMUNE, TRAIT_NEGATES_GRAVITY) hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(4, -4), "west" = list(-4, -4)) canDispose = TRUE + var/datum/weakref/thermal_vision_ref + +/datum/action/cooldown/borg_thermal + name = "Toggle Thermal Night Vision" + button_icon = 'icons/mob/actions/actions_mecha.dmi' + button_icon_state = "meson" + +/datum/action/cooldown/borg_thermal/Activate() + if(usr.sight & SEE_TURFS) + usr.clear_sight(SEE_TURFS|SEE_MOBS) + usr.lighting_cutoff = LIGHTING_CUTOFF_VISIBLE + else + usr.add_sight(SEE_TURFS|SEE_MOBS) + usr.lighting_cutoff = LIGHTING_CUTOFF_HIGH + usr.sync_lighting_plane_cutoff() + +/obj/item/robot_model/saboteur/be_transformed_to(obj/item/robot_model/old_model, forced = FALSE) + var/datum/action/cooldown/borg_thermal/thermal_vision = new(loc) + . = ..() + if(!.) + return + thermal_vision.Grant(loc) + thermal_vision_ref = WEAKREF(thermal_vision) + +/obj/item/robot_model/saboteur/Destroy() + QDEL_NULL(thermal_vision_ref) + return ..() /obj/item/robot_model/syndicate/kiltborg name = "Highlander" diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 3b49079cb87..b26ca10574e 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -1,5 +1,6 @@ /mob/living/silicon gender = NEUTER + abstract_type = /mob/living/silicon verb_say = "states" verb_ask = "queries" verb_exclaim = "declares" diff --git a/code/modules/mob/living/silicon/silicon_say.dm b/code/modules/mob/living/silicon/silicon_say.dm index 7e806bbdf8c..c3edff2b94b 100644 --- a/code/modules/mob/living/silicon/silicon_say.dm +++ b/code/modules/mob/living/silicon/silicon_say.dm @@ -24,7 +24,7 @@ var/namepart = name // If carbon, use voice to account for voice changers if(iscarbon(src)) - namepart = GetVoice() + namepart = get_voice() // AI in carbon body should still have its real name var/obj/item/organ/brain/cybernetic/ai/brain = get_organ_slot(ORGAN_SLOT_BRAIN) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 5facb5188b1..1d1d96e1feb 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -1,4 +1,5 @@ /mob/living/simple_animal/hostile + abstract_type = /mob/living/simple_animal/hostile faction = list(FACTION_HOSTILE) stop_automated_movement_when_pulled = 0 obj_damage = 40 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm index 389b6a164a4..6cf309e8a75 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm @@ -1,6 +1,7 @@ /mob/living/simple_animal/hostile/megafauna name = "boss of this gym" desc = "Attack the weak point for massive damage." + abstract_type = /mob/living/simple_animal/hostile/megafauna health = 1000 maxHealth = 1000 combat_mode = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 8cc6fc3e02f..e105ab56cd1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -7,6 +7,7 @@ name = "elite" desc = "An elite monster, found in one of the strange tumors on lavaland." icon = 'icons/mob/simple/lavaland/lavaland_elites.dmi' + abstract_type = /mob/living/simple_animal/hostile/asteroid/elite faction = list(FACTION_MINING, FACTION_BOSS) robust_searching = TRUE ranged_ignores_vision = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm index 9999736abf7..a2e718aa851 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm @@ -1,5 +1,6 @@ //the base mining mob /mob/living/simple_animal/hostile/asteroid + abstract_type = /mob/living/simple_animal/hostile/asteroid vision_range = 2 atmos_requirements = null faction = list(FACTION_MINING) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index e330a256e50..68cf5480ae6 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -2,6 +2,7 @@ /mob/living/simple_animal name = "animal" icon = 'icons/mob/simple/animal.dmi' + abstract_type = /mob/living/simple_animal health = 20 maxHealth = 20 gender = PLURAL //placeholder diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 2b0314470ab..86d5b7272e1 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -9,6 +9,7 @@ /mob density = TRUE layer = MOB_LAYER + abstract_type = /mob animate_movement = SLIDE_STEPS hud_possible = list(ANTAG_HUD) pressure_resistance = 8 diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index d149b88115a..f33cde396f8 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -101,8 +101,10 @@ //We are now going to move var/add_delay = mob.cached_multiplicative_slowdown - var/new_glide_size = DELAY_TO_GLIDE_SIZE(add_delay * ( (NSCOMPONENT(direct) && EWCOMPONENT(direct)) ? sqrt(2) : 1 ) ) - mob.set_glide_size(new_glide_size) // set it now in case of pulled objects + var/glide_delay = add_delay + if(NSCOMPONENT(direct) && EWCOMPONENT(direct)) + glide_delay = FLOOR(glide_delay * sqrt(2), world.tick_lag) + mob.set_glide_size(DELAY_TO_GLIDE_SIZE(glide_delay)) // set it now in case of pulled objects //If the move was recent, count using old_move_delay //We want fractional behavior and all if(old_move_delay + world.tick_lag > world.time) @@ -120,7 +122,7 @@ . = ..() if((direct & (direct - 1)) && mob.loc == new_loc) //moved diagonally successfully - add_delay *= sqrt(2) + add_delay = FLOOR(add_delay * sqrt(2), world.tick_lag) var/after_glide = 0 if(visual_delay) diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 8fe4a473d05..8486e608289 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -409,13 +409,12 @@ /obj/item/mod/module/stealth/ninja, /obj/item/mod/module/dispenser/ninja, /obj/item/mod/module/dna_lock/reinforced, - /obj/item/mod/module/emp_shield/pulse, + /obj/item/mod/module/emp_shield, /obj/item/mod/module/quick_cuff, ) default_pins = list( /obj/item/mod/module/stealth/ninja, /obj/item/mod/module/dispenser/ninja, - /obj/item/mod/module/emp_shield/pulse, /obj/item/mod/module/weapon_recall, /obj/item/mod/module/adrenaline_boost, /obj/item/mod/module/energy_net, diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index 3ee0fed7449..ffe4cde8075 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -3,6 +3,7 @@ name = "MOD module" icon = 'icons/obj/clothing/modsuit/mod_modules.dmi' icon_state = "module" + abstract_type = /obj/item/mod/module /// If it can be removed var/removable = TRUE /// If it's passive, togglable, usable or active diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index 32b11f23c59..cd2e8ce06d4 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -419,7 +419,7 @@ incompatible_modules = list(/obj/item/mod/module/infiltrator, /obj/item/mod/module/welding/syndicate, /obj/item/mod/module/welding, /obj/item/mod/module/headprotector) required_slots = list(ITEM_SLOT_FEET, ITEM_SLOT_HEAD, ITEM_SLOT_OCLOTHING) /// List of traits added when the suit is activated - var/list/traits_to_add = list(TRAIT_SILENT_FOOTSTEPS, TRAIT_UNKNOWN, TRAIT_HEAD_INJURY_BLOCKED) + var/list/traits_to_add = list(TRAIT_SILENT_FOOTSTEPS, TRAIT_UNKNOWN_APPEARANCE, TRAIT_UNKNOWN_VOICE, TRAIT_HEAD_INJURY_BLOCKED) /obj/item/mod/module/infiltrator/on_install() . = ..() diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 104f6058549..63da26b1df4 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -780,12 +780,11 @@ ///A module that recharges the suit by an itsy tiny bit whenever the user takes a step. Originally called "magneto module" but the videogame reference sounds cooler. /obj/item/mod/module/joint_torsion name = "MOD joint torsion ratchet module" - desc = "A compact, weak AC generator that charges the suit's internal cell through the power of deambulation. It doesn't work in zero G." + desc = "A compact, weak AC generator that charges the suit's internal cell through the power of deambulation. It doesn't work in zero G. More than one can be installed." icon_state = "joint_torsion" complexity = 1 - incompatible_modules = list(/obj/item/mod/module/joint_torsion) required_slots = list(ITEM_SLOT_FEET) - var/power_per_step = DEFAULT_CHARGE_DRAIN * 0.3 + var/power_per_step = DEFAULT_CHARGE_DRAIN * 0.45 /obj/item/mod/module/joint_torsion/on_part_activation() if(!(mod.wearer.movement_type & (FLOATING|FLYING))) diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index efe5d4646ef..2eaebddaf55 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -165,9 +165,10 @@ /obj/item/mod/module/megaphone/on_activation(mob/activator) RegisterSignal(mod.wearer, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + RegisterSignal(mod.wearer, COMSIG_LIVING_TREAT_MESSAGE, PROC_REF(add_tts_filter)) /obj/item/mod/module/megaphone/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) - UnregisterSignal(mod.wearer, COMSIG_MOB_SAY) + UnregisterSignal(mod.wearer, list(COMSIG_LIVING_TREAT_MESSAGE, COMSIG_MOB_SAY)) /obj/item/mod/module/megaphone/proc/handle_speech(datum/source, list/speech_args) SIGNAL_HANDLER @@ -175,6 +176,11 @@ speech_args[SPEECH_SPANS] |= voicespan drain_power(use_energy_cost) +/obj/item/mod/module/megaphone/proc/add_tts_filter(mob/living/carbon/user, list/message_args) + SIGNAL_HANDLER + ///A sharper and louder sound with a bit of echo + message_args[TREAT_TTS_FILTER_ARG] += "acrusher=samples=2:level_out=6,aecho=delays=90:decays=0.3,aemphasis=type=cd,acontrast=30,crystalizer=i=5" + ///Criminal Capture - Generates hardlight bags you can put people in and sinch. /obj/item/mod/module/criminalcapture name = "MOD criminal capture module" diff --git a/code/modules/modular_computers/file_system/programs/maintenance/themes.dm b/code/modules/modular_computers/file_system/programs/maintenance/themes.dm index 26717e33d3a..e3dca731d3a 100644 --- a/code/modules/modular_computers/file_system/programs/maintenance/themes.dm +++ b/code/modules/modular_computers/file_system/programs/maintenance/themes.dm @@ -35,10 +35,19 @@ qdel(src) /datum/computer_file/program/maintenance/theme/cat - theme_name = CAT_THEME_NAME + theme_name = PDA_THEME_CAT_NAME /datum/computer_file/program/maintenance/theme/lightmode - theme_name = LIGHT_THEME_NAME + theme_name = PDA_THEME_LIGHT_MODE_NAME /datum/computer_file/program/maintenance/theme/spooky - theme_name = ELDRITCH_THEME_NAME + theme_name = PDA_THEME_SPOOKY_NAME + +/datum/computer_file/program/maintenance/theme/hacker + theme_name = PDA_THEME_HACKERMAN_NAME + +/datum/computer_file/program/maintenance/theme/roulette + theme_name = PDA_THEME_ROULETTE_NAME + +/datum/computer_file/program/maintenance/theme/alien + theme_name = PDA_THEME_ABDUCTOR_NAME diff --git a/code/modules/modular_computers/file_system/programs/theme_selector.dm b/code/modules/modular_computers/file_system/programs/theme_selector.dm index 6190f9b15ab..3d3f5a6a3cb 100644 --- a/code/modules/modular_computers/file_system/programs/theme_selector.dm +++ b/code/modules/modular_computers/file_system/programs/theme_selector.dm @@ -16,7 +16,7 @@ var/list/data = list() if(computer.obj_flags & EMAGGED) - data["themes"] += list(list("theme_name" = SYNDICATE_THEME_NAME, "theme_ref" = GLOB.pda_name_to_theme[SYNDICATE_THEME_NAME])) + data["themes"] += list(list("theme_name" = PDA_THEME_SYNDICATE_NAME, "theme_ref" = GLOB.pda_name_to_theme[PDA_THEME_SYNDICATE_NAME])) for(var/theme_key in GLOB.default_pda_themes + imported_themes) data["themes"] += list(list("theme_name" = theme_key, "theme_ref" = GLOB.pda_name_to_theme[theme_key])) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 258ae40a15e..11f55c54a4d 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -61,6 +61,9 @@ if(IS_WRITING_UTENSIL(held_item)) context[SCREENTIP_CONTEXT_LMB] = "Rename" return CONTEXTUAL_SCREENTIP_SET + if((held_item.tool_behaviour == TOOL_KNIFE || held_item.tool_behaviour == TOOL_WIRECUTTER) && !contents.len) + context[SCREENTIP_CONTEXT_LMB] = "Cut apart" + return CONTEXTUAL_SCREENTIP_SET return NONE /obj/item/folder/proc/remove_item(obj/item/Item, mob/user) @@ -93,6 +96,8 @@ return insertables_act(user, tool) if(IS_WRITING_UTENSIL(tool)) return writing_utensil_act(user, tool) + if(tool.tool_behaviour == TOOL_KNIFE || tool.tool_behaviour == TOOL_WIRECUTTER) + return sharp_thing_act(user, tool) return NONE /obj/item/folder/proc/insertables_act(mob/living/user, obj/item/tool) @@ -116,6 +121,16 @@ playsound(src, SFX_WRITING_PEN, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, SOUND_FALLOFF_EXPONENT + 3, ignore_walls = FALSE) return ITEM_INTERACT_SUCCESS +/obj/item/folder/proc/sharp_thing_act(mob/user, obj/item/sharp_tool) + if(contents.len) + balloon_alert(user, "empty [src] first!") + return ITEM_INTERACT_BLOCKING + + balloon_alert(user, "cut apart") + qdel(src) + user.put_in_hands(new /obj/item/stack/sheet/cardboard) + return ITEM_INTERACT_SUCCESS + /obj/item/folder/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(is_type_in_typecache(interacting_with, folder_insertables)) return interact_with_insertables(interacting_with, user) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 1801a23b155..2c0cac37b40 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -892,6 +892,12 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks()) charges = 200 max_charges = 200 +/obj/item/toner/infinite + name = "infinite toner cartridge" + desc = "...are you satisfied now?" + charges = INFINITY + max_charges = INFINITY + #undef PHOTOCOPIER_FEE #undef BLANKS_FILE_NAME #undef PAPER_PAPER_USE diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index 450746c71a2..9c76e499a60 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -53,7 +53,7 @@ if(!seen) P.mobs_seen -= seen_ref continue - if(!isobserver(seen) && !isspirit(seen)) + if(!isobserver(seen) && !isghostspecies(seen)) continue set_custom_materials(list(/datum/material/hauntium =SHEET_MATERIAL_AMOUNT)) grind_results = list(/datum/reagent/hauntium = 20) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 47a07f9adef..0c98fcf3048 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -16,6 +16,7 @@ throwforce = 5 throw_speed = 2 throw_range = 5 + emp_damage_modifier = 1 w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5) @@ -53,6 +54,7 @@ desc = "A power cell with a slightly higher capacity than normal!" icon_state = "9v_cell" maxcharge = STANDARD_CELL_CHARGE * 2.5 + custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) chargerate = STANDARD_CELL_RATE * 0.5 @@ -85,6 +87,7 @@ /obj/item/stock_parts/power_store/cell/pulse //200 pulse shots name = "pulse rifle power cell" + emp_damage_modifier = 0.5 maxcharge = STANDARD_CELL_CHARGE * 40 chargerate = STANDARD_CELL_RATE * 0.75 @@ -99,6 +102,7 @@ /obj/item/stock_parts/power_store/cell/ninja name = "black power cell" icon_state = "bscell" + emp_damage_modifier = 3 maxcharge = STANDARD_CELL_CHARGE * 10 custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6) chargerate = STANDARD_CELL_RATE @@ -106,10 +110,11 @@ /obj/item/stock_parts/power_store/cell/high name = "high-capacity power cell" icon_state = "hcell" + emp_damage_modifier = 3 maxcharge = STANDARD_CELL_CHARGE * 10 custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6) chargerate = STANDARD_CELL_RATE * 0.75 - + /obj/item/stock_parts/power_store/cell/high/empty empty = TRUE @@ -117,6 +122,7 @@ /obj/item/stock_parts/power_store/cell/super name = "super-capacity power cell" icon_state = "scell" + emp_damage_modifier = 5 maxcharge = STANDARD_CELL_CHARGE * 20 custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 3) chargerate = STANDARD_CELL_RATE @@ -127,6 +133,7 @@ /obj/item/stock_parts/power_store/cell/hyper name = "hyper-capacity power cell" icon_state = "hpcell" + emp_damage_modifier = 5 maxcharge = STANDARD_CELL_CHARGE * 30 custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 4) chargerate = STANDARD_CELL_RATE * 1.5 @@ -138,6 +145,7 @@ name = "bluespace power cell" desc = "A rechargeable transdimensional power cell." icon_state = "bscell" + emp_damage_modifier = 5 maxcharge = STANDARD_CELL_CHARGE * 40 custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*6) chargerate = STANDARD_CELL_RATE * 2 @@ -148,6 +156,7 @@ /obj/item/stock_parts/power_store/cell/infinite name = "infinite-capacity power cell" icon_state = "icell" + emp_damage_modifier = 0 maxcharge = INFINITY //little disappointing if you examine it and it's not huge custom_materials = list(/datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT) chargerate = INFINITY @@ -174,6 +183,7 @@ icon = 'icons/obj/service/hydroponics/harvest.dmi' icon_state = "potato" maxcharge = STANDARD_CELL_CHARGE * 0.3 + emp_damage_modifier = 0.5 //It's biological, so charge_light_type = null connector_type = null custom_materials = null @@ -187,6 +197,7 @@ /obj/item/stock_parts/power_store/cell/emproof name = "\improper EMP-proof cell" desc = "An EMP-proof cell." + emp_damage_modifier = 0 maxcharge = STANDARD_CELL_CHARGE * 0.5 /obj/item/stock_parts/power_store/cell/emproof/Initialize(mapload) @@ -244,6 +255,7 @@ connector_type = null custom_materials = null grind_results = null + emp_damage_modifier = 0 /obj/item/stock_parts/power_store/cell/ethereal/examine(mob/user) . = ..() diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index a98694af531..e9097005c67 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -407,7 +407,7 @@ return // attempt to stick weapon into light socket - if(status != LIGHT_EMPTY) + if(status != LIGHT_EMPTY || user.combat_mode) return ..() if(tool.tool_behaviour == TOOL_SCREWDRIVER) //If it's a screwdriver open it. tool.play_tool_sound(src, 75) diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm index c03b5b9590c..7e4852f8459 100644 --- a/code/modules/power/power_store.dm +++ b/code/modules/power/power_store.dm @@ -34,6 +34,8 @@ var/connector_type = "standard" ///Does the cell start without any charge? var/empty = FALSE + // Damage multiplier the cells take from emps to prevent stuff like bluespace cells taking 40 shots to drain. + var/emp_damage_modifier = 1 /obj/item/stock_parts/power_store/get_cell() return src @@ -239,7 +241,7 @@ . = ..() if(. & EMP_PROTECT_SELF) return - use(STANDARD_CELL_CHARGE / severity, force = TRUE) + use((STANDARD_CELL_CHARGE /severity) * emp_damage_modifier , force = TRUE) /obj/item/stock_parts/power_store/ex_act(severity, target) . = ..() diff --git a/code/modules/projectiles/ammunition/energy/plasma.dm b/code/modules/projectiles/ammunition/energy/plasma.dm index f68879fc757..840244a3d67 100644 --- a/code/modules/projectiles/ammunition/energy/plasma.dm +++ b/code/modules/projectiles/ammunition/energy/plasma.dm @@ -9,3 +9,4 @@ projectile_type = /obj/projectile/plasma/adv delay = 10 e_cost = LASER_SHOTS(100, STANDARD_CELL_CHARGE) + diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 4194badcc0e..f708ec04f6c 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -3,6 +3,7 @@ name = "ammo box (null_reference_exception)" desc = "A box of ammo." icon = 'icons/obj/weapons/guns/ammo.dmi' + abstract_type = /obj/item/ammo_box obj_flags = CONDUCTS_ELECTRICITY slot_flags = ITEM_SLOT_BELT inhand_icon_state = "syringe_kit" @@ -258,6 +259,7 @@ /obj/item/ammo_box/magazine name = "A magazine (what?)" desc = "A magazine of rounds, they look like error signs... this should probably be reported somewhere." + abstract_type = /obj/item/ammo_box/magazine ammo_box_multiload = AMMO_BOX_MULTILOAD_IN // so you can't use a magazine like a bootleg speedloader drop_sound = 'sound/items/handling/gun/ballistics/magazine/magazine_drop1.ogg' pickup_sound = 'sound/items/handling/gun/ballistics/magazine/magazine_pickup1.ogg' diff --git a/code/modules/projectiles/boxes_magazines/external/toy.dm b/code/modules/projectiles/boxes_magazines/external/toy.dm index ff45d604ebc..1db22717181 100644 --- a/code/modules/projectiles/boxes_magazines/external/toy.dm +++ b/code/modules/projectiles/boxes_magazines/external/toy.dm @@ -1,6 +1,7 @@ /obj/item/ammo_box/magazine/toy name = "foam force META magazine" desc = "A magazine specifically designed for foam force \"firearms\". Probably not great for actually killing your fellow spaceman." + abstract_type = /obj/item/ammo_box/magazine/toy ammo_type = /obj/item/ammo_casing/foam_dart caliber = CALIBER_FOAM diff --git a/code/modules/projectiles/boxes_magazines/internal/_internal.dm b/code/modules/projectiles/boxes_magazines/internal/_internal.dm index 0579d19234b..43b34979e44 100644 --- a/code/modules/projectiles/boxes_magazines/internal/_internal.dm +++ b/code/modules/projectiles/boxes_magazines/internal/_internal.dm @@ -1,5 +1,7 @@ /obj/item/ammo_box/magazine/internal desc = "Oh god, this shouldn't be here" + abstract_type = /obj/item/ammo_box/magazine/internal + spawn_blacklisted = TRUE obj_flags = CONDUCTS_ELECTRICITY item_flags = ABSTRACT diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index db816fb0eb7..6c22e66eeec 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -8,6 +8,7 @@ icon_state = "revolver" inhand_icon_state = "gun" worn_icon_state = "gun" + abstract_type = /obj/item/gun obj_flags = CONDUCTS_ELECTRICITY appearance_flags = TILE_BOUND|PIXEL_SCALE|LONG_GLIDE|KEEP_TOGETHER slot_flags = ITEM_SLOT_BELT diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 8855562c3a6..fe1508d6377 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -1,9 +1,10 @@ ///Subtype for any kind of ballistic gun ///This has a shitload of vars on it, and I'm sorry for that, but it does make making new subtypes really easy /obj/item/gun/ballistic - desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason." name = "projectile gun" + desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason." icon_state = "debug" + abstract_type = /obj/item/gun/ballistic w_class = WEIGHT_CLASS_NORMAL pickup_sound = 'sound/items/handling/gun/gun_pick_up.ogg' drop_sound = 'sound/items/handling/gun/gun_drop.ogg' diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 426d8ef0a60..a404221fb1d 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -1,4 +1,5 @@ /obj/item/gun/ballistic/automatic + abstract_type = /obj/item/gun/ballistic/automatic w_class = WEIGHT_CLASS_NORMAL can_suppress = TRUE burst_size = 3 diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm index ff826883b26..a0986614352 100644 --- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm +++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm @@ -142,18 +142,20 @@ icon_state = "plastic_arrow_projectile" /// special pyre sect arrow -/// in the future, this needs a special sprite, but bows don't support non-hardcoded arrow sprites /obj/item/ammo_casing/arrow/holy/blazing name = "blazing star arrow" desc = "A holy diver seeking its target, blessed with fire. Will ignite on hit, destroying the arrow. But if you hit an already ignited target...?" + icon_state = "flaming_arrow" + inhand_icon_state = "flaming_arrow" + base_icon_state = "flaming_arrow" projectile_type = /obj/projectile/bullet/arrow/blazing reusable = FALSE /obj/projectile/bullet/arrow/blazing name = "blazing arrow" desc = "THE UNMATCHED POWER OF THE SUN" - icon_state = "holy_arrow_projectile" - damage = 20 + icon_state = "flaming_arrow_projectile" + damage_type = BURN embed_type = null /obj/projectile/bullet/arrow/blazing/on_hit(atom/target, blocked, pierce_hit) @@ -168,3 +170,22 @@ return to_chat(human_target, span_danger("[src] reacts with the flames enveloping you! Oh shit!")) explosion(src, light_impact_range = 1, flame_range = 2) //ow + +/// Ashen arrows +/obj/item/ammo_casing/arrow/ashen + name = "ashen arrow" + desc = "An arrow made from watcher sinew and bone. Seems unusually lethal against the creatures it is made from." + icon_state = "ashen_arrow" + inhand_icon_state = "ashen_arrow" + base_icon_state = "ashen_arrow" + projectile_type = /obj/projectile/bullet/arrow/ashen + +/// ashen arrow projectile +/obj/projectile/bullet/arrow/ashen + name = "ashen arrow" + icon_state = "ashen_arrow_projectile" + +/obj/projectile/bullet/arrow/ashen/Initialize(mapload) + . = ..() + AddElement(/datum/element/bane, mob_biotypes = MOB_MINING, damage_multiplier = 0, added_damage = 40) + diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm index daa938015cc..159baba883a 100644 --- a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm +++ b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm @@ -8,7 +8,8 @@ /obj/item/gun/ballistic/bow/shortbow name = "shortbow" desc = "A simple homemade shortbow. Great for LARPing. Or poking out someones eye." - projectile_damage_multiplier = 0.36 + obj_flags = UNIQUE_RENAME + projectile_damage_multiplier = 0.5 ///chaplain's divine archer bow /obj/item/gun/ballistic/bow/divine @@ -21,7 +22,8 @@ slot_flags = ITEM_SLOT_BACK obj_flags = UNIQUE_RENAME accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/holy - //projectile_damage_multiplier = 0.4 // SKYRAT EDIT REMOVAL + //projectile_damage_multiplier = 0.6 // SKYRAT EDIT REMOVAL + projectile_speed_multiplier = 1.5 /obj/item/ammo_box/magazine/internal/bow/holy name = "divine bowstring" @@ -52,3 +54,14 @@ /obj/item/gun/ballistic/bow/divine/with_quiver/Initialize(mapload) . = ..() new /obj/item/storage/bag/quiver/holy(loc) + +/// Ashen bow, crafted from watcher sinew and animal bones. +/obj/item/gun/ballistic/bow/ashenbow + name = "ashen bow" + desc = "A bow made from watcher sinew and bone. Seems to possess an almost eerie radiance about it." + inhand_icon_state = "ashenbow" + base_icon_state = "ashenbow" + worn_icon_state = "ashenbow" + slot_flags = ITEM_SLOT_BACK + obj_flags = UNIQUE_RENAME + projectile_damage_multiplier = 0.5 diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 952e07f523e..492583cef8c 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -22,6 +22,7 @@ /obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel name = "underbarrel grenade launcher" + spawn_blacklisted = TRUE pin = null /obj/item/gun/ballistic/revolver/grenadelauncher/underbarrel/Initialize(mapload) diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm index 32c17488158..670f0b0c370 100644 --- a/code/modules/projectiles/guns/energy/laser_gatling.dm +++ b/code/modules/projectiles/guns/energy/laser_gatling.dm @@ -99,6 +99,7 @@ slowdown = 1 slot_flags = null w_class = WEIGHT_CLASS_HUGE + spawn_blacklisted = TRUE custom_materials = null weapon_weight = WEAPON_HEAVY ammo_type = list(/obj/item/ammo_casing/energy/laser/minigun) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 2d5d2e8f6ed..72bf690812b 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -8,6 +8,7 @@ name = "projectile" icon = 'icons/obj/weapons/guns/projectiles.dmi' icon_state = "bullet" + abstract_type = /obj/projectile density = FALSE anchored = TRUE mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/modules/projectiles/projectile/special/plasma.dm b/code/modules/projectiles/projectile/special/plasma.dm index 7da09b56729..adba89e4d88 100644 --- a/code/modules/projectiles/projectile/special/plasma.dm +++ b/code/modules/projectiles/projectile/special/plasma.dm @@ -38,3 +38,4 @@ damage = 24 range = 7 pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE + diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm index 1b1f8e59fb0..c65c7bc771d 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm @@ -2893,6 +2893,156 @@ quality = DRINK_VERYGOOD taste_description = "the aloha state" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/boston_sour + name = "Boston Sour" + description = "Whiskey sour texturally elevated by an egg white." + boozepwr = 35 + color = "#ddc28b" + quality = DRINK_VERYGOOD + taste_description = "foamy lemony sourness" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/star + name = "Star" + description = "A blend of applejack and vermouth accented with bitters." + boozepwr = 40 + color = "#e5a654" + quality = DRINK_GOOD + taste_description = "vinous apples" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/old_fashioned + name = "Old Fashioned" + description = "By some measures the first cocktail, made by flavoring a hard spirit with sugar and bitters, with the spirit in question most often being whiskey in modern times." + boozepwr = 60 + color = "#b4a287" + quality = DRINK_GOOD + taste_description = "rounded out whiskey" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_EASY + +/datum/reagent/consumable/ethanol/sazerac + name = "Sazerac" + description = "Whiskey made aromatic by absinthe and creole bitters." + boozepwr = 65 + color = "#f43f69" + quality = DRINK_GOOD + taste_description = "flowery anise-scented whiskey" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/amaretto_sour + name = "Amaretto Sour" + description = "A sour made with sweet amaretto." + boozepwr = 15 + color = "#ddc28b" + quality = DRINK_VERYGOOD + taste_description = "foamy lemony sweetness" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_MEDIUM + +/datum/reagent/consumable/ethanol/ramos_gin_fizz + name = "Ramos Gin Fizz" + description = "A complex twist on the concept of a gin fizz, adding cream and egg white along side lemon juice for an incomparable textural experience. In this version, the drink's signature usage of orange blossom water is replaced with a drop of orange liqueur." + boozepwr = 35 + color = "#f9e7c2" + quality = DRINK_FANTASTIC + taste_description = "creamy fluffy citrusy gin" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/french_75 + name = "French 75" + description = "A sophisticated cocktail made by strengthening champagne with gin, then flavoring with lemon juice and sugar." + boozepwr = 30 + color = "#ffffc1" + quality = DRINK_GOOD + taste_description = "glory and gunnery" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_MEDIUM + +/datum/reagent/consumable/ethanol/sangria + name = "Sangria" + description = "A blood-red wine punch strengthened with liquor and sweetened with as much chopped fruit as one can get their hands on." + boozepwr = 20 + color = "#c4383b" + quality = DRINK_GOOD + taste_description = "refreshing fruity wine" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/suffering_bastard + name = "Suffering Bastard" + description = "A tiki style hangover cure made from ginger beer, spirits, and bitters." + boozepwr = 20 + color = "#e8ca78" + quality = DRINK_VERYGOOD + taste_description = "ginger-flavored recuperation" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/suffering_bastard/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + . = ..() + affected_mob.apply_status_effect(/datum/status_effect/headache_soothed) //prevents headaches + affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) //removes disgust, same with sol dry + if(affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, -0.5 * REM * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags)) //heals brain damage very slowly, about 12 damage per 5u + return UPDATE_MOB_HEALTH + +/datum/reagent/consumable/ethanol/blue_blazer + name = "Blue Blazer" + description = "The signature drink of a legendary bartender from the 19th century. While remembered for how he innovated the art of bartending, at the end of the day this drink is really just warmed and sweetened whiskey." + boozepwr = 25 + color = "#b5949b" + quality = DRINK_NICE + taste_description = "scorched sweet whiskey" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/blue_blazer/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + . = ..() + affected_mob.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) + +/datum/reagent/consumable/ethanol/hot_toddy + name = "Hot Toddy" + description = "A warmed blend of spirits, sugar, and spices. While the concept is ancient, this preparation with cognac and refined sugar is a bit more modern." + boozepwr = 25 + color = "#f2d2b4" + quality = DRINK_GOOD + taste_description = "the warmth of a comfy fireplace" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_MEDIUM + +/datum/reagent/consumable/ethanol/hot_toddy/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + . = ..() + affected_mob.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal()) + +/datum/reagent/consumable/ethanol/tizirian_sour + name = "Tizirian Sour" + description = "A twist on a trinidad sour, using korta nectar in place of orgeat. Despite the name, it was invented by a martian barkeep." + boozepwr = 35 + color = "#9b4b3a" + quality = DRINK_VERYGOOD + taste_description = "sweetened and spiced bitterness" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/daiquiri + name = "Daiquiri" + description = "In some ways the ultimate tropical cocktail, very few rum drinks are not in some way a descendant of this classic." + boozepwr = 35 + color = "#b6d3a6ff" + quality = DRINK_NICE + taste_description = "crisp lime" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/flip_cocktail + name = "Flip Cocktail" + description = "A simplified and modernized adaptation of a much older drink that predates the Cocktail. While the older version used ale and was heated before it was drunk, this version is chilled. Really, the main similarity is the use of a whole egg." + boozepwr = 30 + color = "#dddfcaff" + quality = DRINK_GOOD + taste_description = "creamy brandy and nutmeg" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/flip_cocktail/on_mob_metabolize(mob/living/drinker) + . = ..() + if(prob(10)) + drinker.emote("flip") #undef ALCOHOL_EXPONENT #undef ALCOHOL_THRESHOLD_MODIFIER diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index 1b13ee77cca..f8aa1c37d39 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -1366,3 +1366,16 @@ name = "Fruit Punishment" desc = "The unbearable sweetness of the fruit punch is too much to bear without the soothing aura of a liquid cooler! Your body is going into shock!" icon_state = "punch_punishment" + +/datum/reagent/consumable/ethanol/bitters_soda + name = "Bitters and Soda" + description = "A simple beverage of soda water flavored with aromatic bitters. Soothes upset stomachs." + boozepwr = 0 + color = "#f1c1b3" + quality = DRINK_NICE + taste_description = "mild aromatics" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/bitters_soda/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + . = ..() + affected_mob.adjust_disgust(-5 * REM * seconds_per_tick) diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm index 87e75346f84..66199848220 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm @@ -1030,6 +1030,105 @@ icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "blue_hawaiian" +/datum/glass_style/drinking_glass/boston_sour + required_drink_type = /datum/reagent/consumable/ethanol/boston_sour + name = "Boston Sour" + desc = "A classic twist upon a whiskey sour that uses an egg white to provide texture and structure. Despite what some say, the egg white is not sterilized by the alcohol of the whiskey, but if the eggs are handled properly it's probably fine..." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "boston_sour" + +/datum/glass_style/drinking_glass/star + required_drink_type = /datum/reagent/consumable/ethanol/star + name = "Star" + desc = "This cocktail takes rustic applejack and refines it with sweet vermouth. As comfortable out in the orchard as it is within the estate." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "star" + +/datum/glass_style/drinking_glass/old_fashioned + required_drink_type = /datum/reagent/consumable/ethanol/old_fashioned + name = "Old Fashioned" + desc = "The original Cocktail... With some added anachronisms." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "old_fashioned" + +/datum/glass_style/drinking_glass/sazerac + required_drink_type = /datum/reagent/consumable/ethanol/sazerac + name = "Sazerac" + desc = "A classic cocktail from New Orleans, this drink uses creole style bitters and an absinthe rinse of the serving glass to impart a delightful anise scent." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sazerac" + +/datum/glass_style/drinking_glass/amaretto_sour + required_drink_type = /datum/reagent/consumable/ethanol/amaretto_sour + name = "Amaretto Sour" + desc = "This sweet play on the sour formula has gained popularity among tizirian audiences due to it's nutty-eggy nature. It's still perfectly suited to most anyone's palette, as long as they're not vegan." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "amaretto_sour" + +/datum/glass_style/drinking_glass/ramos_gin_fizz + required_drink_type = /datum/reagent/consumable/ethanol/ramos_gin_fizz + name = "Ramos Gin Fizz" + desc = "This cocktail commits the heresy of combining citrus and cream, but with proper technique avoids curdling and creates a beautifully textural head of foam. Famously delicious, famously innovative, famously annoying to make." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "ramos_gin_fizz" + +/datum/glass_style/drinking_glass/french_75 + required_drink_type = /datum/reagent/consumable/ethanol/french_75 + name = "French 75" + desc = "Named after a field artillery piece used by french forces in the early 20th century, this classy champagne cocktail has changed many times throughout history, although it's ability to evoke victory has remained constant." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "french_75" + +/datum/glass_style/drinking_glass/sangria + required_drink_type = /datum/reagent/consumable/ethanol/sangria + name = "Sangria" + desc = "A wine punch for hot summer days. No bloodletting is involved in it's creation, one hopes." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "sangria" + +/datum/glass_style/drinking_glass/suffering_bastard + required_drink_type = /datum/reagent/consumable/ethanol/suffering_bastard + name = "Suffering Bastard" + desc = "Originally meant as a hangover cure for soldiers away from home, then later adapted into tiki aesthetics, this drink has an uncanny ability to cure headaches and settle stomachs." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "suffering_bastard" + +/datum/glass_style/drinking_glass/blue_blazer + required_drink_type = /datum/reagent/consumable/ethanol/blue_blazer + name = "Blue Blazer" + desc = "A visually stunning drink created by one of the fathers of cocktail bartending, made by tossing flaming whiskey between two glasses. Not to be served if it's above fifty degrees farenheit outside, although that's not much of a concern on a space station." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "blue_blazer" + +/datum/glass_style/drinking_glass/hot_toddy + required_drink_type = /datum/reagent/consumable/ethanol/hot_toddy + name = "Hot Toddy" + desc = "Transports you away from the cold of whatever sub-zero hellhole you're in, if only for a moment." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "hot_toddy" + +/datum/glass_style/drinking_glass/tizirian_sour + required_drink_type = /datum/reagent/consumable/ethanol/tizirian_sour + name = "Tizirian Sour" + desc = "From Trinidad to Tobago to Tiziria, it's quite rare to find a cocktail that uses bitters as a base spirit like this." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "tizirian_sour" + +/datum/glass_style/drinking_glass/daiquiri + required_drink_type = /datum/reagent/consumable/ethanol/daiquiri + name = "Daiquiri" + desc = "Pure, simple, natural. A cuban classic." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "daiquiri" + +/datum/glass_style/drinking_glass/flip_cocktail + required_drink_type = /datum/reagent/consumable/ethanol/flip_cocktail + name = "Flip Cocktail" + desc = "No red-hot iron poker included, unfortunately." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "flip_cocktail" + + // Shot glasses /datum/glass_style/shot_glass/toxins_special diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_drinks.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_drinks.dm index 9074aff95ef..e0d8c4990b3 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_drinks.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_drinks.dm @@ -75,3 +75,10 @@ desc = "Mullets and cut-up jorts not included." icon = 'icons/obj/drinks/mixed_drinks.dmi' icon_state = "mississippiglass" + +/datum/glass_style/drinking_glass/bitters_soda + required_drink_type = /datum/reagent/consumable/ethanol/bitters_soda + name = "Bitters and Soda" + desc = "A milder, dryer alternative to ginger beer for the task of settling rumbling tummies. Technically contains alcohol, but in low enough concentrations that children or the pregnant can enjoy without worrying." + icon = 'icons/obj/drinks/mixed_drinks.dmi' + icon_state = "bitters_soda" diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 1187dd6a6e4..8ef6e4bb2bc 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -3,6 +3,7 @@ desc = "..." icon = 'icons/obj/medical/chemical.dmi' icon_state = null + abstract_type = /obj/item/reagent_containers w_class = WEIGHT_CLASS_TINY sound_vary = TRUE /// The maximum amount of reagents per transfer that will be moved out of this reagent container. diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm index 25e6cec8cca..d832f15d304 100644 --- a/code/modules/reagents/reagent_containers/applicator.dm +++ b/code/modules/reagents/reagent_containers/applicator.dm @@ -2,6 +2,7 @@ /obj/item/reagent_containers/applicator name = "generic reagent applicator" desc = "Report this please." + abstract_type = /obj/item/reagent_containers/applicator has_variable_transfer_amount = FALSE grind_results = list() /// Action string displayed in vis_message diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index d4672f0b83c..59f9c7d272b 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -1,5 +1,6 @@ /obj/item/reagent_containers/cup name = "open container" + abstract_type = /obj/item/reagent_containers/cup amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50) volume = 50 diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm index a953a366fe1..b9bd0e2a77a 100644 --- a/code/modules/reagents/reagent_containers/cups/drinks.dm +++ b/code/modules/reagents/reagent_containers/cups/drinks.dm @@ -6,6 +6,7 @@ desc = "yummy" icon = 'icons/obj/drinks/drinks.dmi' icon_state = "glass_empty" + abstract_type = /obj/item/reagent_containers/cup/glass possible_transfer_amounts = list(5,10,15,20,25,30,50) resistance_flags = NONE diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm index c9380d2b9b9..34c9d0d9233 100644 --- a/code/modules/reagents/reagent_containers/cups/soda.dm +++ b/code/modules/reagents/reagent_containers/cups/soda.dm @@ -11,6 +11,7 @@ icon = 'icons/obj/drinks/soda.dmi' icon_state = "cola" icon_state_preview = "cola" + abstract_type = /obj/item/reagent_containers/cup/soda_cans reagent_flags = NONE spillable = FALSE custom_price = PAYCHECK_CREW * 0.9 diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 05a4b0cd07a..63d241fd70a 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -6,6 +6,7 @@ desc = "..." icon = 'icons/obj/medical/chemical_tanks.dmi' icon_state = "water" + abstract_type = /obj/structure/reagent_dispensers density = TRUE anchored = FALSE pressure_resistance = 2*ONE_ATMOSPHERE diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm index 409ead91fdd..6d10524ccba 100644 --- a/code/modules/religion/burdened/psyker.dm +++ b/code/modules/religion/burdened/psyker.dm @@ -40,7 +40,7 @@ is_dimorphic = FALSE should_draw_greyscale = FALSE bodypart_traits = list(TRAIT_DISFIGURED, TRAIT_BALD, TRAIT_SHAVED) - head_flags = HEAD_DEBRAIN + head_flags = HEAD_DEBRAIN | HEAD_NO_DISFIGURE // ignore disfigurement by damage, as we're always disfigured /// flavorful variant of psykerizing that deals damage and sends messages before calling psykerize() /mob/living/carbon/human/proc/slow_psykerize(blind_them = FALSE) diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index 101ced67169..87626687ce1 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -1655,13 +1655,14 @@ search_metadata = "boris" /datum/design/borg_upgrade_rped - name = "Rapid Part Exchange Device" + name = "Rapid Part Exchange Device Expanded" id = "borg_upgrade_rped" build_type = MECHFAB build_path = /obj/item/borg/upgrade/rped materials = list( - /datum/material/iron =SHEET_MATERIAL_AMOUNT*5, - /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5, + /datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5, + /datum/material/glass = SHEET_MATERIAL_AMOUNT*2.5, + /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT*2.5 ) construction_time = 12 SECONDS category = list( @@ -1679,11 +1680,11 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING ) -/datum/design/borg_upgrade_circuit_app - name = "Circuit Manipulator" - id = "borg_upgrade_circuitapp" +/datum/design/borg_upgrade_engineering_app + name = "Engineering Apparatus" + id = "borg_upgrade_engineeringapp" build_type = MECHFAB - build_path = /obj/item/borg/upgrade/circuit_app + build_path = /obj/item/borg/upgrade/engineering_app materials = list( /datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/titanium =SMALL_MATERIAL_AMOUNT*5, @@ -1721,6 +1722,22 @@ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL ) +/datum/design/borg_upgrade_syringe + name = "Advanced Syringe" + id = "borg_upgrade_syringe" + build_type = MECHFAB + build_path = /obj/item/borg/upgrade/bs_syringe + materials = list( + /datum/material/iron =SHEET_MATERIAL_AMOUNT, + /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/diamond =HALF_SHEET_MATERIAL_AMOUNT, + /datum/material/bluespace =SMALL_MATERIAL_AMOUNT*5 + ) + construction_time = 12 SECONDS + category = list( + RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL + ) + /datum/design/borg_upgrade_broomer name = "Experimental Push Broom" id = "borg_upgrade_broomer" diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index b73ae51bdd7..4d0e4537f52 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -778,30 +778,21 @@ user.electrocute_act(15, src, flags = SHOCK_NOGLOVES) playsound(user, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - var/list/chargeable_batteries = list() - for(var/obj/item/stock_parts/power_store/C in user.get_all_contents()) - if(C.charge < (C.maxcharge * 0.95)) // otherwise the PDA always gets recharged - chargeable_batteries |= C + var/list/chargeable_items = user.get_all_cells(max_percent = 0.95) // otherwise the PDA always gets recharged lightning_fx(user, stunner) var/recharges = rand(1, 2) - if(!length(chargeable_batteries)) + if(!length(chargeable_items)) to_chat(user, span_notice("You have a strange feeling for a moment, but then it passes.")) return - for(var/obj/item/stock_parts/power_store/to_charge as anything in chargeable_batteries) - if(!recharges) - return + while(length(chargeable_items) && recharges) recharges-- - to_charge = pick(chargeable_batteries) + var/obj/item/to_charge_base = pick_n_take(chargeable_items) + var/obj/item/stock_parts/power_store/to_charge = chargeable_items[to_charge_base] to_charge.charge = to_charge.maxcharge - // The device powered by the cell is assumed to be its location. - var/obj/device = to_charge.loc - // If it's not an object, or the loc's assigned power_store isn't the cell, undo. - if(!istype(device) || (device.get_cell() != to_charge)) - device = to_charge - device.update_appearance(UPDATE_ICON|UPDATE_OVERLAYS) - to_chat(user, span_notice("[device] feels energized!")) - lightning_fx(device, 0.8 SECONDS) + to_charge_base.update_appearance(UPDATE_ICON|UPDATE_OVERLAYS) + to_chat(user, span_notice("[to_charge_base] feels energized!")) + lightning_fx(to_charge_base, 0.8 SECONDS) /obj/item/relic/proc/lightning_fx(atom/shocker, time) var/lightning = mutable_appearance('icons/effects/effects.dmi', "electricity3", layer = ABOVE_MOB_LAYER) diff --git a/code/modules/research/part_replacer.dm b/code/modules/research/part_replacer.dm index 0b4619a862a..fea7c8211d0 100644 --- a/code/modules/research/part_replacer.dm +++ b/code/modules/research/part_replacer.dm @@ -169,3 +169,8 @@ lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi' storage_type = /datum/storage/rped/bluespace + +/obj/item/storage/part_replacer/cyborg/small + desc = "Special mechanical module made to store, sort, and apply standard machine parts. This one has as much space, as your regular RPED" + icon_state = "RPED" + storage_type = /datum/storage/rped diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index e05a1d58d4d..5a2a2a47630 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -6,13 +6,13 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good name = "stock part" desc = "What?" icon = 'icons/obj/devices/stock_parts.dmi' + ///The generic category type that the stock part belongs to. Generic objects that should not be instantiated should have the same type and abstract_type + abstract_type = /obj/item/stock_parts w_class = WEIGHT_CLASS_SMALL var/rating = 1 ///Used when a base part has a different name to higher tiers of part. For example, machine frames want any servo and not just a micro-servo. var/base_name var/energy_rating = 1 - ///The generic category type that the stock part belongs to. Generic objects that should not be instantiated should have the same type and abstract_type - var/abstract_type = /obj/item/stock_parts /obj/item/stock_parts/Initialize(mapload) . = ..() diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm index 87300c7e70c..4cab2dd3f08 100644 --- a/code/modules/research/techweb/nodes/cyborg_nodes.dm +++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm @@ -89,6 +89,7 @@ "borg_upgrade_piercinghypospray", "borg_upgrade_surgicalprocessor", "borg_upgrade_surgicalomnitool", + "borg_upgrade_syringe", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) announce_channels = list(RADIO_CHANNEL_SCIENCE) @@ -125,7 +126,7 @@ design_ids = list( "borg_upgrade_rped", "borg_upgrade_engineeringomnitool", - "borg_upgrade_circuitapp", + "borg_upgrade_engineeringapp", "borg_upgrade_inducer", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 6d37ec13d01..3dd92891f51 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -595,7 +595,7 @@ return ..() cooldown = max_cooldown var/list/batteries = list() - for(var/obj/item/stock_parts/power_store/C in owner.get_all_contents()) + for(var/obj/item/stock_parts/power_store/C in owner.get_all_cells()) if(C.charge < C.maxcharge) batteries += C if(batteries.len) diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm index c153312cb75..7077b7a7b36 100644 --- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm +++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm @@ -87,7 +87,7 @@ Regenerative extracts: /obj/item/slimecross/regenerative/yellow/core_effect(mob/living/target, mob/user) var/list/batteries = list() - for(var/obj/item/stock_parts/power_store/C in target.get_all_contents()) + for(var/obj/item/stock_parts/power_store/C in target.get_all_cells()) if(C.charge < C.maxcharge) batteries += C if(batteries.len) diff --git a/code/modules/reta/reta_debug.dm b/code/modules/reta/reta_debug.dm new file mode 100644 index 00000000000..788c303c0cf --- /dev/null +++ b/code/modules/reta/reta_debug.dm @@ -0,0 +1,122 @@ +/** + * Request Emergency Temporary Access - Admin Verbs + */ + +/// Admin command to manually trigger RETA access grant for admins +ADMIN_VERB(reta_manual_trigger, R_ADMIN, "RETA Door Access", "Manually trigger RETA access for testing", ADMIN_CATEGORY_EVENTS) + + var/calling_dept = tgui_input_list(user, "RETA - Which department is CALLING for help?", "Calling Department", list("Security", "Engineering", "Medical", "Science", "Service", "Command", "Cargo", "Mining")) + if(!calling_dept) + return + + var/list/available_depts = list("Security", "Engineering", "Medical", "Science", "Service", "Command", "Cargo", "Mining") + available_depts -= calling_dept + + // Multi-select using repeated input_list calls + var/list/selected_depts = list() + var/list/remaining_depts = available_depts.Copy() + + while(length(remaining_depts)) + remaining_depts += "DONE - Finish selection" + var/choice = tgui_input_list(user, "RETA - Select departments to RESPOND to [calling_dept]\nCurrently selected: [english_list(selected_depts)]\n\nSelect another department or DONE:", "Responding Departments", remaining_depts) + + if(!choice || choice == "DONE - Finish selection") + break + + selected_depts += choice + remaining_depts -= choice + remaining_depts -= "DONE - Finish selection" + + if(!length(selected_depts)) + message_admins("No departments selected for RETA response.") + return + + var/duration = tgui_input_number(user, "Duration in minutes:", "RETA Duration", 5, 60, 1) + if(!duration) + return + + message_admins("[key_name_admin(user)] is manually triggering RETA: [calling_dept] called for help, [english_list(selected_depts)] will get access to [calling_dept] areas for [duration] minutes.") + log_game("ADMIN: [key_name(user)] is manually triggering RETA: [calling_dept] called for help, [english_list(selected_depts)] will get access to [calling_dept] areas for [duration] minutes.") + + // Grant access to each responding department and collect results + var/successful_grants = 0 + var/list/granted_depts = list() + var/total_eligible_cards = 0 + + for(var/responding_dept in selected_depts) + var/dept_eligible_cards = 0 + var/list/job_trims = GLOB.reta_job_trims[responding_dept] + + for(var/mob/living/carbon/human/human_player as anything in GLOB.human_list) + if(!human_player.client || human_player.stat == DEAD) + continue + + var/obj/item/card/id/id_card = human_player.get_idcard(hand_first = FALSE) + if(!id_card || !id_card.trim) + continue + + if(is_type_in_list(id_card.trim, job_trims)) + dept_eligible_cards++ + + total_eligible_cards += dept_eligible_cards + message_admins("[responding_dept] department: [dept_eligible_cards] eligible cards from living players") + + // Note: RETA grants access FROM calling_dept TO responding_dept personnel + // So if Medical calls Security, Security personnel get Medical access + if(reta_find_and_grant_access(responding_dept, calling_dept, duration MINUTES)) + successful_grants++ + granted_depts += responding_dept + + // Report results + if(successful_grants > 0) + message_admins("RETA access granted successfully: [english_list(granted_depts)] personnel now have [calling_dept] access. Total eligible cards: [total_eligible_cards]") + + // Send department announcement like the normal system + var/caller_info = " (Called by CENTCOM)" + var/enhanced_location = "[calling_dept][caller_info]" + + // Send announcements to all successfully granted departments + for(var/dept in granted_depts) + switch(dept) + if("Security") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_SECURITY), "Security") + if("Engineering") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_ENGINEERING), "Engineering") + if("Medical") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_MEDICAL), "Medical") + if("Science") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_SCIENCE), "Science") + if("Service") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_SERVICE), "Service") + if("Command") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_COMMAND), "Command") + if("Cargo") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_SUPPLY), "Cargo") + if("Mining") + aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_SUPPLY), "Mining") + + // Send confirmation to the calling department about who has been given access + var/calling_message = "RETA activated[caller_info]. The following now have temporary door access: [english_list(granted_depts)]." + + // Get an announcement system to send simple radio messages + var/obj/machinery/announcement_system/announcer = get_announcement_system(null, null, list(RADIO_CHANNEL_COMMON)) + if(announcer) + switch(calling_dept) + if("Security") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SECURITY) + if("Engineering") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_ENGINEERING) + if("Medical") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_MEDICAL) + if("Science") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SCIENCE) + if("Service") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SERVICE) + if("Command") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_COMMAND) + if("Cargo") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SUPPLY) + if("Mining") + announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SUPPLY) + else + message_admins("RETA access grant failed for all departments.") diff --git a/code/modules/reta/reta_id_card.dm b/code/modules/reta/reta_id_card.dm new file mode 100644 index 00000000000..29d35133710 --- /dev/null +++ b/code/modules/reta/reta_id_card.dm @@ -0,0 +1,217 @@ +/** + * Request Emergency Temporary Access - ID Card Extensions + * code\modules\reta\reta_system.dm + */ + +/obj/item/card/id + /// Dictionary of temporary department access: dept_name -> list(access_flags) + var/list/reta_temp_access = list() + /// Dictionary of timer IDs for clearing temporary access: dept_name -> timer_id + var/list/reta_timers = list() + +/// Grants temporary department access to this ID card +/obj/item/card/id/proc/grant_reta_access(dept, duration_ds) + if(!GLOB.reta_dept_grants[dept]) + return FALSE + + // Clear existing timer for this department if any (allows extending/refreshing access) + if(reta_timers[dept] && reta_timers[dept] != -1) + deltimer(reta_timers[dept]) + reta_timers[dept] = null + + // Grant access flags for this department + var/list/access_flags = GLOB.reta_dept_grants[dept] + var/list/new_access = list() + + // Initialize department access list if needed + if(!reta_temp_access[dept]) + reta_temp_access[dept] = list() + + for(var/flag in access_flags) + if(!(flag in access)) // Only add if not permanently granted + // Add to department-specific temporary access + reta_temp_access[dept] |= flag + // Add to main access list + access += flag + new_access += flag + + if(!LAZYLEN(new_access)) + return FALSE // No new access granted + + // Set timer for this specific department + reta_timers[dept] = addtimer(CALLBACK(src, PROC_REF(clear_reta_access_for_dept), dept), duration_ds, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) + + // Add to global registry for mass operations + GLOB.reta_active_cards |= src + + // User feedback + var/mob/living/carbon/human/holder = get_id_holder() + if(holder) + playsound(holder, 'sound/machines/cryo_warning.ogg', 25, TRUE) + holder.balloon_alert(holder, "emergency access: [dept]") + + // Enhanced logging + var/access_names = list() + for(var/flag in new_access) + access_names += SSid_access.get_access_desc(flag) + + var/holder_info = holder ? "held by [holder]" : "not being held" + log_reta("Granted [dept] temporary access ([english_list(access_names)]) to ID '[registered_name || "Unknown"]' ([holder_info]) for [duration_ds/10] seconds") + investigate_log("RETA: Granted [dept] temporary access ([english_list(access_names)]) to ID '[registered_name || "Unknown"]' ([holder_info])", INVESTIGATE_ACCESSCHANGES) + + return TRUE + +/// Clears temporary access for a specific department +/obj/item/card/id/proc/clear_reta_access_for_dept(dept) + if(!reta_temp_access[dept] || !LAZYLEN(reta_temp_access[dept])) + return + + // User feedback before clearing + var/mob/living/carbon/human/holder = get_id_holder() + if(holder) + holder.balloon_alert(holder, "[dept] access expired") + to_chat(holder, span_warning("Emergency access to [dept] has expired.")) + + // Remove department's temporary access from the main access list + var/list/dept_access = reta_temp_access[dept] + for(var/flag in dept_access) + // Only remove if no other department also grants this access + var/still_needed = FALSE + for(var/other_dept in reta_temp_access) + if(other_dept != dept && reta_temp_access[other_dept] && (flag in reta_temp_access[other_dept])) + still_needed = TRUE + break + + if(!still_needed) + access -= flag + + // Enhanced logging + var/access_names = list() + for(var/flag in dept_access) + access_names += SSid_access.get_access_desc(flag) + + var/holder_info = holder ? "held by [holder]" : "not being held" + log_reta("Cleared [dept] temporary access ([english_list(access_names)]) from ID '[registered_name || "Unknown"]' ([holder_info])") + investigate_log("RETA: Cleared [dept] temporary access ([english_list(access_names)]) from ID '[registered_name || "Unknown"]' ([holder_info])", INVESTIGATE_ACCESSCHANGES) + + // Clean up department data + reta_temp_access[dept] = null + reta_timers[dept] = null + + // Remove from global registry if no more temporary access + if(!has_any_reta_access()) + GLOB.reta_active_cards -= src + +/// Clears all temporary department access from this ID card +/obj/item/card/id/proc/clear_reta_access() + if(!LAZYLEN(reta_temp_access)) + return + + // User feedback before clearing + var/mob/living/carbon/human/holder = get_id_holder() + if(holder) + holder.balloon_alert(holder, "emergency access expired") + to_chat(holder, span_warning("Emergency access has expired.")) + + // Collect all temporary access flags for logging + var/list/all_temp_access = list() + for(var/dept in reta_temp_access) + if(reta_temp_access[dept]) + all_temp_access |= reta_temp_access[dept] + + // Remove all temporary access from the main access list + for(var/flag in all_temp_access) + access -= flag + + // Enhanced logging + var/access_names = list() + for(var/flag in all_temp_access) + access_names += SSid_access.get_access_desc(flag) + + var/holder_info = holder ? "held by [holder]" : "not being held" + log_reta("Cleared all temporary access ([english_list(access_names)]) from ID '[registered_name || "Unknown"]' ([holder_info])") + investigate_log("RETA: Cleared all temporary access ([english_list(access_names)]) from ID '[registered_name || "Unknown"]' ([holder_info])", INVESTIGATE_ACCESSCHANGES) + + // Clear all timers + for(var/dept in reta_timers) + if(reta_timers[dept] && reta_timers[dept] != -1) + deltimer(reta_timers[dept]) + + LAZYCLEARLIST(reta_temp_access) + LAZYCLEARLIST(reta_timers) + + // Remove from global registry + GLOB.reta_active_cards -= src + +/// Checks if this ID card has any temporary access +/obj/item/card/id/proc/has_any_reta_access() + for(var/dept in reta_temp_access) + if(reta_temp_access[dept] && LAZYLEN(reta_temp_access[dept])) + return TRUE + return FALSE + +/// Checks if this ID card has temporary access to a specific flag +/obj/item/card/id/proc/has_reta_access(access_flag) + for(var/dept in reta_temp_access) + if(reta_temp_access[dept] && (access_flag in reta_temp_access[dept])) + return TRUE + return FALSE + +/// Checks if this ID card has temporary access for a specific department +/obj/item/card/id/proc/has_reta_access_for_dept(dept) + return reta_temp_access[dept] && LAZYLEN(reta_temp_access[dept]) + +/// Gets all current temporary access flags for this ID card +/obj/item/card/id/proc/get_reta_access() + var/list/all_access = list() + for(var/dept in reta_temp_access) + if(reta_temp_access[dept]) + all_access |= reta_temp_access[dept] + return all_access + +/// Gets temporary access flags for a specific department +/obj/item/card/id/proc/get_reta_access_for_dept(dept) + var/list/dept_access = reta_temp_access[dept] + return dept_access?.Copy() || list() + +/// Gets a summary of all active RETA accesses (for debugging/display) +/obj/item/card/id/proc/get_reta_summary() + var/list/summary = list() + for(var/dept in reta_temp_access) + if(reta_temp_access[dept] && LAZYLEN(reta_temp_access[dept])) + var/time_left = "unknown" + if(reta_timers[dept]) + var/remaining = timeleft(reta_timers[dept]) + if(remaining > 0) + time_left = "[remaining/10]s" + summary += "[dept] ([LAZYLEN(reta_temp_access[dept])] access, [time_left] left)" + return summary + +/// Helper to get the human holding this ID card +/obj/item/card/id/proc/get_id_holder() + var/mob/living/carbon/human/holder + if(istype(loc, /mob/living/carbon/human)) + holder = loc + else if(istype(loc, /obj/item/card/id) && istype(loc.loc, /mob/living/carbon/human)) + holder = loc.loc + else + // Check if worn in ID slot + for(var/mob/living/carbon/human/human in range(0, src)) + if(human.get_idcard() == src) + holder = human + break + return holder + +/// Cleanup temporary access when ID card is deleted +/obj/item/card/id/Destroy() + // Clear all department timers + for(var/dept in reta_timers) + if(reta_timers[dept] && reta_timers[dept] != -1) + deltimer(reta_timers[dept]) + GLOB.reta_active_cards -= src + return ..() +/* +/mob/living/death(gibbed) + . = ..() + clear_temp_dept_access() +*/ diff --git a/code/modules/reta/reta_system.dm b/code/modules/reta/reta_system.dm new file mode 100644 index 00000000000..ebcfe06d896 --- /dev/null +++ b/code/modules/reta/reta_system.dm @@ -0,0 +1,319 @@ +/** + * Request Emergency Temporary Access - RETA System + * Provides temporary department access when Requests Console emergency calls are made. + */ + +/// Helper function for RETA-specific logging +/proc/log_reta(text) + WRITE_LOG(GLOB.reta_log, "[time_stamp()] RETA: [text]") + log_game("RETA: [text]") + +/proc/initialize_reta_system() + // Define which access flags are granted for each department + GLOB.reta_dept_grants = list( + "Medical" = list(ACCESS_MEDICAL, ACCESS_SURGERY), + "Security" = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_BRIG_ENTRANCE), + "Engineering" = list(ACCESS_ENGINEERING, ACCESS_ATMOSPHERICS), + "Science" = list(ACCESS_SCIENCE, ACCESS_RESEARCH), + "Service" = list(ACCESS_SERVICE, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS), + "Cargo" = list(ACCESS_CARGO), + "Mining" = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_CARGO), + "Command" = list(ACCESS_COMMAND), // Admin-only, not available through request consoles + ) + +/// Checks if an origin department is on cooldown for calling a target department +/proc/reta_on_cooldown(origin, target) + var/list/by_target = GLOB.reta_cooldown[origin] + if(!by_target) + return FALSE + var/next_ok = by_target[target] || 0 + return world.time < next_ok + +/// Sets a cooldown for an origin department calling a target department +/proc/reta_set_cooldown(origin, target, cd_ds) + if(!GLOB.reta_cooldown[origin]) + GLOB.reta_cooldown[origin] = list() + GLOB.reta_cooldown[origin][target] = world.time + cd_ds + +/// Tracks recent emergency calls for multiple department analysis +/proc/reta_track_call(origin, target) + var/list/call_info = list( + "time" = world.time, + "origin" = origin + ) + + if(!GLOB.reta_recent_calls[target]) + GLOB.reta_recent_calls[target] = list() + GLOB.reta_recent_calls[target] += list(call_info) + + // Clean old calls (older than 10 minutes) + var/cutoff_time = world.time - 6000 // 10 minutes + if(GLOB.reta_recent_calls[target]) + var/list/recent_calls = GLOB.reta_recent_calls[target] + GLOB.reta_recent_calls[target] = recent_calls.Copy() + for(var/list/old_call in GLOB.reta_recent_calls[target]) + if(old_call["time"] < cutoff_time) + GLOB.reta_recent_calls[target] -= list(old_call) + + // Check for multiple calls scenario + if(LAZYLEN(GLOB.reta_recent_calls[target]) >= 3) + var/list/origins = list() + for(var/list/call_data in GLOB.reta_recent_calls[target]) + origins |= call_data["origin"] + + if(LAZYLEN(origins) >= 3) + message_admins("RETA: Multiple emergency scenario detected! [target] has been called by [english_list(origins)] in the last 10 minutes. Consider station-wide emergency protocols.") + log_game("RETA: Multiple department emergency - [target] called by [english_list(origins)]") + +/// Finds eligible responders and grants them temporary access +/proc/reta_find_and_grant_access(target_dept, origin_dept, duration_ds) + . = 0 + + var/list/job_trims = GLOB.reta_job_trims[target_dept] + if(!LAZYLEN(job_trims)) + log_reta("No job trims defined for department '[target_dept]'") + return FALSE + + var/granted_count = 0 + var/total_players_checked = 0 + var/matching_trim_players = 0 + + // Check ID cards being carried by living players (fast and efficient) + for(var/mob/living/carbon/human/human_player as anything in GLOB.human_list) + // Only check players who are alive and have clients (actively playing) + if(!human_player.client || human_player.stat == DEAD) + continue + + total_players_checked++ + + // Get their ID card (worn_id, hands, or belt) + var/obj/item/card/id/id_card = human_player.get_idcard(hand_first = FALSE) + if(!id_card || !id_card.trim) + continue + + // Check if this card's trim matches the target department + if(!is_type_in_list(id_card.trim, job_trims)) + continue + + matching_trim_players++ + + if(id_card.grant_reta_access(origin_dept, duration_ds)) + granted_count++ + + if(granted_count > 0) + // Register this as an active RETA grant for new cards + if(!GLOB.reta_active_grants[target_dept]) + GLOB.reta_active_grants[target_dept] = list() + GLOB.reta_active_grants[target_dept][origin_dept] = world.time + duration_ds + + // Set up automatic cleanup when the grant expires + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cleanup_expired_reta_grant), target_dept, origin_dept), duration_ds) + + // Update all doors to show RETA lights for newly activated grants + update_all_doors_reta_lights() + + log_reta("Granted temporary [origin_dept] access to [granted_count] [target_dept] department ID cards from a call by [origin_dept].") + . = TRUE + else + log_reta("No [target_dept] personnel found who needed [origin_dept] access from a call by [origin_dept]. (Checked [total_players_checked] living players, [matching_trim_players] had matching trims)") + + return . + +/// Populates the job trims list for RETA system +/proc/populate_reta_job_trims() + GLOB.reta_job_trims = list( + "Medical" = list(), + "Security" = list(), + "Engineering" = list(), + "Science" = list(), + "Service" = list(), + "Command" = list(), + "Cargo" = list(), + "Mining" = list() + ) + + log_game("RETA: Starting job trim population...") + var/total_trims = 0 + for(var/job_trim_path in subtypesof(/datum/id_trim/job)) + var/datum/id_trim/job/trim = new job_trim_path() + total_trims++ + + if(!trim.job) + log_game("RETA: Trim [job_trim_path] has no job") + continue + if(!trim.job.departments_bitflags) + log_game("RETA: Trim [job_trim_path] job [trim.job] has no departments_bitflags") + continue + + if(trim.job.departments_bitflags & DEPARTMENT_BITFLAG_MEDICAL) + GLOB.reta_job_trims["Medical"] += job_trim_path + if(trim.job.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY) + GLOB.reta_job_trims["Security"] += job_trim_path + if(trim.job.departments_bitflags & DEPARTMENT_BITFLAG_ENGINEERING) + GLOB.reta_job_trims["Engineering"] += job_trim_path + if(trim.job.departments_bitflags & DEPARTMENT_BITFLAG_SCIENCE) + GLOB.reta_job_trims["Science"] += job_trim_path + if(trim.job.departments_bitflags & DEPARTMENT_BITFLAG_SERVICE) + GLOB.reta_job_trims["Service"] += job_trim_path + if(trim.job.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND) + GLOB.reta_job_trims["Command"] += job_trim_path + if(trim.job.departments_bitflags & DEPARTMENT_BITFLAG_CARGO) + GLOB.reta_job_trims["Cargo"] += job_trim_path + GLOB.reta_job_trims["Mining"] += job_trim_path // Mining uses CARGO bitflag + + log_game("RETA: Processed [total_trims] trims. Final counts: Medical=[LAZYLEN(GLOB.reta_job_trims["Medical"])], Security=[LAZYLEN(GLOB.reta_job_trims["Security"])], Engineering=[LAZYLEN(GLOB.reta_job_trims["Engineering"])], Science=[LAZYLEN(GLOB.reta_job_trims["Science"])], Service=[LAZYLEN(GLOB.reta_job_trims["Service"])], Command=[LAZYLEN(GLOB.reta_job_trims["Command"])], Cargo=[LAZYLEN(GLOB.reta_job_trims["Cargo"])], Mining=[LAZYLEN(GLOB.reta_job_trims["Mining"])]") + +/// Pushes UI updates to all consoles in the same origin department +/proc/reta_push_ui_updates(origin, target) + for(var/obj/machinery/requests_console/console in GLOB.reta_consoles_by_origin[origin]) + console.ui_update() + +/// Gets the department string for a user based on their job +/proc/reta_get_user_department(mob/user) + if(!user?.mind?.assigned_role) + return null + + var/datum/job/job = user.mind.assigned_role + if(job.departments_bitflags & DEPARTMENT_BITFLAG_ENGINEERING) + return "Engineering" + if(job.departments_bitflags & DEPARTMENT_BITFLAG_SCIENCE) + return "Science" + if(job.departments_bitflags & DEPARTMENT_BITFLAG_CARGO) + return "Cargo" + if(job.departments_bitflags & DEPARTMENT_BITFLAG_SERVICE) + return "Service" + if(job.departments_bitflags & DEPARTMENT_BITFLAG_MEDICAL) + return "Medical" + if(job.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY) + return "Security" + if(job.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND) + return "Command" + + return null + +/// Gets the standardized department string from a console department name +/proc/reta_get_user_department_by_name(dept_name) + if(!dept_name) + return null + + var/dept_lower = LOWER_TEXT(dept_name) + + // Check for partial matches to handle variations in console naming + if(findtext(dept_lower, "engineering") || findtext(dept_lower, "engine")) + return "Engineering" + if(findtext(dept_lower, "science") || findtext(dept_lower, "research")) + return "Science" + if(findtext(dept_lower, "cargo") || findtext(dept_lower, "supply")) + return "Cargo" + if(findtext(dept_lower, "mining") || findtext(dept_lower, "mine")) + return "Mining" + if(findtext(dept_lower, "service") || findtext(dept_lower, "civilian")) + return "Service" + if(findtext(dept_lower, "medical") || findtext(dept_lower, "medbay")) + return "Medical" + if(findtext(dept_lower, "security") || findtext(dept_lower, "sec")) + return "Security" + if(findtext(dept_lower, "command") || findtext(dept_lower, "bridge")) + return "Command" + + // Autonamed areas that belong to service department + if(findtext(dept_lower, "kitchen") || findtext(dept_lower, "bar") || findtext(dept_lower, "cafeteria") || findtext(dept_lower, "diner")) + return "Service" + if(findtext(dept_lower, "hydroponics") || findtext(dept_lower, "botany")) + return "Service" + if(findtext(dept_lower, "janitor") || findtext(dept_lower, "custodial")) + return "Service" + + // Autonamed areas for medical + if(findtext(dept_lower, "pharmacy") || findtext(dept_lower, "chemistry") || findtext(dept_lower, "chem")) + return "Medical" + if(findtext(dept_lower, "morgue") || findtext(dept_lower, "virology")) + return "Medical" + if(findtext(dept_lower, "surgery") || findtext(dept_lower, "operating") || findtext(dept_lower, "cryo")) + return "Medical" + if(findtext(dept_lower, "patients") || findtext(dept_lower, "exam")) + return "Medical" + + // Autonamed areas for engineering + if(findtext(dept_lower, "atmospherics") || findtext(dept_lower, "atmos")) + return "Engineering" + if(findtext(dept_lower, "supermatter") || findtext(dept_lower, "engine")) + return "Engineering" + if(findtext(dept_lower, "gravity") || findtext(dept_lower, "telecomm") || findtext(dept_lower, "tcomm")) + return "Engineering" + + // Autonamed areas for science department + if(findtext(dept_lower, "xenobiology") || findtext(dept_lower, "xenobio")) + return "Science" + if(findtext(dept_lower, "robotics") || findtext(dept_lower, "genetics")) + return "Science" + if(findtext(dept_lower, "ordnance") || findtext(dept_lower, "cytology")) + return "Science" + + // Handle specific autonamed areas that belong to security department + if(findtext(dept_lower, "brig") || findtext(dept_lower, "holding")) + return "Security" + if(findtext(dept_lower, "armory") || findtext(dept_lower, "checkpoint")) + return "Security" + + return null + +/// Cleans up an expired RETA grant from the active grants registry +/proc/cleanup_expired_reta_grant(target_dept, origin_dept) + if(!GLOB.reta_active_grants[target_dept]) + return + GLOB.reta_active_grants[target_dept] -= origin_dept + if(!length(GLOB.reta_active_grants[target_dept])) + GLOB.reta_active_grants -= target_dept + log_reta("Cleaned up expired [origin_dept] grant for [target_dept] department") + + // Update all doors to remove RETA lights for expired grants + update_all_doors_reta_lights() + +/// Updates RETA lighting for all doors in the game +/proc/update_all_doors_reta_lights() + for(var/obj/machinery/door/airlock/door as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/door/airlock)) + door.update_appearance(UPDATE_OVERLAYS) + +/// Applies any currently active RETA grants to a newly created/spawned ID card +/// This should be called when ID cards are created, spawned, or have their trim changed +/proc/apply_active_reta_grants_to_card(obj/item/card/id/id_card) + if(!id_card || !id_card.trim) + return + + // If no active grants, nothing to do (prevents spam during round start) + if(!LAZYLEN(GLOB.reta_active_grants)) + return + + // Check if this card's department has any active incoming RETA grants + for(var/target_dept in GLOB.reta_active_grants) + var/list/job_trims = GLOB.reta_job_trims[target_dept] + if(!LAZYLEN(job_trims)) + continue + + // Check if this card's trim matches the target department + if(!is_type_in_list(id_card.trim, job_trims)) + continue + + log_reta("Card trim [id_card.trim] matches [target_dept] department - applying active grants") + + // Apply all active grants for this department + for(var/origin_dept in GLOB.reta_active_grants[target_dept]) + var/expiry_time = GLOB.reta_active_grants[target_dept][origin_dept] + if(world.time >= expiry_time) + continue // Grant expired, skip it + + var/remaining_time = expiry_time - world.time + if(id_card.grant_reta_access(origin_dept, remaining_time)) + log_reta("Auto-granted [origin_dept] access to newly created [id_card] ([target_dept] department)") + +// Default config values +#define RETA_DEFAULT_DURATION_DS 3000 // 5 minutes +#define RETA_DEFAULT_COOLDOWN_DS 150 // 15 seconds + +/// Initialize RETA config values +/proc/reta_init_config() + log_world("RETA: System initialized with duration=[CONFIG_GET(number/reta_duration_ds)]ds, cooldown=[CONFIG_GET(number/reta_dept_cooldown_ds)]ds, enabled=[CONFIG_GET(flag/reta_enabled)]") + +#undef RETA_DEFAULT_DURATION_DS +#undef RETA_DEFAULT_COOLDOWN_DS diff --git a/code/modules/spells/spell_types/right_and_wrong.dm b/code/modules/spells/spell_types/right_and_wrong.dm index 8ec7b5bf0e4..47ea9f53942 100644 --- a/code/modules/spells/spell_types/right_and_wrong.dm +++ b/code/modules/spells/spell_types/right_and_wrong.dm @@ -11,6 +11,8 @@ GLOBAL_DATUM(mass_teaching, /datum/summon_things_controller/spellbook_entry) // 1 in 50 chance of getting something really special. #define SPECIALIST_MAGIC_PROB 2 +GLOBAL_LIST_INIT(summoned_all_guns, get_sane_item_types(/obj/item/gun)) + GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/energy/disabler, /obj/item/gun/energy/e_gun, diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 857d00cbe70..7e2f76356dd 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -1,6 +1,7 @@ /obj/item/bodypart name = "limb" desc = "Why is it detached..." + abstract_type = /obj/item/bodypart force = 3 throwforce = 3 w_class = WEIGHT_CLASS_SMALL @@ -194,7 +195,7 @@ var/unarmed_sharpness = NONE /// Traits that are given to the holder of the part. This does not update automatically on life(), only when the organs are initially generated or inserted! - var/list/bodypart_traits = list() + var/list/bodypart_traits /// The name of the trait source that the organ gives. Should not be altered during the events of gameplay, and will cause problems if it is. var/bodypart_trait_source = BODYPART_TRAIT /// List of the above datums which have actually been instantiated, managed automatically @@ -826,15 +827,15 @@ if(speed_modifier) old_owner.update_bodypart_speed_modifier() - if(length(bodypart_traits)) + if(LAZYLEN(bodypart_traits)) old_owner.remove_traits(bodypart_traits, bodypart_trait_source) UnregisterSignal(old_owner, list( SIGNAL_REMOVETRAIT(TRAIT_NOLIMBDISABLE), - SIGNAL_ADDTRAIT(TRAIT_NOLIMBDISABLE), + SIGNAL_ADDTRAIT(TRAIT_NOLIMBDISABLE), SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD), SIGNAL_ADDTRAIT(TRAIT_NOBLOOD), - )) + )) UnregisterSignal(old_owner, list(COMSIG_ATOM_RESTYLE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_LIVING_SET_BODY_POSITION)) @@ -846,7 +847,7 @@ if(speed_modifier) owner.update_bodypart_speed_modifier() - if(length(bodypart_traits)) + if(LAZYLEN(bodypart_traits)) owner.add_traits(bodypart_traits, bodypart_trait_source) if(initial(can_be_disabled)) @@ -887,7 +888,7 @@ item_flags &= ~ABSTRACT REMOVE_TRAIT(src, TRAIT_NODROP, ORGAN_INSIDE_BODY_TRAIT) - if(!length(bodypart_traits)) + if(!LAZYLEN(bodypart_traits)) return owner.remove_traits(bodypart_traits, bodypart_trait_source) @@ -1573,3 +1574,17 @@ return "metal" return "error" + +/// Add a trait to the bodypart traits list, then applies the trait if necessary +/obj/item/bodypart/proc/add_bodypart_trait(new_trait) + LAZYOR(bodypart_traits, new_trait) + if(isnull(owner)) + return + ADD_TRAIT(owner, new_trait, bodypart_trait_source) + +/// Remove a trait from the bodypart traits list, then removes the trait if necessary +/obj/item/bodypart/proc/remove_bodypart_trait(old_trait) + LAZYREMOVE(bodypart_traits, old_trait) + if(isnull(owner)) + return + REMOVE_TRAIT(owner, old_trait, bodypart_trait_source) diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 079f5aa838b..7359b1fb71d 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -34,7 +34,7 @@ /// Replacement name var/real_name = "" /// Flags related to appearance, such as hair, lips, etc - var/head_flags = HEAD_ALL_FEATURES + var/head_flags = HEAD_DEFAULT_FEATURES /// Hair style var/hairstyle = "Bald" @@ -228,18 +228,20 @@ . = ..() AddElement(/datum/element/toy_talk) -/obj/item/bodypart/head/GetVoice() +/obj/item/bodypart/head/get_voice() return "The head of [real_name]" /obj/item/bodypart/head/update_bodypart_damage_state() - if (!ishuman(owner)) + if (head_flags & HEAD_NO_DISFIGURE) return ..() + var/old_states = brutestate + burnstate . = ..() var/new_states = brutestate + burnstate - var/mob/living/carbon/human/as_human = owner - if ((old_states >= HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES && new_states < HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES) || (old_states < HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES && new_states >= HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES)) - as_human.update_visible_name() + if(new_states >= HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES) + add_bodypart_trait(TRAIT_DISFIGURED) + else if(old_states >= HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES) + remove_bodypart_trait(TRAIT_DISFIGURED) /obj/item/bodypart/head/monkey icon = 'icons/mob/human/species/monkey/bodyparts.dmi' diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index 6cff487a837..d6086208672 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -135,6 +135,7 @@ /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." + abstract_type = /obj/item/bodypart/arm attack_verb_continuous = list("slaps", "punches") attack_verb_simple = list("slap", "punch") max_damage = LIMB_MAX_HP_DEFAULT @@ -400,6 +401,7 @@ /obj/item/bodypart/leg name = "leg" desc = "This item shouldn't exist. Talk about breaking a leg. Badum-Tss!" + abstract_type = /obj/item/bodypart/leg attack_verb_continuous = list("kicks", "stomps") attack_verb_simple = list("kick", "stomp") max_damage = LIMB_MAX_HP_DEFAULT diff --git a/code/modules/surgery/bodyparts/species_parts/ghost_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ghost_bodyparts.dm index adeaa04067c..765dd8d465b 100644 --- a/code/modules/surgery/bodyparts/species_parts/ghost_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/ghost_bodyparts.dm @@ -3,7 +3,7 @@ icon_static = 'icons/mob/human/species/ghost.dmi' icon_state = "ghost_head" biological_state = BIO_FLESH - bodytype = BODYTYPE_GHOST + bodytype = BODYTYPE_ORGANIC|BODYTYPE_GHOST limb_id = SPECIES_GHOST is_dimorphic = FALSE should_draw_greyscale = FALSE @@ -18,24 +18,19 @@ icon_state = "ghost_chest" biological_state = BIO_FLESH acceptable_bodyshape = BODYTYPE_GHOST - bodytype = BODYTYPE_GHOST + bodytype = BODYTYPE_ORGANIC|BODYTYPE_GHOST limb_id = SPECIES_GHOST is_dimorphic = FALSE should_draw_greyscale = FALSE dmg_overlay_type = null wing_types = null -//slightly different sprite meant to differentiate spirit from ghost. -/obj/item/bodypart/chest/ghost/spirit - icon_state = "spirit_chest" - limb_id = SPECIES_SPIRIT - /obj/item/bodypart/arm/left/ghost icon = 'icons/mob/human/species/ghost.dmi' icon_static = 'icons/mob/human/species/ghost.dmi' icon_state = "ghost_l_arm" biological_state = BIO_FLESH|BIO_JOINTED - bodytype = BODYTYPE_GHOST + bodytype = BODYTYPE_ORGANIC|BODYTYPE_GHOST limb_id = SPECIES_GHOST should_draw_greyscale = FALSE dmg_overlay_type = null @@ -45,7 +40,7 @@ icon_static = 'icons/mob/human/species/ghost.dmi' icon_state = "ghost_r_arm" biological_state = BIO_FLESH|BIO_JOINTED - bodytype = BODYTYPE_GHOST + bodytype = BODYTYPE_ORGANIC|BODYTYPE_GHOST limb_id = SPECIES_GHOST should_draw_greyscale = FALSE dmg_overlay_type = null diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 7893f33ec4d..6ce2f81ad6d 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -23,9 +23,7 @@ var/obj/item/implant/implant /datum/surgery_step/extract_implant/preop(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery) - for(var/obj/item/object in target.implants) - implant = object - break + implant = LAZYACCESS(target.implants, 1) if(implant) display_results( user, @@ -56,29 +54,27 @@ display_pain(target, "You can feel your [implant.name] pulled out of you!") implant.removed(target) - if (QDELETED(implant)) - return ..() - - var/obj/item/implantcase/case - for(var/obj/item/implantcase/implant_case in user.held_items) - case = implant_case - break - if(!case) - case = locate(/obj/item/implantcase) in get_turf(target) - if(case && !case.imp) - case.imp = implant - implant.forceMove(case) - case.update_appearance() - display_results( - user, - target, - span_notice("You place [implant] into [case]."), - span_notice("[user] places [implant] into [case]!"), - span_notice("[user] places it into [case]!"), - ) - else - qdel(implant) - + if (!QDELETED(implant)) + var/obj/item/implantcase/case + for(var/obj/item/implantcase/implant_case in user.held_items) + case = implant_case + break + if(!case) + case = locate(/obj/item/implantcase) in get_turf(target) + if(case && !case.imp) + case.imp = implant + implant.forceMove(case) + case.update_appearance() + display_results( + user, + target, + span_notice("You place [implant] into [case]."), + span_notice("[user] places [implant] into [case]!"), + span_notice("[user] places it into [case]!"), + ) + else + qdel(implant) + implant = null else to_chat(user, span_warning("You can't find anything in [target]'s [target_zone]!")) return ..() diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index 76f922b2654..5b58f625352 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -1,6 +1,7 @@ /obj/item/organ name = "organ" icon = 'icons/obj/medical/organs/organs.dmi' + abstract_type = /obj/item/organ w_class = WEIGHT_CLASS_SMALL throwforce = 0 /// The mob that owns this organ. @@ -395,28 +396,28 @@ 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) +/obj/item/organ/proc/get_status_text(advanced, add_tooltips, colored = TRUE) if(advanced && (organ_flags & ORGAN_HAZARDOUS)) - return conditional_tooltip("Harmful Foreign Body", "Remove surgically.", add_tooltips) + return conditional_tooltip("[colored ? "" : ""]Harmful Foreign Body[colored ? "" : ""]", "Remove surgically.", add_tooltips) if(organ_flags & ORGAN_EMP) - return conditional_tooltip("EMP-Derived Failure", "Repair or replace surgically.", add_tooltips) + return conditional_tooltip("[colored ? "" : ""]EMP-Derived Failure[colored ? "" : ""]", "Repair or replace surgically.", add_tooltips) var/tech_text = "" if(owner.has_reagent(/datum/reagent/inverse/technetium)) tech_text = "[round((damage / maxHealth) * 100, 1)]% damaged" if(organ_flags & ORGAN_FAILING) - return conditional_tooltip("[tech_text || "Non-Functional"]", "Repair or replace surgically.", add_tooltips) + return conditional_tooltip("[colored ? "" : ""][tech_text || "Non-Functional"][colored ? "" : ""]", "Repair or replace surgically.", add_tooltips) if(damage > high_threshold) - return conditional_tooltip("[tech_text || "Severely Damaged"]", "[healing_factor ? "Treat with rest or use specialty medication." : "Repair surgically or use specialty medication."]", add_tooltips && owner.stat != DEAD) + return conditional_tooltip("[colored ? "" : ""][tech_text || "Severely Damaged"][colored ? "" : ""]", "[healing_factor ? "Treat with rest or use specialty medication." : "Repair surgically or use specialty medication."]", add_tooltips && owner.stat != DEAD) if(damage > low_threshold) - return conditional_tooltip("[tech_text || "Mildly Damaged"] ", "[healing_factor ? "Treat with rest." : "Use specialty medication."]", add_tooltips && owner.stat != DEAD) + return conditional_tooltip("[colored ? "" : ""][tech_text || "Mildly Damaged"][colored ? "" : ""]", "[healing_factor ? "Treat with rest." : "Use specialty medication."]", add_tooltips && owner.stat != DEAD) if(tech_text) - return "[tech_text]" + return "[colored ? "" : ""][tech_text][colored ? "" : ""]" return "" diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm index bec23ed5689..5ae800d95ae 100644 --- a/code/modules/surgery/organs/helpers.dm +++ b/code/modules/surgery/organs/helpers.dm @@ -43,3 +43,30 @@ /mob/living/carbon/get_organ_slot(slot) . = organs_slot[slot] +/** + * Returns a list of all missing organs this species should have + * + * list [key] is the ORGAN_SLOT missing an organ, list value is the text name of the slot organ + */ +/mob/living/carbon/human/proc/get_missing_organs() + var/mob/living/carbon/human/humantarget = src + var/list/missing_organs = list() + + if(!humantarget.get_organ_slot(ORGAN_SLOT_BRAIN)) + missing_organs[ORGAN_SLOT_BRAIN] = "Brain" + if(humantarget.needs_heart() && !humantarget.get_organ_slot(ORGAN_SLOT_HEART)) + missing_organs[ORGAN_SLOT_HEART] = "Heart" + if(!HAS_TRAIT_FROM(humantarget, TRAIT_NOBREATH, SPECIES_TRAIT) && !isnull(humantarget.dna.species.mutantlungs) && !humantarget.get_organ_slot(ORGAN_SLOT_LUNGS)) + missing_organs[ORGAN_SLOT_LUNGS] = "Lungs" + if(!HAS_TRAIT_FROM(humantarget, TRAIT_LIVERLESS_METABOLISM, SPECIES_TRAIT) && !isnull(humantarget.dna.species.mutantliver) && !humantarget.get_organ_slot(ORGAN_SLOT_LIVER)) + missing_organs[ORGAN_SLOT_LIVER] = "Liver" + if(!HAS_TRAIT_FROM(humantarget, TRAIT_NOHUNGER, SPECIES_TRAIT) && !isnull(humantarget.dna.species.mutantstomach) && !humantarget.get_organ_slot(ORGAN_SLOT_STOMACH)) + missing_organs[ORGAN_SLOT_STOMACH] ="Stomach" + if(!isnull(humantarget.dna.species.mutanttongue) && !humantarget.get_organ_slot(ORGAN_SLOT_TONGUE)) + missing_organs[ORGAN_SLOT_TONGUE] = "Tongue" + if(!isnull(humantarget.dna.species.mutantears) && !humantarget.get_organ_slot(ORGAN_SLOT_EARS)) + missing_organs[ORGAN_SLOT_EARS] = "Ears" + if(!isnull(humantarget.dna.species.mutantears) && !humantarget.get_organ_slot(ORGAN_SLOT_EYES)) + missing_organs[ORGAN_SLOT_EYES] = "Eyes" + + return missing_organs diff --git a/code/modules/surgery/organs/internal/appendix/_appendix.dm b/code/modules/surgery/organs/internal/appendix/_appendix.dm index e7594666c4f..29dbbe6a73d 100644 --- a/code/modules/surgery/organs/internal/appendix/_appendix.dm +++ b/code/modules/surgery/organs/internal/appendix/_appendix.dm @@ -99,7 +99,7 @@ ADD_TRAIT(organ_owner, TRAIT_DISEASELIKE_SEVERITY_MEDIUM, type) organ_owner.med_hud_set_status() -/obj/item/organ/appendix/get_status_text(advanced, add_tooltips) +/obj/item/organ/appendix/get_status_text(advanced, add_tooltips, colored) if(!(organ_flags & ORGAN_FAILING) && inflamation_stage) return conditional_tooltip("Inflamed", "Remove surgically.", add_tooltips) return ..() diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm index 681d68e6282..6181ce1105b 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm @@ -1,6 +1,7 @@ /obj/item/organ/cyberimp/arm name = "arm-mounted implant" desc = "An implant that goes in your arm to improve it." + abstract_type = /obj/item/organ/cyberimp/arm zone = BODY_ZONE_R_ARM slot = ORGAN_SLOT_RIGHT_ARM_AUG w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm index c5dedb71fab..767e759e794 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm @@ -1,6 +1,7 @@ /obj/item/organ/cyberimp/chest name = "cybernetic torso implant" desc = "Implants for the organs in your torso." + abstract_type = /obj/item/organ/cyberimp/chest zone = BODY_ZONE_CHEST /obj/item/organ/cyberimp/chest/nutriment diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm index e548b25e835..18a77821228 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm @@ -2,7 +2,7 @@ /obj/item/organ/cyberimp name = "cybernetic implant" desc = "A state-of-the-art implant that improves a baseline's functionality." - + abstract_type = /obj/item/organ/cyberimp organ_flags = ORGAN_ROBOTIC failing_desc = "seems to be broken." /// icon of the bodypart overlay we're going to be applying to our owner diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm index 0e00dce883a..ce04a2fb66d 100644 --- a/code/modules/surgery/organs/internal/heart/_heart.dm +++ b/code/modules/surgery/organs/internal/heart/_heart.dm @@ -97,7 +97,7 @@ /obj/item/organ/heart/proc/is_beating() return beating -/obj/item/organ/heart/get_status_text(advanced, add_tooltips) +/obj/item/organ/heart/get_status_text(advanced, add_tooltips, colored) if(owner.has_status_effect(/datum/status_effect/heart_attack)) return conditional_tooltip("Myocardial Infarction", "Apply defibrillation immediately. Similar electric shocks may work in emergencies.", add_tooltips) if((!beating && !(organ_flags & ORGAN_FAILING) && owner.needs_heart() && owner.stat != DEAD)) diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm index 10fbc5f2f30..fe7b726d00a 100644 --- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm +++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm @@ -108,7 +108,7 @@ return var/list/batteries = list() - for(var/obj/item/stock_parts/power_store/cell in owner.get_all_contents()) + for(var/obj/item/stock_parts/power_store/cell in owner.get_all_cells()) if(cell.used_charge()) batteries += cell diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 99f0a4f7d33..1a454f408d6 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -258,6 +258,7 @@ #include "reagent_transfer.dm" #include "required_map_items.dm" #include "resist.dm" +#include "reta_system.dm" #include "say.dm" #include "screenshot_airlocks.dm" #include "screenshot_antag_icons.dm" diff --git a/code/modules/unit_tests/reta_system.dm b/code/modules/unit_tests/reta_system.dm new file mode 100644 index 00000000000..152b9a69e6b --- /dev/null +++ b/code/modules/unit_tests/reta_system.dm @@ -0,0 +1,152 @@ +/** + * Unit Tests for Request Emergency Temporary Access (RETA) System + * + * Main system file: code\modules\reta\reta_system.dm + */ + +/datum/unit_test/reta_basic_functions + +/datum/unit_test/reta_basic_functions/Run() + // Initialize RETA system for testing + initialize_reta_system() + + // Test department mapping + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Engineering"), "Engineering", "Engineering department mapping failed") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("engineering"), "Engineering", "Engineering lowercase mapping failed") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Medical Department"), "Medical", "Medical department mapping failed") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("medbay"), "Medical", "Medbay alias mapping failed") + TEST_ASSERT_NULL(reta_get_user_department_by_name("Unknown"), "Unknown department should return null") + + // Test cooldown system + TEST_ASSERT(!reta_on_cooldown("Engineering", "Medical"), "Fresh cooldown should be false") + reta_set_cooldown("Engineering", "Medical", 100) + TEST_ASSERT(reta_on_cooldown("Engineering", "Medical"), "Set cooldown should be true") + + // Test department grants - check that departments get appropriate access levels + TEST_ASSERT(GLOB.reta_dept_grants["Engineering"], "Engineering grants should exist") + TEST_ASSERT(ACCESS_ENGINEERING in GLOB.reta_dept_grants["Engineering"], "Engineering should grant ACCESS_ENGINEERING") + TEST_ASSERT(ACCESS_ATMOSPHERICS in GLOB.reta_dept_grants["Engineering"], "Engineering should grant ACCESS_ATMOSPHERICS") + TEST_ASSERT(!(ACCESS_CONSTRUCTION in GLOB.reta_dept_grants["Engineering"]), "Engineering should NOT grant ACCESS_CONSTRUCTION") + TEST_ASSERT(GLOB.reta_dept_grants["Medical"], "Medical grants should exist") + TEST_ASSERT(ACCESS_MEDICAL in GLOB.reta_dept_grants["Medical"], "Medical should grant ACCESS_MEDICAL") + TEST_ASSERT(ACCESS_SURGERY in GLOB.reta_dept_grants["Medical"], "Medical should grant ACCESS_SURGERY") + TEST_ASSERT(GLOB.reta_dept_grants["Security"], "Security grants should exist") + TEST_ASSERT(ACCESS_SECURITY in GLOB.reta_dept_grants["Security"], "Security should grant ACCESS_SECURITY") + TEST_ASSERT(ACCESS_BRIG in GLOB.reta_dept_grants["Security"], "Security should grant ACCESS_BRIG") + TEST_ASSERT(ACCESS_BRIG_ENTRANCE in GLOB.reta_dept_grants["Security"], "Security should grant ACCESS_BRIG_ENTRANCE") + TEST_ASSERT(!(ACCESS_ARMORY in GLOB.reta_dept_grants["Security"]), "Security should NOT grant ACCESS_ARMORY") + + // Test new departments + TEST_ASSERT(GLOB.reta_dept_grants["Command"], "Command grants should exist") + TEST_ASSERT(ACCESS_COMMAND in GLOB.reta_dept_grants["Command"], "Command should grant ACCESS_COMMAND") + TEST_ASSERT(!(ACCESS_CAPTAIN in GLOB.reta_dept_grants["Command"]), "Command should NOT grant ACCESS_CAPTAIN") + + TEST_ASSERT(GLOB.reta_dept_grants["Cargo"], "Cargo grants should exist") + TEST_ASSERT(ACCESS_CARGO in GLOB.reta_dept_grants["Cargo"], "Cargo should grant ACCESS_CARGO") + TEST_ASSERT(!(ACCESS_MINING in GLOB.reta_dept_grants["Cargo"]), "Cargo should NOT grant ACCESS_MINING") + + TEST_ASSERT(GLOB.reta_dept_grants["Mining"], "Mining grants should exist") + TEST_ASSERT(ACCESS_MINING in GLOB.reta_dept_grants["Mining"], "Mining should grant ACCESS_MINING") + TEST_ASSERT(ACCESS_MINING_STATION in GLOB.reta_dept_grants["Mining"], "Mining should grant ACCESS_MINING_STATION") + TEST_ASSERT(ACCESS_CARGO in GLOB.reta_dept_grants["Mining"], "Mining should grant ACCESS_CARGO") + + // Test department name mapping including new Mining support + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Mining Station"), "Mining", "Mining Station should map to Mining") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Command"), "Command", "Command should map to Command") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Bridge"), "Command", "Bridge should map to Command") + + // Test autonamed service areas + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Kitchen"), "Service", "Kitchen should map to Service") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Bar"), "Service", "Bar should map to Service") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Cafeteria"), "Service", "Cafeteria should map to Service") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Diner"), "Service", "Diner should map to Service") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Hydroponics"), "Service", "Hydroponics should map to Service") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Botany"), "Service", "Botany should map to Service") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Janitor"), "Service", "Janitor should map to Service") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Custodial"), "Service", "Custodial should map to Service") + + // Test autonamed medical areas + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Pharmacy"), "Medical", "Pharmacy should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Chemistry"), "Medical", "Chemistry should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Chem"), "Medical", "Chem should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Morgue"), "Medical", "Morgue should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Virology"), "Medical", "Virology should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Surgery"), "Medical", "Surgery should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Operating"), "Medical", "Operating should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Cryo"), "Medical", "Cryo should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Patients"), "Medical", "Patients should map to Medical") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Exam"), "Medical", "Exam should map to Medical") + + // Test autonamed engineering areas + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Atmospherics"), "Engineering", "Atmospherics should map to Engineering") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Atmos"), "Engineering", "Atmos should map to Engineering") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Supermatter"), "Engineering", "Supermatter should map to Engineering") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Gravity"), "Engineering", "Gravity should map to Engineering") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Telecomm"), "Engineering", "Telecomm should map to Engineering") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Tcomm"), "Engineering", "Tcomm should map to Engineering") + + // Test autonamed science areas + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Xenobiology"), "Science", "Xenobiology should map to Science") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Xenobio"), "Science", "Xenobio should map to Science") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Robotics"), "Science", "Robotics should map to Science") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Genetics"), "Science", "Genetics should map to Science") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Ordnance"), "Science", "Ordnance should map to Science") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Cytology"), "Science", "Cytology should map to Science") + + // Test autonamed security areas + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Brig"), "Security", "Brig should map to Security") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Holding"), "Security", "Holding should map to Security") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Armory"), "Security", "Armory should map to Security") + TEST_ASSERT_EQUAL(reta_get_user_department_by_name("Checkpoint"), "Security", "Checkpoint should map to Security") + +/datum/unit_test/reta_id_card_access + +/datum/unit_test/reta_id_card_access/Run() + // Initialize RETA system for testing + initialize_reta_system() + + var/obj/item/card/id/test_card = allocate(/obj/item/card/id) + test_card.registered_name = "Test User" + + // Test temporary access granting + TEST_ASSERT(!test_card.has_reta_access(ACCESS_ENGINEERING), "ID card should not have temp access initially") + TEST_ASSERT(!(ACCESS_ENGINEERING in test_card.access), "ID card should not have engineering access initially") + + test_card.grant_reta_access("Engineering", 100) + TEST_ASSERT(test_card.has_reta_access(ACCESS_ENGINEERING), "ID card should have temp access after granting") + TEST_ASSERT(ACCESS_ENGINEERING in test_card.access, "ID card should have engineering access in main access list") + + // Test access clearing + test_card.clear_reta_access() + TEST_ASSERT(!test_card.has_reta_access(ACCESS_ENGINEERING), "ID card should not have temp access after clearing") + TEST_ASSERT(!(ACCESS_ENGINEERING in test_card.access), "ID card should not have engineering access in main access list after clearing") + + // Test that permanent access is not affected + test_card.access += ACCESS_ENGINEERING // Simulate HoP giving permanent access + test_card.grant_reta_access("Engineering", 100) + TEST_ASSERT(!test_card.has_reta_access(ACCESS_ENGINEERING), "ID card should not add temp access if already has permanent") + TEST_ASSERT(ACCESS_ENGINEERING in test_card.access, "ID card should retain permanent access") + + test_card.clear_reta_access() + TEST_ASSERT(ACCESS_ENGINEERING in test_card.access, "ID card should still have permanent access after clearing temp access") + +/datum/unit_test/reta_paramedic_access + +/datum/unit_test/reta_paramedic_access/Run() + // Initialize RETA system for testing + initialize_reta_system() + + var/datum/id_trim/job/paramedic/paramedic_trim = SSid_access.trim_singletons_by_path[/datum/id_trim/job/paramedic] + + // Test that paramedic no longer has broad access + TEST_ASSERT(!(ACCESS_CARGO in paramedic_trim.minimal_access), "Paramedic should not have cargo access") + TEST_ASSERT(!(ACCESS_SCIENCE in paramedic_trim.minimal_access), "Paramedic should not have science access") + TEST_ASSERT(!(ACCESS_CONSTRUCTION in paramedic_trim.minimal_access), "Paramedic should not have construction access") + TEST_ASSERT(!(ACCESS_HYDROPONICS in paramedic_trim.minimal_access), "Paramedic should not have hydroponics access") + TEST_ASSERT(!(ACCESS_MINING in paramedic_trim.minimal_access), "Paramedic should not have mining access") + + // Test that paramedic still has basic medical access + TEST_ASSERT(ACCESS_MEDICAL in paramedic_trim.minimal_access, "Paramedic should have medical access") + TEST_ASSERT(ACCESS_MAINT_TUNNELS in paramedic_trim.minimal_access, "Paramedic should have maintenance access") + TEST_ASSERT(ACCESS_MORGUE in paramedic_trim.minimal_access, "Paramedic should have morgue access") + TEST_ASSERT(ACCESS_MECH_MEDICAL in paramedic_trim.minimal_access, "Paramedic should have medical mech access") diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_spirit.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ghost.png similarity index 100% rename from code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_spirit.png rename to code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ghost.png diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_spirit_ghost.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_spirit_ghost.png deleted file mode 100644 index c43c67f12a8..00000000000 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_spirit_ghost.png and /dev/null differ diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index cc717e5b969..b8762795c0f 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -31,6 +31,9 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) return focused_tests.len > 0 ? focused_tests : null /datum/unit_test + /// Do not instantiate if type matches this + abstract_type = /datum/unit_test + //Bit of metadata for the future maybe var/list/procs_tested @@ -47,9 +50,6 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests()) var/list/allocated var/list/fail_reasons - /// Do not instantiate if type matches this - var/abstract_type = /datum/unit_test - /// List of atoms that we don't want to ever initialize in an agnostic context, like for Create and Destroy. Stored on the base datum for usability in other relevant tests that need this data. var/static/list/uncreatables = null diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm index bef549b2853..7a3e40bffe7 100644 --- a/code/modules/uplink/uplink_items/nukeops.dm +++ b/code/modules/uplink/uplink_items/nukeops.dm @@ -722,6 +722,7 @@ item = /obj/item/mod/module/injector cost = 2 purchasable_from = (UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) + uplink_item_flags = NONE /datum/uplink_item/suits/holster name = "MODsuit Holster Module" @@ -729,6 +730,7 @@ item = /obj/item/mod/module/holster cost = 2 purchasable_from = (UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) + uplink_item_flags = NONE /datum/uplink_item/device_tools/medgun_mod name = "Medbeam Gun Module" diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index 39ad90d075f..895352a30a6 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -3,6 +3,7 @@ desc = "Yell at coderbus." icon = 'icons/mob/rideables/vehicles.dmi' icon_state = "error" + abstract_type = /obj/vehicle max_integrity = 300 armor_type = /datum/armor/obj_vehicle layer = VEHICLE_LAYER diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm index e4532f23f06..5d28d2be6f6 100644 --- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm +++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm @@ -5,6 +5,7 @@ /obj/item/mecha_parts/mecha_equipment name = "mecha equipment" icon = 'icons/obj/devices/mecha_equipment.dmi' + abstract_type = /obj/item/mecha_parts/mecha_equipment icon_state = "mecha_equip" force = 5 max_integrity = 300 diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index d4dbc1257f6..0cfc0712b59 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -1,5 +1,6 @@ /obj/item/mecha_parts/mecha_equipment/weapon name = "mecha weapon" + abstract_type = /obj/item/mecha_parts/mecha_equipment/weapon range = MECHA_RANGED equipment_slot = MECHA_WEAPON destroy_sound = 'sound/vehicles/mecha/weapdestr.ogg' diff --git a/code/modules/vehicles/mecha/mecha_parts.dm b/code/modules/vehicles/mecha/mecha_parts.dm index 57a3f6c0413..a8719eb1d4d 100644 --- a/code/modules/vehicles/mecha/mecha_parts.dm +++ b/code/modules/vehicles/mecha/mecha_parts.dm @@ -6,6 +6,7 @@ name = "mecha part" icon = 'icons/mob/rideables/mech_construct.dmi' icon_state = "blank" + abstract_type = /obj/item/mecha_parts w_class = WEIGHT_CLASS_GIGANTIC obj_flags = CONDUCTS_ELECTRICITY diff --git a/code/modules/vending/subtype.dm b/code/modules/vending/subtype.dm index e9633c56cb9..d189435e18c 100644 --- a/code/modules/vending/subtype.dm +++ b/code/modules/vending/subtype.dm @@ -22,7 +22,7 @@ ///Adds the subtype to the product list /obj/machinery/vending/subtype_vendor/RefreshParts() products.Cut() - for(var/type in typesof(type_to_vend)) + for(var/type in get_sane_item_types(type_to_vend)) LAZYADDASSOC(products, type, 50) //no refill canister so we fill the records with their max amounts directly diff --git a/code/modules/vending/vendor/_vending.dm b/code/modules/vending/vendor/_vending.dm index eec128f0f32..1a97b034fa8 100644 --- a/code/modules/vending/vendor/_vending.dm +++ b/code/modules/vending/vendor/_vending.dm @@ -38,6 +38,7 @@ desc = "A generic vending machine." icon = 'icons/obj/machines/vending.dmi' icon_state = "generic" + abstract_type = /obj/machinery/vending layer = BELOW_OBJ_LAYER density = TRUE verb_say = "beeps" diff --git a/code/modules/vending/vendor/interaction.dm b/code/modules/vending/vendor/interaction.dm index 641dc84b111..7796545b719 100644 --- a/code/modules/vending/vendor/interaction.dm +++ b/code/modules/vending/vendor/interaction.dm @@ -1,3 +1,17 @@ +//===============================HAND INTERACTION=================================== +/obj/machinery/vending/interact(mob/user) + if(seconds_electrified && !(machine_stat & NOPOWER)) + if(shock(user, 100)) + return + + if(tilted && !user.buckled) + to_chat(user, span_notice("You begin righting [src].")) + if(do_after(user, 5 SECONDS, target = src)) + untilt(user) + return + + return ..() + //================================TOOL ACTS============================================== /obj/machinery/vending/crowbar_act(mob/living/user, obj/item/attack_item) if(!component_parts) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 8cfd5c43c0b..f0c305dca31 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -47,6 +47,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) products = list( /obj/item/clothing/head/beret/sec = 3, /obj/item/clothing/head/soft/sec = 3, + /obj/item/clothing/head/costume/ushanka/sec = 3, /obj/item/clothing/mask/bandana/striped/security = 3, /obj/item/clothing/under/rank/security/officer = 3, /obj/item/clothing/under/rank/security/officer/skirt = 3, diff --git a/code/modules/wiremod/components/atom/hear.dm b/code/modules/wiremod/components/atom/hear.dm index c846c4c7f83..4dc8812efc0 100644 --- a/code/modules/wiremod/components/atom/hear.dm +++ b/code/modules/wiremod/components/atom/hear.dm @@ -53,6 +53,6 @@ if(message_language) language_port.set_output(initial(message_language.name)) speaker_port.set_output(speaker) - speaker_name.set_output(speaker.GetVoice()) + speaker_name.set_output(speaker.get_voice()) trigger_port.set_output(COMPONENT_SIGNAL) return TRUE diff --git a/code/modules/wiremod/shell/shell_items.dm b/code/modules/wiremod/shell/shell_items.dm index 0db08ab7bb8..eac5715f22b 100644 --- a/code/modules/wiremod/shell/shell_items.dm +++ b/code/modules/wiremod/shell/shell_items.dm @@ -7,6 +7,7 @@ name = "assembly" desc = "A shell assembly that can be completed by screwdrivering it." icon = 'icons/obj/science/circuits.dmi' + abstract_type = /obj/item/shell var/shell_to_spawn var/screw_delay = 3 SECONDS diff --git a/config/config.txt b/config/config.txt index 9eea7fd9eac..422597a4b4e 100644 --- a/config/config.txt +++ b/config/config.txt @@ -116,6 +116,16 @@ ALLOW_ADMIN_ASAYCOLOR ## Job slot open/close by identification consoles delay in seconds ID_CONSOLE_JOBSLOT_DELAY 30 +## Request Emergency Temporary Access - RETA System +## Enables temporary department access when Requests Console emergency calls are made +RETA_ENABLED + +## Duration in deciseconds for how long temporary access lasts (default: 3000 = 5 minutes) +RETA_DURATION_DS 3000 + +## Cooldown in deciseconds between RETA calls from the same origin to the same target department (default: 150 = 15 seconds) +RETA_DEPT_COOLDOWN_DS 150 + ## allow players to initiate a restart vote ALLOW_VOTE_RESTART diff --git a/html/changelogs/AutoChangeLog-pr-92849.yml b/html/changelogs/AutoChangeLog-pr-92849.yml deleted file mode 100644 index d0b4abd9a06..00000000000 --- a/html/changelogs/AutoChangeLog-pr-92849.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "SyncIt21" -delete-after: True -changes: - - qol: "hand crafted air sensors now auto connect to input & output ports if they are located within a 4 tile radius from it" - - qol: "atmos control monitors now locate all air sensors nearest to in on that same z level meaning you can have multiple air sensors of the same type on the same map" - - refactor: "refactored how air sensors & atmos monitors connect to each other. Please report any atmos computers that have missing input valves/output ports on their connected air sensors or those that don't list any air sensors at all on github" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-92980.yml b/html/changelogs/AutoChangeLog-pr-92980.yml new file mode 100644 index 00000000000..3fcdfacb5ee --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-92980.yml @@ -0,0 +1,4 @@ +author: "Pickle-Coding" +delete-after: True +changes: + - code_imp: "Caches individual gases for gas reactions." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-92981.yml b/html/changelogs/AutoChangeLog-pr-92981.yml new file mode 100644 index 00000000000..9a591d50ad9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-92981.yml @@ -0,0 +1,5 @@ +author: "RealWinterFrost & TheSelfish" +delete-after: True +changes: + - rscadd: "Multicolours ushankas, woo!" + - rscadd: "Security now has a hat to fight off the frost." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-93002.yml b/html/changelogs/AutoChangeLog-pr-93002.yml new file mode 100644 index 00000000000..911ae678893 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-93002.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - bugfix: "'a box full of shotgun darts with increased chemical storage capacity' now has a shorter name" \ No newline at end of file diff --git a/html/changelogs/archive/2025-09.yml b/html/changelogs/archive/2025-09.yml index 12b37290680..272e375efd6 100644 --- a/html/changelogs/archive/2025-09.yml +++ b/html/changelogs/archive/2025-09.yml @@ -285,3 +285,204 @@ - bugfix: Santa has put cargo in his very naughty list for spam producing his presents by dumpster diving. This fixes Christmas presents (and other holiday items) from spawning inside dumpsters. +2025-09-11: + Ezel: + - balance: CE now gets upgraded welders instead of normal + Hatterhat: + - qol: Mail bags can now hold bounty cubes. + - qol: You can now cut folders apart back into cardboard with wirecutters or a knife. + Melbert: + - bugfix: Fix held items with slowdown not working + - bugfix: Fix hair mask updating oddly + OrionTheFox: + - qol: made Autopsy Reports follow similar formatting to Health Scans, and adds + some information previously missing such as Missing Organs. + SyncIt21: + - qol: hand crafted air sensors now auto connect to input & output ports if they + are located within a 4 tile radius from it + - qol: atmos control monitors now locate all air sensors nearest to in on that same + z level meaning you can have multiple air sensors of the same type on the same + map + - refactor: refactored how air sensors & atmos monitors connect to each other. Please + report any atmos computers that have missing input valves/output ports on their + connected air sensors or those that don't list any air sensors at all on github + lelandkemble: + - qol: allows hitting empty light fixtures on combat mode + - bugfix: mice stored on your person will no longer disappear when killed + loganuk: + - rscadd: RETA System - Request Consoles give temporary access to responders when + used for some areas. Paramedics lose broad access but get external space access. + - qol: Request consoles now show name and job role on call message & Cooldown on + spamming calls + sound prompt + - qol: Medibot access no longer based on Paramedic trim ID - Still has original + access + - image: Added "lights_reta" for temporary door access when in effect + - admin: Gives admins "RETA door access" verb for giving department wide area access + on maps. + - config: New config settings for RETA + necromanceranne: + - balance: Jackets can carry personal firearms and holsters in their suit storage. + So can hawaiian shirts and comedian suits. + - balance: More 'assistant' attire can fit improvised weapons. + - balance: Justice suits can fit security items in their suit storage. + - bugfix: Imperium monk outfits now hold the true list of chaplain suit storage + items, and not just a limited list. +2025-09-12: + Aliceee2ch: + - map: Added shutters in Cargo bay on every station. + - map: Added firelocks on lower Cargo staircase on TramStation. Also added space + shutters in drone bay to prevent easy spacing. + - map: Windows in Meta and IceBox Cargo security outposts are now hotwired, like + every other security outpost does. + - map: Replaced blast doors on regular shutters in QM office on MetaStation. + Ben10Omintrix: + - bugfix: snails no longer crush glass tables when crawling over them + Bisar: + - code_imp: Heat capacity calculation for gas mixtures has been slightly optimized. + Iamgoofball: + - bugfix: Blocks mobs with players controlling them from breeding (ie. sentience + potion'd raptors) + Melbert: + - code_imp: Minor cleanup with species-weapon vulnerabilities (like moths vs flyswatters) + MintMetal: + - bugfix: fixed lost cable on Delta Station + SyncIt21: + - bugfix: Fixes random runtime for round start silo connections + - bugfix: Ore Silo UI works again + lelandkemble: + - bugfix: Station MODules no longer provide illegal technology + sushi: + - bugfix: implants can no longer be removed from the same mob (or other mobs!) multiple + times + timothymtorres: + - bugfix: Fix map z-level generation starting position. Z-levels used to cluster + together near the edges and will now instead be spread out evenly from the center. + - qol: The GPS debug tool will now spawn with the admin outfit apart of the debug + tools + - admin: Add GPS debug tool to admin debug box + tiramisuapimancer: + - bugfix: you can actually get the hat stabilizer modsuit module on the black market +2025-09-13: + FalloutFalcon: + - rscadd: Soda cans show up in the silver slime drink table. + - rscadd: Examine tag for items that are not mean to show up ingame. + - refactor: Standardizes how gifts rule out abstract types. + - bugfix: gifts no longer check if something has an inhand, massively expanding + the list of potential items. + JohnFulpWillard: + - rscdel: Merged ghosts and spirits into one species. + - balance: Spirit's passthrough ability is now tied down 7 tiles from a tombstone, + but is no longer affected by holy water nor does it make them drop their equipped + gear. + - balance: Ghosts can now be healed. + Melbert: + - rscdel: Captain's no longer sorted under Security in places such as the manifest + or job selection + - refactor: Refactored a lot of code relating to human face and voice, ie, what + shows up in examine and in say. Report anything odd when examining people, with + ID cards, when talking over radio, or when disguised + - refactor: Refactored ling mimic voice and traitor voice changer + - rscdel: Potted plants no longer hide voice. They still hide appearance, though + - qol: Honorifics now show in examine / in world, rather than only when speaking. + - rscadd: There's a 1/5 chance that Paradox Clone spawns a second clone if there + are enough candidates. Neither clone is aware of or on a team with the other + - There can only be one. + - rscadd: Paradox Clones are now tasked to `Be the only [x] alive`, meaning means + of identity cloning (such as Genetics or Changelings) may throw a wrench in + your plan. + lelandkemble: + - qol: Eating ice cream no longer curses you + loganuk: + - map: Catwalk - Atmos and Engineering split, new access hallway, new stairs to + AI sat, HFR re-located, space for passion projects, new lighting, So many changes + to document. [C.A.T] + necromanceranne: + - bugfix: Syndicate Tomes once again can be used to beat the shit out of people. + - image: The rebellion mask now renders beneath your hair. + - qol: The rebellion mask now lets you plug in internals. +2025-09-14: + ArcaneMusic: + - rscadd: Boulders from ore-vents can now be used on lava tiles, to create a temporary + bridge to cross. Just don't be standing on it when it sinks back into the lava! + - map: Re-added the gulag boulder-vent to the lavaland gulag. + - bugfix: Lava tiles will now properly burn its contents when a catwalk or similar + crossing disappears above itself. + LemonInTheDark: + - bugfix: Moving diagonally will no longer lead to stutter stepping (it's tickbound) +2025-09-15: + JohnFulpWillard: + - rscadd: Added a new PDA theme and 3 secret ones you may find in maintenance. + Melbert: + - bugfix: Food-tray-to-oven-tray transfer works again + lelandkemble: + - bugfix: Filled worn trashbags are no longer spriteless + necromanceranne: + - balance: Shortbows and divine bows do more damage. The divine bow also launches + arrows at a higher velocity than normal bows. + - image: Flaming arrows now have proper sprites. + - balance: Flaming arrows now deal BURN damage. And also deal an appropriate amount + of damage for an arrow. + - rscadd: Ashen bows and arrows, made from sinew and bone. And leather for the bow. + - rscadd: Ashen arrows deal significantly more damage to mining mobs. + - balance: Arrow quivers are made from wood rather than cardboard. + - qol: Shortbows and ashen bows have the ability to be renamed. +2025-09-16: + Ghommie: + - balance: Clocks, both mounted or tabletop, now improve room's beauty a little. + - balance: Buffed the torsion ratchet MOD module (from that bepis node with several + modsuit mod designs in it). You can also have more than one at a time. + - balance: The secondary action of the chain of command (the chained whip) also + boosts action speed and not just move speed. + - qol: The chain of command now has contextual tip for its secondary action, and + plays the whip attack animation when it's done. + - balance: Tree logs (not hydroponics towercaps) give more planks when cut. From + 1 -> 10. + - bugfix: The megaphone MOD module also has a TTS filter when active, just like + the handheld version. + - qol: Accessories other than the first are now displayed on worn clothing. + - refactor: Underwater basketweaving refactored so it doesn't show in the crafting + menu unless you've the skillchip active. + LemonInTheDark: + - balance: AIs viewing the crew monitor will no longer be told ahead of time if + they cannot jump to a player. + Melbert: + - bugfix: Things that recharge "all cells on your person" now avoid recharging Ethereal + stomachs, and thus, will no longer cause spontaneous overcharge or weird chat + messages + - bugfix: Spades work on trays again + - qol: Poppy seeds now give better feedback when unable to harvest + - qol: Poppy seeds now have an immutable gene indicating they can be sliced for + sap + - rscdel: Lilys and Geraniums can no longer be tapped for sap + Melbert, Toriate: + - rscdel: Removed ninja's EMP burst + - rscadd: Replaced ninja's throwing stars with energy throwing stars, which EMP + on hit and embed, and can't be caught. + - sound: Throwing stars now make stab sounds instead of thud sounds + RusselNotSCP: + - rscadd: You can now make 15 new classic (and some less classic) cocktails. Includes + old standards like the Old Fashioned, Daiquiri, Ramos Gin Fizz, and more! + SyncIt21: + - bugfix: vending machines now randomly shock if electrified & can be untilted again + by hand + WebcomicArtist: + - balance: EMPs now drain cells better, starting at 3 emps to drain a basic cell, + up to 8 for bluespace. + lelandkemble: + - balance: Poly talks less now + - balance: The "Bolt Lights" wire is now the "Feedback" wire, and controls both + lights and sounds for the airlock. +2025-09-17: + Aliceee2ch: + - qol: Added new helpful modules, such as decal painter for engineering and chembag + for medical borg. + - rscadd: Added miner cyborg shield module. In lavaland (low) pressure, it protects + you from 50% of incoming damage in exchange of your cell charge. + - rscadd: Added BS syringe upgrade for medical cyborg. + Ghommie: + - qol: fillets that you cut from fish will now inherit the name of the fish they + were cut from (eg. catfish fillet, char fillet etc.) + - bugfix: Material prefixes won't appear twice when processing items with custom + materials being processed with a tool. + SyncIt21: + - bugfix: ORM's smelt ores correctly when inserted by hand/bag diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi index 143b24de52c..775ba6e14ee 100644 Binary files a/icons/map_icons/clothing/head/_head.dmi and b/icons/map_icons/clothing/head/_head.dmi differ diff --git a/icons/mob/actions/actions_mecha.dmi b/icons/mob/actions/actions_mecha.dmi index 60df1b5ed1a..82f09466995 100644 Binary files a/icons/mob/actions/actions_mecha.dmi and b/icons/mob/actions/actions_mecha.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 48d7f64893e..0f43a1b2850 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index 023652ea9a3..1add3b19076 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi index f3f29788961..142319bbf81 100644 Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ diff --git a/icons/mob/effects/durand_shield.dmi b/icons/mob/effects/durand_shield.dmi index 8f9016ed74b..c4a18d1b599 100644 Binary files a/icons/mob/effects/durand_shield.dmi and b/icons/mob/effects/durand_shield.dmi differ diff --git a/icons/mob/human/species/ghost.dmi b/icons/mob/human/species/ghost.dmi index 42185e3db54..f22d3fc386c 100644 Binary files a/icons/mob/human/species/ghost.dmi and b/icons/mob/human/species/ghost.dmi differ diff --git a/icons/mob/inhands/equipment/shields_lefthand.dmi b/icons/mob/inhands/equipment/shields_lefthand.dmi index a19d5f46245..033345c7d3d 100644 Binary files a/icons/mob/inhands/equipment/shields_lefthand.dmi and b/icons/mob/inhands/equipment/shields_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/shields_righthand.dmi b/icons/mob/inhands/equipment/shields_righthand.dmi index b4d080345c5..66d8bf8a03f 100644 Binary files a/icons/mob/inhands/equipment/shields_righthand.dmi and b/icons/mob/inhands/equipment/shields_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 8dacbfca894..a37b25c6939 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index cb1a99ea114..7db80e89605 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/bows_lefthand.dmi b/icons/mob/inhands/weapons/bows_lefthand.dmi index 78e74393262..c04b8fbd23c 100644 Binary files a/icons/mob/inhands/weapons/bows_lefthand.dmi and b/icons/mob/inhands/weapons/bows_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/bows_righthand.dmi b/icons/mob/inhands/weapons/bows_righthand.dmi index 04ea8cf0bc6..e91344d37e4 100644 Binary files a/icons/mob/inhands/weapons/bows_righthand.dmi and b/icons/mob/inhands/weapons/bows_righthand.dmi differ diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi index 11c107f2cde..e1a6c39a91d 100644 Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ diff --git a/icons/obj/devices/tool.dmi b/icons/obj/devices/tool.dmi index 035f73b0aca..9075c0d2063 100644 Binary files a/icons/obj/devices/tool.dmi and b/icons/obj/devices/tool.dmi differ diff --git a/icons/obj/doors/airlocks/station/overlays.dmi b/icons/obj/doors/airlocks/station/overlays.dmi index 9ccec458ec8..17e9005042e 100644 Binary files a/icons/obj/doors/airlocks/station/overlays.dmi and b/icons/obj/doors/airlocks/station/overlays.dmi differ diff --git a/icons/obj/drinks/mixed_drinks.dmi b/icons/obj/drinks/mixed_drinks.dmi index 4e0043695f8..97b1d99979c 100644 Binary files a/icons/obj/drinks/mixed_drinks.dmi and b/icons/obj/drinks/mixed_drinks.dmi differ diff --git a/icons/obj/ore.dmi b/icons/obj/ore.dmi index 7cc3b882057..5346161a9e7 100644 Binary files a/icons/obj/ore.dmi and b/icons/obj/ore.dmi differ diff --git a/icons/obj/weapons/bows/arrows.dmi b/icons/obj/weapons/bows/arrows.dmi index b19c20187eb..60bba40b93f 100644 Binary files a/icons/obj/weapons/bows/arrows.dmi and b/icons/obj/weapons/bows/arrows.dmi differ diff --git a/icons/obj/weapons/bows/bows.dmi b/icons/obj/weapons/bows/bows.dmi index 57d42371042..280254b8004 100644 Binary files a/icons/obj/weapons/bows/bows.dmi and b/icons/obj/weapons/bows/bows.dmi differ diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi index a6ea9700698..bbb4ff06316 100644 Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ diff --git a/icons/obj/weapons/thrown.dmi b/icons/obj/weapons/thrown.dmi index e877d12d31b..9c11cbaa1d2 100644 Binary files a/icons/obj/weapons/thrown.dmi and b/icons/obj/weapons/thrown.dmi differ diff --git a/tgstation.dme b/tgstation.dme index e384dd2d033..daaa076ec09 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -608,6 +608,7 @@ #include "code\__HELPERS\qdel.dm" #include "code\__HELPERS\radiation.dm" #include "code\__HELPERS\radio.dm" +#include "code\__HELPERS\random_items.dm" #include "code\__HELPERS\randoms.dm" #include "code\__HELPERS\reagents.dm" #include "code\__HELPERS\ref.dm" @@ -686,6 +687,7 @@ #include "code\_globalvars\pipe_info.dm" #include "code\_globalvars\rcd.dm" #include "code\_globalvars\religion.dm" +#include "code\_globalvars\reta.dm" #include "code\_globalvars\silo.dm" #include "code\_globalvars\tgui.dm" #include "code\_globalvars\time_vars.dm" @@ -795,6 +797,7 @@ #include "code\controllers\configuration\entries\jobs.dm" #include "code\controllers\configuration\entries\lua.dm" #include "code\controllers\configuration\entries\resources.dm" +#include "code\controllers\configuration\entries\reta.dm" #include "code\controllers\subsystem\achievements.dm" #include "code\controllers\subsystem\addiction.dm" #include "code\controllers\subsystem\admin_verbs.dm" @@ -2590,6 +2593,7 @@ #include "code\game\objects\effects\spawners\random\techstorage.dm" #include "code\game\objects\effects\spawners\random\trash.dm" #include "code\game\objects\effects\spawners\random\vending.dm" +#include "code\game\objects\effects\spawners\random\weapon.dm" #include "code\game\objects\effects\temporary_visuals\cult.dm" #include "code\game\objects\effects\temporary_visuals\effect_trail.dm" #include "code\game\objects\effects\temporary_visuals\miscellaneous.dm" @@ -2870,6 +2874,7 @@ #include "code\game\objects\items\kirby_plants\organic_plants.dm" #include "code\game\objects\items\kirby_plants\synthetic_plants.dm" #include "code\game\objects\items\melee\baton.dm" +#include "code\game\objects\items\melee\chainofcommand.dm" #include "code\game\objects\items\melee\energy.dm" #include "code\game\objects\items\melee\misc.dm" #include "code\game\objects\items\rcd\RCD.dm" @@ -4823,6 +4828,7 @@ #include "code\modules\library\skill_learning\generic_skillchips\musical.dm" #include "code\modules\library\skill_learning\generic_skillchips\point.dm" #include "code\modules\library\skill_learning\generic_skillchips\self_surgery.dm" +#include "code\modules\library\skill_learning\generic_skillchips\underwater_basketweaving.dm" #include "code\modules\library\skill_learning\job_skillchips\_job.dm" #include "code\modules\library\skill_learning\job_skillchips\chef.dm" #include "code\modules\library\skill_learning\job_skillchips\clown.dm" @@ -6271,6 +6277,9 @@ #include "code\modules\research\xenobiology\vatgrowing\samples\cell_lines\common.dm" #include "code\modules\research\xenobiology\vatgrowing\samples\cell_lines\organs.dm" #include "code\modules\research\xenobiology\vatgrowing\samples\viruses\_virus.dm" +#include "code\modules\reta\reta_debug.dm" +#include "code\modules\reta\reta_id_card.dm" +#include "code\modules\reta\reta_system.dm" #include "code\modules\security_levels\keycard_authentication.dm" #include "code\modules\security_levels\security_level_datums.dm" #include "code\modules\shuttle\shuttle.dm" diff --git a/tgui/packages/tgui/interfaces/AiAirlock.jsx b/tgui/packages/tgui/interfaces/AiAirlock.jsx index bf9cdf4a7ff..7dc5943e6da 100644 --- a/tgui/packages/tgui/interfaces/AiAirlock.jsx +++ b/tgui/packages/tgui/interfaces/AiAirlock.jsx @@ -142,19 +142,19 @@ export const AiAirlock = (props) => { {!data.wires.bolts && '[Wires have been cut!]'}