" break_counter++ diff --git a/code/modules/admin/verbs/map_export.dm b/code/modules/admin/verbs/map_export.dm index 0546eb3723c3..398f85170fe4 100644 --- a/code/modules/admin/verbs/map_export.dm +++ b/code/modules/admin/verbs/map_export.dm @@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(save_file_chars, list( if(istext(value)) //Prevent symbols from being because otherwise you can name something // [";},/obj/item/gun/energy/laser/instakill{name="da epic gun] and spawn yourself an instakill gun. - return "\"[hashtag_newlines_and_tabs("[value]", list("{"="", "}"="", "\""="", ";"="", ","=""))]\"" + return "\"[hashtag_newlines_and_tabs("[value]", list("{"="", "}"="", "\""="", ","=""))]\"" if(isnum(value) || ispath(value)) return "[value]" if(islist(value)) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index f5958a127f43..f708ec696e0a 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 90d2d5a90538..febfa8758a4d 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)) @@ -445,7 +446,6 @@ Return to step 11 of normal process."} if(do_after(user, time_to_cuff, carbon_victim) && carbon_victim.canBeHandcuffed()) if(!carbon_victim.handcuffed) carbon_victim.set_handcuffed(new /obj/item/restraints/handcuffs/energy/used(carbon_victim)) - carbon_victim.update_handcuffed() to_chat(user, span_notice("You restrain [carbon_victim].")) log_combat(user, carbon_victim, "handcuffed") else diff --git a/code/modules/antagonists/changeling/changeling_power.dm b/code/modules/antagonists/changeling/changeling_power.dm index 85fa4b537806..82b0120a7b6f 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 99f543045804..e1d895d2b14e 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 028ba5aaa96d..dbf97c2f6f44 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 20519d2d8b73..81b62be3df74 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/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index db66083062a3..1bafdb7a3ef8 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -573,7 +573,6 @@ if(do_after(user, 3 SECONDS, C)) if(!C.handcuffed) C.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult/used(C)) - C.update_handcuffed() C.adjust_silence(10 SECONDS) to_chat(user, span_notice("You shackle [C].")) log_combat(user, C, "shackled") diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index 9e9cc36c948f..210baad0dda1 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -334,13 +334,7 @@ sac_target.visible_message(span_danger("[sac_target] begins to shudder violenty as dark tendrils begin to drag them into thin air!")) sac_target.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult(sac_target)) - sac_target.update_handcuffed() - - if(sac_target.legcuffed) - sac_target.legcuffed.forceMove(sac_target.drop_location()) - sac_target.legcuffed.dropped(sac_target) - sac_target.legcuffed = null - sac_target.update_worn_legcuffs() + sac_target.dropItemToGround(sac_target.legcuffed, TRUE) sac_target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 85, 150) sac_target.do_jitter_animation() diff --git a/code/modules/antagonists/heretic/magic/shadow_cloak.dm b/code/modules/antagonists/heretic/magic/shadow_cloak.dm index 0012495867ae..825e1874c786 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 ab327817735a..3da3c43e1ebd 100644 --- a/code/modules/antagonists/heretic/status_effects/buffs.dm +++ b/code/modules/antagonists/heretic/status_effects/buffs.dm @@ -345,11 +345,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 2e5817f05df5..079289075924 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 c5100bed01b2..d009d9b5d481 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() - var/datum/mind/original_mind = original_ref?.resolve() +/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!") - 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/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm index 105448189678..51a7a5d055a0 100644 --- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm +++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm @@ -367,7 +367,7 @@ ///there are still licing mobs inside that item. Stop, don't sell it ffs. if(locate(/mob/living) in item_on_pad.get_all_contents()) continue - export_item_and_contents(item_on_pad, apply_elastic = FALSE, dry_run = dry_run, delete_unsold = FALSE, external_report = report, ignore_typecache = nosell_typecache, export_market = EXPORT_MARKET_PIRACY) + export_item_and_contents(item_on_pad, apply_elastic = FALSE, dry_run = dry_run, delete_unsold = FALSE, external_report = report, ignore_typecache = nosell_typecache, export_markets = list(EXPORT_MARKET_STATION, EXPORT_MARKET_PIRACY)) return report /// Prepares to sell the items on the pad diff --git a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm index 5f3e2387a351..229b0dc7ae1d 100644 --- a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm +++ b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm @@ -168,7 +168,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han return TRUE target.AddComponent(\ /datum/component/interaction_booby_trap,\ - additional_triggers = list(COMSIG_ORM_COLLECTED_ORE),\ + /*additional_triggers = list(COMSIG_ORM_COLLECTED_ORE), (tgcoderes decided to do some refactoring, of course that broke this line of code, too lazy to readd it once again*/\ on_triggered_callback = CALLBACK(src, PROC_REF(on_triggered)),\ on_defused_callback = CALLBACK(src, PROC_REF(on_defused)),\ ) diff --git a/code/modules/antagonists/traitor/traitor_objective.dm b/code/modules/antagonists/traitor/traitor_objective.dm index ecfebaddeadc..c1be5b1873dc 100644 --- a/code/modules/antagonists/traitor/traitor_objective.dm +++ b/code/modules/antagonists/traitor/traitor_objective.dm @@ -42,8 +42,6 @@ var/progression_cost_coeff = 0 /// The percentage that this objective has been increased or decreased by as a result of progression. Used by the UI var/original_progression = 0 - /// Abstract type that won't be included as a possible objective - var/abstract_type = /datum/traitor_objective /// The duplicate type that will be used to check for duplicates. /// If undefined, this will either take from the abstract type or the type of the objective itself var/duplicate_type = null diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index 7f467a411b42..7a2fc5a8f5aa 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/signaler.dm b/code/modules/assembly/signaler.dm index 2e6037ff53d0..72a2395641d9 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -37,14 +37,13 @@ suicide_mob = REF(user) return MANUAL_SUICIDE_NONLETHAL -/obj/item/assembly/signaler/proc/manual_suicide(datum/mind/suicidee) - var/mob/living/user = suicidee.current +/obj/item/assembly/signaler/proc/manual_suicide() + var/mob/living/user = suicider.current if(!istype(user)) return - if(suicide_mob == REF(user)) - user.visible_message(span_suicide("[user]'s [src] receives a signal, killing [user.p_them()] instantly!")) - else - user.visible_message(span_suicide("[user]'s [src] receives a signal and [user.p_they()] die[user.p_s()] like a gamer!")) + if(suicide_mob != REF(user)) + return + user.visible_message(span_suicide("[user]'s [src] receives a signal, killing [user.p_them()] instantly!")) user.set_suicide(TRUE) user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something. user.death(FALSE) @@ -164,7 +163,7 @@ if(signal.data["code"] != code) return if(suicider) - manual_suicide(suicider) + manual_suicide() return // If the holder is a TTV, we want to store the last received signal to incorporate it into TTV logging, else wipe it. diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index ffe5eab54cef..62375dc06434 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 a50cefb34dc5..b9f59c3208df 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/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index c040e30db3fc..ae81c16def10 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -121,7 +121,7 @@ rarity = 500 purchaseable = TRUE base_value = 0.5 - desc = "Water, in gas form. Makes things slippery." + desc = "Water, in gas form. Makes floors slippery and washes items on them." primary_color = "#b0c4de" /datum/gas/hypernoblium diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 7a76dc6ec4ea..8e1e4ad1f5e9 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -111,6 +111,9 @@ if(-INFINITY to WATER_VAPOR_DEPOSITION_POINT) if(location?.freeze_turf()) consumed = MOLES_GAS_VISIBLE + var/datum/component/wet_floor/wet_floor = location?.GetComponent(/datum/component/wet_floor) + if(wet_floor && wet_floor.highest_strength == TURF_WET_PERMAFROST) + . |= VOLATILE_REACTION if(WATER_VAPOR_DEPOSITION_POINT to WATER_VAPOR_CONDENSATION_POINT) if(!isgroundlessturf(location) && !isnoslipturf(location)) location.water_vapor_gas_act() @@ -119,7 +122,7 @@ if(consumed) air.gases[/datum/gas/water_vapor][MOLES] -= consumed SET_REACTION_RESULTS(consumed) - . = REACTING + . |= REACTING /** @@ -141,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 @@ -182,6 +187,7 @@ ) /datum/gas_reaction/plasmafire/react(datum/gas_mixture/air, datum/holder) + . = NO_REACTION // This reaction should proceed faster at higher temperatures. var/temperature = air.temperature var/temperature_scale = 0 @@ -190,28 +196,30 @@ else temperature_scale = (temperature - PLASMA_MINIMUM_BURN_TEMPERATURE) / (PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE) if(temperature_scale <= 0) - return NO_REACTION + return var/oxygen_burn_ratio = OXYGEN_BURN_RATIO_BASE - temperature_scale 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 NO_REACTION + 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 @@ -234,7 +242,7 @@ if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) location.hotspot_expose(temperature, CELL_VOLUME) - return REACTING + . |= REACTING | VOLATILE_REACTION /** @@ -259,16 +267,19 @@ ) /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. - return NO_REACTION + 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 @@ -287,7 +298,7 @@ if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) location.hotspot_expose(temperature, CELL_VOLUME) - return burned_fuel ? REACTING : NO_REACTION + . |= REACTING | VOLATILE_REACTION /** @@ -313,16 +324,19 @@ ) /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. - return NO_REACTION + 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 @@ -350,7 +364,7 @@ if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) location.hotspot_expose(temperature, CELL_VOLUME) - return burned_fuel ? REACTING : NO_REACTION + . |= REACTING | VOLATILE_REACTION @@ -376,6 +390,7 @@ ) /datum/gas_reaction/freonfire/react(datum/gas_mixture/air, datum/holder) + . = NO_REACTION var/temperature = air.temperature var/temperature_scale if(temperature < FREON_TERMINAL_TEMPERATURE) //stop the reaction when too cold @@ -385,23 +400,25 @@ else temperature_scale = (FREON_MAXIMUM_BURN_TEMPERATURE - temperature) / (FREON_MAXIMUM_BURN_TEMPERATURE - FREON_TERMINAL_TEMPERATURE) //calculate the scale based on the temperature if (temperature_scale <= 0) - return NO_REACTION + return 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 if (freon_burn_rate < MINIMUM_HEAT_CAPACITY) - return NO_REACTION + 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 @@ -420,7 +437,7 @@ if(temperature < FREON_MAXIMUM_BURN_TEMPERATURE) location.hotspot_expose(temperature, CELL_VOLUME) - return REACTING + . |= REACTING | VOLATILE_REACTION // N2O @@ -449,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 @@ -488,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 NO_REACTION - if(cached_gases[/datum/gas/nitrous_oxide][MOLES] - burned_fuel < 0) + 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) @@ -507,7 +525,7 @@ var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) air.temperature = (temperature * old_heat_capacity + energy_released) / new_heat_capacity - return REACTING + . |= REACTING // BZ @@ -533,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() @@ -560,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)) @@ -596,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) @@ -642,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) @@ -685,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 @@ -729,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) @@ -779,28 +809,32 @@ ) /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 NO_REACTION + 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) - return REACTING + . |= REACTING | VOLATILE_REACTION // Halon @@ -826,17 +860,20 @@ ) /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. - return NO_REACTION + 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) @@ -853,8 +890,9 @@ var/datum/effect_system/fluid_spread/foam/metal/resin/halon/foaming = new foaming.set_up(amount = HALON_COMBUSTION_RESIN_VOLUME, holder = holder, location = location) foaming.start() + . |= VOLATILE_REACTION - return REACTING + . |= REACTING // Healium @@ -880,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) @@ -920,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) @@ -960,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 @@ -1002,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) @@ -1041,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 @@ -1078,15 +1125,18 @@ ) /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) - return NO_REACTION + 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 @@ -1099,13 +1149,15 @@ else if(isatom(holder)) location = holder if (location && energy_released > PN_TRITIUM_CONVERSION_RAD_RELEASE_THRESHOLD * (air.volume / CELL_VOLUME) ** ATMOS_RADIATION_VOLUME_EXP) + . |= VOLATILE_REACTION radiation_pulse(location, max_range = min(sqrt(produced_amount) / PN_TRITIUM_RAD_RANGE_DIVISOR, GAS_REACTION_MAXIMUM_RADIATION_PULSE_RANGE), threshold = PN_TRITIUM_RAD_THRESHOLD) if(energy_released) var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) air.temperature = max((temperature * old_heat_capacity + energy_released) / new_heat_capacity, TCMB) - return REACTING + + . |= REACTING /** * Proto-Nitrate BZase Action @@ -1127,14 +1179,17 @@ ) /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) - return NO_REACTION + 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) @@ -1151,6 +1206,7 @@ else if(isatom(holder)) location = holder if (location && energy_released > PN_BZASE_RAD_RELEASE_THRESHOLD * (air.volume / CELL_VOLUME) ** ATMOS_RADIATION_VOLUME_EXP) + . |= VOLATILE_REACTION ///How many nuclear particles will fire in this reaction. var/nuclear_particle_amount = min(round(consumed_amount / PN_BZASE_NUCLEAR_PARTICLE_DIVISOR), PN_BZASE_NUCLEAR_PARTICLE_MAXIMUM) for(var/i in 1 to nuclear_particle_amount) @@ -1161,7 +1217,7 @@ var/new_heat_capacity = air.heat_capacity() if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) air.temperature = max((temperature * old_heat_capacity + energy_released) / new_heat_capacity, TCMB) - return REACTING + . |= REACTING /datum/gas_reaction/antinoblium_replication priority_group = PRIORITY_FORMATION @@ -1181,7 +1237,7 @@ * Converts all gases into antinoblium. */ /datum/gas_reaction/antinoblium_replication/react(datum/gas_mixture/air, datum/holder) - . = REACTING + . = REACTING | VOLATILE_REACTION var/list/cached_gases = air.gases var/heat_capacity = air.heat_capacity() var/total_moles = air.total_moles() @@ -1192,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/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm index ea9e4e82b5a1..9013e31b632f 100644 --- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm @@ -714,7 +714,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27) ///Used for air alarm link helper, which connects air alarm to a sensor with corresponding chamber_id /obj/machinery/airalarm/proc/setup_chamber_link() - var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[GLOB.map_loaded_sensors[air_sensor_chamber_id]] + var/obj/machinery/air_sensor/sensor = null + for(var/obj/machinery/air_sensor/target as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/air_sensor)) + if(target.z == z && target.chamber_id == air_sensor_chamber_id) + sensor = target + break if(isnull(sensor)) log_mapping("[src] at [AREACOORD(src)] tried to connect to a sensor, but no sensor with chamber_id:[air_sensor_chamber_id] found!") return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index c1837bbf5093..f281fee74f26 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/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 5528b838ff05..8cc0eb7b2469 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -32,9 +32,6 @@ // ATMOS_INTERNAL_BOUND: Do not pass internal_pressure_bound // NO_BOUND: Do not pass either - /// id of air sensor its connected to - var/chamber_id - ///area this vent is assigned to var/area/assigned_area diff --git a/code/modules/bitrunning/components/avatar_gear.dm b/code/modules/bitrunning/components/avatar_gear.dm index be7ede816feb..09a336f4bd0d 100644 --- a/code/modules/bitrunning/components/avatar_gear.dm +++ b/code/modules/bitrunning/components/avatar_gear.dm @@ -5,6 +5,8 @@ var/datum/callback/load_callback /// Weakref to the human we are currently carried by var/datum/weakref/tracked_human_ref + /// Weakref to the connect_containers component that tracks the human + var/datum/weakref/connect_ref /datum/component/loads_avatar_gear/Initialize(datum/callback/load_callback) if(!isitem(parent)) @@ -18,14 +20,14 @@ var/static/list/loc_connections = list( COMSIG_ATOM_ENTERING = PROC_REF(on_entered_loc), ) - AddComponent(/datum/component/connect_containers, parent, loc_connections) + connect_ref = WEAKREF(AddComponent(/datum/component/connect_containers, parent, loc_connections)) /datum/component/loads_avatar_gear/UnregisterFromParent() UnregisterSignal(parent, list( COMSIG_ATOM_ENTERING, )) - qdel(GetComponent(/datum/component/connect_containers)) + qdel(connect_ref) /datum/component/loads_avatar_gear/Destroy(force) load_callback = null diff --git a/code/modules/cards/cards.dm b/code/modules/cards/cards.dm index 3a18b36f86db..fbfa2a396587 100644 --- a/code/modules/cards/cards.dm +++ b/code/modules/cards/cards.dm @@ -102,7 +102,10 @@ card_atoms += card if(istype(card_item, /obj/item/toy/cards/cardhand)) - qdel(card_item) + var/obj/item/toy/cards/cardhand/recycled_cardhand = card_item + recycled_cardhand.card_atoms -= cards_to_add + if (!length(recycled_cardhand.fetch_card_atoms())) + qdel(card_item) update_appearance() return cards_to_add diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index b12ee087494d..7d1d61064301 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/exports.dm b/code/modules/cargo/exports.dm index f2de2cfa8fe8..1e140d646df2 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -46,9 +46,12 @@ Then the player gets the profit from selling his own wasted time. ** dry_run: if the item should be actually sold, or if it's just a pirce test ** external_report: works as "transaction" object, pass same one in if you're doing more than one export in single go ** ignore_typecache: typecache containing types that should be completely ignored - ** export_market: Defines the market that the items are being sold to. + ** export_markets: Defines the market that the items are being sold to. */ -/proc/export_item_and_contents(atom/movable/exported_atom, apply_elastic = TRUE, delete_unsold = TRUE, dry_run = FALSE, datum/export_report/external_report, list/ignore_typecache, export_market = EXPORT_MARKET_STATION) +/proc/export_item_and_contents(atom/movable/exported_atom, apply_elastic = TRUE, delete_unsold = TRUE, dry_run = FALSE, datum/export_report/external_report, list/ignore_typecache, export_markets = list(EXPORT_MARKET_STATION)) + if(!islist(export_markets)) + export_markets = list(export_markets) + external_report = init_export(external_report) var/list/contents = exported_atom.get_all_contents_ignoring(ignore_typecache) @@ -56,7 +59,7 @@ Then the player gets the profit from selling his own wasted time. // We go backwards, so it'll be innermost objects sold first. We also make sure nothing is accidentally delete before everything is sold. var/list/to_delete = list() for(var/atom/movable/thing as anything in reverse_range(contents)) - var/sold = _export_loop(thing, apply_elastic, dry_run, external_report, export_market) + var/sold = _export_loop(thing, apply_elastic, dry_run, external_report, export_markets) if(!dry_run && (sold || delete_unsold) && sold != EXPORT_SOLD_DONT_DELETE) if(ismob(thing)) thing.investigate_log("deleted through cargo export", INVESTIGATE_CARGO) @@ -69,10 +72,10 @@ Then the player gets the profit from selling his own wasted time. return external_report /// It works like export_item_and_contents(), however it ignores the contents. Meaning only `exported_atom` will be valued. -/proc/export_single_item(atom/movable/exported_atom, apply_elastic = TRUE, delete_unsold = TRUE, dry_run = FALSE, datum/export_report/external_report, export_market = EXPORT_MARKET_STATION) +/proc/export_single_item(atom/movable/exported_atom, apply_elastic = TRUE, delete_unsold = TRUE, dry_run = FALSE, datum/export_report/external_report, export_markets = list(EXPORT_MARKET_STATION)) external_report = init_export(external_report) - var/sold = _export_loop(exported_atom, apply_elastic, dry_run, external_report, export_market) + var/sold = _export_loop(exported_atom, apply_elastic, dry_run, external_report, export_markets) if(!dry_run && (sold || delete_unsold) && sold != EXPORT_SOLD_DONT_DELETE) if(ismob(exported_atom)) exported_atom.investigate_log("deleted through cargo export", INVESTIGATE_CARGO) @@ -81,10 +84,10 @@ Then the player gets the profit from selling his own wasted time. return external_report /// The main bit responsible for selling the item. Shared by export_single_item() and export_item_and_contents() -/proc/_export_loop(atom/movable/exported_atom, apply_elastic = TRUE, dry_run = FALSE, datum/export_report/external_report, export_market) +/proc/_export_loop(atom/movable/exported_atom, apply_elastic = TRUE, dry_run = FALSE, datum/export_report/external_report, export_markets) var/sold = EXPORT_NOT_SOLD for(var/datum/export/export as anything in GLOB.exports_list) - if(export.applies_to(exported_atom, apply_elastic, export_market)) + if(export.applies_to(exported_atom, apply_elastic, export_markets)) if(!dry_run && (SEND_SIGNAL(exported_atom, COMSIG_ITEM_PRE_EXPORT) & COMPONENT_STOP_EXPORT)) break //Don't add value of unscannable items for a dry run report @@ -163,18 +166,19 @@ Then the player gets the profit from selling his own wasted time. return 1 /// Checks if the item is fit for export datum. -/datum/export/proc/applies_to(obj/exported_item, apply_elastic = TRUE, export_market) - if(!is_type_in_typecache(exported_item, export_types)) - return FALSE - if(include_subtypes && is_type_in_typecache(exported_item, exclude_types)) - return FALSE - if(!get_cost(exported_item, apply_elastic)) - return FALSE - if(export_market != sales_market) - return FALSE - if(exported_item.flags_1 & HOLOGRAM_1) - return FALSE - return TRUE +/datum/export/proc/applies_to(obj/exported_item, apply_elastic = TRUE, export_markets) + for(var/found_market in export_markets) + if(!is_type_in_typecache(exported_item, export_types)) + continue + if(include_subtypes && is_type_in_typecache(exported_item, exclude_types)) + continue + if(!get_cost(exported_item, apply_elastic)) + continue + if(found_market != sales_market) + continue + if(exported_item.flags_1 & HOLOGRAM_1) + continue + return TRUE /** * Calculates the exact export value of the object, while factoring in all the relivant variables. diff --git a/code/modules/cargo/markets/market_items/consumables.dm b/code/modules/cargo/markets/market_items/consumables.dm index a8c7c72cd453..e06a9fc0fdb4 100644 --- a/code/modules/cargo/markets/market_items/consumables.dm +++ b/code/modules/cargo/markets/market_items/consumables.dm @@ -74,3 +74,69 @@ price_min = CARGO_CRATE_VALUE * 0.25 price_max = CARGO_CRATE_VALUE * 0.75 availability_prob = 90 + +/datum/market_item/consumable/methshipment + name = "Wholesale Methaphemtamine Shipment" + desc = "Dealer quantity! Don't get high on your own supply. Or do. You already bought it." + item = /obj/item/storage/box/methdealer + + stock_min = 1 + stock_max = 3 + price_min = CARGO_CRATE_VALUE * 0.5 + price_max = CARGO_CRATE_VALUE * 1.5 + availability_prob = 25 + +/datum/market_item/consumable/opiumshipment + name = "Wholesale Opium Shipment" + desc = "Are your coworkers stressed? We've got vice in bulk." + item = /obj/item/storage/box/opiumdealer + + stock_min = 1 + stock_max = 3 + price_min = CARGO_CRATE_VALUE * 0.5 + price_max = CARGO_CRATE_VALUE * 1.2 + availability_prob = 35 + +/datum/market_item/consumable/kronkshipment + name = "Wholesale Kronkaine Shipment" + desc = "Warning! Security might actually care about this one!" + item = /obj/item/storage/box/kronkdealer + + stock_min = 1 + stock_max = 3 + price_min = CARGO_CRATE_VALUE * 1 + price_max = CARGO_CRATE_VALUE * 2 + availability_prob = 15 + +/datum/market_item/consumable/methaphetamine + name = "Crystal Meth" + desc = "A big rock, for when you just need a hit." + item = /obj/item/food/drug/meth_crystal + + stock_min = 1 + stock_max = 5 + price_min = CARGO_CRATE_VALUE * 0.4 + price_max = CARGO_CRATE_VALUE * 0.5 + availability_prob = 35 + +/datum/market_item/consumable/heroin + name = "Heroin" + desc = "Chase the dragon." + item = /obj/item/food/drug/opium + + stock_min = 1 + stock_max = 5 + price_min = CARGO_CRATE_VALUE * 0.35 + price_max = CARGO_CRATE_VALUE * 0.5 + availability_prob = 45 + +/datum/market_item/consumable/kronkaine + name = "Kronkaine" + desc = "An 8⁸ ball, this is hardly ever on the market!" + item = /obj/item/food/drug/moon_rock + + stock_min = 1 + stock_max = 2 + price_min = CARGO_CRATE_VALUE * 0.5 + price_max = CARGO_CRATE_VALUE * 1 + availability_prob = 15 diff --git a/code/modules/cargo/markets/market_items/misc.dm b/code/modules/cargo/markets/market_items/misc.dm index 69bfef56fe01..7f1ede77d53f 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/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm index 41f397439358..ccbca24f8188 100644 --- a/code/modules/cargo/packs/imports.dm +++ b/code/modules/cargo/packs/imports.dm @@ -99,7 +99,7 @@ desc = "I'm not sure why you bothered to buy this...and why does it cost so much?" cost = CARGO_CRATE_VALUE * 5 contains = list( - /obj/effect/spawner/random/maintenance/three, + /obj/effect/spawner/random/maintenance/dumpster, /obj/effect/spawner/random/trash/garbage = 5, ) crate_name = "putrid dumpster" diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm index 1d06060d91fd..d1bac0a82f86 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 97801af313ad..af6d206ccd5e 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -200,7 +200,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. @@ -235,7 +235,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/_chameleon_action.dm b/code/modules/clothing/chameleon/_chameleon_action.dm index d0fdf8269914..4befe80fbe82 100644 --- a/code/modules/clothing/chameleon/_chameleon_action.dm +++ b/code/modules/clothing/chameleon/_chameleon_action.dm @@ -120,6 +120,7 @@ if(ismob(chameleon_item.loc)) var/mob/wearer = chameleon_item.loc wearer.update_clothing(chameleon_item.slot_flags | ITEM_SLOT_HANDS) + wearer.refresh_obscured() /datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item) PROTECTED_PROC(TRUE) // Call update_look, not this! diff --git a/code/modules/clothing/chameleon/generic_chameleon_clothing.dm b/code/modules/clothing/chameleon/generic_chameleon_clothing.dm index 3749f84d6700..a8f03b0b3f98 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 4fb5a44a6bc0..d648a551abfe 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. @@ -569,12 +571,12 @@ BLIND // can't see anything if(user.is_holding(src)) user.update_held_items() return TRUE - if(up) - user.update_obscured_slots(visor_flags_inv) user.update_clothing(slot_flags) if(!iscarbon(user)) return TRUE var/mob/living/carbon/carbon_user = user + if(up) + carbon_user.refresh_obscured() if(visor_vars_to_toggle & VISOR_TINT) carbon_user.update_tint() if((visor_flags & (MASKINTERNALS|HEADINTERNALS)) && carbon_user.invalid_internals()) diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index e14fb8a13ddc..a5a654687c59 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 9147a0e1e15b..69476431f6d7 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 f1c7785e323e..20b321592b70 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 df1e00cf3a84..c3d44c9c760d 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 a732613edf73..71e3b789a6cf 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/animalears.dm b/code/modules/clothing/head/animalears.dm index 77ed57a9083c..bcb5ffb63edd 100644 --- a/code/modules/clothing/head/animalears.dm +++ b/code/modules/clothing/head/animalears.dm @@ -10,7 +10,7 @@ if(ishuman(user) && (slot & ITEM_SLOT_HEAD)) update_icon(ALL, user) user.update_worn_head() //Color might have been changed by update_appearance. - ..() + return ..() /obj/item/clothing/head/costume/kitty/update_icon(updates=ALL, mob/living/carbon/human/user) . = ..() diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index ef9385f40ef3..8c10a3126d5f 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 971470bdf1d8..7607dc8631ca 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 86476cceb215..a6402607781f 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" @@ -326,7 +327,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|HIDEHAIR cold_protection = HEAD @@ -334,9 +341,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) @@ -352,9 +359,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/cosmetic_sec + 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 d593119dafe9..be5c86740c38 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 bed6d8afab77..8682dc4a9276 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 fd900810e67c..2913ae101fff 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 @@ -91,6 +92,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) to_chat(M, span_userdanger("[src] was cursed!")) M.update_worn_mask() + M.refresh_obscured() /obj/item/clothing/mask/animal/proc/clear_curse() REMOVE_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT) @@ -192,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 41e4e48dd6b2..8ddfcf5520fa 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 3a5982712bd2..b70e7105bf4c 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 @@ -248,7 +249,7 @@ var/heart_strength var/pulse_pressure - + var/having_heart_attack = carbon_patient.has_status_effect(/datum/status_effect/heart_attack) var/heart_noises = TRUE var/obj/item/organ/heart/heart = carbon_patient.get_organ_slot(ORGAN_SLOT_HEART) @@ -292,6 +293,8 @@ if(isnull(heart) || !heart.is_beating() || carbon_patient.stat == DEAD) render_list += "You don't hear a heartbeat!\n"//they're dead or their heart isn't beating heart_noises = FALSE + else if(having_heart_attack) + render_list += "You hear a rapid, irregular heartbeat.\n" else if(heart.damage > 10 || carbon_patient.blood_volume <= BLOOD_VOLUME_OKAY) render_list += "You hear a weak heartbeat.\n"//their heart is damaged, or they have critical blood else @@ -304,28 +307,25 @@ user.visible_message(span_notice("[user] presses their hands against [carbon_patient]'s abdomen."), ignored_mobs = user) //assess abdominal organs - if(body_part == BODY_ZONE_PRECISE_GROIN) - var/appendix_okay = TRUE - var/liver_okay = TRUE - if(!liver)//sanity check, ensure the patient actually has a liver - render_list += "You can't feel anything where [target.p_their()] liver would be.\n" + var/appendix_okay = TRUE + var/liver_okay = TRUE + if(!liver)//sanity check, ensure the patient actually has a liver + render_list += "You can't feel anything where [target.p_their()] liver would be.\n" + liver_okay = FALSE + else + if(liver.damage > 10) + render_list += "[target.p_Their()] liver feels firm.\n"//their liver is damaged liver_okay = FALSE - else - if(liver.damage > 10) - render_list += "[target.p_Their()] liver feels firm.\n"//their liver is damaged - liver_okay = FALSE - - if(!appendix)//sanity check, ensure the patient actually has an appendix - render_list += "You can't feel anything where [target.p_their()] appendix would be.\n" + if(!appendix)//sanity check, ensure the patient actually has an appendix + render_list += "You can't feel anything where [target.p_their()] appendix would be.\n" + appendix_okay = FALSE + else + if(appendix.damage > 10 && carbon_patient.stat == CONSCIOUS) + render_list += "[target] screams when you lift your hand from [target.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake + target.emote("scream") appendix_okay = FALSE - else - if(appendix.damage > 10 && carbon_patient.stat == CONSCIOUS) - render_list += "[target] screams when you lift your hand from [target.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake - target.emote("scream") - appendix_okay = FALSE - - if(liver_okay && appendix_okay)//if they have all their organs and have no detectable damage - render_list += "You don't find anything abnormal.\n"//they're okay :D + if(liver_okay && appendix_okay)//if they have all their organs and have no detectable damage + render_list += "You don't find anything abnormal.\n"//they're okay :D if(BODY_ZONE_PRECISE_EYES) balloon_alert(user, "can't do that!") @@ -347,12 +347,14 @@ if(isnull(heart) || !heart.is_beating() || carbon_patient.blood_volume <= BLOOD_VOLUME_OKAY || carbon_patient.stat == DEAD) render_list += "You can't find a pulse!\n"//they're dead, their heart isn't beating, or they have critical blood else - if(heart.damage > 10) - heart_strength = span_danger("irregular")//their heart is damaged + if(having_heart_attack) + heart_strength = span_danger("irregular") + else if(heart.damage > 10) + heart_strength = span_danger("weak")//their heart is damaged else heart_strength = span_notice("regular")//they're okay :D - if(carbon_patient.blood_volume <= BLOOD_VOLUME_SAFE && carbon_patient.blood_volume > BLOOD_VOLUME_OKAY) + if((carbon_patient.blood_volume <= BLOOD_VOLUME_SAFE && carbon_patient.blood_volume > BLOOD_VOLUME_OKAY) || having_heart_attack) pulse_pressure = span_danger("thready")//low blood else pulse_pressure = span_notice("strong")//they're okay :D diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 1d57e38ac395..dc3dbe27cf91 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' @@ -77,7 +78,7 @@ . += "The [fastening_type] are all knotted together." /obj/item/clothing/shoes/visual_equipped(mob/user, slot) - ..() + . = ..() if(offset && (slot_flags & slot)) user.pixel_z += offset worn_y_dimension -= (offset * 2) diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 6df25ca10bb1..74bb02622fcb 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 939912dd95e7..3fc343810cb6 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 @@ -755,6 +756,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 77c3478abdb9..656cdd287bdf 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 52c19be3bd16..d5d9c370ae95 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 ddd05bf5ab6d..820aeba2e14e 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 1040bc03120d..12ba36c89eb7 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 0d03a6362013..552e69dcffa5 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 @@ -290,9 +291,6 @@ 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) @@ -315,35 +313,25 @@ 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() - -/// 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 + if(update) + update_accessory_overlay() -/// 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) @@ -355,8 +343,9 @@ /// 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() @@ -533,4 +522,5 @@ 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 60fcbf97e5cb..0e4e2f981907 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 1d39d2f1ad71..c2c1325d4aaa 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 ccd268eb7641..38bcafe12114 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 d906bc3d8792..923cfbaa74ce 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 85ce2c2976f4..257312ffff83 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 9937e23929a1..6cf86c8770e6 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 bb65ef5801f7..b5731ac06a41 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 1753c9311e1e..8d6753afadb7 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 034641d35b19..b351bd2a17e1 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 ba7a6b8c0ba6..91ca031837f7 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 90f05d8f2ea6..ea76c0b61533 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/economy/account.dm b/code/modules/economy/account.dm index 8ec8e5b2d8a5..986def70031c 100644 --- a/code/modules/economy/account.dm +++ b/code/modules/economy/account.dm @@ -37,6 +37,8 @@ var/list/transaction_history = list() ///A lazylist of coupons redeemed with the Coupon Master pda app associated with this account. var/list/redeemed_coupons + /// How many paychecks to skip when payday is called. + var/paydays_to_skip = 0 /datum/bank_account/New(newname, job, modifier = 1, player_account = TRUE) account_holder = newname @@ -188,10 +190,21 @@ * Arguments: * * amount_of_paychecks - literally the number of salaries, 1 for issuing one salary, 5 for issuing five salaries. * * free - issuance of free funds, if TRUE then takes funds from the void, if FALSE (default) tries to send from the department's account. + * * skippable - if TRUE, this proc may pay out nothing if the account has paydays_to_skip + * * event - the name of the event that is being processed, used for bank card messages. */ -/datum/bank_account/proc/payday(amount_of_paychecks, free = FALSE) +/datum/bank_account/proc/payday(amount_of_paychecks, free = FALSE, skippable = FALSE, event = "Payday") if(!account_job) - return + return FALSE + + if(skippable && !free) + while(paydays_to_skip > 0 && amount_of_paychecks > 0) + amount_of_paychecks -= 1 + paydays_to_skip -= 1 + + if(amount_of_paychecks <= 0) + return FALSE + var/money_to_transfer = round(account_job.paycheck * payday_modifier * amount_of_paychecks) if(amount_of_paychecks == 1) money_to_transfer = clamp(money_to_transfer, 0, PAYCHECK_CREW) //We want to limit single, passive paychecks to regular crew income. @@ -201,17 +214,15 @@ SSeconomy.station_target += money_to_transfer log_econ("[money_to_transfer] credits were given to [src.account_holder]'s account from income.") return TRUE - else - var/datum/bank_account/department_account = SSeconomy.get_dep_account(account_job.paycheck_department) - if(department_account) - if(!transfer_money(department_account, money_to_transfer)) - bank_card_talk("ERROR: Payday aborted, departmental funds insufficient.") - return FALSE - else - bank_card_talk("Payday processed, account now holds [account_balance] cr.") - return TRUE - bank_card_talk("ERROR: Payday aborted, unable to contact departmental account.") - return FALSE + var/datum/bank_account/department_account = SSeconomy.get_dep_account(account_job.paycheck_department) + if(isnull(department_account)) + bank_card_talk("ERROR: [event] aborted, unable to contact departmental account.") + return FALSE + if(!transfer_money(department_account, money_to_transfer)) + bank_card_talk("ERROR: [event] aborted, departmental funds insufficient.") + return FALSE + bank_card_talk("[event] processed, account now holds [account_balance] cr.") + return TRUE /** * This sends a local chat message to the owner of a bank account, on all ID cards registered to the bank_account. diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm index 8a9d922ee822..9db702169dd6 100644 --- a/code/modules/events/space_vines/vine_mutations.dm +++ b/code/modules/events/space_vines/vine_mutations.dm @@ -1,6 +1,8 @@ /datum/spacevine_mutation /// Displayed name of mutation var/name = "" + /// Description of mutation, shown in the plant analyzer + var/description = "" /// Severity of mutation in terms of gameplay, affects appearance chance and how many mutations can be on the same vine var/severity = 1 /// The mutation's contribution to a given vine's color @@ -64,6 +66,7 @@ /datum/spacevine_mutation/light name = "Light" + description = "Emits light." hue = "#B2EA70" quality = POSITIVE severity = SEVERITY_TRIVIAL @@ -74,6 +77,7 @@ /datum/spacevine_mutation/toxicity name = "Toxic" + description = "Releases toxins when touched or eaten." hue = "#9B3675" severity = SEVERITY_AVERAGE quality = NEGATIVE @@ -91,6 +95,7 @@ /datum/spacevine_mutation/explosive // JC IT'S A BOMB name = "Explosive" + description = "Causes an explosion when destroyed." hue = "#D83A56" quality = NEGATIVE severity = SEVERITY_MAJOR @@ -108,6 +113,7 @@ /datum/spacevine_mutation/fire_proof name = "Fire proof" + description = "Provides immunity to heat and burn damage." hue = "#FF616D" quality = MINOR_NEGATIVE severity = SEVERITY_ABOVE_AVERAGE @@ -123,6 +129,7 @@ /datum/spacevine_mutation/cold_proof name = "Cold proof" + description = "Provides immunity to cold damage." hue = "#0BD5D9" quality = MINOR_NEGATIVE severity = SEVERITY_AVERAGE @@ -133,6 +140,7 @@ /datum/spacevine_mutation/temp_stabilisation name = "Temperature stabilisation" + description = "Stabilizes the temperature of the surrounding area." hue = "#B09856" quality = POSITIVE severity = SEVERITY_MINOR @@ -156,6 +164,7 @@ /datum/spacevine_mutation/vine_eating name = "Vine eating" + description = "Destroys other Kudzu vines on spread." hue = "#F4A442" quality = MINOR_NEGATIVE severity = SEVERITY_MINOR @@ -167,6 +176,7 @@ /datum/spacevine_mutation/aggressive_spread //very OP, but im out of other ideas currently name = "Aggressive spreading" + description = "Heavily wounds mobs when spreading or tangling them." hue = "#316b2f" severity = SEVERITY_MAJOR quality = NEGATIVE @@ -222,6 +232,7 @@ /datum/spacevine_mutation/transparency name = "transparent" + description = "Allows light to pass through." hue = "" quality = POSITIVE severity = SEVERITY_TRIVIAL @@ -232,6 +243,7 @@ /datum/spacevine_mutation/oxy_eater name = "Oxygen consuming" + description = "Consumes Oxygen from the surrounding area." hue = "#28B5B5" severity = SEVERITY_AVERAGE quality = NEGATIVE @@ -247,6 +259,7 @@ /datum/spacevine_mutation/nitro_eater name = "Nitrogen consuming" + description = "Consumes Nitrogen from the surrounding area." hue = "#FF7B54" severity = SEVERITY_AVERAGE quality = NEGATIVE @@ -262,6 +275,7 @@ /datum/spacevine_mutation/carbondioxide_eater name = "CO2 consuming" + description = "Consumes Carbon Dioxide from the surrounding area." hue = "#798777" severity = SEVERITY_MINOR quality = POSITIVE @@ -277,6 +291,7 @@ /datum/spacevine_mutation/plasma_eater name = "Plasma consuming" + description = "Consumes Plasma from the surrounding area." hue = "#9074b6" severity = SEVERITY_AVERAGE quality = POSITIVE @@ -292,6 +307,7 @@ /datum/spacevine_mutation/thorns name = "Thorny" + description = "Causes damage when hitting or passing through the vines." hue = "#9ECCA4" severity = SEVERITY_AVERAGE quality = NEGATIVE @@ -324,6 +340,7 @@ /datum/spacevine_mutation/hardened name = "Hardened" + description = "Provides resistance to cutting attacks, makes vines hardier, and prevents light from passing through." hue = "#997700" quality = NEGATIVE severity = SEVERITY_ABOVE_AVERAGE @@ -340,6 +357,7 @@ /datum/spacevine_mutation/timid name = "Timid" + description = "Hides the vines under structures and prevents them from tangling mobs." hue = "#a4a9ac" quality = POSITIVE severity = SEVERITY_MINOR @@ -354,6 +372,7 @@ /datum/spacevine_mutation/flowering name = "Flowering" + description = "Causes the vine to grow flower buds which spawns man eating plants when fully grown." hue = "#66DE93" quality = NEGATIVE severity = SEVERITY_MAJOR diff --git a/code/modules/experisci/experiment/physical_experiments.dm b/code/modules/experisci/experiment/physical_experiments.dm index 60303814e44e..11075d1c75ec 100644 --- a/code/modules/experisci/experiment/physical_experiments.dm +++ b/code/modules/experisci/experiment/physical_experiments.dm @@ -43,12 +43,12 @@ linked_experiment_handler.announce_message("Incorrect object for experiment.") return FALSE - RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND, PROC_REF(win_arcade)) + RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_VICTORY, PROC_REF(win_arcade)) linked_experiment_handler.announce_message("Experiment ready to start.") return TRUE /datum/experiment/physical/arcade_winner/unregister_events() - UnregisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND) + UnregisterSignal(currently_scanned_atom, COMSIG_ARCADE_VICTORY) /datum/experiment/physical/arcade_winner/check_progress() . += EXPERIMENT_PROG_BOOL("Win an arcade game at a tracked arcade cabinet.", is_complete()) diff --git a/code/modules/explorer_drone/exploration_events/_exploration_event.dm b/code/modules/explorer_drone/exploration_events/_exploration_event.dm index 5385a48fbb4e..d60b730e07de 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 bdf9b62c10b5..f7127d677785 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 605974fa8289..5a4d70207423 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 762f661aa6cf..908ad0cb81d8 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 0367eb71516e..ba0bbdf22eda 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 9a21203d5962..4a8be99417e7 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/fishing/fish/types/rift.dm b/code/modules/fishing/fish/types/rift.dm index eb72c82ac448..ba6a0142ed44 100644 --- a/code/modules/fishing/fish/types/rift.dm +++ b/code/modules/fishing/fish/types/rift.dm @@ -722,12 +722,7 @@ icon_state = "babbearfish" /datum/bodypart_overlay/simple/babbearfish/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner) - var/mob/living/carbon/human/human = bodypart_owner.owner - if(!istype(human)) - return TRUE - if((human.head?.flags_inv & HIDEEARS) || (human.wear_mask?.flags_inv & HIDEEARS)) - return FALSE - return TRUE + return !(bodypart_owner.owner?.obscured_slots & HIDEEARS) /obj/item/organ/ears/babbelfish/Initialize(mapload) . = ..() diff --git a/code/modules/fishing/sources/subtypes/surgery.dm b/code/modules/fishing/sources/subtypes/surgery.dm index 3beaa1d2fd98..0ee2b06d856a 100644 --- a/code/modules/fishing/sources/subtypes/surgery.dm +++ b/code/modules/fishing/sources/subtypes/surgery.dm @@ -12,9 +12,13 @@ wait_time_range = list(6 SECONDS, 12 SECONDS) /datum/fish_source/surgery/spawn_reward(reward_path, atom/spawn_location, atom/fishing_spot, obj/item/fishing_rod/used_rod) + if(reward_path != FISHING_RANDOM_ORGAN) + return ..() + if(istype(fishing_spot, /obj/machinery/fishing_portal_generator)) var/obj/machinery/fishing_portal_generator/portal = fishing_spot fishing_spot = portal.current_linked_atom + if(!iscarbon(fishing_spot)) var/random_type = pick(subtypesof(/obj/item/organ) - GLOB.prototype_organs) return new random_type(spawn_location) diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm index 2659d9800a40..192760ed4474 100644 --- a/code/modules/food_and_drinks/machinery/coffeemaker.dm +++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm @@ -160,11 +160,22 @@ /obj/machinery/coffeemaker/proc/replace_pot(mob/living/user, obj/item/reagent_containers/cup/coffeepot/new_coffeepot) if(!user) return FALSE - if(coffeepot) + + // If we're trying to eject/remove the current pot + if(!new_coffeepot) + if(!coffeepot) + balloon_alert(user, "no coffeepot to remove!") + return FALSE try_put_in_hand(coffeepot, user) - if(new_coffeepot) + balloon_alert(user, "coffeepot returned") + coffeepot = null + else + // If we're replacing with a new pot + if(coffeepot) + try_put_in_hand(coffeepot, user) coffeepot = new_coffeepot - balloon_alert(user, "replaced pot") + balloon_alert(user, "coffeepot inserted") + update_appearance(UPDATE_OVERLAYS) return TRUE @@ -183,90 +194,92 @@ default_unfasten_wrench(user, tool) return ITEM_INTERACT_SUCCESS -/obj/machinery/coffeemaker/attackby(obj/item/attack_item, mob/living/user, list/modifiers, list/attack_modifiers) +/obj/machinery/coffeemaker/item_interaction(mob/living/user, obj/item/tool, list/modifiers) //You can only screw open empty grinder - if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, attack_item)) - return FALSE + if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, tool)) + return ITEM_INTERACT_SUCCESS - if(default_deconstruction_crowbar(attack_item)) - return + if(default_deconstruction_crowbar(tool)) + return ITEM_INTERACT_SUCCESS if(panel_open) //Can't insert objects when its screwed open - return TRUE + return ITEM_INTERACT_BLOCKING - if (istype(attack_item, /obj/item/reagent_containers/cup/coffeepot) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container()) - var/obj/item/reagent_containers/cup/coffeepot/new_pot = attack_item - . = TRUE //no afterattack + if (istype(tool, /obj/item/reagent_containers/cup/coffeepot) && !(tool.item_flags & ABSTRACT) && tool.is_open_container()) + var/obj/item/reagent_containers/cup/coffeepot/new_pot = tool + . = ITEM_INTERACT_SUCCESS //no afterattack if(!user.transferItemToLoc(new_pot, src)) - return TRUE + return ITEM_INTERACT_BLOCKING replace_pot(user, new_pot) update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/cup/glass/coffee_cup) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container()) - var/obj/item/reagent_containers/cup/glass/coffee_cup/new_cup = attack_item + if (istype(tool, /obj/item/reagent_containers/cup/glass/coffee_cup) && !(tool.item_flags & ABSTRACT) && tool.is_open_container()) + var/obj/item/reagent_containers/cup/glass/coffee_cup/new_cup = tool if(new_cup.reagents.total_volume > 0) balloon_alert(user, "the cup must be empty!") - return + return ITEM_INTERACT_BLOCKING if(coffee_cups >= max_coffee_cups) balloon_alert(user, "the cup holder is full!") - return - if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING coffee_cups++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/sugar)) - var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = attack_item + if (istype(tool, /obj/item/reagent_containers/condiment/pack/sugar)) + var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = tool if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume) balloon_alert(user, "the pack must be full!") - return + return ITEM_INTERACT_BLOCKING if(sugar_packs >= max_sugar_packs) balloon_alert(user, "the sugar compartment is full!") - return - if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING sugar_packs++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/condiment/creamer)) - var/obj/item/reagent_containers/condiment/creamer/new_pack = attack_item + if (istype(tool, /obj/item/reagent_containers/condiment/creamer)) + var/obj/item/reagent_containers/condiment/creamer/new_pack = tool if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume) balloon_alert(user, "the pack must be full!") - return + return ITEM_INTERACT_BLOCKING if(creamer_packs >= max_creamer_packs) balloon_alert(user, "the creamer compartment is full!") - return - if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING creamer_packs++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/astrotame)) - var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = attack_item + if (istype(tool, /obj/item/reagent_containers/condiment/pack/astrotame)) + var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = tool if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume) balloon_alert(user, "the pack must be full!") - return + return ITEM_INTERACT_BLOCKING else if(sweetener_packs >= max_sweetener_packs) balloon_alert(user, "the sweetener compartment is full!") - return - else if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + else if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING sweetener_packs++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/coffee_cartridge) && !(attack_item.item_flags & ABSTRACT)) - var/obj/item/coffee_cartridge/new_cartridge = attack_item + if (istype(tool, /obj/item/coffee_cartridge) && !(tool.item_flags & ABSTRACT)) + var/obj/item/coffee_cartridge/new_cartridge = tool if(!user.transferItemToLoc(new_cartridge, src)) - return + return ITEM_INTERACT_BLOCKING replace_cartridge(user, new_cartridge) balloon_alert(user, "added cartridge") update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack + + return NONE // Allow normal attack processing if no special interaction occurred /obj/machinery/coffeemaker/proc/try_brew() if(!cartridge) @@ -582,101 +595,102 @@ return FALSE return TRUE -/obj/machinery/coffeemaker/impressa/attackby(obj/item/attack_item, mob/living/user, list/modifiers, list/attack_modifiers) +/obj/machinery/coffeemaker/impressa/item_interaction(mob/living/user, obj/item/tool, list/modifiers) //You can only screw open empty grinder - if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, attack_item)) - return + if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, tool)) + return ITEM_INTERACT_SUCCESS - if(default_deconstruction_crowbar(attack_item)) - return + if(default_deconstruction_crowbar(tool)) + return ITEM_INTERACT_SUCCESS if(panel_open) //Can't insert objects when its screwed open - return TRUE + return ITEM_INTERACT_BLOCKING - if (istype(attack_item, /obj/item/reagent_containers/cup/coffeepot) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container()) - var/obj/item/reagent_containers/cup/coffeepot/new_pot = attack_item + if (istype(tool, /obj/item/reagent_containers/cup/coffeepot) && !(tool.item_flags & ABSTRACT) && tool.is_open_container()) + var/obj/item/reagent_containers/cup/coffeepot/new_pot = tool if(!user.transferItemToLoc(new_pot, src)) - return TRUE + return ITEM_INTERACT_BLOCKING replace_pot(user, new_pot) update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/cup/glass/coffee) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container()) - var/obj/item/reagent_containers/cup/glass/coffee/new_cup = attack_item //different type of cup + if (istype(tool, /obj/item/reagent_containers/cup/glass/coffee) && !(tool.item_flags & ABSTRACT) && tool.is_open_container()) + var/obj/item/reagent_containers/cup/glass/coffee/new_cup = tool //different type of cup if(new_cup.reagents.total_volume > 0 ) balloon_alert(user, "the cup must be empty!") - return + return ITEM_INTERACT_BLOCKING if(coffee_cups >= max_coffee_cups) balloon_alert(user, "the cup holder is full!") - return - if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING coffee_cups++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/sugar)) - var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = attack_item + if (istype(tool, /obj/item/reagent_containers/condiment/pack/sugar)) + var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = tool if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume) balloon_alert(user, "the pack must be full!") - return + return ITEM_INTERACT_BLOCKING if(sugar_packs >= max_sugar_packs) balloon_alert(user, "the sugar compartment is full!") - return - if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING sugar_packs++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/condiment/creamer)) - var/obj/item/reagent_containers/condiment/creamer/new_pack = attack_item + if (istype(tool, /obj/item/reagent_containers/condiment/creamer)) + var/obj/item/reagent_containers/condiment/creamer/new_pack = tool if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume) balloon_alert(user, "the pack must be full!") - return + return ITEM_INTERACT_BLOCKING if(creamer_packs >= max_creamer_packs) balloon_alert(user, "the creamer compartment is full!") - return - if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING creamer_packs++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/astrotame)) - var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = attack_item + if (istype(tool, /obj/item/reagent_containers/condiment/pack/astrotame)) + var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = tool if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume) balloon_alert(user, "the pack must be full!") - return + return ITEM_INTERACT_BLOCKING if(sweetener_packs >= max_sweetener_packs) balloon_alert(user, "the sweetener compartment is full!") - return - if(!user.transferItemToLoc(attack_item, src)) - return + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING sweetener_packs++ update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return ITEM_INTERACT_SUCCESS //no afterattack - if (istype(attack_item, /obj/item/food/grown/coffee) && !(attack_item.item_flags & ABSTRACT)) + if (istype(tool, /obj/item/food/grown/coffee) && !(tool.item_flags & ABSTRACT)) if(coffee_amount >= BEAN_CAPACITY) balloon_alert(user, "the coffee container is full!") - return - if(!HAS_TRAIT(attack_item, TRAIT_DRIED)) + return ITEM_INTERACT_BLOCKING + if(!HAS_TRAIT(tool, TRAIT_DRIED)) balloon_alert(user, "coffee beans must be dry!") - return - var/obj/item/food/grown/coffee/new_coffee = attack_item + return ITEM_INTERACT_BLOCKING + var/obj/item/food/grown/coffee/new_coffee = tool if(!user.transferItemToLoc(new_coffee, src)) - return + return ITEM_INTERACT_BLOCKING coffee += new_coffee coffee_amount++ balloon_alert(user, "added coffee") + update_appearance(UPDATE_OVERLAYS) + return ITEM_INTERACT_SUCCESS //no afterattack - - if (istype(attack_item, /obj/item/storage/box/coffeepack)) + if (istype(tool, /obj/item/storage/box/coffeepack)) if(coffee_amount >= BEAN_CAPACITY) balloon_alert(user, "the coffee container is full!") - return - var/obj/item/storage/box/coffeepack/new_coffee_pack = attack_item + return ITEM_INTERACT_BLOCKING + var/obj/item/storage/box/coffeepack/new_coffee_pack = tool for(var/obj/item/food/grown/coffee/new_coffee in new_coffee_pack.contents) if(HAS_TRAIT(new_coffee, TRAIT_DRIED)) //the coffee beans inside must be dry if(coffee_amount < BEAN_CAPACITY) @@ -687,15 +701,16 @@ balloon_alert(user, "added coffee") update_appearance(UPDATE_OVERLAYS) else - return + return ITEM_INTERACT_BLOCKING else - return + return ITEM_INTERACT_BLOCKING else balloon_alert(user, "non-dried beans inside of coffee pack!") - return + return ITEM_INTERACT_BLOCKING + update_appearance(UPDATE_OVERLAYS) + return ITEM_INTERACT_SUCCESS //no afterattack - update_appearance(UPDATE_OVERLAYS) - return TRUE //no afterattack + return NONE // Allow normal attack processing if no special interaction occurred /obj/machinery/coffeemaker/impressa/take_cup(mob/user) if(!coffee_cups) //shouldn't happen, but we all know how stuff manages to break diff --git a/code/modules/food_and_drinks/machinery/griddle.dm b/code/modules/food_and_drinks/machinery/griddle.dm index f5ff1c140e88..5d0beed7ee0a 100644 --- a/code/modules/food_and_drinks/machinery/griddle.dm +++ b/code/modules/food_and_drinks/machinery/griddle.dm @@ -57,11 +57,6 @@ visible_message(span_notice("[exposing_reagent] begins to cook on [src].")) return NONE -/obj/machinery/griddle/crowbar_act(mob/living/user, obj/item/I) - . = ..() - return default_deconstruction_crowbar(I, ignore_panel = TRUE) - - /obj/machinery/griddle/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers) if(griddled_objects.len >= max_items) diff --git a/code/modules/food_and_drinks/machinery/oven.dm b/code/modules/food_and_drinks/machinery/oven.dm index 7b4ccb762801..a0d0ebad4176 100644 --- a/code/modules/food_and_drinks/machinery/oven.dm +++ b/code/modules/food_and_drinks/machinery/oven.dm @@ -270,6 +270,9 @@ return ITEM_INTERACT_SUCCESS /obj/item/plate/oven_tray/item_interaction(mob/living/user, obj/item/item, list/modifiers) + . = ..() + if(. & ITEM_INTERACT_ANY_BLOCKER) + return . if(isnull(item.atom_storage)) return NONE diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm index 243d4f0ef148..225e8d868650 100644 --- a/code/modules/food_and_drinks/plate.dm +++ b/code/modules/food_and_drinks/plate.dm @@ -24,26 +24,25 @@ if(fragile) AddElement(/datum/element/can_shatter) -/obj/item/plate/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers) - if(!IS_EDIBLE(I)) - balloon_alert(user, "not food!") - return - if(I.w_class > biggest_w_class) +/obj/item/plate/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!IS_EDIBLE(tool)) + return NONE + if(tool.w_class > biggest_w_class) balloon_alert(user, "too big!") - return + return ITEM_INTERACT_BLOCKING if(contents.len >= max_items) balloon_alert(user, "can't fit!") - return + return ITEM_INTERACT_BLOCKING //Center the icon where the user clicked. if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y)) - return - if(user.transferItemToLoc(I, src, silent = FALSE)) - I.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -max_x_offset, max_x_offset) - I.pixel_y = min(text2num(LAZYACCESS(modifiers, ICON_Y)) + placement_offset, max_height_offset) - to_chat(user, span_notice("You place [I] on [src].")) - AddToPlate(I, user) - else - return ..() + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src, silent = FALSE)) + return ITEM_INTERACT_BLOCKING + tool.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -max_x_offset, max_x_offset) + tool.pixel_y = min(text2num(LAZYACCESS(modifiers, ICON_Y)) + placement_offset, max_height_offset) + to_chat(user, span_notice("You place [tool] on [src].")) + AddToPlate(tool, user) + return ITEM_INTERACT_SUCCESS /obj/item/plate/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers) if(!iscarbon(target)) 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 78b9623c3a01..2b3cefec7dbd 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 3790c7a31008..9b4f82d0c349 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 97b5b0c00ece..35b162e29b79 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/forensics/forensics_helpers.dm b/code/modules/forensics/forensics_helpers.dm index 46c0bfa3a9df..5b32ee434182 100644 --- a/code/modules/forensics/forensics_helpers.dm +++ b/code/modules/forensics/forensics_helpers.dm @@ -200,7 +200,7 @@ var/dirty_hands = !!(target_flags & (ITEM_SLOT_GLOVES|ITEM_SLOT_HANDS)) var/dirty_feet = !!(target_flags & ITEM_SLOT_FEET) - var/slots_to_bloody = target_flags & ~check_covered_slots() + var/slots_to_bloody = target_flags & ~hidden_slots_to_inventory_slots(covered_slots) var/list/all_worn = get_equipped_items() for(var/obj/item/thing as anything in all_worn) if(thing.slot_flags & slots_to_bloody) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index f02632934549..0426d59ae012 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -26,8 +26,8 @@ var/processed_items_per_cycle = 5 /// The maximum amount of items the biogenerator can hold for biomass conversion purposes. var/max_items = 20 - /// The current amount of items that can be converted into biomass that the biogenerator is holding. - var/current_item_count = 0 + /// Cached amount of items currently in the biogenerator, for use in UI so we don't have to loop over contents every second while its open + var/content_count_cache = 0 /// The maximum amount of biomass that will affect the visuals of the biogenerator. var/max_visual_biomass = 5000 /// The maximum amount of reagents that the biogenerator can output to a container at once. @@ -155,7 +155,7 @@ . += span_notice(" - Productivity at [productivity * 100]%.") . += span_notice(" - Converting [processed_items_per_cycle] pieces of food per cycle.") . += span_notice(" - Matter consumption at [1 / efficiency * 100]%.") - . += span_notice(" - Internal biomass converter capacity at [max_items] pieces of food, and currently holding [current_item_count] piece\s.") + . += span_notice(" - Internal biomass converter capacity at [max_items] pieces of food, and currently holding [get_content_count()] piece\s.") if(welded_down) . += span_info("It's moored firmly to the floor. You can unsecure its moorings with a welder.") @@ -238,33 +238,35 @@ insert_beaker(user, tool) return ITEM_INTERACT_SUCCESS + var/content_count = get_content_count() if(istype(tool, /obj/item/storage/bag)) - if(current_item_count >= max_items) + if(content_count >= max_items) to_chat(user, span_warning("\The [src] is already full! Activate it to free up some space.")) return ITEM_INTERACT_FAILURE var/obj/item/storage/bag/bag = tool for(var/obj/item/food/item in bag.contents) - if(current_item_count >= max_items) + if(content_count >= max_items) break - if(bag.atom_storage.attempt_remove(item, src)) - current_item_count++ + bag.atom_storage.attempt_remove(item, src) + content_count = get_content_count() // Refresh the cache for UI if(bag.contents.len == 0) to_chat(user, span_info("You empty \the [bag] into \the [src].")) - else if (current_item_count >= max_items) + else if (content_count >= max_items) to_chat(user, span_info("You fill \the [src] from \the [bag] to its capacity.")) else to_chat(user, span_info("You fill \the [src] from \the [bag].")) return ITEM_INTERACT_SUCCESS if(istype(tool, /obj/item/food)) - if(current_item_count >= max_items) + if(content_count >= max_items) to_chat(user, span_warning("\The [src] is already full! Activate it to free up some space.")) return ITEM_INTERACT_FAILURE if(user.transferItemToLoc(tool, src)) to_chat(user, span_info("You insert \the [tool] in \the [src]")) + get_content_count() // Refresh the cache for UI return ITEM_INTERACT_SUCCESS to_chat(user, span_warning("You cannot put \the [tool] in \the [src]!")) @@ -274,16 +276,6 @@ eject_beaker(user) return CLICK_ACTION_SUCCESS -/obj/machinery/biogenerator/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) - . = ..() - if(istype(arrived, /obj/item/food)) - current_item_count += 1 // No need to track qdels because they call Exited() - -/obj/machinery/biogenerator/Exited(atom/movable/gone, direction) - . = ..() - if(istype(gone, /obj/item/food)) - current_item_count -= 1 - /// Activates biomass processing and converts all inserted food products into biomass /obj/machinery/biogenerator/proc/start_process() if(machine_stat != NONE || panel_open) @@ -310,7 +302,7 @@ stop_process() return - if(!current_item_count) + if(!get_content_count()) stop_process() return @@ -327,12 +319,16 @@ use_energy(active_power_usage * seconds_per_tick) - if(!current_item_count) + if(!get_content_count()) stop_process(FALSE) update_appearance() - +/obj/machinery/biogenerator/proc/get_content_count() + content_count_cache = 0 + for (var/obj/item/food/food in contents) + content_count_cache += 1 + return content_count_cache /** * Simple helper proc that converts the given food item into biomass for the generator, while also handling removing it @@ -485,7 +481,7 @@ data["processing"] = processing data["max_output"] = max_output data["efficiency"] = efficiency - data["can_process"] = !!current_item_count + data["can_process"] = !!content_count_cache if(beaker) data["beakerCurrentVolume"] = round(beaker.reagents.total_volume, 0.01) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index a254241d1fd1..3a819bf9941e 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 f23bb43305b8..93be3a4a05f1 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 40a84d9c8ff9..8fb4c974f1c1 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -15,7 +15,7 @@ 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) @@ -42,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 @@ -71,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 @@ -96,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 9d0e465d033f..7a1003ed2ad8 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/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 2b97110dafae..842c10a025e2 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -106,11 +106,10 @@ sampleDNA = null contains_sample = FALSE -/obj/item/seeds/replicapod/get_unique_analyzer_text() +/obj/item/seeds/replicapod/get_unique_analyzer_data() if(contains_sample) - return "It contains a blood sample with blood DNA (UE) \"[sampleDNA]\"." //blood DNA (UE) shows in medical records and is readable by forensics scanners - else - return null + return list("Blood DNA" = sampleDNA) + return null /obj/item/seeds/replicapod/harvest(mob/user) //now that one is fun -- Urist var/obj/machinery/hydroponics/parent = loc diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index f0db7a02282a..f2d611b1aefe 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/grown/weeds/kudzu.dm b/code/modules/hydroponics/grown/weeds/kudzu.dm index a0a3c9405718..87241365cf49 100644 --- a/code/modules/hydroponics/grown/weeds/kudzu.dm +++ b/code/modules/hydroponics/grown/weeds/kudzu.dm @@ -50,13 +50,12 @@ plant(user) to_chat(user, span_notice("You plant the kudzu. You monster.")) -/obj/item/seeds/kudzu/get_unique_analyzer_text() - var/kudzu_mutations = "" - var/output_message = "" - for(var/datum/spacevine_mutation/SM in mutations) - kudzu_mutations += "[(kudzu_mutations == "") ? "" : ", "][SM.name]" - output_message += "Plant Mutations: [(kudzu_mutations == "") ? "None." : "[kudzu_mutations]."]" - return output_message +/obj/item/seeds/kudzu/get_unique_analyzer_data() + var/list/all_mutations = list() + for(var/datum/spacevine_mutation/vine_trait in mutations) + all_mutations[vine_trait.name] = vine_trait.description + + return list("Kudzu Traits" = all_mutations) /obj/item/seeds/kudzu/on_chem_reaction(datum/reagents/reagents) var/list/temp_mut_list = list() diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 2b2556790e2b..1565c3113ac5 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 5d110f8ef8ee..00d01c9732d5 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -111,16 +111,16 @@ if(HAS_SILICON_ACCESS(user)) return NONE + context[SCREENTIP_CONTEXT_RMB] = "Empty nutrients" + switch(plant_status) if(HYDROTRAY_PLANT_DEAD) context[SCREENTIP_CONTEXT_LMB] = "Remove dead plant" - return CONTEXTUAL_SCREENTIP_SET if(HYDROTRAY_PLANT_HARVESTABLE) context[SCREENTIP_CONTEXT_LMB] = "Harvest plant" - return CONTEXTUAL_SCREENTIP_SET - return NONE + return CONTEXTUAL_SCREENTIP_SET // If the plant is harvestable, we can graft it with secateurs or harvest it with a plant bag. if(plant_status == HYDROTRAY_PLANT_HARVESTABLE) @@ -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. * diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 0cc9d78bc39a..0a5c7b711300 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -123,7 +123,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 @@ -178,10 +178,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 @@ -335,7 +354,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 @@ -499,7 +518,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) @@ -895,7 +914,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 /** @@ -907,7 +926,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 c2985aef15e5..2f0f026110e3 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. @@ -452,9 +453,11 @@ /** * Override for seeds with unique text for their analyzer. (No newlines at the start or end of unique text!) - * Returns null if no unique text, or a string of text if there is. + * Returns null if no unique data + * Return an assoc list (label = text) to add a new line to the analyzer + * Return an assoc list (label = list(text = tooltip, text = tooltip)) to add a new collapsible section to the analyzer */ -/obj/item/seeds/proc/get_unique_analyzer_text() +/obj/item/seeds/proc/get_unique_analyzer_data() return null /** @@ -656,3 +659,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 1691dbecfb13..8989d753a959 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 12a4b17062a2..2f3929fdfaae 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 de6ae2d0bbf1..cde0adbdc945 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 c87e1dc31c5e..3d974366cd8e 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/_job.dm b/code/modules/jobs/job_types/_job.dm index 869c59c7044e..449392abe265 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -203,7 +203,7 @@ /mob/living/carbon/human/on_job_equipping(datum/job/equipping, client/player_client) if(equipping.paycheck_department) var/datum/bank_account/bank_account = new(real_name, equipping, dna.species.payday_modifier) - bank_account.payday(STARTING_PAYCHECKS, TRUE) + bank_account.payday(STARTING_PAYCHECKS, free = TRUE) account_id = bank_account.account_id bank_account.replaceable = FALSE add_mob_memory(/datum/memory/key/account, remembered_id = account_id) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index f865819203bd..a9872c6092f8 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/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 3a9a9fbc397b..8b24da5ab06c 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -69,6 +69,8 @@ backpack_contents = list( /obj/item/melee/baton/telescopic/silver = 1, /obj/item/construction/rcd/ce = 1, + /obj/item/extinguisher/mini = 1, + /obj/item/analyzer = 1, ) belt = /obj/item/storage/belt/utility/chief/full ears = /obj/item/radio/headset/heads/ce diff --git a/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm b/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm index 4f0af0d2d061..c11c931a3ef9 100644 --- a/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm +++ b/code/modules/jobs/job_types/station_trait/cargo_gorilla.dm @@ -34,7 +34,7 @@ . = ..() // Gorilla with a wage, what's he buyin? var/datum/bank_account/bank_account = new(spawned.real_name, src) - bank_account.payday(STARTING_PAYCHECKS, TRUE) + bank_account.payday(STARTING_PAYCHECKS, free = TRUE) bank_account.replaceable = FALSE spawned.add_mob_memory(/datum/memory/key/account, remembered_id = bank_account.account_id) diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm index 112f75aa4020..0478989ee518 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 92c024c47322..083f67cb4a00 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 8b26e413b7e2..23971af80e01 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 000000000000..eb83bffdad02 --- /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 a74e87b4c0e3..2400798bbeb2 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 a77131e73cec..418a4b8e5093 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 cb6dd212f3e0..6d0b7e58167a 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/reader.dm b/code/modules/mapping/reader.dm index 1efcf71676e6..e5a323d07253 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -1008,27 +1008,61 @@ GLOBAL_LIST_EMPTY(map_model_default) var/old_position = 1 while(position != 0) // find next delimiter that is not within "..." - position = find_next_delimiter_position(text,old_position,delimiter) + position = find_next_delimiter_position(text, old_position, delimiter) // check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7)) - var/equal_position = findtext(text,"=",old_position, position) - var/trim_left = trim(copytext(text,old_position,(equal_position ? equal_position : position))) - var/left_constant = parse_constant(trim_left) - if(position) - old_position = position + length(text[position]) - if(!left_constant) // damn newlines man. Exists to provide behavior consistency with the above loop. not a major cost becuase this path is cold + var/equal_position = find_next_delimiter_position(text, old_position, "=") + var/trim_left = trim(copytext(text, old_position, (equal_position ? equal_position : position))) + if(!trim_left) // damn newlines man. Exists to provide behavior consistency with the above loop. not a major cost becuase this path is cold + if(position) + old_position = position + length(text[position]) continue - if(equal_position && !isnum(left_constant)) + var/is_simple = TRUE //linear list + var/trim_right = trim_left //simple var + if(equal_position) // Associative var, so do the association. // Note that numbers cannot be keys - the RHS is dropped if so. - var/trim_right = trim(copytext(text, equal_position + length(text[equal_position]), position)) - var/right_constant = parse_constant(trim_right) - .[left_constant] = right_constant - else // simple var + trim_right = trim(copytext(text, equal_position + length(text[equal_position]), position)) + is_simple = FALSE + + //right value is a list and since we used the delimiter , this text would be incomplete so we need to parse the full string + if(copytext(trim_right, 1, 6) == "list(") + var/start_index = is_simple ? old_position : equal_position + length(text[equal_position]) + var/opening_count = 0 + var/closing_count = 0 + var/index = start_index + var/begin = FALSE + while(!begin || (opening_count != closing_count)) + var/char = text[index] + if(char == "(") + opening_count += 1 + begin = TRUE + else if(char == ")") + closing_count += 1 + index += length(char) + trim_right = trim(copytext(text, start_index, index)) + if(is_simple) + trim_left = trim_right + if(index >= length(text)) //stops a wasteful iteration when we reach the end + position = 0 + else + old_position = index + length(text[index]) //this moves our pointer past , to the next element + else if(position) + old_position = position + length(text[position]) + + //assign value + var/left_constant = parse_constant(trim_left) + if(is_simple) . += list(left_constant) + else + .[left_constant] = parse_constant(trim_right) /datum/parsed_map/proc/parse_constant(text) + // empty text + if(!text) + return "" + // number var/num = text2num(text) if(isnum(num)) diff --git a/code/modules/mapping/space_management/space_transition.dm b/code/modules/mapping/space_management/space_transition.dm index 7f2eafe00990..9e303111d944 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 274b5d3816d4..6ffddb8e5cd2 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. @@ -189,3 +216,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 6298bb98139e..ec67648fe2a3 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 b662242fb84b..420aad1ceaa0 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/fulton.dm b/code/modules/mining/fulton.dm index d05370b273fb..8738752af33e 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -62,31 +62,30 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) if(thing.anchored) return NONE - . = ITEM_INTERACT_BLOCKING var/obj/structure/extraction_point/beacon = beacon_ref?.resolve() if(isnull(beacon)) balloon_alert(user, "not linked!") beacon_ref = null - return . + return ITEM_INTERACT_BLOCKING var/area/area = get_area(thing) if(!can_use_indoors) if(!area.outdoors) balloon_alert(user, "not outdoors!") - return . + return ITEM_INTERACT_BLOCKING if(area.area_flags & NOTELEPORT) balloon_alert(user, "unable to activate!") - return + return ITEM_INTERACT_BLOCKING var/area/target_area = get_area(beacon) if(area != target_area && ((area.area_flags & LOCAL_TELEPORT) || (target_area.area_flags & LOCAL_TELEPORT))) balloon_alert(user, "unable to activate!") - return + return ITEM_INTERACT_BLOCKING if(!safe_for_living_creatures && check_for_living_mobs(thing)) to_chat(user, span_warning("[src] is not safe for use with living creatures, they wouldn't survive the trip back!")) balloon_alert(user, "not safe!") - return . + return ITEM_INTERACT_BLOCKING if(thing.move_resist > max_force_fulton) balloon_alert(user, "too heavy!") - return . + return ITEM_INTERACT_BLOCKING balloon_alert_to_viewers("attaching...") playsound(thing, 'sound/items/zip/zip.ogg', vol = 50, vary = TRUE) if(isliving(thing)) @@ -95,7 +94,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) to_chat(thing, span_userdanger("You are being extracted! Stand still to proceed.")) if(!do_after(user, 5 SECONDS, target = thing)) - return . + return ITEM_INTERACT_BLOCKING balloon_alert_to_viewers("extracting!") if(loc == user && ishuman(user)) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index e5d6e82cf747..d9e6b3c16c85 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 465bfff27085..d3d05077b7e3 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,13 +192,12 @@ //smelting the ore for(var/obj/item/stack/ore/gathered_ore as anything in ore_list) - if(isnull(gathered_ore.refined_type)) + var/obj/item/smelted_ore = gathered_ore.on_orm_collection() + if(isnull(smelted_ore)) continue - if(materials.insert_item(gathered_ore, ore_multiplier) <= 0) - unload_mineral(gathered_ore) //if rejected unload - - SEND_SIGNAL(src, COMSIG_ORM_COLLECTED_ORE) + 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 @@ -344,7 +365,7 @@ var/amount = round(min(text2num(params["sheets"]), 50, can_smelt_alloy(alloy))) if(amount < 1) //no negative mats return - materials.use_materials(alloy.materials, multiplier = amount, action = "released", name = "sheets", user_data = ID_DATA(usr)) + materials.use_materials(alloy.materials, multiplier = amount, action = "withdrawn", name = "sheets", user_data = ID_DATA(usr)) var/output if(ispath(alloy.build_path, /obj/item/stack/sheet)) output = new alloy.build_path(src, amount) diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm index 467b7786e083..82b87421d299 100644 --- a/code/modules/mining/machine_silo.dm +++ b/code/modules/mining/machine_silo.dm @@ -33,8 +33,8 @@ interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN|INTERACT_MACHINE_ALLOW_SILICON|INTERACT_MACHINE_OPEN_SILICON processing_flags = NONE - /// By default, an ore silo requires you to be wearing an ID to pull materials from it. - var/ID_required = TRUE + /// Only the station loaded ore silo starts out with ID restrictions, else its optional + var/ID_required = FALSE /// List of all connected components that are on hold from accessing materials. var/list/holds = list() /// List of all components that are sharing ores with this silo. @@ -52,6 +52,7 @@ RADIO_CHANNEL_SUPPLY = NONE, RADIO_CHANNEL_SECURITY = NONE, ) + ///List of announcement messages for silo restrictions var/static/alist/announcement_messages = alist( BAN_ATTEMPT_FAILURE_NO_ACCESS = "ACCESS ENFORCEMENT FAILURE: $SILO_USER_NAME lacks supply command authority.", BAN_ATTEMPT_FAILURE_CHALLENGING_DA_CHIEF = "ACCESS ENFORCEMENT FAILURE: $SILO_USER_NAME attempting subversion of supply command authority.", @@ -69,6 +70,7 @@ /obj/machinery/ore_silo/Initialize(mapload) . = ..() + materials = AddComponent( \ /datum/component/material_container, \ SSmaterials.materials_by_category[MAT_CATEGORY_SILO], \ @@ -80,12 +82,28 @@ ), \ allowed_items = /obj/item/stack \ ) + if (!GLOB.ore_silo_default && mapload && is_station_level(z)) GLOB.ore_silo_default = src + ID_required = TRUE + register_context() setup_radio() configure_default_announcements_policy() +/obj/machinery/ore_silo/Destroy() + if (GLOB.ore_silo_default == src) + GLOB.ore_silo_default = null + + for(var/datum/component/remote_materials/mats as anything in ore_connected_machines) + mats.disconnect() + + ore_connected_machines = null + materials = null + QDEL_NULL(radio) + + return ..() + /obj/machinery/ore_silo/emag_act(mob/living/user) if(obj_flags & EMAGGED) return FALSE @@ -104,19 +122,6 @@ radio.keyslot.channels[RADIO_CHANNEL_SECURITY] = TRUE radio.recalculateChannels() -/obj/machinery/ore_silo/Destroy() - if (GLOB.ore_silo_default == src) - GLOB.ore_silo_default = null - - for(var/datum/component/remote_materials/mats as anything in ore_connected_machines) - mats.disconnect() - - ore_connected_machines = null - materials = null - QDEL_NULL(radio) - - return ..() - /obj/machinery/ore_silo/examine(mob/user) . = ..() . += span_notice("It can be linked to techfabs, circuit printers and protolathes with a multitool.") @@ -144,14 +149,14 @@ /obj/machinery/ore_silo/proc/on_item_consumed(datum/component/material_container/container, obj/item/item_inserted, last_inserted_id, mats_consumed, amount_inserted, atom/context, alist/user_data) SIGNAL_HANDLER - silo_log(context, "DEPOSIT", amount_inserted, item_inserted.name, mats_consumed, user_data) + silo_log(context, "DEPOSITED", amount_inserted, item_inserted.name, mats_consumed, user_data) SEND_SIGNAL(context, COMSIG_SILO_ITEM_CONSUMED, container, item_inserted, last_inserted_id, mats_consumed, amount_inserted) /obj/machinery/ore_silo/proc/log_sheets_ejected(datum/component/material_container/container, obj/item/stack/sheet/sheets, atom/context, alist/user_data) SIGNAL_HANDLER - silo_log(context, "EJECT", -sheets.amount * SHEET_MATERIAL_AMOUNT, "[sheets.singular_name]", sheets.custom_materials, user_data) + silo_log(context, "WITHDRAWN", -sheets.amount * SHEET_MATERIAL_AMOUNT, "[sheets.name]", sheets.custom_materials, user_data) /obj/machinery/ore_silo/screwdriver_act(mob/living/user, obj/item/tool) . = ITEM_INTERACT_BLOCKING @@ -330,11 +335,12 @@ if("toggle_ban") var/list/banned_user_data = params["user_data"] - attempt_ban_toggle(usr, banned_user_data) + attempt_ban_toggle(ui.user, banned_user_data) return TRUE if("toggle_restrict") - attempt_toggle_restrict(usr) + attempt_toggle_restrict(ui.user) + return TRUE /** * Called from the ore silo's UI, when someone attempts to (un)ban a user from using the ore silo. * The person doing the banning should have at least QM access. Unless this is emagged. Not modifiable by silicons unless emagged. @@ -558,6 +564,7 @@ var/amount ///List of individual materials used in the action var/list/materials + ///User data of the player doing material operations var/alist/user_data /datum/ore_silo_log/New(obj/machinery/M, _action, _amount, _noun, list/mats=list(), alist/user_data) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 599f446017d7..8582a1c3c86c 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -43,6 +43,14 @@ if(stack_overlays) . += stack_overlays +/** + * Called when the ore is collected by an ore redemption machine. returns the ore itself. + * Normally, ores without a refined type aren't collected by the orm. + * 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() + return isnull(refined_type) ? null : src + /obj/item/stack/ore/welder_act(mob/living/user, obj/item/I) ..() if(!refined_type) @@ -98,7 +106,7 @@ icon_state = "glass" singular_name = "sand pile" points = 1 - mats_per_unit = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT) + mats_per_unit = list(/datum/material/sand = SHEET_MATERIAL_AMOUNT) refined_type = /obj/item/stack/sheet/glass w_class = WEIGHT_CLASS_TINY mine_experience = 0 //its sand @@ -114,6 +122,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ . = ..() AddComponent(/datum/component/storm_hating) +/obj/item/stack/ore/glass/on_orm_collection() //we need to smelt the glass beforehand because the silo and orm don't accept sand mats + var/obj/item/stack/sheet/glass = new refined_type(drop_location(), amount) + qdel(src) + return glass + /obj/item/stack/ore/glass/get_main_recipes() . = ..() . += GLOB.sand_recipes @@ -138,6 +151,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ return FALSE +/obj/item/stack/ore/glass/thirty + amount = 30 + /obj/item/stack/ore/glass/basalt name = "volcanic ash" icon_state = "volcanic_sand" diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index 324282c0af05..11cbd18a3717 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 @@ -295,10 +295,7 @@ location = turf break - I.forceMove(location) - I.layer = initial(I.layer) - SET_PLANE_EXPLICIT(I, initial(I.plane), location) - I.dropped(src) + transferItemToLoc(I, location, force = TRUE, silent = TRUE, animated = !ignore_animation) return FALSE /// Returns true if a mob is holding something @@ -424,13 +421,10 @@ if(!item_dropping) return FALSE - if(client) - client.screen -= item_dropping + client?.screen -= item_dropping - if(observers?.len) - for(var/mob/dead/observe as anything in observers) - if(observe.client) - observe.client.screen -= item_dropping + for(var/mob/dead/observe as anything in observers) + observe.client?.screen -= item_dropping item_dropping.layer = initial(item_dropping.layer) SET_PLANE_EXPLICIT(item_dropping, initial(item_dropping.plane), newloc) @@ -441,7 +435,7 @@ else item_dropping.forceMove(newloc) - item_dropping.dropped(src, silent) + has_unequipped(item_dropping, silent) SEND_SIGNAL(item_dropping, COMSIG_ITEM_POST_UNEQUIP, force, newloc, no_move, invdrop, silent) SEND_SIGNAL(src, COMSIG_MOB_UNEQUIPPED_ITEM, item_dropping, force, newloc, no_move, invdrop, silent) return TRUE @@ -520,8 +514,15 @@ /// This proc is called after an item has been successfully handled and equipped to a slot. /mob/proc/has_equipped(obj/item/item, slot, initial = FALSE) + SHOULD_CALL_PARENT(TRUE) return item.on_equipped(src, slot, initial) +/// This proc is called after an item has been removed from a mob but before it has been officially deslotted. +/mob/proc/has_unequipped(obj/item/item, silent = FALSE) + SHOULD_CALL_PARENT(TRUE) + item.dropped(src, silent) + return TRUE + /** * Equip an item to the slot or delete * @@ -683,3 +684,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 9ee2145dff23..e2d1482c8a5b 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/bots/medbot/medbot.dm b/code/modules/mob/living/basic/bots/medbot/medbot.dm index 92afa3006dd8..4a60ca178a75 100644 --- a/code/modules/mob/living/basic/bots/medbot/medbot.dm +++ b/code/modules/mob/living/basic/bots/medbot/medbot.dm @@ -23,7 +23,7 @@ hackables = "health processor circuits" possessed_message = "You are a medbot! Ensure good health among the crew to the best of your ability!" - additional_access = /datum/id_trim/job/paramedic + additional_access = /datum/id_trim/medibot announcement_type = /datum/action/cooldown/bot_announcement/medbot path_image_color = "#d9d9f4" @@ -330,9 +330,10 @@ if(DOING_INTERACTION(src, TEND_DAMAGE_INTERACTION)) return - if((damage_type_healer == HEAL_ALL_DAMAGE && patient.get_total_damage() <= heal_threshold) || (!(damage_type_healer == HEAL_ALL_DAMAGE) && patient.get_current_damage_of_type(damage_type_healer) <= heal_threshold)) - to_chat(src, "[patient] is healthy! Your programming prevents you from tending the wounds of anyone with less than [heal_threshold + 1] [damage_type_healer == HEAL_ALL_DAMAGE ? "total" : damage_type_healer] damage.") - return + if (!(bot_access_flags & BOT_COVER_EMAGGED)) + if((damage_type_healer == HEAL_ALL_DAMAGE && patient.get_total_damage() <= heal_threshold) || (!(damage_type_healer == HEAL_ALL_DAMAGE) && patient.get_current_damage_of_type(damage_type_healer) <= heal_threshold)) + to_chat(src, "[patient] is healthy! Your programming prevents you from tending the wounds of anyone with less than [heal_threshold + 1] [damage_type_healer == HEAL_ALL_DAMAGE ? "total" : damage_type_healer] damage.") + return update_bot_mode(new_mode = BOT_HEALING, update_hud = FALSE) patient.visible_message("[src] is trying to tend the wounds of [patient]", span_userdanger("[src] is trying to tend your wounds!")) @@ -368,6 +369,32 @@ if(CanReach(patient)) melee_attack(patient) +/datum/id_trim/medibot + assignment = JOB_MEDIBOT + trim_state = "trim_paramedic" + department_color = COLOR_MEDICAL_BLUE + subdepartment_color = COLOR_MEDICAL_BLUE + sechud_icon_state = SECHUD_PARAMEDIC + access = list( + ACCESS_BIT_DEN, + ACCESS_CARGO, + ACCESS_CONSTRUCTION, + ACCESS_HYDROPONICS, + ACCESS_MAINT_TUNNELS, + ACCESS_MECH_MEDICAL, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_MINING, + ACCESS_MINING_STATION, + ACCESS_MORGUE, + ACCESS_SCIENCE, + ACCESS_SERVICE, + ACCESS_SURGERY, + ACCESS_VIROLOGY, + ACCESS_PHARMACY, + ) + honorifics = list("Medical Robot") + honorific_positions = HONORIFIC_POSITION_FIRST | HONORIFIC_POSITION_LAST | HONORIFIC_POSITION_FIRST_FULL | HONORIFIC_POSITION_NONE /mob/living/basic/bot/medbot/autopatrol bot_mode_flags = BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION diff --git a/code/modules/mob/living/basic/cytology/vatbeast.dm b/code/modules/mob/living/basic/cytology/vatbeast.dm index 0075061cda1e..d9d1c364802a 100644 --- a/code/modules/mob/living/basic/cytology/vatbeast.dm +++ b/code/modules/mob/living/basic/cytology/vatbeast.dm @@ -15,6 +15,7 @@ damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 1, STAMINA = 1, OXY = 1) melee_damage_lower = 25 melee_damage_upper = 25 + melee_attack_cooldown = CLICK_CD_MELEE obj_damage = 40 unsuitable_atmos_damage = 0 attack_sound = 'sound/items/weapons/punch3.ogg' diff --git a/code/modules/mob/living/basic/drone/inventory.dm b/code/modules/mob/living/basic/drone/inventory.dm index 37f61b2b2086..c6c7aa5da95f 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/drone/visuals_icons.dm b/code/modules/mob/living/basic/drone/visuals_icons.dm index fb89e82c8a17..59952d8d2490 100644 --- a/code/modules/mob/living/basic/drone/visuals_icons.dm +++ b/code/modules/mob/living/basic/drone/visuals_icons.dm @@ -27,7 +27,7 @@ client.screen += internal_storage -/mob/living/basic/drone/update_worn_head(update_obscured = TRUE) +/mob/living/basic/drone/update_worn_head() remove_overlay(DRONE_HEAD_LAYER) if(head) @@ -44,7 +44,7 @@ apply_overlay(DRONE_HEAD_LAYER) -/mob/living/basic/drone/update_worn_mask(update_obscured = TRUE) +/mob/living/basic/drone/update_worn_mask() update_worn_head() /mob/living/basic/drone/regenerate_icons() 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 a5e0a9c0272c..138d09cf324e 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/jungle/mega_arachnid/mega_arachnid.dm b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm index bfbd222f89ca..72c55a8eca3c 100644 --- a/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm +++ b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm @@ -10,6 +10,7 @@ mob_biotypes = MOB_ORGANIC|MOB_BUG melee_damage_lower = 30 melee_damage_upper = 30 + melee_attack_cooldown = CLICK_CD_MELEE maxHealth = 300 health = 300 diff --git a/code/modules/mob/living/basic/pets/parrot/poly.dm b/code/modules/mob/living/basic/pets/parrot/poly.dm index 93308852a520..f79df7e8dec2 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/slime/actions.dm b/code/modules/mob/living/basic/slime/actions.dm index 2995a240a40f..b96ada87025e 100644 --- a/code/modules/mob/living/basic/slime/actions.dm +++ b/code/modules/mob/living/basic/slime/actions.dm @@ -106,11 +106,11 @@ balloon_alert(src, "overcrowded!") return - var/list/babies = list() - var/new_nutrition = round(nutrition * 0.9) - var/new_powerlevel = round(powerlevel / 4) + var/new_nutrition = floor(nutrition * 0.9) + var/new_powerlevel = floor(powerlevel * 0.25) var/turf/drop_loc = drop_location() + var/list/created_slimes = list(src) var/list/slime_friends = list() for(var/faction_member in faction) var/mob/living/possible_friend = locate(faction_member) in GLOB.mob_living_list @@ -118,42 +118,34 @@ continue slime_friends += possible_friend - for(var/i in 1 to 4) - var/child_colour - - if(mutation_chance >= 100) - child_colour = /datum/slime_type/rainbow - else if(prob(mutation_chance)) - child_colour = pick_weight(slime_type.mutations) - else - child_colour = slime_type.type - - var/mob/living/basic/slime/baby - baby = new(drop_loc, child_colour) - - if(ckey) - baby.set_nutrition(new_nutrition) //Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature! - - baby.powerlevel = new_powerlevel - if(i != 1) - step_away(baby, src) - + for(var/i in 1 to 3) + var/mob/living/basic/slime/baby = new(drop_loc, get_random_mutation()) + created_slimes += baby for(var/slime_friend in slime_friends) baby.befriend(slime_friend) - babies += baby - if(mutation_chance == 0) - baby.mutation_chance = 0 - else - baby.mutation_chance = clamp(mutation_chance+(rand(5,-5)),0,100) SSblackbox.record_feedback("tally", "slime_babies_born", 1, baby.slime_type.colour) + step_away(baby, src) - var/mob/living/basic/slime/new_slime = pick(babies) // slime that the OG slime will move into. - new_slime.set_combat_mode(TRUE) + set_nutrition(SLIME_STARTING_NUTRITION) + for(var/mob/living/basic/slime/baby as anything in created_slimes) + if(ckey) // Player slimes are more robust at spliting. Once an oversight of poor copypasta, now a feature! + baby.set_nutrition(new_nutrition) + baby.powerlevel = new_powerlevel + if(mutation_chance) + baby.mutation_chance = clamp(mutation_chance + rand(-5, 5), 0, 100) + else + baby.mutation_chance = 0 - if(isnull(mind)) - new_slime.PossessByPlayer(key) - else - mind.transfer_to(new_slime) + set_life_stage(SLIME_LIFE_STAGE_BABY) + set_slime_type(get_random_mutation()) + amount_grown = 0 + mutator_used = FALSE - qdel(src) +/mob/living/basic/slime/proc/get_random_mutation() + if(mutation_chance >= 100) + return /datum/slime_type/rainbow + else if(prob(mutation_chance)) + return pick_weight(slime_type.mutations) + else + return slime_type.type diff --git a/code/modules/mob/living/basic/slime/life.dm b/code/modules/mob/living/basic/slime/life.dm index b1e24070ff6e..fc7b55927434 100644 --- a/code/modules/mob/living/basic/slime/life.dm +++ b/code/modules/mob/living/basic/slime/life.dm @@ -7,7 +7,7 @@ if(!HAS_TRAIT(src, TRAIT_STASIS)) //No hunger in stasis handle_nutrition(seconds_per_tick) - handle_slime_stasis(seconds_per_tick) + handle_slime_stasis() /mob/living/basic/slime/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired) ..() @@ -17,7 +17,7 @@ remove_status_effect(/datum/status_effect/freon, SLIME_COLD) ///Handles if a slime's environment would cause it to enter stasis. Ignores TRAIT_STASIS -/mob/living/basic/slime/proc/handle_slime_stasis(seconds_per_tick) +/mob/living/basic/slime/proc/handle_slime_stasis() var/datum/gas_mixture/environment = loc.return_air() var/bz_percentage = 0 diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm index 1b9dd8566586..36a023318c43 100644 --- a/code/modules/mob/living/basic/slime/slime.dm +++ b/code/modules/mob/living/basic/slime/slime.dm @@ -21,8 +21,8 @@ maxHealth = 150 health = 150 mob_biotypes = MOB_SLIME - melee_damage_lower = 5 - melee_damage_upper = 25 + melee_damage_lower = 7 + melee_damage_upper = 17 wound_bonus = -45 can_buckle_to = FALSE @@ -125,8 +125,8 @@ for(var/datum/slime_type/slime_type as anything in subtypesof(/datum/slime_type)) possible_slime_types[slime_type] = new slime_type + set_life_stage(new_life_stage, TRUE) set_slime_type(new_type) - set_life_stage(new_life_stage) set_nutrition(SLIME_STARTING_NUTRITION) AddComponent(/datum/component/health_scaling_effects, min_health_slowdown = 2) @@ -250,29 +250,23 @@ . += span_warning("It seems too overcroweded to properly reproduce!") ///Changes the slime's current life state -/mob/living/basic/slime/proc/set_life_stage(new_life_stage = SLIME_LIFE_STAGE_BABY) +/mob/living/basic/slime/proc/set_life_stage(new_life_stage = SLIME_LIFE_STAGE_BABY, initial = FALSE) life_stage = new_life_stage - - switch(life_stage) - if(SLIME_LIFE_STAGE_BABY) - - health = initial(health) - maxHealth = initial(maxHealth) - - obj_damage = initial(obj_damage) - melee_damage_lower = initial(melee_damage_lower) - melee_damage_upper = initial(melee_damage_upper) - wound_bonus = initial(wound_bonus) - - if(SLIME_LIFE_STAGE_ADULT) - - health = 200 - maxHealth = 200 - - obj_damage = 15 - melee_damage_lower += 10 - melee_damage_upper += 10 - wound_bonus = -90 + if(life_stage == SLIME_LIFE_STAGE_ADULT) + health /= 0.75 + maxHealth /= 0.75 + melee_damage_lower *= 2 + melee_damage_upper *= 2 + obj_damage = 15 + wound_bonus = -90 + + else if(!initial) + health *= 0.75 + maxHealth *= 0.75 + melee_damage_lower *= 0.5 + melee_damage_upper *= 0.5 + obj_damage = initial(obj_damage) + wound_bonus = initial(wound_bonus) ai_controller.set_blackboard_key(BB_SLIME_LIFE_STAGE, life_stage) update_mob_action_buttons() diff --git a/code/modules/mob/living/basic/snails/snail.dm b/code/modules/mob/living/basic/snails/snail.dm index 259bce0d5c4d..0cbdaf9f1132 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/space_fauna/bear/_bear.dm b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm index a85f4cab8143..32738c054347 100644 --- a/code/modules/mob/living/basic/space_fauna/bear/_bear.dm +++ b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm @@ -127,6 +127,7 @@ obj_damage = 11 melee_damage_lower = 0 melee_damage_upper = 0 + melee_attack_cooldown = CLICK_CD_MELEE sharpness = NONE //it's made of butter armour_penetration = 0 response_harm_continuous = "takes a bite out of" diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm index 9acddd1c8600..738a711d3c9b 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 f379900acb7c..c2c68428ec55 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.dm b/code/modules/mob/living/carbon/carbon.dm index 6a16b8ea879f..004dbedb06a7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -220,32 +220,10 @@ /mob/living/carbon/proc/uncuff() if (handcuffed) - var/obj/item/W = handcuffed - set_handcuffed(null) - if (buckled?.buckle_requires_restraints) - buckled.unbuckle_mob(src) - update_handcuffed() - if (client) - client.screen -= W - if (W) - W.forceMove(drop_location()) - W.dropped(src) - if (W) - W.layer = initial(W.layer) - SET_PLANE_EXPLICIT(W, initial(W.plane), src) + dropItemToGround(handcuffed, TRUE) changeNext_move(0) if (legcuffed) - var/obj/item/W = legcuffed - legcuffed = null - update_worn_legcuffs() - if (client) - client.screen -= W - if (W) - W.forceMove(drop_location()) - W.dropped(src) - if (W) - W.layer = initial(W.layer) - SET_PLANE_EXPLICIT(W, initial(W.plane), src) + dropItemToGround(legcuffed, TRUE) changeNext_move(0) /mob/living/carbon/proc/clear_cuffs(obj/item/I, cuff_break) @@ -263,18 +241,10 @@ else if(I == handcuffed) - handcuffed.forceMove(drop_location()) - set_handcuffed(null) - I.dropped(src) - if(buckled?.buckle_requires_restraints) - buckled.unbuckle_mob(src) - update_handcuffed() + dropItemToGround(I, TRUE) return TRUE if(I == legcuffed) - legcuffed.forceMove(drop_location()) - legcuffed = null - I.dropped(src) - update_worn_legcuffs() + dropItemToGround(I, TRUE) return TRUE /mob/living/carbon/proc/accident(obj/item/I) @@ -836,8 +806,6 @@ if(heal_flags & HEAL_RESTRAINTS) QDEL_NULL(handcuffed) QDEL_NULL(legcuffed) - set_handcuffed(null) - update_handcuffed() return ..() @@ -1128,7 +1096,7 @@ . |= held_thing.wash(clean_types) // Check and wash stuff that isn't covered - var/covered = check_covered_slots() + var/covered = hidden_slots_to_inventory_slots(covered_slots) for(var/obj/item/worn as anything in get_equipped_items()) var/slot = get_slot_by_item(worn) // Don't wash glasses if something other than them is covering our eyes @@ -1185,9 +1153,6 @@ scaries.fake = TRUE QDEL_NULL(phantom_wound) -/mob/living/carbon/is_face_visible() - return !(wear_mask?.flags_inv & HIDEFACE) && !(head?.flags_inv & HIDEFACE) - /// Returns whether or not the carbon should be able to be shocked /mob/living/carbon/proc/should_electrocute(power_source) if (ismecha(loc)) @@ -1231,7 +1196,7 @@ REMOVE_TRAIT(src, TRAIT_RESTRAINED, HANDCUFFED_TRAIT) else if(handcuffed) ADD_TRAIT(src, TRAIT_RESTRAINED, HANDCUFFED_TRAIT) - + update_handcuffed() /mob/living/carbon/on_lying_down(new_lying_angle) . = ..() diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 1efea4923e57..90896042dbea 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 @@ -125,3 +126,8 @@ var/bodyshape = BODYSHAPE_HUMANOID COOLDOWN_DECLARE(bleeding_message_cd) + + /// Obscured hide flags (hideflags that can't be seen AND can't be interacted with) + var/obscured_slots = NONE + /// Covered hide flags (hideflags that can be seen, BUT can't be interacted with) + var/covered_slots = NONE diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index a7b22ed39b5b..78f5d38205b6 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -1,7 +1,3 @@ -/mob/living/carbon/update_obscured_slots(obscured_flags) - ..() - update_body() - /// Updates features and clothing attached to a specific limb with limb-specific offsets /mob/living/carbon/proc/update_features(feature_key) switch(feature_key) @@ -338,7 +334,7 @@ overlays_standing[WOUND_LAYER] = wound_overlay apply_overlay(WOUND_LAYER) -/mob/living/carbon/update_worn_mask(update_obscured = TRUE) +/mob/living/carbon/update_worn_mask() remove_overlay(FACEMASK_LAYER) if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated @@ -349,15 +345,13 @@ inv.update_appearance() if(wear_mask) - if(update_obscured) - update_obscured_slots(wear_mask.flags_inv) - if(!(check_obscured_slots() & ITEM_SLOT_MASK)) + if(!(obscured_slots & HIDEMASK)) overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/clothing/mask.dmi') update_hud_wear_mask(wear_mask) apply_overlay(FACEMASK_LAYER) -/mob/living/carbon/update_worn_neck(update_obscured = TRUE) +/mob/living/carbon/update_worn_neck() remove_overlay(NECK_LAYER) if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]) @@ -365,15 +359,13 @@ inv.update_appearance() if(wear_neck) - if(update_obscured) - update_obscured_slots(wear_neck.flags_inv) - if(!(check_obscured_slots() & ITEM_SLOT_NECK)) + if(!(obscured_slots & HIDENECK)) overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = 'icons/mob/clothing/neck.dmi') update_hud_neck(wear_neck) apply_overlay(NECK_LAYER) -/mob/living/carbon/update_worn_back(update_obscured = TRUE) +/mob/living/carbon/update_worn_back() remove_overlay(BACK_LAYER) if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) @@ -381,24 +373,20 @@ inv.update_appearance() if(back) - if(update_obscured) - update_obscured_slots(back.flags_inv) overlays_standing[BACK_LAYER] = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = 'icons/mob/clothing/back.dmi') update_hud_back(back) apply_overlay(BACK_LAYER) -/mob/living/carbon/update_worn_legcuffs(update_obscured = TRUE) +/mob/living/carbon/update_worn_legcuffs() remove_overlay(LEGCUFF_LAYER) clear_alert("legcuffed") if(legcuffed) - if(update_obscured) - update_obscured_slots(legcuffed.flags_inv) overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/simple/mob.dmi', "legcuff1", -LEGCUFF_LAYER) apply_overlay(LEGCUFF_LAYER) throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed) -/mob/living/carbon/update_worn_head(update_obscured = TRUE) +/mob/living/carbon/update_worn_head() remove_overlay(HEAD_LAYER) if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated @@ -409,20 +397,16 @@ inv.update_appearance() if(head) - if(update_obscured) - update_obscured_slots(head.flags_inv) - if(!(check_obscured_slots() & ITEM_SLOT_HEAD)) + if(!(obscured_slots & HIDEHEADGEAR)) overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi') update_hud_head(head) apply_overlay(HEAD_LAYER) -/mob/living/carbon/update_worn_handcuffs(update_obscured = TRUE) +/mob/living/carbon/update_worn_handcuffs() remove_overlay(HANDCUFF_LAYER) if(handcuffed) - if(update_obscured) - update_obscured_slots(handcuffed.flags_inv) var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER) if(handcuffed.blocks_emissive != EMISSIVE_BLOCK_NONE) handcuff_overlay.overlays += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, src, alpha = handcuff_overlay.alpha) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 8e1c9d91fbf3..d7d3df762be8 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() @@ -365,14 +365,13 @@ /// Coolects examine information about the mob's clothing and equipment /mob/living/carbon/proc/get_clothing_examine_info(mob/living/user) . = list() - var/obscured = check_obscured_slots() var/t_He = p_They() var/t_His = p_Their() var/t_his = p_their() var/t_has = p_have() var/t_is = p_are() //head - if(head && !(obscured & ITEM_SLOT_HEAD) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP)) + if(head && !(obscured_slots & HIDEHEADGEAR) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [head.examine_title(user)] on [t_his] head." //back if(back && !HAS_TRAIT(back, TRAIT_EXAMINE_SKIP)) @@ -388,7 +387,7 @@ var/obj/item/corresponding_item = get_item_for_held_index(part.held_index) || part . += "[t_He] [t_has] a [corresponding_item.examine_title(user)] in place of [t_his] [initial(part.plaintext_zone)]." //gloves - if(gloves && !(obscured & ITEM_SLOT_GLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP)) + if(gloves && !(obscured_slots & HIDEGLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [gloves.examine_title(user)] on [t_his] hands." else if(GET_ATOM_BLOOD_DECAL_LENGTH(src) && num_hands) var/list/blood_stains = GET_ATOM_BLOOD_DECALS(src) @@ -402,15 +401,15 @@ var/cables_or_cuffs = istype(handcuffed, /obj/item/restraints/handcuffs/cable) ? "restrained with cable" : "handcuffed" . += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] [cables_or_cuffs]!") //shoes - if(shoes && !(obscured & ITEM_SLOT_FEET) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP)) + if(shoes && !(obscured_slots & HIDESHOES) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [shoes.examine_title(user)] on [t_his] feet." //mask - if(wear_mask && !(obscured & ITEM_SLOT_MASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP)) + if(wear_mask && !(obscured_slots & HIDEMASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [wear_mask.examine_title(user)] on [t_his] face." - if(wear_neck && !(obscured & ITEM_SLOT_NECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP)) + if(wear_neck && !(obscured_slots & HIDENECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [wear_neck.examine_title(user)] around [t_his] neck." //eyes - if(!(obscured & ITEM_SLOT_EYES) ) + if(!(obscured_slots & HIDEEYES)) if(glasses && !HAS_TRAIT(glasses, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [glasses.examine_title(user)] covering [t_his] eyes." else if(HAS_TRAIT(src, TRAIT_UNNATURAL_RED_GLOWY_EYES)) @@ -418,13 +417,12 @@ else if(HAS_TRAIT(src, TRAIT_BLOODSHOT_EYES)) . += span_warning("[t_His] eyes are bloodshot!") //ears - if(ears && !(obscured & ITEM_SLOT_EARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP)) + if(ears && !(obscured_slots & HIDEEARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [ears.examine_title(user)] on [t_his] ears." // Yes there's a lot of copypasta here, we can improve this later when carbons are less dumb in general /mob/living/carbon/human/get_clothing_examine_info(mob/living/user) . = list() - var/obscured = check_obscured_slots() var/t_He = p_They() var/t_His = p_Their() var/t_his = p_their() @@ -432,7 +430,7 @@ var/t_is = p_are() //uniform - if(w_uniform && !(obscured & ITEM_SLOT_ICLOTHING) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP)) + if(w_uniform && !(obscured_slots & HIDEJUMPSUIT) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP)) //accessory var/accessory_message = "" if(istype(w_uniform, /obj/item/clothing/under)) @@ -443,16 +441,16 @@ . += "[t_He] [t_is] wearing [w_uniform.examine_title(user)][accessory_message]." //head - if(head && !(obscured & ITEM_SLOT_HEAD) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP)) + if(head && !(obscured_slots & HIDEHEADGEAR) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [head.examine_title(user)] on [t_his] head." //mask - if(wear_mask && !(obscured & ITEM_SLOT_MASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP)) + if(wear_mask && !(obscured_slots & HIDEMASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [wear_mask.examine_title(user)] on [t_his] face." //neck - if(wear_neck && !(obscured & ITEM_SLOT_NECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP)) + if(wear_neck && !(obscured_slots & HIDENECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [wear_neck.examine_title(user)] around [t_his] neck." //eyes - if(!(obscured & ITEM_SLOT_EYES) ) + if(!(obscured_slots & HIDEEYES)) if(glasses && !HAS_TRAIT(glasses, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [glasses.examine_title(user)] covering [t_his] eyes." else if(HAS_TRAIT(src, TRAIT_UNNATURAL_RED_GLOWY_EYES)) @@ -460,13 +458,13 @@ else if(HAS_TRAIT(src, TRAIT_BLOODSHOT_EYES)) . += span_warning("[t_His] eyes are bloodshot!") //ears - if(ears && !(obscured & ITEM_SLOT_EARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP)) + if(ears && !(obscured_slots & HIDEEARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [ears.examine_title(user)] on [t_his] ears." //suit/armor if(wear_suit && !HAS_TRAIT(wear_suit, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [wear_suit.examine_title(user)]." //suit/armor storage - if(s_store && !(obscured & ITEM_SLOT_SUITSTORE) && !HAS_TRAIT(s_store, TRAIT_EXAMINE_SKIP)) + if(s_store && !(obscured_slots & HIDESUITSTORAGE) && !HAS_TRAIT(s_store, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] carrying [s_store.examine_title(user)] on [t_his] [wear_suit.name]." //back if(back && !HAS_TRAIT(back, TRAIT_EXAMINE_SKIP)) @@ -491,7 +489,7 @@ var/obj/item/corresponding_item = get_item_for_held_index(part.held_index) || part . += "[t_He] [t_has] [corresponding_item.examine_title(user)] in place of [t_his] [initial(part.plaintext_zone)]." //gloves - if(gloves && !(obscured & ITEM_SLOT_GLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP)) + if(gloves && !(obscured_slots & HIDEGLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [gloves.examine_title(user)] on [t_his] hands." else if(GET_ATOM_BLOOD_DECAL_LENGTH(src) || blood_in_hands) if(num_hands) @@ -501,10 +499,10 @@ var/cables_or_cuffs = istype(handcuffed, /obj/item/restraints/handcuffs/cable) ? "restrained with cable" : "handcuffed" . += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] [cables_or_cuffs]!") //belt - if(belt && !(obscured & ITEM_SLOT_BELT) && !HAS_TRAIT(belt, TRAIT_EXAMINE_SKIP)) + if(belt && !(obscured_slots & HIDEBELT) && !HAS_TRAIT(belt, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_has] [belt.examine_title(user)] about [t_his] waist." //shoes - if(shoes && !(obscured & ITEM_SLOT_FEET) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP)) + if(shoes && !(obscured_slots & HIDESHOES) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP)) . += "[t_He] [t_is] wearing [shoes.examine_title(user)] on [t_his] feet." /// Collects info displayed about any HUDs the user has when examining src @@ -584,12 +582,12 @@ /mob/living/carbon/human/examine_more(mob/user) . = ..() - if(istype(w_uniform, /obj/item/clothing/under) && !(check_obscured_slots() & ITEM_SLOT_ICLOTHING) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP)) + if(istype(w_uniform, /obj/item/clothing/under) && !(obscured_slots & HIDEJUMPSUIT) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP)) var/obj/item/clothing/under/undershirt = w_uniform 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() @@ -622,7 +620,7 @@ /// Reports how old the mob appears to be /mob/living/carbon/human/proc/get_age_text() - if((wear_mask?.flags_inv & HIDEFACE) || (head?.flags_inv & HIDEFACE)) + if(obscured_slots & HIDEFACE) return var/age_text diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 7ef6b08251c8..d5b60051347f 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -72,8 +72,13 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) qdel(delete) /mob/living/carbon/human/dummy/has_equipped(obj/item/item, slot, initial = FALSE) + SHOULD_CALL_PARENT(FALSE) // assuming direct control item.item_flags |= IN_INVENTORY - return item.visual_equipped(src, slot, initial) + if(!item.visual_equipped(src, slot, initial)) + return FALSE + + add_item_coverage(item) + return TRUE /mob/living/carbon/human/dummy/proc/wipe_state() delete_equipment() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index d2c86f4da5f7..c40e6ab1b7ba 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -105,7 +105,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 @@ -588,7 +588,7 @@ * Returns false if we couldn't wash our hands due to them being obscured, otherwise true */ /mob/living/carbon/human/proc/wash_hands(clean_types) - if(check_covered_slots() & ITEM_SLOT_GLOVES) + if(covered_slots & HIDEGLOVES) return FALSE if(gloves) @@ -611,7 +611,7 @@ if(glasses && !is_eyes_covered(ITEM_SLOT_MASK|ITEM_SLOT_HEAD) && glasses.wash(clean_types)) . = TRUE - if(wear_mask && !(check_covered_slots() & ITEM_SLOT_MASK) && wear_mask.wash(clean_types)) + if(wear_mask && !(covered_slots & HIDEMASK) && wear_mask.wash(clean_types)) . = TRUE /** @@ -623,7 +623,7 @@ . |= COMPONENT_CLEANED // Wash hands if exposed - if(!gloves && (clean_types & CLEAN_TYPE_BLOOD) && blood_in_hands > 0 && !(check_covered_slots() & ITEM_SLOT_GLOVES)) + if(!gloves && (clean_types & CLEAN_TYPE_BLOOD) && blood_in_hands > 0 && !(covered_slots & HIDEGLOVES)) blood_in_hands = 0 update_worn_gloves() . |= COMPONENT_CLEANED @@ -1115,11 +1115,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_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 4e9e37010eed..a3034d11719a 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -393,7 +393,7 @@ if (!(flags & SHOCK_NO_HUMAN_ANIM)) electrocution_animation(4 SECONDS) -/mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit) //todo: update this to utilize check_obscured_slots() //and make sure it's check_obscured_slots(TRUE) to stop aciding through visors etc +/mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit) //todo: update this to utilize obscured_slots //and make sure it's check_obscured_slots(TRUE) to stop aciding through visors etc var/list/damaged = list() var/list/inventory_items_to_kill = list() var/acidity = acidpwr * min(acid_volume*0.005, 0.1) @@ -673,29 +673,28 @@ /mob/living/carbon/human/proc/burn_clothing(seconds_per_tick, stacks) var/list/burning_items = list() - var/covered = check_covered_slots() //HEAD// - if(glasses && !(covered & ITEM_SLOT_EYES)) + if(glasses && !(covered_slots & HIDEEYES)) burning_items += glasses - if(wear_mask && !(covered & ITEM_SLOT_MASK)) + if(wear_mask && !(covered_slots & HIDEMASK)) burning_items += wear_mask - if(wear_neck && !(covered & ITEM_SLOT_NECK)) + if(wear_neck && !(covered_slots & HIDENECK)) burning_items += wear_neck - if(ears && !(covered & ITEM_SLOT_EARS)) + if(ears && !(covered_slots & HIDEEARS)) burning_items += ears if(head) burning_items += head //CHEST// - if(w_uniform && !(covered & ITEM_SLOT_ICLOTHING)) + if(w_uniform && !(covered_slots & HIDEJUMPSUIT)) burning_items += w_uniform if(wear_suit) burning_items += wear_suit //ARMS & HANDS// var/obj/item/clothing/arm_clothes = null - if(gloves && !(covered & ITEM_SLOT_GLOVES)) + if(gloves && !(covered_slots & HIDEGLOVES)) arm_clothes = gloves else if(wear_suit && ((wear_suit.body_parts_covered & HANDS) || (wear_suit.body_parts_covered & ARMS))) arm_clothes = wear_suit @@ -706,7 +705,7 @@ //LEGS & FEET// var/obj/item/clothing/leg_clothes = null - if(shoes && !(covered & ITEM_SLOT_FEET)) + if(shoes && !(covered_slots & HIDESHOES)) leg_clothes = shoes else if(wear_suit && ((wear_suit.body_parts_covered & FEET) || (wear_suit.body_parts_covered & LEGS))) leg_clothes = wear_suit diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 78d4db6fa0a4..5269d7ebefb7 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" //Hair colour and style var/hair_color = COLOR_BLACK @@ -70,7 +71,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 5c4140223be8..1bcdb336d9f6 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,66 +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("") + + 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/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)) + 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" - if(face_name) - if(add_id_name && id_name && (id_name != face_name)) + + // 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])" - 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 + // 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 - for(var/obj/item/worn_item in get_equipped_items()) - if(!(worn_item.flags_inv & HIDEFACE)) - continue + 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 053582174d18..a962b5d33cc3 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -29,40 +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/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 5c9c3ef86c64..8579ceeeb0ca 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -70,14 +70,10 @@ There are several things that need to be remembered: //damage overlays update_damage_overlays() -/mob/living/carbon/human/update_obscured_slots(obscured_flags) - ..() - sec_hud_set_security_status() - /* --------------------------------------- */ //vvvvvv UPDATE_INV PROCS vvvvvv -/mob/living/carbon/human/update_worn_undersuit(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_undersuit() remove_overlay(UNIFORM_LAYER) if(client && hud_used) @@ -88,10 +84,7 @@ There are several things that need to be remembered: var/obj/item/clothing/under/uniform = w_uniform update_hud_uniform(uniform) - if(update_obscured) - update_obscured_slots(uniform.flags_inv) - - if(HAS_TRAIT(uniform, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_ICLOTHING)) + if(HAS_TRAIT(uniform, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEJUMPSUIT)) return var/target_overlay = uniform.icon_state @@ -136,7 +129,7 @@ There are several things that need to be remembered: apply_overlay(UNIFORM_LAYER) check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_ICLOTHING) -/mob/living/carbon/human/update_worn_id(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_id() remove_overlay(ID_LAYER) if(client && hud_used) @@ -149,9 +142,6 @@ There are several things that need to be remembered: var/obj/item/worn_item = wear_id update_hud_id(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON)) return @@ -169,7 +159,7 @@ There are several things that need to be remembered: apply_overlay(ID_LAYER) -/mob/living/carbon/human/update_worn_gloves(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_gloves() remove_overlay(GLOVES_LAYER) if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]) @@ -198,10 +188,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = gloves update_hud_gloves(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_GLOVES)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEGLOVES)) return var/icon_file = 'icons/mob/clothing/hands.dmi' @@ -233,7 +220,7 @@ There are several things that need to be remembered: overlays_standing[GLOVES_LAYER] = gloves_overlay apply_overlay(GLOVES_LAYER) -/mob/living/carbon/human/update_worn_glasses(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_glasses() remove_overlay(GLASSES_LAYER) var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) @@ -248,10 +235,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = glasses update_hud_glasses(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_EYES)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEEYES)) return var/icon_file = 'icons/mob/clothing/eyes.dmi' @@ -261,7 +245,8 @@ There are several things that need to be remembered: overlays_standing[GLASSES_LAYER] = glasses_overlay apply_overlay(GLASSES_LAYER) -/mob/living/carbon/human/update_worn_ears(update_obscured = TRUE) + +/mob/living/carbon/human/update_worn_ears() remove_overlay(EARS_LAYER) var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) @@ -276,10 +261,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = ears update_hud_ears(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_EARS)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEEARS)) return var/icon_file = 'icons/mob/clothing/ears.dmi' @@ -289,7 +271,7 @@ There are several things that need to be remembered: overlays_standing[EARS_LAYER] = ears_overlay apply_overlay(EARS_LAYER) -/mob/living/carbon/human/update_worn_neck(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_neck() remove_overlay(NECK_LAYER) if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]) @@ -300,10 +282,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = wear_neck update_hud_neck(wear_neck) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_NECK)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDENECK)) return var/icon_file = 'icons/mob/clothing/neck.dmi' @@ -315,7 +294,7 @@ There are several things that need to be remembered: apply_overlay(NECK_LAYER) -/mob/living/carbon/human/update_worn_shoes(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_shoes() remove_overlay(SHOES_LAYER) if(num_legs < 2) @@ -329,10 +308,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = shoes update_hud_shoes(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_FEET)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDESHOES)) return var/icon_file = DEFAULT_SHOES_FILE @@ -356,7 +332,7 @@ There are several things that need to be remembered: apply_overlay(SHOES_LAYER) check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_FEET) -/mob/living/carbon/human/update_suit_storage(update_obscured = TRUE) +/mob/living/carbon/human/update_suit_storage() remove_overlay(SUIT_STORE_LAYER) if(client && hud_used) @@ -367,10 +343,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = s_store update_hud_s_store(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_SUITSTORE)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDESUITSTORAGE)) return var/mutable_appearance/s_store_overlay = worn_item.build_worn_icon(default_layer = SUIT_STORE_LAYER, default_icon_file = 'icons/mob/clothing/belt_mirror.dmi') @@ -379,7 +352,7 @@ There are several things that need to be remembered: overlays_standing[SUIT_STORE_LAYER] = s_store_overlay apply_overlay(SUIT_STORE_LAYER) -/mob/living/carbon/human/update_worn_head(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_head() remove_overlay(HEAD_LAYER) if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]) var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1] @@ -389,10 +362,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = head update_hud_head(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_HEAD)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEHEADGEAR)) return var/icon_file = 'icons/mob/clothing/head/default.dmi' @@ -405,7 +375,7 @@ There are several things that need to be remembered: apply_overlay(HEAD_LAYER) check_body_shape(BODYSHAPE_SNOUTED, ITEM_SLOT_HEAD) -/mob/living/carbon/human/update_worn_belt(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_belt() remove_overlay(BELT_LAYER) if(client && hud_used) @@ -416,10 +386,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = belt update_hud_belt(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_BELT)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEBELT)) return var/icon_file = 'icons/mob/clothing/belt.dmi' @@ -437,7 +404,7 @@ There are several things that need to be remembered: apply_overlay(BELT_LAYER) -/mob/living/carbon/human/update_worn_oversuit(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_oversuit() remove_overlay(SUIT_LAYER) if(client && hud_used) @@ -448,9 +415,6 @@ There are several things that need to be remembered: var/obj/item/worn_item = wear_suit update_hud_wear_suit(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON)) return @@ -485,7 +449,7 @@ There are several things that need to be remembered: client.screen += r_store update_observer_view(r_store) -/mob/living/carbon/human/update_worn_mask(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_mask() remove_overlay(FACEMASK_LAYER) var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD) @@ -500,10 +464,7 @@ There are several things that need to be remembered: var/obj/item/worn_item = wear_mask update_hud_wear_mask(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_MASK)) + if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEMASK)) return var/icon_file = 'icons/mob/clothing/mask.dmi' @@ -515,7 +476,7 @@ There are several things that need to be remembered: apply_overlay(FACEMASK_LAYER) check_body_shape(BODYSHAPE_SNOUTED, ITEM_SLOT_MASK) -/mob/living/carbon/human/update_worn_back(update_obscured = TRUE) +/mob/living/carbon/human/update_worn_back() remove_overlay(BACK_LAYER) if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]) @@ -527,9 +488,6 @@ There are several things that need to be remembered: var/mutable_appearance/back_overlay update_hud_back(worn_item) - if(update_obscured) - update_obscured_slots(worn_item.flags_inv) - if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON)) return diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm index 4bea0e925eac..827716b91a6b 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)) @@ -13,15 +12,9 @@ RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face)) - // List of signals which force a visible name update - // TRAIT_UNKNOWN is excluded as it calls update_ID_card which also calls update_visible_name - var/static/list/name_update_signals = list( - SIGNAL_ADDTRAIT(TRAIT_INVISIBLE_MAN), - SIGNAL_REMOVETRAIT(TRAIT_INVISIBLE_MAN), - SIGNAL_ADDTRAIT(TRAIT_DISFIGURED), - SIGNAL_REMOVETRAIT(TRAIT_DISFIGURED), - ) - RegisterSignals(src, name_update_signals, PROC_REF(update_visible_name)) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), PROC_REF(refresh_obscured)) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_INVISIBLE_MAN), SIGNAL_REMOVETRAIT(TRAIT_INVISIBLE_MAN)), PROC_REF(invisible_man_toggle)) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_DISFIGURED), SIGNAL_REMOVETRAIT(TRAIT_DISFIGURED)), PROC_REF(update_visible_name)) /// Gaining or losing [TRAIT_DWARF] updates our height and grants passtable /mob/living/carbon/human/proc/on_dwarf_trait(datum/source) @@ -39,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() @@ -91,3 +69,9 @@ vision_distance = COMBAT_MESSAGE_RANGE, ) playsound(src, SFX_RUSTLE, 50, TRUE, -5, frequency = 0.8) + +/// When [TRAIT_INVISIBLE_MAN] is added or removed we need to update a few things +/mob/living/carbon/human/proc/invisible_man_toggle(datum/source) + SIGNAL_HANDLER + refresh_obscured() + update_visible_name() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 0805e2a11694..a2dfad08eeec 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -215,7 +215,6 @@ . = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should. if(!. || !item_dropping) return - var/not_handled = FALSE //if we actually unequipped an item, this is because we dont want to run this proc twice, once for carbons and once for humans if(item_dropping == wear_suit) if(s_store && invdrop) dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit. @@ -280,15 +279,12 @@ s_store = null if(!QDELETED(src)) update_suit_storage() - else - not_handled = TRUE - - if(not_handled) - return - update_equipment_speed_mods() - update_obscured_slots(item_dropping.flags_inv) - hud_used?.update_locked_slots() +/mob/living/carbon/human/item_coverage_changed(added_slots, removed_slots) + . = ..() + if((added_slots|removed_slots) & HIDEFACE) + sec_hud_set_security_status() + update_visible_name() /mob/living/carbon/human/toggle_internals(obj/item/tank, is_external = FALSE) // Just close the tank if it's the one the mob already has open. @@ -420,9 +416,3 @@ new_bodypart.try_attach_limb(src, TRUE) hand_bodyparts[i] = new_bodypart ..() //Don't redraw hands until we have organs for them - -/mob/living/carbon/human/update_equipment(obj/item/source) - . = ..() - // If the item we equipped/unequipped hides our face, we (potentially) need to update our name - if (source.flags_inv & HIDEFACE) - update_visible_name() 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 f3361ee7a724..eca9383698f9 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 7e54ce261966..e1653c9f3b48 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 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 + 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 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 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 - 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 + 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 c23c0d4f2b68..3eaa7346fdcc 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -31,17 +31,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/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index e03cef43cf3b..9d0797e0b04e 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -78,12 +78,7 @@ return SSaccessories.caps_list /datum/bodypart_overlay/mutant/mushroom_cap/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner) - var/mob/living/carbon/human/human = bodypart_owner.owner - if(!istype(human)) - return TRUE - if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR)) - return FALSE - return TRUE + return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR) /datum/bodypart_overlay/mutant/mushroom_cap/override_color(obj/item/bodypart/bodypart_owner) //The mushroom cap is red by default (can still be dyed) diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index d68e588fcb8b..60010bcfd842 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -23,6 +23,7 @@ TRAIT_UNHUSKABLE, TRAIT_XENO_IMMUNE, ) + inherent_factions = list(FACTION_SKELETON) inherent_biotypes = MOB_UNDEAD|MOB_HUMANOID mutanttongue = /obj/item/organ/tongue/bone mutantstomach = /obj/item/organ/stomach/bone 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 68dcc4ea89e5..3fd0212c2847 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 a2f4b623826d..8ab032018078 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -1,21 +1,3 @@ -/// Returns a list of slots that are *visibly* covered by clothing and thus cannot be seen by others -/mob/living/carbon/proc/check_obscured_slots() - var/hidden_slots = NONE - - for(var/obj/item/equipped_item in get_equipped_items()) - hidden_slots |= equipped_item.flags_inv - - return hidden_slots_to_inventory_slots(hidden_slots) - -/// Returns a list of slots that are protected by other clothing, but could possibly be seen by others, via transparent visors and similar stuff -/mob/living/carbon/proc/check_covered_slots() - var/hidden_slots = NONE - - for(var/obj/item/equipped_item in get_equipped_items()) - hidden_slots |= equipped_item.flags_inv | equipped_item.transparent_protection - - return hidden_slots_to_inventory_slots(hidden_slots) - /// Convers HIDEX to ITEM_SLOT_X, should be phased out in favor of using latter everywhere later /proc/hidden_slots_to_inventory_slots(hidden_slots) var/obscured = NONE @@ -81,34 +63,13 @@ /// Returns items which are currently visible on the mob /mob/living/carbon/proc/get_visible_items() - var/static/list/visible_slots = list( - ITEM_SLOT_OCLOTHING, - ITEM_SLOT_ICLOTHING, - ITEM_SLOT_GLOVES, - ITEM_SLOT_EYES, - ITEM_SLOT_EARS, - ITEM_SLOT_MASK, - ITEM_SLOT_HEAD, - ITEM_SLOT_FEET, - ITEM_SLOT_ID, - ITEM_SLOT_BELT, - ITEM_SLOT_BACK, - ITEM_SLOT_NECK, - ITEM_SLOT_HANDS, - ITEM_SLOT_SUITSTORE, - ITEM_SLOT_HANDCUFFED, - ITEM_SLOT_LEGCUFFED, - ) - var/list/obscured = check_obscured_slots() var/list/visible_items = list() - for (var/slot in visible_slots) - if (obscured & slot) - continue - var/obj/item/equipped = get_item_by_slot(slot) - if (equipped) - visible_items += equipped + var/obscured_item_slots = hidden_slots_to_inventory_slots(obscured_slots) for (var/obj/item/held in held_items) visible_items += held + for(var/obj/item/thing in get_equipped_items()) + if(!(get_slot_by_item(thing) & obscured_item_slots)) + visible_items += thing return visible_items /mob/living/carbon/proc/equip_in_one_of_slots(obj/item/equipping, list/slots, qdel_on_fail = TRUE, indirect_action = FALSE) @@ -154,13 +115,10 @@ equipping.pulledby.stop_pulling() equipping.screen_loc = null - if(client) - client.screen -= equipping + client?.screen -= equipping - if(observers?.len) - for(var/mob/dead/observe as anything in observers) - if(observe.client) - observe.client.screen -= equipping + for(var/mob/dead/observe as anything in observers) + observe.client?.screen -= equipping equipping.forceMove(src) SET_PLANE_EXPLICIT(equipping, ABOVE_HUD_PLANE, src) @@ -190,7 +148,6 @@ update_worn_neck(equipping) if(ITEM_SLOT_HANDCUFFED) set_handcuffed(equipping) - update_handcuffed() if(ITEM_SLOT_LEGCUFFED) legcuffed = equipping update_worn_legcuffs() @@ -203,24 +160,43 @@ //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 -/mob/living/carbon/has_equipped(obj/item/item, slot, initial) +/mob/living/carbon/get_equipped_speed_mod_items() + return ..() + get_equipped_items() + +/mob/living/carbon/has_equipped(obj/item/item, slot, initial = FALSE) . = ..() + if(!.) + return + + 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/get_equipped_speed_mod_items() - return ..() + get_equipped_items() +/mob/living/carbon/has_unequipped(obj/item/item) + . = ..() // NB: ATP the item is still in the slot, but no longer has the IN_INVENTORY flag (so is not returned by get_equipped_items) + if(!.) + return + + 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) . = ..() //Sets the default return value to what the parent returns. if(!. || !item_dropping) //We don't want to set anything to null if the parent returned 0. return - var/not_handled = FALSE //if we actually unequipped an item, this is because we dont want to run this proc twice, once for carbons and once for humans if(item_dropping == head) head = null if(!QDELETED(src)) @@ -241,14 +217,10 @@ set_handcuffed(null) if(buckled?.buckle_requires_restraints) buckled.unbuckle_mob(src) - if(!QDELETED(src)) - update_handcuffed() else if(item_dropping == legcuffed) legcuffed = null if(!QDELETED(src)) update_worn_legcuffs() - else - not_handled = TRUE // Not an else-if because we're probably equipped in another slot if(item_dropping == internal && (QDELETED(src) || QDELETED(item_dropping) || item_dropping.loc != src)) @@ -256,12 +228,44 @@ if(!QDELETED(src)) update_mob_action_buttons(UPDATE_BUTTON_STATUS) - if(not_handled) - return +/// Adds the passed item's coverage to the mob's coverage related flags +/mob/living/carbon/proc/add_item_coverage(obj/item/item) + var/pre_coverage = obscured_slots + obscured_slots |= item.flags_inv + covered_slots |= item.flags_inv | item.transparent_protection + if(pre_coverage != obscured_slots) + item_coverage_changed(obscured_slots & ~pre_coverage, pre_coverage & ~obscured_slots) - update_equipment_speed_mods() - update_obscured_slots(item_dropping.flags_inv) - hud_used?.update_locked_slots() +/// Removes the passed item's coverage from the mob's coverage related flags +/mob/living/carbon/proc/remove_item_coverage(obj/item/item) + refresh_obscured() // No way to remove a single item's coverage without recalculating everything + +/mob/living/carbon/refresh_obscured() + var/pre_coverage = obscured_slots + + obscured_slots = NONE + covered_slots = NONE + for(var/obj/item/other_equipped_item as anything in get_equipped_items()) + obscured_slots |= other_equipped_item.flags_inv + covered_slots |= other_equipped_item.flags_inv | other_equipped_item.transparent_protection + + if(HAS_TRAIT(src, TRAIT_HUSK) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) + obscured_slots |= HIDEHAIR|HIDEFACIALHAIR + + if(pre_coverage != obscured_slots) + item_coverage_changed(obscured_slots & ~pre_coverage, pre_coverage & ~obscured_slots) + +/** + * Called when a mob's obscured slots change + * + * Args + * * added_slots - slots that were added to obscured_slots + * * removed_slots - slots that were removed from obscured_slots + */ +/mob/living/carbon/proc/item_coverage_changed(added_slots, removed_slots) + update_clothing(hidden_slots_to_inventory_slots(added_slots|removed_slots)) + if((added_slots|removed_slots) & (HIDEJUMPSUIT|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEMUTWINGS|HIDEANTENNAE)) + update_body() /// Returns the helmet if an air tank compatible helmet is equipped. /mob/living/carbon/proc/can_breathe_helmet() diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 98077996f0ab..8f1fd0b431d1 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -14,6 +14,19 @@ . = ..() user.spin(TAUNT_EMOTE_DURATION, 0.1 SECONDS) +/datum/emote/living/tongue + key = "tongue" + key_third_person = "tongues" + message = "sticks their tongue out." + +/datum/emote/living/tongue/run_emote(mob/user, params, type_override, intentional) + var/mob/living/carbon/human/human_user = user + if(istype(human_user) && !human_user.get_organ_slot(ORGAN_SLOT_TONGUE)) + to_chat(human_user, span_warning("You don't have a tongue!")) + return + . = ..() + QDEL_IN(human_user.give_emote_overlay(/datum/bodypart_overlay/simple/emote/tongue), 5.2 SECONDS) + /datum/emote/living/blush key = "blush" key_third_person = "blushes" @@ -385,6 +398,11 @@ return return user.dna.species.get_cough_sound(user) +/datum/emote/living/wheeze + key = "wheeze" + key_third_person = "wheezes" + message = "wheezes!" + emote_type = EMOTE_AUDIBLE /datum/emote/living/pout key = "pout" @@ -630,7 +648,7 @@ TIMER_COOLDOWN_START(user, COOLDOWN_YAWN_PROPAGATION, cooldown * 3) var/mob/living/carbon/carbon_user = user - if(istype(carbon_user) && ((carbon_user.wear_mask?.flags_inv & HIDEFACE) || carbon_user.head?.flags_inv & HIDEFACE)) + if(carbon_user.obscured_slots & HIDEFACE) return // if your face is obscured, skip propagation var/propagation_distance = user.client ? 5 : 2 // mindless mobs are less able to spread yawns diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f0d3e1f249e9..bab3c20164b2 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -2478,11 +2478,6 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(GRAB_KILL) add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/kill) - -/// Only defined for carbons who can wear masks and helmets, we just assume other mobs have visible faces -/mob/living/proc/is_face_visible() - return TRUE - /// Sprite to show for photocopying mob butts /mob/living/proc/get_butt_sprite() return null @@ -2958,7 +2953,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 7754593a4327..505000db7679 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) 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 69c548ab9379..d1c35cf77a3d 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -424,7 +424,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 75564b0448d4..a0c117593de1 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -781,7 +781,7 @@ var/obj/structure/ai_core/new_core = new /obj/structure/ai_core/deactivated(loc, posibrain_inside)//Spawns a deactivated terminal at AI location. new_core.circuit.battery = battery ai_restore_power()//So the AI initially has power. - control_disabled = TRUE //Can't control things remotely if you're stuck in a card! + set_control_disabled(TRUE) //Can't control things remotely if you're stuck in a card! radio_enabled = FALSE //No talking on the built-in radio for you either! forceMove(card) card.AI = src @@ -810,14 +810,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) @@ -1092,12 +1092,16 @@ . = ..() .[/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 return +/mob/living/silicon/ai/proc/set_control_disabled(control_disabled) + SEND_SIGNAL(src, COMSIG_SILICON_AI_SET_CONTROL_DISABLED, control_disabled) + src.control_disabled = control_disabled + #undef HOLOGRAM_CHOICE_CHARACTER #undef CHARACTER_TYPE_SELF #undef CHARACTER_TYPE_CREWMEMBER diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 4f910463b9b3..eb9eb2d2fc02 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -312,6 +312,12 @@ eye_lights.icon = icon add_overlay(eye_lights) + 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) if(wiresexposed) add_overlay("ov-opencover +w") diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 0306e8b56649..e198a254c8b2 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!") @@ -517,3 +535,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 07eb2b23611c..8ae9d1cf0c6b 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 d473cf205fd0..8c8e27080929 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -213,7 +213,7 @@ if(!to_stock) //Nothing for us in the silo continue - storage_datum.energy += charger.materials.use_materials(list(GET_MATERIAL_REF(storage_datum.mat_type) = to_stock), action = "resupplied", name = "units", user_data = ID_DATA(robot)) + storage_datum.energy += charger.materials.use_materials(list(GET_MATERIAL_REF(storage_datum.mat_type) = to_stock), action = "restocked", name = "units", user_data = ID_DATA(robot)) charger.balloon_alert(robot, "+ [to_stock]u [initial(storage_datum.mat_type.name)]") playsound(charger, 'sound/items/weapons/gun/general/mag_bullet_insert.ogg', 50, vary = FALSE) return @@ -386,7 +386,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, @@ -404,6 +403,7 @@ /obj/item/stack/rods/cyborg, /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( @@ -413,6 +413,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" @@ -701,6 +731,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( @@ -718,7 +750,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, @@ -730,6 +761,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( @@ -743,6 +775,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" @@ -902,6 +947,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" @@ -912,7 +958,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, @@ -926,6 +971,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, @@ -937,6 +983,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 eb90260a3ff2..ecd088b26d4d 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 7e806bbdf8c9..c3edff2b94b2 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/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index d2fb1785b868..d902fdf1eff8 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -349,7 +349,6 @@ return FALSE if(!current_target.handcuffed) current_target.set_handcuffed(new cuff_type(current_target)) - current_target.update_handcuffed() playsound(src, SFX_LAW, 50, FALSE) back_to_idle() diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index c6e03028a263..bd8b6fdc01c8 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 ace7f2d257e1..909a06706308 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/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 4f07a92bec1f..dc469a813bf7 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -200,7 +200,7 @@ Difficulty: Medium /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget(atom/attacked_target) . = ..() if(. && prob(12)) - INVOKE_ASYNC(dash, TYPE_PROC_REF(/datum/action, Trigger), NONE, target) + INVOKE_ASYNC(dash, TYPE_PROC_REF(/datum/action, Trigger), src, NONE, target) /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom name = "hostile-environment miner" 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 8cc6fc3e02f9..e105ab56cd1e 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 9999736abf72..a2e718aa851e 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 c65176ceacda..d324557412dc 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.dm b/code/modules/mob/mob.dm index a047f0dc1ed9..4f5432ee1f04 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -675,18 +675,25 @@ return // check to see if their face is blocked or, if not, a signal blocks it - if(examined_mob.is_face_visible() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT) + if(examined_mob.can_eye_contact() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT) var/obj/item/clothing/eye_cover = examined_mob.is_eyes_covered() if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect)) var/msg = span_smallnotice("You make eye contact with [examined_mob].") addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, msg), 0.3 SECONDS) // so the examine signal has time to fire and this will print after - if(!imagined_eye_contact && is_face_visible() && !examined_mob.is_blind() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT) + if(!imagined_eye_contact && can_eye_contact() && !examined_mob.is_blind() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT) var/obj/item/clothing/eye_cover = is_eyes_covered() if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect)) var/msg = span_smallnotice("[src] makes eye contact with you.") addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), examined_mob, msg), 0.3 SECONDS) +/// Checks if we can make eye contact or someone can make eye contact with us +/mob/living/proc/can_eye_contact() + return TRUE + +/mob/living/carbon/can_eye_contact() + return !(obscured_slots & HIDEFACE) + /** * Called by using Activate Held Object with an empty hand/limb * @@ -1502,11 +1509,6 @@ else living_flags |= QUEUE_NUTRITION_UPDATE -/// Update mob stats based on equipment we are wearing when an item is equipped/dropped, to be overriden by children -/// source - Item that caused the update by being equipped/dropped -/mob/proc/update_equipment(obj/item/source) - update_equipment_speed_mods() - /// Apply a proper movespeed modifier based on items we have equipped /mob/proc/update_equipment_speed_mods() var/speedies = 0 diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index fe91176128b4..d43edf33d746 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 f833ad9028a6..16a77411e4c0 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/mob/mob_update_icons.dm b/code/modules/mob/mob_update_icons.dm index b14da72e8306..210c041408c2 100644 --- a/code/modules/mob/mob_update_icons.dm +++ b/code/modules/mob/mob_update_icons.dm @@ -42,42 +42,24 @@ if(slot_flags & ITEM_SLOT_HANDS) update_held_items() -///Updates item slots obscured by this item (or using an override of flags to check) -/mob/proc/update_obscured_slots(obscured_flags) - if(obscured_flags & HIDEGLOVES) - update_worn_gloves(update_obscured = FALSE) - if(obscured_flags & HIDESUITSTORAGE) - update_suit_storage(update_obscured = FALSE) - if(obscured_flags & HIDEJUMPSUIT) - update_worn_undersuit(update_obscured = FALSE) - if(obscured_flags & HIDESHOES) - update_worn_shoes(update_obscured = FALSE) - if(obscured_flags & HIDEMASK) - update_worn_mask(update_obscured = FALSE) - if(obscured_flags & HIDEBELT) - update_worn_belt(update_obscured = FALSE) - if(obscured_flags & HIDEEARS) - update_worn_ears(update_obscured = FALSE) - if(obscured_flags & HIDEEYES) - update_worn_glasses(update_obscured = FALSE) - if(obscured_flags & HIDENECK) - update_worn_neck(update_obscured = FALSE) - if(obscured_flags & HIDEHEADGEAR) - update_worn_head(update_obscured = FALSE) +/// Recalculates the mob's obscured and covered slots based on currently equipped items +/mob/proc/refresh_obscured() + SIGNAL_HANDLER + return /mob/proc/update_icons() return ///Updates the handcuff overlay & HUD element. -/mob/proc/update_worn_handcuffs(update_obscured = FALSE) +/mob/proc/update_worn_handcuffs() return ///Updates the legcuff overlay & HUD element. -/mob/proc/update_worn_legcuffs(update_obscured = FALSE) +/mob/proc/update_worn_legcuffs() return ///Updates the back overlay & HUD element. -/mob/proc/update_worn_back(update_obscured = FALSE) +/mob/proc/update_worn_back() return ///Updates the held items overlay(s) & HUD element. @@ -86,27 +68,27 @@ SEND_SIGNAL(src, COMSIG_MOB_UPDATE_HELD_ITEMS) ///Updates the mask overlay & HUD element. -/mob/proc/update_worn_mask(update_obscured = FALSE) +/mob/proc/update_worn_mask() return ///Updates the neck overlay & HUD element. -/mob/proc/update_worn_neck(update_obscured = FALSE) +/mob/proc/update_worn_neck() return ///Updates the oversuit overlay & HUD element. -/mob/proc/update_worn_oversuit(update_obscured = FALSE) +/mob/proc/update_worn_oversuit() return ///Updates the undersuit/uniform overlay & HUD element. -/mob/proc/update_worn_undersuit(update_obscured = FALSE) +/mob/proc/update_worn_undersuit() return ///Updates the belt overlay & HUD element. -/mob/proc/update_worn_belt(update_obscured = FALSE) +/mob/proc/update_worn_belt() return ///Updates the on-head overlay & HUD element. -/mob/proc/update_worn_head(update_obscured = FALSE) +/mob/proc/update_worn_head() return ///Updates every part of a carbon's body. Including parts, mutant parts, lips, underwear, and socks. @@ -117,23 +99,23 @@ return ///Updates the glasses overlay & HUD element. -/mob/proc/update_worn_glasses(update_obscured = FALSE) +/mob/proc/update_worn_glasses() return ///Updates the id overlay & HUD element. -/mob/proc/update_worn_id(update_obscured = FALSE) +/mob/proc/update_worn_id() return ///Updates the shoes overlay & HUD element. -/mob/proc/update_worn_shoes(update_obscured = FALSE) +/mob/proc/update_worn_shoes() return ///Updates the glasses overlay & HUD element. -/mob/proc/update_worn_gloves(update_obscured = FALSE) +/mob/proc/update_worn_gloves() return ///Updates the suit storage overlay & HUD element. -/mob/proc/update_suit_storage(update_obscured = FALSE) +/mob/proc/update_suit_storage() return ///Updates the pocket overlay & HUD element. @@ -141,5 +123,5 @@ return ///Updates the headset overlay & HUD element. -/mob/proc/update_worn_ears(update_obscured = FALSE) +/mob/proc/update_worn_ears() return diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm index d0424d9682dc..8385b6576710 100644 --- a/code/modules/mod/mod_actions.dm +++ b/code/modules/mod/mod_actions.dm @@ -32,7 +32,7 @@ /datum/action/item_action/mod/do_effect(trigger_flags) var/obj/item/mod/control/mod = target - if(mod.malfunctioning && prob(75)) + if(mod.malfunctioning && prob(MOD_MALFUNCTION_PROB)) mod.balloon_alert(usr, "button malfunctions!") return FALSE return TRUE @@ -182,7 +182,7 @@ . = ..() if(!.) return - module.on_select() + module.on_select(owner) /datum/action/item_action/mod/pinnable/module/apply_button_overlay(atom/movable/screen/movable/action_button/current_button, force) current_button.cut_overlays() diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index 76fa31d5eacf..d2baba9c8d21 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -271,7 +271,7 @@ part.alternate_worn_layer = part_datum.unsealed_layer update_speed() wearer.update_clothing(part.slot_flags | slot_flags) - wearer.update_obscured_slots(part.visor_flags_inv) + wearer.refresh_obscured() if((part.clothing_flags & (MASKINTERNALS|HEADINTERNALS)) && wearer.invalid_internals()) wearer.cutoff_internals() SEND_SIGNAL(src, COMSIG_MOD_PART_SEALED, part_datum) diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index 269eb4a96bb8..461cb8c4f86e 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -45,7 +45,7 @@ /// Place an AI in control of your suit functions /obj/item/mod/control/proc/ai_enter_mod(mob/living/silicon/ai/new_ai) - new_ai.control_disabled = FALSE + new_ai.set_control_disabled(FALSE) new_ai.radio_enabled = TRUE new_ai.ai_restore_power() new_ai.cancel_camera() @@ -58,7 +58,7 @@ /obj/item/mod/control/proc/ai_exit_mod(obj/item/aicard/card) var/mob/living/silicon/ai/old_ai = ai_assistant old_ai.ai_restore_power()//So the AI initially has power. - old_ai.control_disabled = TRUE + old_ai.set_control_disabled(TRUE) old_ai.radio_enabled = FALSE old_ai.disconnect_shell() old_ai.forceMove(card) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index d6974643acf0..cb4689e81d04 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -191,6 +191,7 @@ set_wearer(user) else if(wearer) unset_wearer() + return ..() /obj/item/mod/control/dropped(mob/user) . = ..() @@ -377,7 +378,7 @@ return cell /obj/item/mod/control/GetAccess() - if(ai_controller) + if(ai_controller && req_access) return req_access.Copy() else return ..() diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 2a1c677b6411..db4b0f61c255 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -167,6 +167,7 @@ part.worn_icon = used_skin[MOD_WORN_ICON_OVERRIDE] || 'icons/mob/clothing/modsuit/mod_clothing.dmi' part.icon_state = "[skin]-[part.base_icon_state][mod.get_part_datum(part).sealed ? "-sealed" : ""]" mod.wearer?.update_clothing(part.slot_flags) + mod.wearer?.refresh_obscured() /datum/armor/mod_theme melee = 10 diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 03cd746045c5..26e06bb0bdd5 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/mod_ui.dm b/code/modules/mod/mod_ui.dm index 9a8e77f7e8e7..e25c3b2a836c 100644 --- a/code/modules/mod/mod_ui.dm +++ b/code/modules/mod/mod_ui.dm @@ -86,7 +86,7 @@ . = ..() if(.) return - if(malfunctioning && prob(75)) + if(malfunctioning && prob(MOD_MALFUNCTION_PROB)) balloon_alert(ui.user, "button malfunctions!") return switch(action) @@ -108,7 +108,7 @@ var/obj/item/mod/module/module = locate(params["ref"]) in modules if(!module) return - module.on_select() + module.on_select(ui.user) // We can now if("configure") var/obj/item/mod/module/module = locate(params["ref"]) in modules if(!module) diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index 5f0be8207f92..ecf20ae2532a 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 @@ -105,32 +106,29 @@ return TRUE /// Called when the module is selected from the TGUI, radial or the action button -/obj/item/mod/module/proc/on_select() - if(!mod.wearer) - if(ismob(mod.loc)) - balloon_alert(mod.loc, "not equipped!") +/obj/item/mod/module/proc/on_select(mob/activator) + if(!mod.wearer && !(allow_flags & MODULE_ALLOW_UNWORN)) //No wearer and cannot be used unworn + balloon_alert(activator, "not equipped!") return - if(((!mod.active || mod.activating) && !(allow_flags & MODULE_ALLOW_INACTIVE)) || module_type == MODULE_PASSIVE) - if(mod.wearer) - balloon_alert(mod.wearer, "not active!") + if(((!mod.active || mod.activating) && !(allow_flags & (MODULE_ALLOW_INACTIVE | MODULE_ALLOW_UNWORN))) || module_type == MODULE_PASSIVE) // not active + balloon_alert(activator, "not active!") return - if(!has_required_parts(mod.mod_parts, need_active = TRUE)) - if(mod.wearer) - balloon_alert(mod.wearer, "required parts inactive!") - var/list/slot_strings = list() - for(var/slot in required_slots) - var/list/slot_list = parse_slot_flags(slot) - slot_strings += (length(slot_list) == 1 ? "" : "one of ") + english_list(slot_list, and_text = " or ") - to_chat(mod.wearer, span_warning("[src] requires these slots to be deployed: [english_list(slot_strings)]")) - playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + if(!has_required_parts(mod.mod_parts, need_active = TRUE) && !(allow_flags & MODULE_ALLOW_UNWORN)) // Doesn't have parts + balloon_alert(activator, "required parts inactive!") + var/list/slot_strings = list() + for(var/slot in required_slots) + var/list/slot_list = parse_slot_flags(slot) + slot_strings += (length(slot_list) == 1 ? "" : "one of ") + english_list(slot_list, and_text = " or ") + to_chat(activator, span_warning("[src] requires these slots to be deployed: [english_list(slot_strings)]")) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return if(module_type != MODULE_USABLE) if(active) - deactivate() + deactivate(activator) else - activate() + activate(activator) else - used() + used(activator) SEND_SIGNAL(mod, COMSIG_MOD_MODULE_SELECTED, src) /// Apply a cooldown until this item can be used again @@ -141,16 +139,16 @@ SEND_SIGNAL(src, COMSIG_MODULE_COOLDOWN_STARTED, applied_cooldown) /// Called when the module is activated -/obj/item/mod/module/proc/activate() +/obj/item/mod/module/proc/activate(mob/activator) if(!COOLDOWN_FINISHED(src, cooldown_timer)) - balloon_alert(mod.wearer, "on cooldown!") + balloon_alert(activator, "on cooldown!") return FALSE if(!mod.active || mod.activating || !mod.get_charge()) - balloon_alert(mod.wearer, "unpowered!") + balloon_alert(activator, "unpowered!") return FALSE if(!(allow_flags & MODULE_ALLOW_PHASEOUT) && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob)) //specifically a to_chat because the user is phased out. - to_chat(mod.wearer, span_warning("You cannot activate this right now.")) + to_chat(activator, span_warning("You cannot activate this right now.")) return FALSE if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED, mod.wearer) & MOD_ABORT_USE) return FALSE @@ -160,25 +158,25 @@ mod.selected_module = src if(device) if(mod.wearer.put_in_hands(device)) - balloon_alert(mod.wearer, "[device] extended") + balloon_alert(activator, "[device] extended") RegisterSignal(mod.wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) RegisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN, PROC_REF(dropkey)) else - balloon_alert(mod.wearer, "can't extend [device]!") + balloon_alert(activator, "can't extend [device]!") mod.wearer.transferItemToLoc(device, src, force = TRUE) return FALSE else var/used_button = mod.wearer.client?.prefs.read_preference(/datum/preference/choiced/mod_select) || MIDDLE_CLICK update_signal(used_button) - balloon_alert(mod.wearer, "[src] activated, [used_button]-click to use") + balloon_alert(mod.wearer, "[src] activated, [used_button]-click to use") // As of now, only wearers can "use" mods active = TRUE SEND_SIGNAL(src, COMSIG_MODULE_ACTIVATED) - on_activation() + on_activation(activator) update_clothing_slots() return TRUE /// Called when the module is deactivated -/obj/item/mod/module/proc/deactivate(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/proc/deactivate(mob/activator, display_message = TRUE, deleting = FALSE) active = FALSE if(module_type == MODULE_ACTIVE) mod.selected_module = null @@ -192,12 +190,15 @@ UnregisterSignal(mod.wearer, used_signal) used_signal = null SEND_SIGNAL(src, COMSIG_MODULE_DEACTIVATED, mod.wearer) - on_deactivation(display_message = TRUE, deleting = FALSE) + on_deactivation(activator, display_message = TRUE, deleting = FALSE) update_clothing_slots() return TRUE /// Call to update all slots visually affected by this module /obj/item/mod/module/proc/update_clothing_slots() + if(!mod.wearer) + return + var/updated_slots = mod.slot_flags if (mask_worn_overlay) for (var/obj/item/part as anything in mod.get_parts()) @@ -208,24 +209,25 @@ mod.wearer.update_clothing(updated_slots) /// Called when the module is used -/obj/item/mod/module/proc/used() +/obj/item/mod/module/proc/used(mob/activator) if(!COOLDOWN_FINISHED(src, cooldown_timer)) - balloon_alert(mod.wearer, "on cooldown!") + balloon_alert(activator, "on cooldown!") return FALSE if(!check_power(use_energy_cost)) - balloon_alert(mod.wearer, "not enough charge!") + balloon_alert(activator, "not enough charge!") return FALSE if(!(allow_flags & MODULE_ALLOW_PHASEOUT) && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob)) //specifically a to_chat because the user is phased out. - to_chat(mod.wearer, span_warning("You cannot activate this right now.")) + to_chat(activator, span_warning("You cannot activate this right now.")) return FALSE if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED, mod.wearer) & MOD_ABORT_USE) return FALSE start_cooldown() - addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/mob, update_clothing), mod.slot_flags), cooldown_time+1) //need to run it a bit after the cooldown starts to avoid conflicts + if(mod.wearer) + addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/mob, update_clothing), mod.slot_flags), cooldown_time+1) //need to run it a bit after the cooldown starts to avoid conflicts update_clothing_slots() SEND_SIGNAL(src, COMSIG_MODULE_USED) - on_use() + on_use(activator) return TRUE /// Called when an activated module without a device is used @@ -257,15 +259,15 @@ return TRUE /// Called from the module's activate() -/obj/item/mod/module/proc/on_activation() +/obj/item/mod/module/proc/on_activation(mob/activator) return /// Called from the module's deactivate() -/obj/item/mod/module/proc/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/proc/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) return /// Called from the module's used() -/obj/item/mod/module/proc/on_use() +/obj/item/mod/module/proc/on_use(mob/activator) return /// Called on the MODsuit's process if it is an active module diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm index 436d3dc9e874..f79701e7961f 100644 --- a/code/modules/mod/modules/module_kinesis.dm +++ b/code/modules/mod/modules/module_kinesis.dm @@ -63,7 +63,7 @@ drain_power(use_energy_cost) grab_atom(target) -/obj/item/mod/module/anomaly_locked/kinesis/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/anomaly_locked/kinesis/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) clear_grab(playsound = !deleting) /obj/item/mod/module/anomaly_locked/kinesis/process(seconds_per_tick) diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm index 9f1cec7e9fab..4b948d6ed07e 100644 --- a/code/modules/mod/modules/module_pathfinder.dm +++ b/code/modules/mod/modules/module_pathfinder.dm @@ -15,12 +15,22 @@ use_energy_cost = DEFAULT_CHARGE_DRAIN * 10 incompatible_modules = list(/obj/item/mod/module/pathfinder) required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT) + allow_flags = list(MODULE_ALLOW_INACTIVE|MODULE_ALLOW_UNWORN) /// The pathfinding implant. var/obj/item/implant/mod/implant + /// Whether the implant has been used or not + var/implant_inside = TRUE + /// The jet icon we apply to the MOD. + var/image/jet_icon + /// Allow suit activation - Lets this module be recalled from the MOD. + var/allow_suit_activation = FALSE // I'm not here to argue about balance + /obj/item/mod/module/pathfinder/Initialize(mapload) . = ..() implant = new(src) + jet_icon = image(icon = 'icons/obj/clothing/modsuit/mod_modules.dmi', icon_state = "mod_jet", layer = LOW_ITEM_LAYER) + /obj/item/mod/module/pathfinder/Destroy() QDEL_NULL(implant) @@ -28,28 +38,28 @@ /obj/item/mod/module/pathfinder/Exited(atom/movable/gone, direction) if(gone == implant) - implant = null + implant_inside = FALSE update_icon_state() return ..() /obj/item/mod/module/pathfinder/update_icon_state() . = ..() - icon_state = implant ? "pathfinder" : "pathfinder_empty" + icon_state = implant_inside ? "pathfinder" : "pathfinder_empty" /obj/item/mod/module/pathfinder/examine(mob/user) . = ..() - if(implant) + if(implant_inside) . += span_notice("Use it on a human to implant them.") else . += span_warning("The implant is missing.") /obj/item/mod/module/pathfinder/attack(mob/living/target, mob/living/user, list/modifiers, list/attack_modifiers) - if(!ishuman(target) || !implant) + if(!ishuman(target) || !implant_inside) // Not human, or no implant in module return if(!do_after(user, 1.5 SECONDS, target = target)) balloon_alert(user, "interrupted!") return - if(!implant.implant(target, user)) + if(!implant.implant(target, user)) // If implant fails balloon_alert(user, "can't implant!") return if(target == user) @@ -57,21 +67,29 @@ else target.visible_message(span_notice("[user] implants [target]."), span_notice("[user] implants you with [implant].")) playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6) - module_type = MODULE_PASSIVE -/obj/item/mod/module/pathfinder/on_use() +/obj/item/mod/module/pathfinder/on_use(mob/activator) . = ..() - if (!ishuman(mod.wearer) || !implant) + if(mod.wearer && implant_inside) // implant them + try_implant(activator) + return + if(mod.wearer) + balloon_alert(activator, "suit already worn!") + else + recall(activator) + + +/// Assuming we have a wearer, attempt to implant them. +/obj/item/mod/module/pathfinder/proc/try_implant(mob/activator) + if(!ishuman(mod.wearer)) // Wearer isn't human return if(!implant.implant(mod.wearer, mod.wearer)) - balloon_alert(mod.wearer, "can't implant!") + balloon_alert(activator, "can't implant!") return - balloon_alert(mod.wearer, "implanted") + balloon_alert(activator, "implanted") + if(!(activator == mod.wearer)) // someone else implanted you + balloon_alert(mod.wearer, "pathfinder MOD tracker implanted!") playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6) - module_type = MODULE_PASSIVE - var/datum/action/item_action/mod/pinnable/module/existing_action = pinned_to[REF(mod.wearer)] - if(existing_action) - mod.remove_item_action(existing_action) /obj/item/mod/module/pathfinder/proc/attach(mob/living/user) if(!ishuman(user)) @@ -87,27 +105,86 @@ playsound(mod, 'sound/machines/ping.ogg', 50, TRUE) drain_power(use_energy_cost) +/obj/item/mod/module/pathfinder/proc/recall(mob/recaller) + if(!implant) + balloon_alert(recaller, "no target implant!") + return FALSE + if(recaller != implant.imp_in && !allow_suit_activation) // No pAI recalling + balloon_alert(recaller, "sector safety regulations prevent MOD-side recalling!") + return FALSE + if(mod.open) + balloon_alert(recaller, "cover open!") + return FALSE + if(mod.ai_controller) + balloon_alert(recaller, "already moving!") + return FALSE + if(ismob(get_atom_on_turf(mod))) + balloon_alert(recaller, "already on someone!") + return FALSE + if(mod.z != implant.imp_in.z || get_dist(implant.imp_in, mod) > MOD_AI_RANGE) + balloon_alert(recaller, "too far!") + return FALSE + var/datum/ai_controller/mod_ai = new /datum/ai_controller/mod(mod) + mod.ai_controller = mod_ai + mod_ai.set_movement_target(type, implant.imp_in) + mod_ai.set_blackboard_key(BB_MOD_TARGET, implant.imp_in) + mod_ai.set_blackboard_key(BB_MOD_MODULE, src) + mod.interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP + mod.AddElement(/datum/element/movetype_handler) + ADD_TRAIT(mod, TRAIT_MOVE_FLYING, MOD_TRAIT) + animate(mod, 0.2 SECONDS, pixel_x = base_pixel_y, pixel_y = base_pixel_y) + mod.add_overlay(jet_icon) + RegisterSignal(mod, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + balloon_alert(recaller, "suit recalled") + if(!(recaller == mod.wearer)) + balloon_alert(mod.wearer, "suit recalled") + return TRUE + +/obj/item/mod/module/pathfinder/proc/on_move(atom/movable/source, atom/old_loc, dir, forced) + SIGNAL_HANDLER + + var/matrix/mod_matrix = matrix() + mod_matrix.Turn(get_angle(source, implant.imp_in)) + source.transform = mod_matrix + +/obj/item/mod/module/pathfinder/proc/end_recall(successful = TRUE) + if(!mod) + return + QDEL_NULL(mod.ai_controller) + mod.interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP + REMOVE_TRAIT(mod, TRAIT_MOVE_FLYING, MOD_TRAIT) + mod.RemoveElement(/datum/element/movetype_handler) + mod.cut_overlay(jet_icon) + mod.transform = matrix() + UnregisterSignal(mod, COMSIG_MOVABLE_MOVED) + if(!successful) + balloon_alert(implant.imp_in, "suit lost connection!") + +// ########### +// THE INPLANT +// ########### + + /obj/item/implant/mod name = "MOD pathfinder implant" desc = "Lets you recall a MODsuit to you at any time." actions_types = list(/datum/action/item_action/mod_recall) + allow_multiple = TRUE // Surgrey is annoying if you loose your MOD /// The pathfinder module we are linked to. var/obj/item/mod/module/pathfinder/module - /// The jet icon we apply to the MOD. - var/image/jet_icon + + /obj/item/implant/mod/Initialize(mapload) . = ..() if(!istype(loc, /obj/item/mod/module/pathfinder)) return INITIALIZE_HINT_QDEL module = loc - jet_icon = image(icon = 'icons/obj/clothing/modsuit/mod_modules.dmi', icon_state = "mod_jet", layer = LOW_ITEM_LAYER) /obj/item/implant/mod/Destroy() if(module?.mod?.ai_controller) - end_recall(successful = FALSE) + module.end_recall(successful = FALSE) module = null - jet_icon = null return ..() /obj/item/implant/mod/get_data() @@ -115,55 +192,6 @@ Name: Nakamura Engineering Pathfinder Implant
\ Implant Details: Allows for the recall of a Modular Outerwear Device by the implant owner at any time.
" -/obj/item/implant/mod/proc/recall() - if(!module?.mod) - balloon_alert(imp_in, "no connected unit!") - return FALSE - if(module.mod.open) - balloon_alert(imp_in, "cover open!") - return FALSE - if(module.mod.ai_controller) - balloon_alert(imp_in, "already moving!") - return FALSE - if(ismob(get_atom_on_turf(module.mod))) - balloon_alert(imp_in, "already on someone!") - return FALSE - if(module.z != z || get_dist(imp_in, module.mod) > MOD_AI_RANGE) - balloon_alert(imp_in, "too far!") - return FALSE - var/datum/ai_controller/mod_ai = new /datum/ai_controller/mod(module.mod) - module.mod.ai_controller = mod_ai - mod_ai.set_movement_target(type, imp_in) - mod_ai.set_blackboard_key(BB_MOD_TARGET, imp_in) - mod_ai.set_blackboard_key(BB_MOD_IMPLANT, src) - module.mod.interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP - module.mod.AddElement(/datum/element/movetype_handler) - ADD_TRAIT(module.mod, TRAIT_MOVE_FLYING, MOD_TRAIT) - animate(module.mod, 0.2 SECONDS, pixel_x = base_pixel_y, pixel_y = base_pixel_y) - module.mod.add_overlay(jet_icon) - RegisterSignal(module.mod, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) - balloon_alert(imp_in, "suit recalled") - return TRUE - -/obj/item/implant/mod/proc/end_recall(successful = TRUE) - if(!module?.mod) - return - QDEL_NULL(module.mod.ai_controller) - module.mod.interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP - REMOVE_TRAIT(module.mod, TRAIT_MOVE_FLYING, MOD_TRAIT) - module.mod.RemoveElement(/datum/element/movetype_handler) - module.mod.cut_overlay(jet_icon) - module.mod.transform = matrix() - UnregisterSignal(module.mod, COMSIG_MOVABLE_MOVED) - if(!successful) - balloon_alert(imp_in, "suit lost connection!") - -/obj/item/implant/mod/proc/on_move(atom/movable/source, atom/old_loc, dir, forced) - SIGNAL_HANDLER - - var/matrix/mod_matrix = matrix() - mod_matrix.Turn(get_angle(source, imp_in)) - source.transform = mod_matrix /datum/action/item_action/mod_recall name = "Recall MOD" @@ -185,7 +213,7 @@ /datum/action/item_action/mod_recall/do_effect(trigger_flags) var/obj/item/implant/mod/implant = target if(!COOLDOWN_FINISHED(src, recall_cooldown)) - implant.balloon_alert(implant.imp_in, "on cooldown!") + implant.balloon_alert(owner, "on cooldown!") return - if(implant.recall()) + if(implant.module.recall(owner)) // change this COOLDOWN_START(src, recall_cooldown, 15 SECONDS) diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index d8449338f7bf..cd2e8ce06d4e 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -78,6 +78,8 @@ idle_power_cost = 0 //magic use_energy_cost = 0 //magic too max_charges = 5 + recharge_start_delay = 20 SECONDS + charge_increment_delay = 3 SECONDS shield_icon_file = 'icons/effects/magic.dmi' shield_icon = "mageshield" required_slots = list() @@ -290,7 +292,7 @@ complexity = 2 incompatible_modules = list(/obj/item/mod/module/chameleon) cooldown_time = 0.5 SECONDS - allow_flags = MODULE_ALLOW_INACTIVE + allow_flags = list(MODULE_ALLOW_INACTIVE|MODULE_ALLOW_UNWORN) /// A list of all the items the suit can disguise as. var/list/possible_disguises = list() /// The path of the item we're disguised as. @@ -312,17 +314,17 @@ return_look() possible_disguises = null -/obj/item/mod/module/chameleon/used() +/obj/item/mod/module/chameleon/used(mob/activator) if(mod.active || mod.activating) - balloon_alert(mod.wearer, "unit active!") + balloon_alert(activator, "unit active!") return FALSE return ..() -/obj/item/mod/module/chameleon/on_use() +/obj/item/mod/module/chameleon/on_use(mob/activator) if(current_disguise) return_look() return - var/picked_name = tgui_input_list(mod.wearer, "Select look to change into", "Chameleon Settings", possible_disguises) + var/picked_name = tgui_input_list(activator, "Select look to change into", "Chameleon Settings", possible_disguises) if(!possible_disguises[picked_name] || mod.active || mod.activating) return current_disguise = possible_disguises[picked_name] @@ -417,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() . = ..() @@ -504,10 +506,10 @@ if(disrupted.on_saboteur(src, 1 MINUTES)) mod.add_charge(DEFAULT_CHARGE_DRAIN * 250) -/obj/item/mod/module/stealth/wraith/on_activation() +/obj/item/mod/module/stealth/wraith/on_activation(mob/activator) return // Don't activate stealth when the module is activated because the stealth portion of the module is fully passive -/obj/item/mod/module/stealth/wraith/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/stealth/wraith/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) . = ..() UnregisterSignal(mod.wearer, list(COMSIG_LIVING_MOB_BUMP, COMSIG_ATOM_BUMPED, COMSIG_MOB_FIRED_GUN)) diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm index fa28e7aaee63..5838e2391cdd 100644 --- a/code/modules/mod/modules/modules_engineering.dm +++ b/code/modules/mod/modules/modules_engineering.dm @@ -81,11 +81,11 @@ . = ..() UnregisterSignal(mod, COMSIG_MOD_UPDATE_SPEED) -/obj/item/mod/module/magboot/on_activation() +/obj/item/mod/module/magboot/on_activation(mob/activator) mod.wearer.add_traits(active_traits, REF(src)) mod.update_speed() -/obj/item/mod/module/magboot/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/magboot/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) mod.wearer.remove_traits(active_traits, REF(src)) mod.update_speed() @@ -140,7 +140,7 @@ if (key == "cut_tethers") SEND_SIGNAL(src, COMSIG_MOD_TETHER_SNAP) -/obj/item/mod/module/tether/on_deactivation(display_message, deleting) +/obj/item/mod/module/tether/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) SEND_SIGNAL(src, COMSIG_MOD_TETHER_SNAP) /obj/projectile/tether @@ -222,6 +222,7 @@ anchor.pixel_x = hitx anchor.pixel_y = hity anchor.anchored = TRUE + anchor.reset_pixel_pos = TRUE anchor.parent_module = parent_module firer.AddComponent(/datum/component/tether, anchor, 7, "MODtether", parent_module = parent_module, tether_trait_source = REF(parent_module)) @@ -238,6 +239,8 @@ interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT /// MODsuit tether module that created our projectile var/obj/item/mod/module/tether/parent_module + /// Should we reset our pixel positions next time we move? + var/reset_pixel_pos = FALSE /obj/item/tether_anchor/Initialize(mapload) . = ..() @@ -255,8 +258,12 @@ /obj/item/tether_anchor/wrench_act(mob/living/user, obj/item/tool) . = ..() - default_unfasten_wrench(user, tool) - return ITEM_INTERACT_SUCCESS + if (default_unfasten_wrench(user, tool)) + pixel_x = 0 + pixel_y = 0 + reset_pixel_pos = FALSE + return ITEM_INTERACT_SUCCESS + return ITEM_INTERACT_BLOCKING /obj/item/tether_anchor/attack_hand_secondary(mob/user, list/modifiers) if (!can_interact(user) || !user.CanReach(src) || !isturf(loc)) @@ -274,6 +281,13 @@ user.AddComponent(/datum/component/tether, src, 7, "tether", tether_trait_source = REF(src)) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN +/obj/item/tether_anchor/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) + . = ..() + if (reset_pixel_pos) + pixel_x = 0 + pixel_y = 0 + reset_pixel_pos = FALSE + /obj/item/tether_anchor/mouse_drop_receive(atom/target, mob/user, params) if (!can_interact(user) || !user.CanReach(src) || !isturf(loc)) return @@ -394,7 +408,7 @@ /obj/item/mod/module/constructor/on_part_deactivation(deleting = FALSE) REMOVE_TRAIT(mod.wearer, TRAIT_QUICK_BUILD, REF(src)) -/obj/item/mod/module/constructor/on_use() +/obj/item/mod/module/constructor/on_use(mob/activator) rcd_scan(src, fade_time = 10 SECONDS) drain_power(use_energy_cost) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index b7016fc4224f..5455675c6daf 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -171,12 +171,12 @@ return FALSE return TRUE -/obj/item/mod/module/jetpack/on_activation() +/obj/item/mod/module/jetpack/on_activation(mob/activator) mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/full_speed) if (!stabilize) ADD_TRAIT(mod.wearer, TRAIT_NOGRAV_ALWAYS_DRIFT, REF(src)) -/obj/item/mod/module/jetpack/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/jetpack/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/full_speed) REMOVE_TRAIT(mod.wearer, TRAIT_NOGRAV_ALWAYS_DRIFT, REF(src)) @@ -206,9 +206,9 @@ incompatible_modules = list(/obj/item/mod/module/jump_jet) required_slots = list(ITEM_SLOT_BACK) -/obj/item/mod/module/jump_jet/on_use() +/obj/item/mod/module/jump_jet/on_use(mob/activator) if (DOING_INTERACTION(mod.wearer, mod.wearer)) - balloon_alert(mod.wearer, "busy!") + balloon_alert(activator, "busy!") return balloon_alert(mod.wearer, "launching...") mod.wearer.Shake(duration = 1 SECONDS) @@ -243,9 +243,9 @@ incompatible_modules = list(/obj/item/mod/module/status_readout) tgui_id = "status_readout" required_slots = list(ITEM_SLOT_BACK) - /// Does this show damage types, body temp, satiety + /// Does this show damage types, body temp, satiety? var/display_detailed_vitals = TRUE - /// Does this show DNA data + /// Does this show DNA data? var/display_dna = FALSE /// Does this show the round ID and shift time? var/display_time = FALSE @@ -253,6 +253,8 @@ var/death_sound = 'sound/effects/flatline3.ogg' /// Death sound volume. Please be responsible with this. var/death_sound_volume = 50 + /// Does this boost suit sensor status across Z-levels? + var/sensor_boost = TRUE /obj/item/mod/module/status_readout/add_ui_data() . = ..() @@ -291,6 +293,7 @@ . = ..() .["display_detailed_vitals"] = add_ui_configuration("Detailed Vitals", "bool", display_detailed_vitals) .["display_dna"] = add_ui_configuration("DNA Information", "bool", display_dna) + .["sensor_boost"] = add_ui_configuration("Suit Sensor Booster", "bool", sensor_boost) /obj/item/mod/module/status_readout/configure_edit(key, value) switch(key) @@ -298,12 +301,23 @@ display_detailed_vitals = text2num(value) if("display_dna") display_dna = text2num(value) + if("sensor_boost") + sensor_boost = text2num(value) + update_sensor_booster() /obj/item/mod/module/status_readout/on_part_activation() RegisterSignal(mod.wearer, COMSIG_LIVING_DEATH, PROC_REF(death_sound)) + update_sensor_booster() /obj/item/mod/module/status_readout/on_part_deactivation(deleting) UnregisterSignal(mod.wearer, COMSIG_LIVING_DEATH) + REMOVE_TRAIT(mod.wearer, TRAIT_MULTIZ_SUIT_SENSORS, REF(src)) + +/obj/item/mod/module/status_readout/proc/update_sensor_booster() + if(sensor_boost) + ADD_TRAIT(mod.wearer, TRAIT_MULTIZ_SUIT_SENSORS, REF(src)) + else + REMOVE_TRAIT(mod.wearer, TRAIT_MULTIZ_SUIT_SENSORS, REF(src)) /obj/item/mod/module/status_readout/proc/death_sound(mob/living/carbon/human/wearer) SIGNAL_HANDLER @@ -424,12 +438,12 @@ /// Maximum range we can set. var/max_range = 5 -/obj/item/mod/module/flashlight/on_activation() +/obj/item/mod/module/flashlight/on_activation(mob/activator) set_light_flags(light_flags | LIGHT_ATTACHED) set_light_on(active) active_power_cost = base_power * light_range -/obj/item/mod/module/flashlight/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/flashlight/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) set_light_flags(light_flags & ~LIGHT_ATTACHED) set_light_on(active) @@ -504,13 +518,13 @@ /// Time it takes for us to dispense. var/dispense_time = 0 SECONDS -/obj/item/mod/module/dispenser/on_use() +/obj/item/mod/module/dispenser/on_use(mob/activator) if(dispense_time && !do_after(mod.wearer, dispense_time, target = mod)) balloon_alert(mod.wearer, "interrupted!") return FALSE var/obj/item/dispensed = new dispense_type(mod.wearer.loc) mod.wearer.put_in_hands(dispensed) - balloon_alert(mod.wearer, "[dispensed] dispensed") + balloon_alert(activator, "[dispensed] dispensed") playsound(src, 'sound/machines/click.ogg', 100, TRUE) drain_power(use_energy_cost) return dispensed @@ -613,9 +627,9 @@ UnregisterSignal(mod, COMSIG_ATOM_EMP_ACT) UnregisterSignal(mod, COMSIG_ATOM_EMAG_ACT) -/obj/item/mod/module/dna_lock/on_use() +/obj/item/mod/module/dna_lock/on_use(mob/activator) dna = mod.wearer.dna.unique_enzymes - balloon_alert(mod.wearer, "dna updated") + balloon_alert(activator, "dna updated") drain_power(use_energy_cost) /obj/item/mod/module/dna_lock/emp_act(severity) @@ -753,12 +767,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))) @@ -841,11 +854,11 @@ container = null return ..() -/obj/item/mod/module/recycler/on_activation() +/obj/item/mod/module/recycler/on_activation(mob/activator) connector = AddComponent(/datum/component/connect_loc_behalf, mod.wearer, loc_connections) RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_moved)) -/obj/item/mod/module/recycler/on_deactivation(display_message, deleting = FALSE) +/obj/item/mod/module/recycler/on_deactivation(mob/activator, display_message, deleting = FALSE) QDEL_NULL(connector) UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_moved)) diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index 17804dcd4067..2e0b2dba3a0f 100644 --- a/code/modules/mod/modules/modules_maint.dm +++ b/code/modules/mod/modules/modules_maint.dm @@ -136,12 +136,12 @@ QDEL_NULL(rave_screen) return ..() -/obj/item/mod/module/visor/rave/on_activation() +/obj/item/mod/module/visor/rave/on_activation(mob/activator) rave_screen = mod.wearer.add_client_colour(/datum/client_colour/rave, REF(src)) rave_screen.update_color(rainbow_order[rave_number]) music_player.start_music(mod.wearer) -/obj/item/mod/module/visor/rave/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/visor/rave/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) QDEL_NULL(rave_screen) if(isnull(music_player.active_song_sound)) return @@ -199,7 +199,7 @@ cooldown_time = 30 SECONDS required_slots = list(ITEM_SLOT_OCLOTHING|ITEM_SLOT_ICLOTHING) -/obj/item/mod/module/tanner/on_use() +/obj/item/mod/module/tanner/on_use(mob/activator) playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, TRUE) var/datum/reagents/holder = new() holder.add_reagent(/datum/reagent/spraytan, 10) @@ -223,7 +223,7 @@ var/blowing_time = 10 SECONDS var/oxygen_damage = 20 -/obj/item/mod/module/balloon/on_use() +/obj/item/mod/module/balloon/on_use(mob/activator) if(!do_after(mod.wearer, blowing_time, target = mod)) return FALSE mod.wearer.adjustOxyLoss(oxygen_damage) @@ -247,7 +247,7 @@ /// The total number of sheets created by this MOD. The more sheets, them more likely they set on fire. var/num_sheets_dispensed = 0 -/obj/item/mod/module/paper_dispenser/on_use() +/obj/item/mod/module/paper_dispenser/on_use(mob/activator) if(!do_after(mod.wearer, 1 SECONDS, target = mod)) return FALSE @@ -316,7 +316,7 @@ /// If you use the module on a planetary turf, you fly up. To the sky. var/you_fucked_up = FALSE -/obj/item/mod/module/atrocinator/on_activation() +/obj/item/mod/module/atrocinator/on_activation(mob/activator) playsound(src, 'sound/effects/curse/curseattack.ogg', 50) mod.wearer.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY) RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(check_upstairs)) @@ -325,13 +325,13 @@ passtable_on(mod.wearer, REF(src)) check_upstairs() //todo at some point flip your screen around -/obj/item/mod/module/atrocinator/deactivate(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/atrocinator/deactivate(mob/activator, display_message = TRUE, deleting = FALSE) if(you_fucked_up && !deleting) - to_chat(mod.wearer, span_danger("It's too late.")) + to_chat(activator, span_danger("It's too late.")) return FALSE return ..() -/obj/item/mod/module/atrocinator/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/atrocinator/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) if(!deleting) playsound(src, 'sound/effects/curse/curseattack.ogg', 50) qdel(mod.wearer.RemoveElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY)) diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm index 77bd5a129f28..e06745450049 100644 --- a/code/modules/mod/modules/modules_ninja.dm +++ b/code/modules/mod/modules/modules_ninja.dm @@ -19,7 +19,7 @@ /// The alpha applied when the cloak is on. var/stealth_alpha = 50 -/obj/item/mod/module/stealth/on_activation() +/obj/item/mod/module/stealth/on_activation(mob/activator) if(bumpoff) RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, PROC_REF(unstealth)) RegisterSignal(mod.wearer, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) @@ -28,7 +28,7 @@ animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS) drain_power(use_energy_cost) -/obj/item/mod/module/stealth/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/stealth/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) if(bumpoff) UnregisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP) UnregisterSignal(mod.wearer, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_MOB_ITEM_ATTACK, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED)) @@ -72,11 +72,11 @@ cooldown_time = 3 SECONDS -/obj/item/mod/module/stealth/ninja/on_activation() +/obj/item/mod/module/stealth/ninja/on_activation(mob/activator) . = ..() ADD_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, REF(src)) -/obj/item/mod/module/stealth/ninja/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/stealth/ninja/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) . = ..() REMOVE_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, REF(src)) @@ -287,7 +287,7 @@ use_energy_cost = DEFAULT_CHARGE_DRAIN * 10 cooldown_time = 8 SECONDS -/obj/item/mod/module/emp_shield/pulse/on_use() +/obj/item/mod/module/emp_shield/pulse/on_use(mob/activator) playsound(src, 'sound/effects/empulse.ogg', 60, TRUE) empulse(src, heavy_range = 4, light_range = 6) drain_power(use_energy_cost) @@ -302,6 +302,7 @@ and even useful information such as their overall health and wellness. This one comes with a clock that calibrates to the \ local system time, and an operational ID number display. The vital monitor's speaker has been removed." display_time = TRUE + sensor_boost = FALSE death_sound = null death_sound_volume = null @@ -419,7 +420,7 @@ return FALSE return ..() -/obj/item/mod/module/adrenaline_boost/on_use() +/obj/item/mod/module/adrenaline_boost/on_use(mob/activator) if(IS_SPACE_NINJA(mod.wearer)) mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type) to_chat(mod.wearer, span_notice("You have used the adrenaline boost.")) diff --git a/code/modules/mod/modules/modules_science.dm b/code/modules/mod/modules/modules_science.dm index 8cb15d35370a..8a41d449edf8 100644 --- a/code/modules/mod/modules/modules_science.dm +++ b/code/modules/mod/modules/modules_science.dm @@ -13,10 +13,10 @@ incompatible_modules = list(/obj/item/mod/module/reagent_scanner) required_slots = list(ITEM_SLOT_HEAD|ITEM_SLOT_EYES|ITEM_SLOT_MASK) -/obj/item/mod/module/reagent_scanner/on_activation() +/obj/item/mod/module/reagent_scanner/on_activation(mob/activator) ADD_TRAIT(mod.wearer, TRAIT_REAGENT_SCANNER, REF(src)) -/obj/item/mod/module/reagent_scanner/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/reagent_scanner/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) REMOVE_TRAIT(mod.wearer, TRAIT_REAGENT_SCANNER, REF(src)) /obj/item/mod/module/reagent_scanner/advanced @@ -29,12 +29,12 @@ removable = FALSE var/explosion_detection_dist = 21 -/obj/item/mod/module/reagent_scanner/advanced/on_activation() +/obj/item/mod/module/reagent_scanner/advanced/on_activation(mob/activator) . = ..() ADD_TRAIT(mod.wearer, TRAIT_RESEARCH_SCANNER, REF(src)) RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion)) -/obj/item/mod/module/reagent_scanner/advanced/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/reagent_scanner/advanced/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) . = ..() REMOVE_TRAIT(mod.wearer, TRAIT_RESEARCH_SCANNER, REF(src)) UnregisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION) @@ -61,13 +61,13 @@ accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/grav) required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT) -/obj/item/mod/module/anomaly_locked/antigrav/on_activation() +/obj/item/mod/module/anomaly_locked/antigrav/on_activation(mob/activator) if(mod.wearer.has_gravity()) new /obj/effect/temp_visual/mook_dust(get_turf(src)) mod.wearer.AddElement(/datum/element/forced_gravity, 0) playsound(src, 'sound/effects/gravhit.ogg', 50) -/obj/item/mod/module/anomaly_locked/antigrav/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/anomaly_locked/antigrav/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) mod.wearer.RemoveElement(/datum/element/forced_gravity, 0) if(deleting) return diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index a19cd09db2b0..2eaebddaf556 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -82,7 +82,7 @@ /obj/item/mod/module/pepper_shoulders/on_part_deactivation(deleting = FALSE) UnregisterSignal(mod.wearer, COMSIG_LIVING_CHECK_BLOCK) -/obj/item/mod/module/pepper_shoulders/on_use() +/obj/item/mod/module/pepper_shoulders/on_use(mob/activator) playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6) var/datum/reagents/capsaicin_holder = new(10) capsaicin_holder.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 10) @@ -117,7 +117,7 @@ /// Gun we have holstered. var/obj/item/gun/holstered -/obj/item/mod/module/holster/on_use() +/obj/item/mod/module/holster/on_use(mob/activator) if(!holstered) var/obj/item/gun/holding = mod.wearer.get_active_held_item() if(!holding) @@ -163,11 +163,12 @@ /// List of spans we add to the speaker. var/list/voicespan = list(SPAN_COMMAND) -/obj/item/mod/module/megaphone/on_activation() +/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(display_message = TRUE, deleting = FALSE) - UnregisterSignal(mod.wearer, COMSIG_MOB_SAY) +/obj/item/mod/module/megaphone/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) + 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" @@ -203,7 +209,7 @@ idle_power_cost = linked_bodybag ? (DEFAULT_CHARGE_DRAIN * 3) : 0 return ..() -/obj/item/mod/module/criminalcapture/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/criminalcapture/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) if(!linked_bodybag) return packup() @@ -269,7 +275,7 @@ overlay_state_inactive = "module_mirage_grenade" dispense_type = /obj/item/grenade/mirage -/obj/item/mod/module/dispenser/mirage/on_use() +/obj/item/mod/module/dispenser/mirage/on_use(mob/activator) var/obj/item/grenade/mirage/grenade = ..() grenade.arm_grenade(mod.wearer) @@ -318,18 +324,18 @@ /// Effect image on projectiles. var/image/projectile_effect /// The dampening field - var/datum/proximity_monitor/advanced/projectile_dampener/dampening_field + var/datum/proximity_monitor/advanced/bubble/projectile_dampener/dampening_field /obj/item/mod/module/projectile_dampener/Initialize(mapload) . = ..() projectile_effect = image('icons/effects/fields.dmi', "projectile_dampen_effect") -/obj/item/mod/module/projectile_dampener/on_activation() +/obj/item/mod/module/projectile_dampener/on_activation(mob/activator) if(istype(dampening_field)) QDEL_NULL(dampening_field) dampening_field = new(mod.wearer, field_radius, TRUE, src) -/obj/item/mod/module/projectile_dampener/on_deactivation(display_message, deleting = FALSE) +/obj/item/mod/module/projectile_dampener/on_deactivation(mob/activator, display_message, deleting = FALSE) QDEL_NULL(dampening_field) ///Active Sonar - Displays a hud circle on the turf of any living creatures in the given radius @@ -429,12 +435,12 @@ scanned_slice = 1 COOLDOWN_START(src, scan_cooldown, scan_cooldown_time) -/obj/item/mod/module/active_sonar/on_use() - balloon_alert(mod.wearer, "readying sonar...") +/obj/item/mod/module/active_sonar/on_use(mob/activator) + balloon_alert(activator, "readying sonar...") playsound(mod.wearer, 'sound/vehicles/mecha/skyfall_power_up.ogg', vol = 20, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) if(!do_after(mod.wearer, 1.1 SECONDS, target = mod)) return - playsound(mod.wearer, 'sound/effects/ping_hit.ogg', vol = 75, vary = TRUE) // Should be audible for the radius of the sonar + playsound(src, 'sound/effects/ping_hit.ogg', vol = 75, vary = TRUE) // Should be audible for the radius of the sonar to_chat(mod.wearer, span_notice("You slam your fist into the ground, sending out a sonic wave that detects [detect_living_creatures()] living beings nearby!")) for(var/mob/living/creature as anything in keyed_creatures) new /obj/effect/temp_visual/sonar_ping(mod.wearer.loc, mod.wearer, creature) diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm index 3a53705e24bc..9ca53939fb2a 100644 --- a/code/modules/mod/modules/modules_service.dm +++ b/code/modules/mod/modules/modules_service.dm @@ -12,7 +12,7 @@ incompatible_modules = list(/obj/item/mod/module/bikehorn) cooldown_time = 1 SECONDS -/obj/item/mod/module/bikehorn/on_use() +/obj/item/mod/module/bikehorn/on_use(mob/activator) playsound(src, 'sound/items/bikehorn.ogg', 100, FALSE) drain_power(use_energy_cost) diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index 3a244f7ea740..4ba54760aca7 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -18,8 +18,8 @@ . = ..() AddComponent(/datum/component/gps/item, "MOD0", state = GLOB.deep_inventory_state, overlay_state = FALSE) -/obj/item/mod/module/gps/on_use() - attack_self(mod.wearer) +/obj/item/mod/module/gps/on_use(mob/activator) + attack_self(mod.wearer) // todo: refactor to make compatable with pAIs. Maybe ui_interact(activator) ///Hydraulic Clamp - Lets you pick up and drop crates. /obj/item/mod/module/clamp @@ -40,16 +40,28 @@ var/load_time = 3 SECONDS /// The max amount of crates you can carry. var/max_crates = 3 + /// Disallow mobs larger than this size in containers + var/max_mob_size = MOB_SIZE_SMALL + /// Items that allowed to be picked up by this module + var/list/accepted_items /// The crates stored in the module. var/list/stored_crates = list() + +/obj/item/mod/module/clamp/Initialize(mapload) + . = ..() + accepted_items = typecacheof(list( + /obj/structure/closet/crate, + /obj/item/delivery/big + )) + /obj/item/mod/module/clamp/on_select_use(atom/target) . = ..() if(!.) return if(!mod.wearer.Adjacent(target)) return - if(istype(target, /obj/structure/closet/crate) || istype(target, /obj/item/delivery/big)) + if(is_type_in_typecache(target, accepted_items)) var/atom/movable/picked_crate = target if(!check_crate_pickup(picked_crate)) return @@ -92,7 +104,7 @@ balloon_alert(mod.wearer, "too many crates!") return FALSE for(var/mob/living/mob in target.get_all_contents()) - if(mob.mob_size < MOB_SIZE_HUMAN) + if(mob.mob_size <= max_mob_size) continue balloon_alert(mod.wearer, "crate too heavy!") return FALSE @@ -124,10 +136,10 @@ overlay_state_active = "module_drill" required_slots = list(ITEM_SLOT_GLOVES) -/obj/item/mod/module/drill/on_activation() +/obj/item/mod/module/drill/on_activation(mob/activator) RegisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP, PROC_REF(bump_mine)) -/obj/item/mod/module/drill/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/drill/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) UnregisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP) /obj/item/mod/module/drill/on_select_use(atom/target) @@ -202,7 +214,7 @@ ore.forceMove(src) ores += ore -/obj/item/mod/module/orebag/on_use() +/obj/item/mod/module/orebag/on_use(mob/activator) for(var/obj/item/ore as anything in ores) ore.forceMove(drop_location()) ores -= ore @@ -333,7 +345,7 @@ locker.throw_at(mod.wearer, range = 7, speed = 3, force = MOVE_FORCE_WEAK, \ callback = CALLBACK(src, PROC_REF(check_locker), locker)) -/obj/item/mod/module/magnet/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/magnet/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) if(istype(mod.wearer.pulling, /obj/structure/closet)) mod.wearer.stop_pulling() @@ -343,13 +355,13 @@ if(!locker.Adjacent(mod.wearer) || !isturf(locker.loc) || !isturf(mod.wearer.loc)) return mod.wearer.start_pulling(locker) - locker.strong_grab = TRUE + ADD_TRAIT(locker, TRAIT_STRONGPULL, REF(mod.wearer)) RegisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED, PROC_REF(on_stop_pull)) /obj/item/mod/module/magnet/proc/on_stop_pull(obj/structure/closet/locker, atom/movable/last_puller) SIGNAL_HANDLER - locker.strong_grab = FALSE + REMOVE_TRAIT(locker, TRAIT_STRONGPULL, REF(mod.wearer)) UnregisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED) /obj/item/mod/module/ash_accretion @@ -369,7 +381,7 @@ /// Armor values per tile. var/datum/armor/armor_mod = /datum/armor/mod_ash_accretion /// Speed added when you're fully covered in ash. - var/speed_added = -0.5 + var/speed_added = -0.75 /// Turfs that let us accrete ash. var/static/list/accretion_turfs /// Turfs that let us keep ash. @@ -483,13 +495,13 @@ TRAIT_NO_SLIP_ALL, ) -/obj/item/mod/module/sphere_transform/activate() +/obj/item/mod/module/sphere_transform/activate(mob/activator) if(!mod.wearer.has_gravity()) - balloon_alert(mod.wearer, "no gravity!") + balloon_alert(activator, "no gravity!") return FALSE return ..() -/obj/item/mod/module/sphere_transform/on_activation() +/obj/item/mod/module/sphere_transform/on_activation(mob/activator) playsound(src, 'sound/items/modsuit/ballin.ogg', 100, TRUE) mod.wearer.add_filter("mod_ball", 1, alpha_mask_filter(icon = icon('icons/mob/clothing/modsuit/mod_modules.dmi', "ball_mask"), flags = MASK_INVERSE)) mod.wearer.add_filter("mod_blur", 2, angular_blur_filter(size = 15)) @@ -503,7 +515,7 @@ mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/sphere) RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, PROC_REF(on_statchange)) -/obj/item/mod/module/sphere_transform/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/sphere_transform/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) if(!deleting) playsound(src, 'sound/items/modsuit/ballin.ogg', 100, TRUE, frequency = -1) mod.wearer.remove_offsets(REF(src)) @@ -516,9 +528,9 @@ mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/sphere) UnregisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE) -/obj/item/mod/module/sphere_transform/used() +/obj/item/mod/module/sphere_transform/used(mob/activator) if(!lavaland_equipment_pressure_check(get_turf(src))) - balloon_alert(mod.wearer, "too much pressure!") + balloon_alert(activator, "too much pressure!") playsound(src, 'sound/items/weapons/gun/general/dry_fire.ogg', 25, TRUE) return FALSE return ..() diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm index 701cbc304210..0a18a5598302 100644 --- a/code/modules/mod/modules/modules_timeline.dm +++ b/code/modules/mod/modules/modules_timeline.dm @@ -29,9 +29,10 @@ UnregisterSignal(mod, COMSIG_MOD_ACTIVATE) UnregisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL) -/obj/item/mod/module/eradication_lock/on_use() +/obj/item/mod/module/eradication_lock/on_use(mob/activator) true_owner_ckey = mod.wearer.ckey - balloon_alert(mod.wearer, "user remembered") + balloon_alert(activator, "user remembered") + playsound(src, 'sound/items/pshoom/pshoom.ogg', 25, TRUE) drain_power(use_energy_cost) ///Signal fired when the modsuit tries activating @@ -66,8 +67,8 @@ cooldown_time = 20 SECONDS required_slots = list(ITEM_SLOT_BACK) -/obj/item/mod/module/rewinder/on_use() - balloon_alert(mod.wearer, "anchor point set") +/obj/item/mod/module/rewinder/on_use(mob/activator) + balloon_alert(activator, "anchor point set") playsound(src, 'sound/items/modsuit/time_anchor_set.ogg', 50, TRUE) //stops all mods from triggering during rewinding for(var/obj/item/mod/module/module as anything in mod.modules) @@ -110,13 +111,13 @@ ///The current timestop in progress. var/obj/effect/timestop/channelled/timestop -/obj/item/mod/module/timestopper/used() +/obj/item/mod/module/timestopper/used(mob/activator) if(timestop) - mod.balloon_alert(mod.wearer, "already freezing time!") + mod.balloon_alert(activator, "already freezing time!") return FALSE return ..() -/obj/item/mod/module/timestopper/on_use() +/obj/item/mod/module/timestopper/on_use(mob/activator) //stops all mods from triggering during timestop- including timestop itself for(var/obj/item/mod/module/module as anything in mod.modules) RegisterSignal(module, COMSIG_MODULE_TRIGGERED, PROC_REF(on_module_triggered)) @@ -159,14 +160,14 @@ ///The dummy for phasing from this module, the wearer is phased out while this exists. var/obj/effect/dummy/phased_mob/chrono/phased_mob -/obj/item/mod/module/timeline_jumper/used() +/obj/item/mod/module/timeline_jumper/used(mob/activator) var/area/noteleport_check = get_area(mod.wearer) if(noteleport_check && !check_teleport_valid(mod.wearer, get_turf(mod.wearer))) - to_chat(mod.wearer, span_danger("Some dull, universal force is between you and the [phased_mob ? "current timeline" : "stream between timelines"].")) + to_chat(activator, span_danger("Some dull, universal force is between you and the [phased_mob ? "current timeline" : "stream between timelines"].")) return FALSE return ..() -/obj/item/mod/module/timeline_jumper/on_use() +/obj/item/mod/module/timeline_jumper/on_use(mob/activator) if(!phased_mob) //phasing out mod.visible_message(span_warning("[mod.wearer] leaps out of the timeline!")) diff --git a/code/modules/mod/modules/modules_visor.dm b/code/modules/mod/modules/modules_visor.dm index 7897ac404f27..c865cc3e6703 100644 --- a/code/modules/mod/modules/modules_visor.dm +++ b/code/modules/mod/modules/modules_visor.dm @@ -12,12 +12,12 @@ /// The traits given by the visor. var/list/visor_traits = list() -/obj/item/mod/module/visor/on_activation() +/obj/item/mod/module/visor/on_activation(mob/activator) if(length(visor_traits)) mod.wearer.add_traits(visor_traits, REF(src)) mod.wearer.update_sight() -/obj/item/mod/module/visor/on_deactivation(display_message = TRUE, deleting = FALSE) +/obj/item/mod/module/visor/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) if(length(visor_traits)) mod.wearer.remove_traits(visor_traits, REF(src)) mod.wearer.update_sight() @@ -91,10 +91,10 @@ incompatible_modules = list(/obj/item/mod/module/night, /obj/item/mod/module/visor/night) required_slots = list(ITEM_SLOT_HEAD|ITEM_SLOT_EYES|ITEM_SLOT_MASK) -/obj/item/mod/module/night/on_activation() - ADD_TRAIT(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src)) +/obj/item/mod/module/night/on_activation(mob/activator) + mod.wearer.add_traits(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src)) mod.wearer.update_sight() -/obj/item/mod/module/night/on_deactivation(display_message = TRUE, deleting = FALSE) - REMOVE_TRAIT(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src)) +/obj/item/mod/module/night/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE) + mod.wearer.remove_traits(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src)) mod.wearer.update_sight() 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 26717e33d3a6..e3dca731d3a0 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 6190f9b15aba..3d3f5a6a3cbb 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 258ae40a15e5..11f55c54a4d1 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 1801a23b1554..2c0cac37b40e 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/camera/camera.dm b/code/modules/photography/camera/camera.dm index c55c038de299..9ef40666fc35 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -315,8 +315,9 @@ qdel(clone_area) get_icon.Blend("#000", ICON_UNDERLAY) for(var/mob/living/carbon/human/person in mobs) - if(person.is_face_visible()) - names += "[person.name]" + if(person.obscured_slots & HIDEFACE) + continue + names += "[person.name]" var/datum/picture/picture = new("picture", desc.Join("
"), mobs_spotted, dead_spotted, names, get_icon, null, psize_x, psize_y, blueprints, can_see_ghosts = see_ghosts) after_picture(user, picture) diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index 450746c71a22..9c76e499a607 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/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index 1627b667f1a1..84e51918dc8c 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -98,7 +98,9 @@ /obj/machinery/plumbing/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced) user.balloon_alert_to_viewers("furiously plunging...") - if(do_after(user, 3 SECONDS, target = src)) - user.balloon_alert_to_viewers("finished plunging") - reagents.expose(get_turf(src), TOUCH) //splash on the floor - reagents.clear_reagents() + if(!do_after(user, 3 SECONDS, target = src)) + return TRUE + user.balloon_alert_to_viewers("finished plunging") + reagents.expose(get_turf(src), TOUCH) //splash on the floor + reagents.clear_reagents() + return TRUE diff --git a/code/modules/plumbing/plumbers/iv_drip.dm b/code/modules/plumbing/plumbers/iv_drip.dm index a2e3f905d1fa..0fef34ef4ca0 100644 --- a/code/modules/plumbing/plumbers/iv_drip.dm +++ b/code/modules/plumbing/plumbers/iv_drip.dm @@ -22,10 +22,12 @@ /obj/machinery/iv_drip/plumbing/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced) user.balloon_alert_to_viewers("furiously plunging...", "plunging iv drip...") - if(do_after(user, 3 SECONDS, target = src)) - user.balloon_alert_to_viewers("finished plunging") - reagents.expose(get_turf(src), TOUCH) //splash on the floor - reagents.clear_reagents() + if(!do_after(user, 3 SECONDS, target = src)) + return TRUE + user.balloon_alert_to_viewers("finished plunging") + reagents.expose(get_turf(src), TOUCH) //splash on the floor + reagents.clear_reagents() + return TRUE /obj/machinery/iv_drip/plumbing/wrench_act(mob/living/user, obj/item/tool) if(default_unfasten_wrench(user, tool) != SUCCESSFUL_UNFASTEN) diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm index ca0336de3d81..4bd9321d2a86 100644 --- a/code/modules/plumbing/plumbers/pill_press.dm +++ b/code/modules/plumbing/plumbers/pill_press.dm @@ -53,6 +53,7 @@ packaging_types += list(category_item) packaging_type = GLOB.reagent_containers[CAT_PILLS][1] + packaging_category = CAT_PILLS max_volume = initial(packaging_type.volume) current_volume = clamp(current_volume, MIN_VOLUME, max_volume) @@ -77,11 +78,11 @@ var/suffix switch(packaging_category) if(CAT_PILLS) - suffix = "Pill" + suffix = "pill" if(CAT_PATCHES) - suffix = "Patch" + suffix = "patch" else - suffix = "Bottle" + suffix = "bottle" container.name = "[product_name] [suffix]" reagents.trans_to(container, current_volume) if (istype(container, /obj/item/reagent_containers/applicator/pill)) diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index 92ccd59f8c6b..dbdf8325db43 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -590,15 +590,14 @@ force_update = TRUE return - if(obj_flags & EMAGGED || malfai) + if((obj_flags & EMAGGED) || malfai) hacked_flicker_counter = hacked_flicker_counter - 1 if(hacked_flicker_counter <= 0) flicker_hacked_icon() - if(COOLDOWN_FINISHED(src, malf_ai_pt_generation) && cell.use(60 KILO JOULES)>0 && malfai.malf_picker.processing_time
--- {account.balance} credit balance - -- Employee has {account.modifier * 100}% pay modifier - -
- {purchase.account} spent {purchase.cost} cr at{' '} - {purchase.vendor}. -- ))} -
+ {!entry.refundable ? ( +