£%@%(*$%&(£&?*(%&£/{}") + var/time = 100 * length(linked_server.decryptkey) + addtimer(CALLBACK(src, PROC_REF(unemag_console)), time) + error_message = "%$&(£: Critical %$$@ Error // !RestArting!
[credit]") - to_chat(world, fieldset_block("Now Playing: [span_bold(music_extra_data["title"])] by [span_bold(music_extra_data["artist"])]", jointext(to_chat_message, ""), "boxed_message")) + var/list/recipients = list() + for(var/client/client as anything in GLOB.clients) + if(client.prefs.read_preference(/datum/preference/numeric/volume/sound_midi) > 0) + recipients += client + recipients |= user.client + to_chat(recipients, fieldset_block("Now Playing: [span_bold(music_extra_data["title"])] by [span_bold(music_extra_data["artist"])]", jointext(to_chat_message, ""), "boxed_message")) SSblackbox.record_feedback("nested tally", "played_url", 1, list("[user.ckey]", "[input]")) log_admin("[key_name(user)] played web sound: [input]") diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 88f50b3cb3e2..aecb24dfd673 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -349,16 +349,6 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w airlock.req_one_access = list() message_admins("[key_name_admin(holder)] activated Egalitarian Station mode") priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, SSstation.announcer.get_rand_report_sound()) - if("ancap") - if(!is_funmin) - return - SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Anarcho-capitalist Station")) - SSeconomy.full_ancap = !SSeconomy.full_ancap - message_admins("[key_name_admin(holder)] toggled Anarcho-capitalist mode") - if(SSeconomy.full_ancap) - priority_announce("The NAP is now in full effect.", null, SSstation.announcer.get_rand_report_sound()) - else - priority_announce("The NAP has been revoked.", null, SSstation.announcer.get_rand_report_sound()) if("send_shuttle_back") if (!is_funmin) return @@ -687,6 +677,20 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w message_admins("[key_name_admin(holder)] healed everyone.") log_admin("[key_name(holder)] healed everyone.") + if("cascade") + if(!is_funmin) + return + message_admins("[key_name_admin(holder)] started a resonance cascade! You're supposed to be a scientist! Use your common sense!") + for(var/obj/machinery/power/supermatter_crystal/S in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/power/supermatter_crystal)) + if(!S.is_main_engine) + continue + S.explosion_point = 0 + S.set_delam(SM_DELAM_PRIO_IN_GAME, /datum/sm_delam/cascade) + S.external_damage_immediate += 200 + S.count_down() + return + return + if(holder) log_admin("[key_name(holder)] used secret: [action].") #undef THUNDERDOME_TEMPLATE_FILE diff --git a/code/modules/admin/view_variables/reference_tracking.dm b/code/modules/admin/view_variables/reference_tracking.dm index b9fd0e6d2ad6..858af794365d 100644 --- a/code/modules/admin/view_variables/reference_tracking.dm +++ b/code/modules/admin/view_variables/reference_tracking.dm @@ -126,6 +126,7 @@ else if(islist(potential_container)) var/list/potential_cache = potential_container + var/is_alist = istype(potential_cache, /alist) for(var/element_in_list in potential_cache) //Check normal sublists if(islist(element_in_list)) @@ -162,7 +163,7 @@ log_reftracker("All references to [type] [text_ref(src)] found, exiting.") return - if(!isnum(element_in_list) && !is_special_list) + if((!isnum(element_in_list) || is_alist) && !is_special_list) // This exists to catch an error that throws when we access a special list // is_special_list is a hint, it can be wrong try diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 4e6ade226cd9..ac45ba082427 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -57,6 +57,8 @@ GLOBAL_LIST_EMPTY(antagonists) var/hardcore_random_bonus = FALSE /// A path to the audio stinger that plays upon gaining this datum. var/stinger_sound + /// Multiplicative modifier to the mind's desensitized level when this antagonist is applied. Minimum is 0.1. + var/desensitized_modifier = 1.0 //ANTAG UI @@ -262,6 +264,7 @@ GLOBAL_LIST_EMPTY(antagonists) if(type_policy) to_chat(owner.current, type_policy) + owner.desensitized_level *= max(DESENSITIZED_MINIMUM, desensitized_modifier) apply_innate_effects() give_antag_moodies() RegisterSignal(owner, COMSIG_PRE_MINDSHIELD_IMPLANT, PROC_REF(pre_mindshield)) @@ -320,6 +323,7 @@ GLOBAL_LIST_EMPTY(antagonists) if(!owner) CRASH("Antag datum with no owner.") + owner.desensitized_level /= max(DESENSITIZED_MINIMUM, desensitized_modifier) if(owner.current) remove_innate_effects() clear_antag_moodies() diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm index 3cdbda71f79d..fd75708e57f1 100644 --- a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm +++ b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm @@ -484,9 +484,7 @@ Return to step 11 of normal process."} /obj/item/restraints/handcuffs/energy/on_uncuffed(datum/source, mob/living/wearer) . = ..() wearer.visible_message(span_danger("[wearer]'s [name] breaks in a discharge of energy!"), span_userdanger("[wearer]'s [name] breaks in a discharge of energy!")) - var/datum/effect_system/spark_spread/sparks = new - sparks.set_up(4,0,wearer.loc) - sparks.start() + do_sparks(4, FALSE, wearer.loc) qdel(src) /obj/item/melee/baton/abductor/examine(mob/user) diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index 1610d9a6cff3..391ac36789aa 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -58,9 +58,7 @@ /obj/effect/temp_visual/teleport_abductor/Initialize(mapload) . = ..() - var/datum/effect_system/spark_spread/S = new - S.set_up(10,0,loc) - S.start() + do_sparks(10, FALSE, loc) /obj/effect/temp_visual/teleport_golem name = "bluespace silhouette" diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 017dbf49d6ef..0be336ff584d 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -593,6 +593,7 @@ Striking a noncultist, however, will tear their flesh."} lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' list_reagents = list(/datum/reagent/fuel/unholywater = 50) + can_lid = FALSE /obj/item/reagent_containers/cup/beaker/unholywater/Initialize(mapload) . = ..() diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm index 7cbd9fe6284a..130683a9046f 100644 --- a/code/modules/antagonists/cult/datums/cult_team.dm +++ b/code/modules/antagonists/cult/datums/cult_team.dm @@ -58,7 +58,6 @@ SEND_SOUND(mind.current, 'sound/music/antag/bloodcult/bloodcult_eyes.ogg') to_chat(mind.current, span_cult_large(span_warning("The veil weakens as your cult grows, your eyes begin to glow..."))) mind.current.AddElement(/datum/element/cult_eyes) - ADD_TRAIT(mind.current, TRAIT_DESENSITIZED, CULT_TRAIT) cult_risen = TRUE log_game("The blood cult has risen with [cultplayers] players.") diff --git a/code/modules/antagonists/cult/datums/cultist.dm b/code/modules/antagonists/cult/datums/cultist.dm index 9ce4dc5b13af..c637b2b45cb3 100644 --- a/code/modules/antagonists/cult/datums/cultist.dm +++ b/code/modules/antagonists/cult/datums/cultist.dm @@ -8,6 +8,7 @@ pref_flag = ROLE_CULTIST antag_hud_name = "cult" stinger_sound = 'sound/music/antag/bloodcult/bloodcult_gain.ogg' + desensitized_modifier = DESENSITIZED_THRESHOLD ///Boolean on whether the starting equipment should be given to their inventory. var/give_equipment = FALSE @@ -65,7 +66,6 @@ if(cult_team.cult_risen) current.AddElement(/datum/element/cult_eyes, initial_delay = 0 SECONDS) - ADD_TRAIT(current, TRAIT_DESENSITIZED, CULT_TRAIT) if(cult_team.cult_ascendent) current.AddElement(/datum/element/cult_halo, initial_delay = 0 SECONDS) @@ -88,7 +88,6 @@ if (HAS_TRAIT(current, TRAIT_CULT_HALO)) current.RemoveElement(/datum/element/cult_halo) - REMOVE_TRAIT(current, TRAIT_DESENSITIZED, CULT_TRAIT) REMOVE_TRAIT(current, TRAIT_HEALS_FROM_CULT_PYLONS, CULT_TRAIT) /datum/antagonist/cult/on_mindshield(mob/implanter) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index fbadeba3518d..be3a5b92d2dd 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -242,7 +242,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(!IS_CULTIST(non_cultist)) myriad_targets += non_cultist - if(!length(myriad_targets) && !try_spawn_sword()) + if(!length(myriad_targets) && !try_sacrifice_item()) fail_invoke() return @@ -400,57 +400,38 @@ structure_check() searches for nearby cultist structures required for the invoca sacrificial.investigate_log("has been sacrificially gibbed by the cult.", INVESTIGATE_DEATHS) sacrificial.gib(DROP_ALL_REMAINS) - try_spawn_sword() // after sharding and gibbing, which potentially dropped a null rod + try_sacrifice_item() // after sharding and gibbing, which potentially dropped a sacrificable item return TRUE -/// Tries to convert a null rod over the rune to a cult sword -/obj/effect/rune/convert/proc/try_spawn_sword() - for(var/obj/item/potential_rod in loc) - if(!HAS_TRAIT(potential_rod, TRAIT_NULLROD_ITEM)) +/// Tries to convert a valid item over the rune to something else +/obj/effect/rune/convert/proc/try_sacrifice_item() + for(var/obj/item/checked_item in loc) + if(checked_item.anchored || (checked_item.resistance_flags & INDESTRUCTIBLE)) continue - if(potential_rod.anchored || (potential_rod.resistance_flags & INDESTRUCTIBLE)) - continue - - var/num_slain = 0 - if (istype(potential_rod, /obj/item/nullrod)) - var/obj/item/nullrod/actual_rod = potential_rod - num_slain = LAZYLEN(actual_rod.cultists_slain) - - var/displayed_message = "[potential_rod] glows an unholy red and begins to transform..." - if(num_slain && GET_ATOM_BLOOD_DNA_LENGTH(potential_rod)) - displayed_message += " The blood of [num_slain] fallen cultist[num_slain == 1 ? "":"s"] is absorbed into [potential_rod]!" - - potential_rod.visible_message(span_cult_italic(displayed_message)) - switch(num_slain) - if(0) - animate_spawn_sword(potential_rod, /obj/item/melee/cultblade/dagger) - if(1) - animate_spawn_sword(potential_rod, /obj/item/melee/cultblade) - else - animate_spawn_sword(potential_rod, /obj/item/melee/cultblade/halberd) - return TRUE + if(SEND_SIGNAL(checked_item, COMSIG_ITEM_CULT_SACRIFICE, src) & COMPONENT_SACRIFICE_SUCCESSFUL) + return TRUE return FALSE -/// Does an animation of a null rod transforming into a cult sword -/obj/effect/rune/convert/proc/animate_spawn_sword(obj/item/former_rod, new_blade_typepath) +/// Does an animation of a sacrificable item transforming into something else +/obj/effect/rune/convert/proc/animate_convert_item(obj/item/old_item, new_movable_typepath) playsound(src, 'sound/effects/magic.ogg', 33, vary = TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, frequency = 0.66) - former_rod.anchored = TRUE - former_rod.Shake() - animate(former_rod, alpha = 0, transform = matrix(former_rod.transform).Scale(0.01), time = 2 SECONDS, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) - QDEL_IN(former_rod, 2 SECONDS) - - var/obj/item/new_blade = new new_blade_typepath(loc) - var/matrix/blade_matrix_on_spawn = matrix(new_blade.transform) - new_blade.name = "converted [new_blade.name]" - new_blade.anchored = TRUE - new_blade.alpha = 0 - new_blade.transform = matrix(new_blade.transform).Scale(0.01) - new_blade.Shake() - animate(new_blade, alpha = 255, transform = blade_matrix_on_spawn, time = 2 SECONDS, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) - addtimer(VARSET_CALLBACK(new_blade, anchored, FALSE), 2 SECONDS) + old_item.anchored = TRUE + old_item.Shake() + animate(old_item, alpha = 0, transform = matrix(old_item.transform).Scale(0.01), time = 2 SECONDS, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) + QDEL_IN(old_item, 2 SECONDS) + + var/atom/movable/new_movable = new new_movable_typepath(loc) + var/matrix/matrix_on_spawn = matrix(new_movable.transform) + new_movable.name = "converted [new_movable.name]" + new_movable.anchored = TRUE + new_movable.alpha = 0 + new_movable.transform = matrix(new_movable.transform).Scale(0.01) + new_movable.Shake() + animate(new_movable, alpha = 255, transform = matrix_on_spawn, time = 2 SECONDS, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL) + addtimer(VARSET_CALLBACK(new_movable, anchored, FALSE), 2 SECONDS) /obj/effect/rune/empower cultist_name = "Empower" diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index c0bf50819e01..baa59a14dfd1 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -13,6 +13,7 @@ suicide_cry = "FOR NANOTRASEN!!" // Not 'true' antags, this disables certain interactions that assume the owner is a baddie antag_flags = ANTAG_FAKE|ANTAG_SKIP_GLOBAL_LIST + desensitized_modifier = DESENSITIZED_THRESHOLD * 0.5 var/datum/team/ert/ert_team var/leader = FALSE var/datum/outfit/outfit = /datum/outfit/centcom/ert/security @@ -36,14 +37,6 @@ equipERT() . = ..() -/datum/antagonist/ert/apply_innate_effects(mob/living/mob_override) - var/mob/living/carbon/human/officer = mob_override || owner.current - ADD_TRAIT(officer, TRAIT_DESENSITIZED, REF(src)) - -/datum/antagonist/ert/remove_innate_effects(mob/living/mob_override) - var/mob/living/carbon/human/officer = mob_override || owner.current - REMOVE_TRAIT(officer, TRAIT_DESENSITIZED, REF(src)) - /datum/antagonist/ert/get_team() return ert_team @@ -258,7 +251,7 @@ to_chat(owner, "You are the [name].") - var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division." + var/missiondesc = "Your squad is being sent on a mission to [station_name()]." // DARKPACK EDIT CHANGE - Original : var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division." if(leader) //If Squad Leader missiondesc += " Lead your squad to ensure the completion of the mission. Board the shuttle when your team is ready." else diff --git a/code/modules/antagonists/fugitive/hunters/hunter_gear.dm b/code/modules/antagonists/fugitive/hunters/hunter_gear.dm index 34d10b057890..dd829c4ce8a4 100644 --- a/code/modules/antagonists/fugitive/hunters/hunter_gear.dm +++ b/code/modules/antagonists/fugitive/hunters/hunter_gear.dm @@ -106,9 +106,7 @@ color = "#d6ad8b" /obj/item/clothing/suit/armor/reactive/psykerboost/cooldown_activation(mob/living/carbon/human/owner) - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread - sparks.set_up(1, 1, src) - sparks.start() + do_sparks(1, TRUE, src) return ..() /obj/item/clothing/suit/armor/reactive/psykerboost/reactive_activation(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) diff --git a/code/modules/antagonists/heretic/heretic_curses.dm b/code/modules/antagonists/heretic/heretic_curses.dm index f9ae9fde801d..1893bc725587 100644 --- a/code/modules/antagonists/heretic/heretic_curses.dm +++ b/code/modules/antagonists/heretic/heretic_curses.dm @@ -3,7 +3,7 @@ */ /datum/heretic_knowledge/curse - abstract_parent_type = /datum/heretic_knowledge/curse + abstract_type = /datum/heretic_knowledge/curse /// How far can we curse people? var/max_range = 64 /// The duration of the curse @@ -134,7 +134,7 @@ //---- Curse of Paralysis /datum/heretic_knowledge/curse/paralysis - abstract_parent_type = /datum/heretic_knowledge/curse/paralysis + abstract_type = /datum/heretic_knowledge/curse/paralysis name = "Curse of Paralysis" desc = "Allows you to transmute a hatchet and both a left and right leg to cast a curse of immobility on a crew member. \ While cursed, the victim will be unable to walk. You can additionally supply an item that a victim has touched \ @@ -169,7 +169,7 @@ //---- Curse of Corrosion /datum/heretic_knowledge/curse/corrosion - abstract_parent_type = /datum/heretic_knowledge/curse/corrosion + abstract_type = /datum/heretic_knowledge/curse/corrosion name = "Curse of Corrosion" desc = "Allows you to transmute wirecutters, a pool of vomit, and a heart to cast a curse of sickness on a crew member. \ While cursed, the victim will repeatedly vomit while their organs will take constant damage. You can additionally supply an item \ @@ -198,7 +198,7 @@ //---- Curse of Transmutation /datum/heretic_knowledge/curse/transmutation - abstract_parent_type = /datum/heretic_knowledge/curse/transmutation + abstract_type = /datum/heretic_knowledge/curse/transmutation name = "Curse of Transmutation" duration = 0 // Infinite curse, it breaks when our codex is destroyed curse_color = NONE @@ -266,7 +266,7 @@ //---- Curse of Indulgence /datum/heretic_knowledge/curse/indulgence - abstract_parent_type = /datum/heretic_knowledge/curse/indulgence + abstract_type = /datum/heretic_knowledge/curse/indulgence name = "Curse of Indulgence" duration = 8 MINUTES curse_color = COLOR_MAROON diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm index af0381db3cc3..d1a1ee28bebe 100644 --- a/code/modules/antagonists/heretic/heretic_knowledge.dm +++ b/code/modules/antagonists/heretic/heretic_knowledge.dm @@ -9,14 +9,14 @@ * */ /datum/heretic_knowledge + /// The abstract parent type of the knowledge, used in determine mutual exclusivity in some cases + abstract_type = /datum/heretic_knowledge /// Name of the knowledge, shown to the heretic. var/name = "Basic knowledge" /// Description of the knowledge, shown to the heretic. Describes what it unlocks / does. var/desc = "Basic knowledge of forbidden arts." /// What's shown to the heretic when the knowledge is acquired var/gain_text - /// The abstract parent type of the knowledge, used in determine mutual exclusivity in some cases - var/datum/heretic_knowledge/abstract_parent_type = /datum/heretic_knowledge /// Assoc list of [typepaths we need] to [amount needed]. /// If set, this knowledge allows the heretic to do a ritual on a transmutation rune with the components set. /// If one of the items in the list is a list, it's treated as 'any of these items will work' @@ -191,7 +191,7 @@ * A knowledge subtype that grants the heretic a certain spell. */ /datum/heretic_knowledge/spell - abstract_parent_type = /datum/heretic_knowledge/spell + abstract_type = /datum/heretic_knowledge/spell /// Spell path we add to the heretic. Type-path. var/datum/action/action_to_add /// The spell we actually created. @@ -220,7 +220,7 @@ * created at once. */ /datum/heretic_knowledge/limited_amount - abstract_parent_type = /datum/heretic_knowledge/limited_amount + abstract_type = /datum/heretic_knowledge/limited_amount /// The limit to how many items we can create at once. var/limit = 1 /// A list of weakrefs to all items we've created. @@ -262,7 +262,7 @@ * and their ascension depends on whichever they chose. */ /datum/heretic_knowledge/limited_amount/starting - abstract_parent_type = /datum/heretic_knowledge/limited_amount/starting + abstract_type = /datum/heretic_knowledge/limited_amount/starting limit = 2 cost = 1 priority = MAX_KNOWLEDGE_PRIORITY - 5 @@ -362,7 +362,7 @@ * A heretic can only learn one /blade_upgrade type knowledge. */ /datum/heretic_knowledge/blade_upgrade - abstract_parent_type = /datum/heretic_knowledge/blade_upgrade + abstract_type = /datum/heretic_knowledge/blade_upgrade cost = 1 /datum/heretic_knowledge/blade_upgrade/on_gain(mob/user, datum/antagonist/heretic/our_heretic) @@ -411,7 +411,7 @@ * A knowledge subtype lets the heretic summon a monster with the ritual. */ /datum/heretic_knowledge/summon - abstract_parent_type = /datum/heretic_knowledge/summon + abstract_type = /datum/heretic_knowledge/summon /// Typepath of a mob to summon when we finish the recipe. var/mob/living/mob_to_summon @@ -476,7 +476,7 @@ name = "Ritual of Knowledge" desc = "A randomly generated transmutation ritual that rewards knowledge points and can only be completed once." gain_text = "Everything can be a key to unlocking the secrets behind the Gates. I must be wary and wise." - abstract_parent_type = /datum/heretic_knowledge/knowledge_ritual + abstract_type = /datum/heretic_knowledge/knowledge_ritual cost = 1 priority = MAX_KNOWLEDGE_PRIORITY - 10 // A pretty important midgame ritual. research_tree_icon_path = 'icons/obj/antags/eldritch.dmi' @@ -564,7 +564,7 @@ * The special final tier of knowledges that unlocks ASCENSION. */ /datum/heretic_knowledge/ultimate - abstract_parent_type = /datum/heretic_knowledge/ultimate + abstract_type = /datum/heretic_knowledge/ultimate cost = 2 priority = MAX_KNOWLEDGE_PRIORITY + 1 // Yes, the final ritual should be ABOVE the max priority. required_atoms = list(/mob/living/carbon/human = 3) @@ -654,7 +654,7 @@ if(!isnull(ascension_achievement)) user.client?.give_award(ascension_achievement, user) heretic_datum.rust_strength = RUST_RESISTANCE_ORGANIC // Ascended heretics can rust whatever they want (below RUST_RESISTANCE_ABSOLUTE) - ADD_TRAIT(user, TRAIT_DESENSITIZED, type) + user.apply_status_effect(/datum/status_effect/desensitized, type, DESENSITIZED_THRESHOLD * 0.4) return TRUE /datum/heretic_knowledge/ultimate/cleanup_atoms(list/selected_atoms) diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index 659ed72854ba..71f79a51cbd1 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -147,8 +147,7 @@ else human_user.gib(DROP_ALL_REMAINS) human_user.investigate_log("has died from using telekinesis on a heretic influence.", INVESTIGATE_DEATHS) - var/datum/effect_system/reagents_explosion/explosion = new() - explosion.set_up(1, get_turf(human_user), 1) + var/datum/effect_system/reagents_explosion/explosion = new(get_turf(human_user), 1, 1, 1) explosion.start(src) /obj/effect/visible_heretic_influence/examine(mob/living/user) diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm index 02adc82d9fa1..5ef62fa410b4 100644 --- a/code/modules/antagonists/heretic/items/eldritch_flask.dm +++ b/code/modules/antagonists/heretic/items/eldritch_flask.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/antags/eldritch.dmi' icon_state = "eldritch_flask" list_reagents = list(/datum/reagent/eldritch = 50) + can_lid = FALSE // Unique bottle that lets you instantly draw blood from a victim /obj/item/reagent_containers/cup/phylactery diff --git a/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm b/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm index 5890e459c162..6bdda2d115c6 100644 --- a/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm +++ b/code/modules/antagonists/heretic/knowledge/_heretic_paths.dm @@ -5,14 +5,14 @@ GLOBAL_LIST_INIT(heretic_path_datums, init_heretic_path_datums()) /proc/init_heretic_path_datums() var/list/paths = list() - for(var/datum/heretic_knowledge_tree_column/column_path as anything in subtypesof(/datum/heretic_knowledge_tree_column)) - if(initial(column_path.abstract_parent_type) == column_path) - continue + for(var/datum/heretic_knowledge_tree_column/column_path as anything in valid_subtypesof(/datum/heretic_knowledge_tree_column)) var/datum/heretic_knowledge_tree_column/heretic_route = new column_path() paths[heretic_route.route] += heretic_route return paths /datum/heretic_knowledge_tree_column + ///Used to determine if this is a side path or a main path + abstract_type = /datum/heretic_knowledge_tree_column ///Route that symbolizes what path this is, MUST be unique between paths var/route = PATH_START var/icon_state = "dark_blade" @@ -35,8 +35,6 @@ GLOBAL_LIST_INIT(heretic_path_datums, init_heretic_path_datums()) var/list/pros = list("Is bad", "Is very bad", "Is extremely bad") var/list/cons = list("Smells bad", "Looks bad", "Tastes bad") var/list/tips = list("Don't use it", "Don't touch it", "Don't look at it") - ///Used to determine if this is a side path or a main path - var/abstract_parent_type = /datum/heretic_knowledge_tree_column ///UI background var/ui_bgr = BGR_SIDE diff --git a/code/modules/antagonists/heretic/knowledge/heretic_armor_knowledge.dm b/code/modules/antagonists/heretic/knowledge/heretic_armor_knowledge.dm index 5bd0379cfe30..243c84b2ed91 100644 --- a/code/modules/antagonists/heretic/knowledge/heretic_armor_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/heretic_armor_knowledge.dm @@ -9,7 +9,7 @@ list(/obj/structure/table, /obj/item/clothing/suit) = 1, /obj/item/clothing/mask = 1, ) - abstract_parent_type = /datum/heretic_knowledge/armor + abstract_type = /datum/heretic_knowledge/armor result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/eldritch) cost = 1 diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm index f099050ecfb1..f3a9a9da7124 100644 --- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm @@ -303,8 +303,7 @@ var/obj/item/bodypart/head/head = locate() in carbon_view.bodyparts if(!head?.dismember()) carbon_view.gib(DROP_ALL_REMAINS) - var/datum/effect_system/reagents_explosion/explosion = new() - explosion.set_up(1, get_turf(carbon_view), 1) + var/datum/effect_system/reagents_explosion/explosion = new(get_turf(carbon_view), 1, 1, 1) explosion.start(src) else attempt_conversion(carbon_view, source) diff --git a/code/modules/antagonists/heretic/magic/rust_wave.dm b/code/modules/antagonists/heretic/magic/rust_wave.dm index 70e36471a21a..379a86322922 100644 --- a/code/modules/antagonists/heretic/magic/rust_wave.dm +++ b/code/modules/antagonists/heretic/magic/rust_wave.dm @@ -93,7 +93,7 @@ damage_type = TOX hitsound = 'sound/items/weapons/punch3.ogg' trigger_range = 0 - ignored_factions = list(FACTION_HERETIC) + faction = list(FACTION_HERETIC) range = 15 speed = 1 diff --git a/code/modules/antagonists/heretic/status_effects/ghoul.dm b/code/modules/antagonists/heretic/status_effects/ghoul.dm index 74e60c966a46..bc2f524e7565 100644 --- a/code/modules/antagonists/heretic/status_effects/ghoul.dm +++ b/code/modules/antagonists/heretic/status_effects/ghoul.dm @@ -62,9 +62,9 @@ on_made_callback?.Invoke(human_target) ADD_TRAIT(human_target, TRAIT_FAKEDEATH, TRAIT_STATUS_EFFECT(id)) ADD_TRAIT(human_target, TRAIT_HERETIC_SUMMON, TRAIT_STATUS_EFFECT(id)) - ADD_TRAIT(human_target, TRAIT_DESENSITIZED, TRAIT_STATUS_EFFECT(id)) human_target.become_husk(TRAIT_STATUS_EFFECT(id)) human_target.add_faction(FACTION_HERETIC) + human_target.apply_status_effect(/datum/status_effect/desensitized, TRAIT_STATUS_EFFECT(id), DESENSITIZED_THRESHOLD * 0.2) if(human_target.mind) var/datum/antagonist/heretic_monster/heretic_monster = human_target.mind.add_antag_datum(/datum/antagonist/heretic_monster) @@ -93,9 +93,9 @@ on_lost_callback?.Invoke(human_target) REMOVE_TRAIT(human_target, TRAIT_FAKEDEATH, TRAIT_STATUS_EFFECT(id)) REMOVE_TRAIT(human_target, TRAIT_HERETIC_SUMMON, TRAIT_STATUS_EFFECT(id)) - REMOVE_TRAIT(human_target, TRAIT_DESENSITIZED, TRAIT_STATUS_EFFECT(id)) human_target.cure_husk(TRAIT_STATUS_EFFECT(id)) human_target.remove_faction(FACTION_HERETIC) + human_target.remove_status_effect(/datum/status_effect/desensitized, TRAIT_STATUS_EFFECT(id)) human_target.mind?.remove_antag_datum(/datum/antagonist/heretic_monster) UnregisterSignal(human_target, COMSIG_LIVING_DEATH) diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm index d197f91f5732..39a6a52eef9a 100644 --- a/code/modules/antagonists/highlander/highlander.dm +++ b/code/modules/antagonists/highlander/highlander.dm @@ -6,9 +6,9 @@ can_elimination_hijack = ELIMINATION_ENABLED suicide_cry = "FOR SCOTLAND!!" // If they manage to lose their no-drop stuff somehow antag_flags = ANTAG_FAKE|ANTAG_SKIP_GLOBAL_LIST + desensitized_modifier = DESENSITIZED_THRESHOLD * 0.2 /// Traits we apply/remove to our target on-demand. var/static/list/applicable_traits = list( - TRAIT_DESENSITIZED, TRAIT_NOBREATH, TRAIT_NODISMEMBER, TRAIT_NOFIRE, diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm index 56591e13748d..2f5d0c19383b 100644 --- a/code/modules/antagonists/nightmare/nightmare_equipment.dm +++ b/code/modules/antagonists/nightmare/nightmare_equipment.dm @@ -3,14 +3,14 @@ */ /obj/item/light_eater name = "light eater" //as opposed to heavy eater - icon = 'icons/obj/weapons/changeling_items.dmi' - icon_state = "arm_blade" - inhand_icon_state = "arm_blade" + icon = 'icons/obj/weapons/nightmare_items.dmi' + icon_state = "light_eater" + inhand_icon_state = "light_eater" icon_angle = 180 force = 25 armour_penetration = 35 - lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi' - righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi' + lefthand_file = 'icons/mob/inhands/antag/nightmare_lefthand.dmi' + righthand_file = 'icons/mob/inhands/antag/nightmare_righthand.dmi' item_flags = ABSTRACT | DROPDEL resistance_flags = INDESTRUCTIBLE | ACID_PROOF | FIRE_PROOF | LAVA_PROOF | UNACIDABLE w_class = WEIGHT_CLASS_HUGE diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm index d3ab9cf1ac86..6ac1148a2224 100644 --- a/code/modules/antagonists/nightmare/nightmare_organs.dm +++ b/code/modules/antagonists/nightmare/nightmare_organs.dm @@ -78,11 +78,11 @@ name = "heart of darkness" desc = "An alien organ that twists and writhes when exposed to light." visual = TRUE - icon_state = "demon_heart-on" - base_icon_state = "demon_heart" + icon = 'icons/obj/medical/organs/shadow_organs.dmi' + icon_state = "dark_heart-on" + base_icon_state = "dark_heart" beat_noise = "the writhing pulses of a fear given form" // evil schmeevil - color = COLOR_CRAYON_BLACK decay_factor = 0 // No love is to be found in a heart so twisted. food_reagents = list(/datum/reagent/consumable/nutriment/organ_tissue = 5) diff --git a/code/modules/antagonists/nukeop/datums/operative.dm b/code/modules/antagonists/nukeop/datums/operative.dm index 59b2ca2f4af3..abf385939903 100644 --- a/code/modules/antagonists/nukeop/datums/operative.dm +++ b/code/modules/antagonists/nukeop/datums/operative.dm @@ -9,6 +9,7 @@ hijack_speed = 2 //If you can't take out the station, take the shuttle instead. suicide_cry = "FOR THE SYNDICATE!!" stinger_sound = 'sound/music/antag/ops.ogg' + desensitized_modifier = DESENSITIZED_THRESHOLD * 0.5 /// Which nukie team are we on? var/datum/team/nuclear/nuke_team @@ -132,7 +133,6 @@ var/mob/living/carbon/human/operative = owner.current ADD_TRAIT(operative, TRAIT_NOFEAR_HOLDUPS, INNATE_TRAIT) - ADD_TRAIT(operative, TRAIT_DESENSITIZED, INNATE_TRAIT) if(!nukeop_outfit) // this variable is null in instances where an antagonist datum is granted via enslaving the mind (/datum/mind/proc/enslave_mind_to_creator), like in golems. return diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm index 10f92ce631d2..807f0e6e6905 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm @@ -124,10 +124,22 @@ GLOBAL_VAR(station_nuke_source) if(NUKESTATE_INTACT) if(istype(weapon, /obj/item/screwdriver/nuke)) to_chat(user, span_notice("You start removing [src]'s front panel's screws...")) - if(weapon.use_tool(src, user, 6 SECONDS, volume = 100)) - deconstruction_state = NUKESTATE_UNSCREWED - to_chat(user, span_notice("You remove the screws from [src]'s front panel.")) - update_appearance() + if(!weapon.use_tool(src, user, 6 SECONDS, volume = 100)) + return TRUE + deconstruction_state = NUKESTATE_UNSCREWED + to_chat(user, span_notice("You remove the screws from [src]'s front panel.")) + update_appearance() + return TRUE + + if(NUKESTATE_UNSCREWED) + if(istype(weapon, /obj/item/screwdriver/nuke)) + to_chat(user, span_notice("You start screwing [src]'s front panel back in...")) + if(!weapon.use_tool(src, user, 8 SECONDS, volume = 100)) + return TRUE + deconstruction_state = NUKESTATE_INTACT + to_chat(user, span_notice("You screw [src]'s front panel back into place.")) + deconstruction_state = NUKESTATE_INTACT + update_appearance() return TRUE if(NUKESTATE_PANEL_REMOVED) @@ -135,24 +147,26 @@ GLOBAL_VAR(station_nuke_source) if(!weapon.tool_start_check(user, amount = 1)) return TRUE to_chat(user, span_notice("You start cutting [src]'s inner plate...")) - if(weapon.use_tool(src, user, 8 SECONDS, volume=100)) - to_chat(user, span_notice("You cut [src]'s inner plate.")) - deconstruction_state = NUKESTATE_WELDED - update_appearance() + if(!weapon.use_tool(src, user, 8 SECONDS, volume=100)) + return TRUE + to_chat(user, span_notice("You cut [src]'s inner plate.")) + deconstruction_state = NUKESTATE_WELDED + update_appearance() return TRUE if(NUKESTATE_CORE_EXPOSED) if(istype(weapon, /obj/item/nuke_core_container)) var/obj/item/nuke_core_container/core_box = weapon to_chat(user, span_notice("You start loading the plutonium core into [core_box]...")) - if(do_after(user, 5 SECONDS, target = src, hidden = TRUE)) - if(core_box.load(core, user)) - to_chat(user, span_notice("You load the plutonium core into [core_box].")) - deconstruction_state = NUKESTATE_CORE_REMOVED - update_appearance() - core = null - else - to_chat(user, span_warning("You fail to load the plutonium core into [core_box]. [core_box] has already been used!")) + if(!do_after(user, 5 SECONDS, target = src, hidden = TRUE)) + return TRUE + if(core_box.load(core, user)) + to_chat(user, span_notice("You load the plutonium core into [core_box].")) + deconstruction_state = NUKESTATE_CORE_REMOVED + update_appearance() + core = null + else + to_chat(user, span_warning("You fail to load the plutonium core into [core_box]. [core_box] has already been used!")) return TRUE if(istype(weapon, /obj/item/stack/sheet/iron)) @@ -160,11 +174,37 @@ GLOBAL_VAR(station_nuke_source) return TRUE to_chat(user, span_notice("You begin repairing [src]'s inner metal plate...")) - if(weapon.use_tool(src, user, 10 SECONDS, amount = 20)) - to_chat(user, span_notice("You repair [src]'s inner metal plate. The radiation is contained.")) - deconstruction_state = NUKESTATE_PANEL_REMOVED - STOP_PROCESSING(SSobj, core) - update_appearance() + if(!weapon.use_tool(src, user, 10 SECONDS, amount = 20)) + return TRUE + to_chat(user, span_notice("You repair [src]'s inner metal plate. The radiation is contained.")) + deconstruction_state = NUKESTATE_PANEL_REMOVED + STOP_PROCESSING(SSobj, core) + update_appearance() + return TRUE + + if(NUKESTATE_CORE_REMOVED) + if(astype(weapon, /obj/item/nuke_core_container)?.core && !istype(weapon, /obj/item/nuke_core_container/supermatter)) + var/obj/item/nuke_core_container/core_box = weapon + to_chat(user, span_notice("You pry open [core_box] and begin placing [core_box.core] into [src]'s inner chamber...")) + if(!do_after(user, 15 SECONDS, src)) + return TRUE + core_box.core.forceMove(src) + core = core_box.core + to_chat(user, span_notice("You place [core_box.core] into [src]'s inner chamber.")) + deconstruction_state = NUKESTATE_CORE_EXPOSED + update_appearance() + core_box.icon_state = core_box::icon_state + core_box.core = null + return TRUE + if(istype(weapon, /obj/item/nuke_core) && !istype(weapon, /obj/item/nuke_core/supermatter_sliver)) + to_chat(user, span_notice("You begin placing [weapon] into [src]'s inner chamber...")) + if(!do_after(user, 6 SECONDS, src)) + return TRUE + weapon.forceMove(src) + core = weapon + to_chat(user, span_notice("You place [weapon] into [src]'s inner chamber.")) + deconstruction_state = NUKESTATE_CORE_EXPOSED + update_appearance() return TRUE return ..() @@ -173,22 +213,42 @@ GLOBAL_VAR(station_nuke_source) switch(deconstruction_state) if(NUKESTATE_UNSCREWED) to_chat(user, span_notice("You start removing [src]'s front panel...")) - if(tool.use_tool(src, user, 30, volume=100)) - to_chat(user, span_notice("You remove [src]'s front panel.")) - deconstruction_state = NUKESTATE_PANEL_REMOVED - update_appearance() + if(!tool.use_tool(src, user, 30, volume=100)) + return TRUE + to_chat(user, span_notice("You remove [src]'s front panel.")) + deconstruction_state = NUKESTATE_PANEL_REMOVED + update_appearance() return TRUE if(NUKESTATE_WELDED) to_chat(user, span_notice("You start prying off [src]'s inner plate...")) - if(tool.use_tool(src, user, 30, volume=100)) + if(!tool.use_tool(src, user, 30, volume=100)) + return TRUE + if(core) to_chat(user, span_notice("You pry off [src]'s inner plate. You can see the core's green glow!")) deconstruction_state = NUKESTATE_CORE_EXPOSED - update_appearance() START_PROCESSING(SSobj, core) + else + to_chat(user, span_notice("You pry off [src]'s inner plate. The inner chamber is empty, save for some beer stains.")) + deconstruction_state = NUKESTATE_CORE_REMOVED + update_appearance() + new /obj/item/stack/sheet/iron(loc, 15) + return TRUE + if(NUKESTATE_PANEL_REMOVED) + to_chat(user, span_notice("You start levering [src]'s inner panel back into place...")) + if(!tool.use_tool(src, user, 30, volume = 100)) + return TRUE + to_chat(user, span_notice("You lever [src]'s inner panel back into place.")) + deconstruction_state = NUKESTATE_UNSCREWED + update_appearance() return TRUE - return FALSE +/obj/machinery/nuclearbomb/attack_hand_secondary(mob/user, list/modifiers) + if(deconstruction_state != NUKESTATE_CORE_EXPOSED) + return ..() + to_chat(user, span_danger("You can't hold [core] with your bare hands!")) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + /obj/machinery/nuclearbomb/can_interact(mob/user) if(HAS_TRAIT(user, TRAIT_CAN_USE_NUKE)) return TRUE diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm index f2cc848a8b35..66798ae798c6 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm @@ -32,13 +32,11 @@ weapon.interact_with_atom(keg, user) // redirect refillable containers to the keg, allowing them to be filled return TRUE // pretend we handled the attack, too. - if(istype(weapon, /obj/item/nuke_core_container)) - to_chat(user, span_notice("[src] has had its plutonium core removed as a part of being decommissioned.")) - return TRUE - return ..() /obj/machinery/nuclearbomb/beer/actually_explode() + if(core) + return ..() //Unblock roundend, we're not actually exploding. SSticker.roundend_check_paused = FALSE var/turf/bomb_location = get_turf(src) @@ -57,16 +55,12 @@ return ..() /obj/machinery/nuclearbomb/beer/proc/local_foam() - var/datum/reagents/tmp_holder = new/datum/reagents(1000) - tmp_holder.my_atom = src - tmp_holder.add_reagent(flood_reagent, 100) - - var/datum/effect_system/fluid_spread/foam/foam = new - foam.set_up(200, holder = src, location = get_turf(src), carry = tmp_holder) - foam.start() + do_foam(200, src, get_turf(src), flood_reagent, 100) disarm_nuke() /obj/machinery/nuclearbomb/beer/really_actually_explode(detonation_status) + if(core) + return ..() //if it's always hooked in it'll override admin choices RegisterSignal(overflow_control, COMSIG_CREATED_ROUND_EVENT, PROC_REF(on_created_round_event)) disarm_nuke() diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index 7b09a2540ecb..e3f4d00d8ebe 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -8,6 +8,7 @@ suicide_cry = "FOR ME MATEYS!!" stinger_sound = 'sound/music/antag/pirate/pirate_start.ogg' hijack_speed = 2 // That is without doubt the worst pirate I have ever seen. + desensitized_modifier = DESENSITIZED_THRESHOLD var/datum/team/pirate/crew /datum/antagonist/pirate/greet() @@ -46,12 +47,10 @@ var/datum/language_holder/holder = owner_mob.get_language_holder() holder.grant_language(/datum/language/piratespeak, source = LANGUAGE_PIRATE) holder.selected_language = /datum/language/piratespeak - ADD_TRAIT(owner_mob, TRAIT_DESENSITIZED, REF(src)) /datum/antagonist/pirate/remove_innate_effects(mob/living/mob_override) var/mob/living/owner_mob = mob_override || owner.current owner_mob.remove_language(/datum/language/piratespeak, source = LANGUAGE_PIRATE) - REMOVE_TRAIT(owner_mob, TRAIT_DESENSITIZED, REF(src)) /datum/team/pirate name = "\improper Pirate crew" diff --git a/code/modules/antagonists/space_ninja/equipment/energy_katana.dm b/code/modules/antagonists/space_ninja/equipment/energy_katana.dm index a03dfa66fd9c..f02df8b59264 100644 --- a/code/modules/antagonists/space_ninja/equipment/energy_katana.dm +++ b/code/modules/antagonists/space_ninja/equipment/energy_katana.dm @@ -24,7 +24,7 @@ throwforce = 30 block_chance = 50 armour_penetration = 50 - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY hitsound = 'sound/items/weapons/bladeslice.ogg' pickup_sound = 'sound/items/unsheath.ogg' drop_sound = 'sound/items/sheath.ogg' @@ -36,14 +36,13 @@ max_integrity = 200 resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF item_flags = NEEDS_PERMIT - var/datum/effect_system/spark_spread/spark_system + var/datum/effect_system/basic/spark_spread/spark_system var/datum/action/innate/dash/ninja/jaunt /obj/item/energy_katana/Initialize(mapload) . = ..() jaunt = new(src) - spark_system = new /datum/effect_system/spark_spread() - spark_system.set_up(5, 0, src) + spark_system = new(src, 5, FALSE) spark_system.attach(src) /obj/item/energy_katana/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) diff --git a/code/modules/antagonists/space_ninja/outfit.dm b/code/modules/antagonists/space_ninja/outfit.dm index f1d42506fc82..4ffd89d674cf 100644 --- a/code/modules/antagonists/space_ninja/outfit.dm +++ b/code/modules/antagonists/space_ninja/outfit.dm @@ -5,10 +5,10 @@ mask = /obj/item/clothing/mask/gas/ninja ears = /obj/item/radio/headset shoes = /obj/item/clothing/shoes/jackboots + suit_store = /obj/item/storage/belt/sheath/ninja l_pocket = /obj/item/grenade/c4/ninja r_pocket = /obj/item/tank/internals/emergency_oxygen internals_slot = ITEM_SLOT_RPOCKET - belt = /obj/item/energy_katana back = /obj/item/mod/control/pre_equipped/ninja implants = list(/obj/item/implant/explosive) @@ -32,7 +32,7 @@ uniform = /obj/item/clothing/under/syndicate/ninja back = /obj/item/mod/control/pre_equipped/empty/ninja - belt = /obj/item/energy_katana + suit_store = /obj/item/storage/belt/sheath/ninja /datum/outfit/ninja/plasmaman name = "Space Ninja (Plasmaman)" diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm index 9cb98f928f91..5a1bed62c7fe 100644 --- a/code/modules/antagonists/space_ninja/space_ninja.dm +++ b/code/modules/antagonists/space_ninja/space_ninja.dm @@ -12,17 +12,10 @@ can_assign_self_objectives = TRUE ui_name = "AntagInfoNinja" default_custom_objective = "Destroy vital station infrastructure, without being seen." + desensitized_modifier = DESENSITIZED_THRESHOLD ///Whether or not this ninja will obtain objectives var/give_objectives = TRUE -/datum/antagonist/ninja/apply_innate_effects(mob/living/mob_override) - var/mob/ninja = mob_override || owner.current - ADD_TRAIT(ninja, TRAIT_DESENSITIZED, REF(src)) - -/datum/antagonist/ninja/remove_innate_effects(mob/living/mob_override) - var/mob/ninja = mob_override || owner.current - REMOVE_TRAIT(ninja, TRAIT_DESENSITIZED, REF(src)) - /** * Proc that equips the space ninja outfit on a given individual. By default this is the owner of the antagonist datum. * diff --git a/code/modules/antagonists/wizard/equipment/wizard_hammer.dm b/code/modules/antagonists/wizard/equipment/wizard_hammer.dm index 9c6f50392ef5..4a4b945632b9 100644 --- a/code/modules/antagonists/wizard/equipment/wizard_hammer.dm +++ b/code/modules/antagonists/wizard/equipment/wizard_hammer.dm @@ -105,9 +105,8 @@ /obj/item/mjollnir/proc/shock(mob/living/target) target.Stun(1.5 SECONDS) target.Knockdown(10 SECONDS) - var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread - s.set_up(5, 1, target.loc) - s.start() + var/datum/effect_system/basic/lightning_spread/lightning = new(target.loc, 5, TRUE) + lightning.start() target.visible_message(span_danger("[target.name] is shocked by [src]!"), \ span_userdanger("You feel a powerful shock course through your body sending you flying!"), \ span_hear("You hear a heavy electrical crack!")) diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm index c86c6a84bf3d..140b63cf92ab 100644 --- a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm +++ b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm @@ -247,9 +247,7 @@ /datum/grand_side_effect/smoke/trigger(potency, turf/ritual_location, mob/invoker) playsound(src, 'sound/effects/magic/smoke.ogg', 50, TRUE) var/range = LERP(2, 4, potency/GRAND_RITUAL_FINALE_COUNT) - var/datum/effect_system/fluid_spread/smoke/colourful/smoke = new - smoke.set_up(range, holder = ritual_location, location = ritual_location) - smoke.start() + do_smoke(round(range), ritual_location, ritual_location, smoke_type = /datum/effect_system/fluid_spread/smoke/colourful) /// Spawns randomly coloured smoke /datum/effect_system/fluid_spread/smoke/colourful diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm index 1c62bc96cb24..45dfa4f179e8 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -1,4 +1,11 @@ -#define MAX_PAINTING_ZOOM_OUT 3 +GLOBAL_LIST_INIT(canvas_dimensions, init_canvas_dimensions()) + +/proc/init_canvas_dimensions() + . = list() + for(var/obj/item/canvas/canvas_type in typesof(/obj/item/canvas)) + var/width = canvas_type::width + var/height = canvas_type::height + .["[width]x[height]"] = list(width, height) /////////// // EASEL // @@ -16,15 +23,14 @@ var/obj/item/canvas/painting = null //Adding canvases -/obj/structure/easel/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers) - if(istype(I, /obj/item/canvas)) - var/obj/item/canvas/canvas = I +/obj/structure/easel/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(istype(tool, /obj/item/canvas)) + var/obj/item/canvas/canvas = tool user.transfer_item_to_turf(canvas, get_turf(src), silent = FALSE) painting = canvas canvas.layer = layer+0.1 user.visible_message(span_notice("[user] puts \the [canvas] on \the [src]."),span_notice("You place \the [canvas] on \the [src].")) - else - return ..() + return ITEM_INTERACT_SUCCESS //Stick to the easel like glue @@ -46,14 +52,13 @@ interaction_flags_atom = parent_type::interaction_flags_atom | INTERACT_ATOM_ALLOW_USER_LOCATION var/width = 11 var/height = 11 - var/list/grid /// empty canvas color var/canvas_color = "#ffffff" + /// The sprite editor workspace that carries the data for this canvas + var/datum/sprite_editor_workspace/workspace /// Is it clean canvas or was there something painted on it at some point, used to decide when to show wip splotch overlay var/used = FALSE var/finalized = FALSE //Blocks edits - /// Whether a grid should be shown in the UI if the canvas is editable and the viewer is holding a painting tool. - var/show_grid = TRUE var/icon_generated = FALSE var/icon/generated_icon ///boolean that blocks persistence from saving it. enabled from printing copies, because we do not want to save copies. @@ -74,17 +79,20 @@ */ var/pixels_per_unit = 9 - ///A list that keeps track of the current zoom value for each current viewer. - var/list/zoom_by_observer - SET_BASE_PIXEL(11, 10) custom_price = PAYCHECK_CREW /obj/item/canvas/Initialize(mapload) . = ..() - reset_grid() - + workspace = new(width, + height, + color_mode = SPRITE_EDITOR_COLOR_MODE_RGB, + config_flags = NONE, + tool_flags = SPRITE_EDITOR_TOOL_PENCIL | SPRITE_EDITOR_TOOL_BUCKET, + initial_layer_color = "[canvas_color]ff" // To avoid needing to handle strings of mixed lengths, sprite editor workspaces always use the alpha channel + ) + RegisterSignal(workspace, COMSIG_SPRITE_EDITOR_VALIDATE_COLOR, PROC_REF(validate_color)) painting_metadata = new painting_metadata.title = "Untitled Artwork" painting_metadata.creation_round_id = GLOB.round_id @@ -100,12 +108,6 @@ painting_metadata = null return ..() -/obj/item/canvas/proc/reset_grid() - grid = new/list(width,height) - for(var/x in 1 to width) - for(var/y in 1 to height) - grid[x][y] = canvas_color - /obj/item/canvas/attack_self(mob/user) . = ..() ui_interact(user) @@ -116,56 +118,59 @@ return ..() /obj/item/canvas/ui_state(mob/user) - if(isobserver(user)) - return GLOB.observer_state if(finalized) return GLOB.hold_or_view_state return GLOB.default_state -/obj/item/canvas/ui_status(mob/user, datum/ui_state/state) - if(state == GLOB.default_state || !state) - return ..() - //Skip the can_interact() check from atom/ui_status() and let them zoom in/out! - var/src_object = ui_host(user) - return state.can_use_topic(src_object, user) - /obj/item/canvas/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Canvas", name) ui.open() -/obj/item/canvas/attackby(obj/item/I, mob/living/user, list/modifiers, list/attack_modifiers) - if(!user.combat_mode) - ui_interact(user) - else - return ..() +/obj/item/canvas/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + ui_interact(user) + return ITEM_INTERACT_SUCCESS /obj/item/canvas/ui_static_data(mob/user) . = ..() - .["px_per_unit"] = pixels_per_unit - .["max_zoom"] = MAX_PAINTING_ZOOM_OUT + .["year_offset"] = STATION_YEAR_OFFSET /obj/item/canvas/ui_data(mob/user) . = ..() - .["grid"] = grid - .["zoom"] = LAZYACCESS(zoom_by_observer, user.key) || (finalized ? 1 : MAX_PAINTING_ZOOM_OUT) - .["name"] = painting_metadata.title - .["author"] = painting_metadata.creator_name - .["patron"] = painting_metadata.patron_name - .["medium"] = painting_metadata.medium - .["date"] = painting_metadata.creation_date - .["finalized"] = finalized - .["editable"] = !finalized //Ideally you should be able to draw moustaches on existing paintings in the gallery but that's not implemented yet - .["show_plaque"] = istype(loc,/obj/structure/sign/painting) - .["show_grid"] = show_grid - .["paint_tool_palette"] = null - var/obj/item/painting_implement = user.get_active_held_item() - if(!painting_implement) - .["paint_tool_color"] = null - return - .["paint_tool_color"] = get_paint_tool_color(painting_implement) - SEND_SIGNAL(painting_implement, COMSIG_PAINTING_TOOL_GET_ADDITIONAL_DATA, .) + var/list/metadata = list( + "title" = painting_metadata.title, + "author" = painting_metadata.creator_name, + "patron" = painting_metadata.patron_name, + "medium" = painting_metadata.medium, + "date" = painting_metadata.creation_date, + ) + var/list/editor_data = workspace.sprite_editor_ui_data() + var/can_edit = TRUE + + var/obj/item/implement = user.get_active_held_item() + var/implement_color = get_paint_tool_color(implement) + var/can_change_implement_color = can_change_paint_tool_color(implement) + if(implement_color) + editor_data["serverSelectedColor"] = implement_color + editor_data["serverPalette"] = get_paint_tool_palette(implement) + editor_data["maxServerColors"] = get_paint_tool_palette_capacity(implement) + editor_data["onSelectServerColor"] = "onSelectColor" + editor_data["onAddServerColor"] = "onAddPaletteColor" + editor_data["onRemoveServerColor"] = "onRemovePaletteColor" + if(can_change_implement_color) + editor_data["toolFlags"] |= SPRITE_EDITOR_TOOL_DROPPER + else + can_edit = FALSE + return list( + "metadata" = metadata, + "editorData" = editor_data, + "pixelsPerUnit" = pixels_per_unit, + "finalized" = finalized, + "allowColorPicker" = can_change_implement_color, + "editable" = can_edit && !finalized, //Ideally you should be able to draw moustaches on existing paintings in the gallery but that's not implemented yet + "showPlaque" = istype(loc, /obj/structure/sign/painting) + ) /obj/item/canvas/examine(mob/user) . = ..() @@ -176,87 +181,56 @@ if(.) return var/mob/user = usr - //this is here to allow observers and viewers to zoom in and out regardless of adjacency. - //observers need this special check because we allow them to operate the UI in ui_state - if((action != "zoom_in" && action != "zoom_out") && (isobserver(user) || !can_interact(user))) - return + var/obj/item/implement = user.get_active_held_item() + var/datum/component/palette/palette_comp = implement?.GetComponent(/datum/component/palette) switch(action) - if("paint", "fill") + if("spriteEditorCommand") + . = TRUE if(finalized) - return TRUE - var/obj/item/I = user.get_active_held_item() - var/tool_color = get_paint_tool_color(I) - if(!tool_color) - return FALSE - if(action == "fill") - var/x = params["x"] - var/y = params["y"] - if(!canvas_fill(x, y, tool_color)) - return FALSE - else - var/list/data = params["data"] - for(var/point in data) - var/x = text2num(point["x"]) - var/y = text2num(point["y"]) - grid[x][y] = tool_color - var/medium = get_paint_tool_medium(I) + return + var/command = params["command"] + if(command != "transaction") // Painting only allows transactions, no undo/redo or layer visibility toggling + return + if(!workspace.new_transaction(params["transaction"])) + return + var/medium = get_paint_tool_medium(implement) if(medium && painting_metadata.medium && painting_metadata.medium != medium) painting_metadata.medium = "Mixed medium" else painting_metadata.medium = medium used = TRUE update_appearance() + if("onSelectColor") . = TRUE - if("select_color") - var/obj/item/painting_implement = user.get_active_held_item() - painting_implement?.set_painting_tool_color(params["selected_color"]) + var/paint_color = copytext(params["color"], 1, 8) + implement?.set_painting_tool_color(paint_color) + if("onAddPaletteColor") . = TRUE - if("select_color_from_coords") - var/obj/item/painting_implement = user.get_active_held_item() - if(!painting_implement) - return FALSE - var/x = text2num(params["x"]) - var/y = text2num(params["y"]) - painting_implement.set_painting_tool_color(grid[x][y]) + if(!palette_comp) + return + if(length(palette_comp.colors) >= palette_comp.max_colors) + return + var/paint_color = copytext(params["color"], 1, 8) + palette_comp.colors += paint_color + if("onRemovePaletteColor") . = TRUE - if("change_palette") - var/obj/item/painting_implement = user.get_active_held_item() - if(!painting_implement) - return FALSE - //I'd have this done inside the signal, but that'd have to be asynced, - //while we want the UI to be updated after the color is chosen, not before. - var/chosen_color = tgui_color_picker(user, "Pick new color", painting_implement, params["old_color"]) - if(!chosen_color || IS_DEAD_OR_INCAP(user) || !user.is_holding(painting_implement)) - return FALSE - SEND_SIGNAL(painting_implement, COMSIG_PAINTING_TOOL_PALETTE_COLOR_CHANGED, chosen_color, params["color_index"]) - . = TRUE - if("toggle_grid") - . = TRUE - show_grid = !show_grid + if(!palette_comp) + return + var/color_index = params["index"] + palette_comp.colors.Cut(color_index, color_index+1) if("finalize") . = TRUE finalize(user) if("patronage") . = TRUE patron(user) - if("zoom_in") - . = TRUE - LAZYINITLIST(zoom_by_observer) - if(!zoom_by_observer[user.key]) - zoom_by_observer[user.key] = 2 - else - zoom_by_observer[user.key] = min(zoom_by_observer[user.key] + 1, MAX_PAINTING_ZOOM_OUT) - if("zoom_out") - . = TRUE - LAZYINITLIST(zoom_by_observer) - if(!zoom_by_observer[user.key]) - zoom_by_observer[user.key] = MAX_PAINTING_ZOOM_OUT - 1 - else - zoom_by_observer[user.key] = max(zoom_by_observer[user.key] - 1, 1) -/obj/item/canvas/ui_close(mob/user) - . = ..() - LAZYREMOVE(zoom_by_observer, user.key) +/obj/item/canvas/proc/validate_color(_source, paint_color) + SIGNAL_HANDLER + paint_color = copytext(paint_color, 1, 8) + var/obj/item/implement = usr.get_active_held_item() + if(!implement || !((get_paint_tool_color(implement) == paint_color) || (paint_color in get_paint_tool_palette(implement)))) + return COLOR_IS_INVALID /obj/item/canvas/proc/finalize(mob/user) if(finalized || painting_metadata.loaded_from_json) @@ -401,9 +375,10 @@ /obj/item/canvas/proc/get_data_string() var/list/data = list() + var/list/grid = workspace.layers[1]["data"]["[SOUTH]"] for(var/y in 1 to height) for(var/x in 1 to width) - data += grid[x][y] + data += grid[y][x] return data.Join("") //Todo make this element ? @@ -419,9 +394,38 @@ else if(istype(painting_implement, /obj/item/pen)) var/obj/item/pen/pen = painting_implement return pen.colour + else if (istype(painting_implement, /obj/item/airlock_painter/decal)) + var/obj/item/airlock_painter/decal/painter = painting_implement + return painter.selected_custom_color else if(istype(painting_implement, /obj/item/soap) || istype(painting_implement, /obj/item/rag)) return canvas_color +/obj/item/canvas/proc/get_paint_tool_palette(obj/item/painting_implement) + if(!painting_implement) + return list() + var/datum/component/palette/palette_comp = painting_implement.GetComponent(/datum/component/palette) + if(!palette_comp) + var/implement_color = get_paint_tool_color(painting_implement) + return implement_color ? list(implement_color) : list() + return palette_comp.colors + +/obj/item/canvas/proc/get_paint_tool_palette_capacity(obj/item/painting_implement) + if(!painting_implement) + return + var/datum/component/palette/palette_comp = painting_implement.GetComponent(/datum/component/palette) + if(!palette_comp) + return get_paint_tool_color(painting_implement) ? 1 : 0 + return palette_comp.max_colors + +/obj/item/canvas/proc/can_change_paint_tool_color(obj/item/painting_implement) + if(!painting_implement) + return + if(istype(painting_metadata, /obj/item/paint_palette) || istype(painting_implement, /obj/item/airlock_painter/decal)) + return TRUE + if(istype(painting_implement, /obj/item/toy/crayon)) + var/obj/item/toy/crayon/crayon = painting_implement + return crayon.can_change_colour + /// Generates medium description /obj/item/canvas/proc/get_paint_tool_medium(obj/item/painting_implement) if(!painting_implement) @@ -432,7 +436,7 @@ return "Spraycan on canvas" else if(istype(painting_implement, /obj/item/toy/crayon)) return "Crayon on canvas" - else if(istype(painting_implement, /obj/item/pen)) + else if(istype(painting_implement, /obj/item/pen) || istype(painting_implement, /obj/item/airlock_painter/decal)) return "Ink on canvas" else if(istype(painting_implement, /obj/item/soap) || istype(painting_implement, /obj/item/rag)) return //These are just for cleaning, ignore them @@ -457,147 +461,6 @@ return FALSE -///The pixel to the right matches the previous color we're flooding over -#define CANVAS_FILL_R_MATCH (1<<0) -///The pixel to the left matches the previous color we're flooding over -#define CANVAS_FILL_L_MATCH (1<<1) - -//a macro for the stringized key for coordinates to check later -#define CANVAS_COORD(x, y) "[x]-[y]" -///queues a coordinate on the canvas for future cycles. -#define QUEUE_CANVAS_COORD(x, y, queue) \ - if(y && !queue[CANVAS_COORD(x, y)]) {\ - queue[CANVAS_COORD(x, y)] = list(x, y);\ - } - -/** - * A proc that adopts a span-based, 4-dir (correct me if I'm wrong) flood fill algorithm used - * by the bucked tool in the UI, to facilitate coloring larger portions of the canvas. - * If you have never used the bucket/flood tool on an image editor, I suggest you do it - * now so you know what I'm basically talking about. - * - * @ param x The point on the x axys where we start flooding our canvas. The arg is later used to store the current x - * @ param y The point on the y axys where we start flooding the canvas. The arg is later used to store the current y - * @ param new_color The new color that floods over the old one - */ -/obj/item/canvas/proc/canvas_fill(x, y, new_color) - var/prev_color = grid[x][y] - //If the colors are the same, don't do anything. - if(prev_color == new_color) - return FALSE - - //The queue for coordinates to the right of the current line - var/list/queue_right = list() - //Inversely for those to our left - var/list/queue_left = list() - //Whether we're currently checking the right or left queue. - var/go_right = TRUE - - //The current coordinates. The only reason this is outside the loop - //is because we first go up, then reset our vertical position to just below - //the starting position and go down from there. - var/list/coords = list(x, y) - - //Basically, the way it works is that each cycle we first go up, then down until we - //either reach the vertical borders of the raster or find a pixel that is not of the color we want - //to flood. As we do this, we try to queue a minimum of coordinates to our - //left and right to use for future cycles, moving horizontally in one direction until there are no - //more queued coordinates for that dir. Then we turn around and repeat - //until both left and right queues are completely empty. - while(coords) - //The current vertical line, the right and the left ones. - var/list/curr_line = grid[x] - var/list/right_line = x < width ? grid[x+1] : null - var/list/left_line = x > 1 ? grid[x-1] : null - //the queue we're on, depending on direction - var/list/curr_queue = go_right ? queue_right : queue_left - //Instead of queueing every point to our left and right that shares our prevous color, - //Causing a lot of empty cycles, we only queue an extremity of a vertical segment - //delimited by pixels of other colors or the y boundaries of the raster. To do this, - //we need to track where the segment (called line for simplicity) starts (or ends). - var/r_line_start - var/l_line_start - - //go up first (y = 1 is the upper border is) - while(y >= 1 && curr_line[y] == prev_color) - var/return_flags = canvas_scan_step(x, y, queue_left, queue_right, left_line, right_line, l_line_start, r_line_start, prev_color) - if(return_flags & CANVAS_FILL_R_MATCH) - r_line_start = y - else - r_line_start = null - if(return_flags & CANVAS_FILL_L_MATCH) - l_line_start = y - else - l_line_start = null - curr_line[y] = new_color - curr_queue -= CANVAS_COORD(x, y) //remove it from the queue if possible. - y-- - - //Any unqueued coordinate is queued and cleared before the next half of the cycle - QUEUE_CANVAS_COORD(x + 1, r_line_start, queue_right) - QUEUE_CANVAS_COORD(x - 1, l_line_start, queue_left) - r_line_start = l_line_start = null - - //set y to the pixel immediately below the starting y - y = coords[2] + 1 - - //then go down (y = height is the bottom border) - while(y <= height && curr_line[y] == prev_color) - var/return_flags = canvas_scan_step(x, y, queue_left, queue_right, left_line, right_line, l_line_start, r_line_start, prev_color) - if(!(return_flags & CANVAS_FILL_R_MATCH)) - r_line_start = null - else if(!r_line_start) - r_line_start = y - if(!(return_flags & CANVAS_FILL_L_MATCH)) - l_line_start = null - else if(!l_line_start) - l_line_start = y - curr_line[y] = new_color - curr_queue -= CANVAS_COORD(x, y) - y++ - - QUEUE_CANVAS_COORD(x + 1, r_line_start, queue_right) - QUEUE_CANVAS_COORD(x - 1, l_line_start, queue_left) - - //Pick the next set of coords from the queue (and change direction if necessary) - if(!length(curr_queue)) - var/list/other_queue = go_right ? queue_left : queue_right - coords = other_queue[other_queue[1]] - other_queue.Cut(1, 2) - go_right = !go_right - else - coords = curr_queue[curr_queue[1]] - curr_queue.Cut(1, 2) - - x = coords?[1] - y = coords?[2] - - return TRUE - -/** - * The step of canvas_fill() that scans the pixels to the immediate right and left of our coord and see if they need to be queue'd or not. - * Kept as a separate proc to reduce copypasted code. - */ -/proc/canvas_scan_step(x, y, list/queue_left, list/queue_right, list/left_line, list/right_line, left_pos, right_pos, prev_color) - if(left_line) - if(left_line[y] == prev_color) - . += CANVAS_FILL_L_MATCH - else - QUEUE_CANVAS_COORD(x - 1, left_pos, queue_left) - - if(!right_line) - return - - if(right_line[y] == prev_color) - . += CANVAS_FILL_R_MATCH - else - QUEUE_CANVAS_COORD(x + 1, right_pos, queue_right) - -#undef CANVAS_FILL_R_MATCH -#undef CANVAS_FILL_L_MATCH -#undef CANVAS_COORD -#undef QUEUE_CANVAS_COORD - /obj/item/canvas/nineteen_nineteen name = "canvas (19x19)" icon_state = "19x19" @@ -725,14 +588,14 @@ . = ..() SSpersistent_paintings.painting_frames -= src -/obj/structure/sign/painting/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers) - if(!current_canvas && istype(I, /obj/item/canvas)) - frame_canvas(user,I) - else if(current_canvas && current_canvas.painting_metadata.title == initial(current_canvas.painting_metadata.title) && istype(I,/obj/item/pen)) +/obj/structure/sign/painting/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!current_canvas && istype(tool, /obj/item/canvas)) + frame_canvas(user, tool) + return ITEM_INTERACT_SUCCESS + if(current_canvas && current_canvas.painting_metadata.title == initial(current_canvas.painting_metadata.title) && istype(tool, /obj/item/pen)) if(try_rename(user)) SStgui.update_uis(src) - else - return ..() + return ITEM_INTERACT_SUCCESS /obj/structure/sign/painting/atom_deconstruct(disassembled) var/turf/drop_turf = drop_location() @@ -849,7 +712,7 @@ if(!istype(new_canvas)) CRASH("Found painting size with no matching canvas type") new_canvas.painting_metadata = painting - new_canvas.fill_grid_from_icon(I) + fill_grid_from_icon(new_canvas.workspace.get_first_layer_pixel_data(), I) new_canvas.generated_icon = I new_canvas.icon_generated = TRUE new_canvas.finalized = TRUE @@ -907,10 +770,11 @@ SSpersistent_paintings.paintings += current_canvas.painting_metadata /obj/item/canvas/proc/fill_grid_from_icon(icon/I) + var/list/grid = workspace.layers[1]["data"]["[SOUTH]"] var/h = I.Height() + 1 for(var/x in 1 to width) for(var/y in 1 to height) - grid[x][y] = I.GetPixel(x,h-y) + grid[y][x] = I.GetPixel(x,h-y) /obj/item/wallframe/painting/large name = "large painting frame" @@ -1073,4 +937,3 @@ current_color = chosen_color #undef AVAILABLE_PALETTE_SPACE -#undef MAX_PAINTING_ZOOM_OUT diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 74f2f748f1b8..e9c57626bc67 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -125,7 +125,7 @@ /obj/item/assembly_holder/dropped(mob/user) . = ..() for(var/obj/item/assembly/assembly as anything in assemblies) - assembly.dropped() + assembly.dropped(user) /obj/item/assembly_holder/attack_hand(mob/living/user, list/modifiers)//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess . = ..() diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 11e037bf7ad0..adddd5dd1b3c 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -8,7 +8,7 @@ desc = "A small electronic device able to ignite combustible substances." icon_state = "igniter" custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*5, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5) - var/datum/effect_system/spark_spread/sparks + var/datum/effect_system/basic/spark_spread/sparks heat = 1000 drop_sound = 'sound/items/handling/component_drop.ogg' pickup_sound = 'sound/items/handling/component_pickup.ogg' @@ -21,15 +21,12 @@ /obj/item/assembly/igniter/Initialize(mapload) . = ..() - sparks = new - sparks.set_up(2, 0, src) + sparks = new(src, 2, FALSE) sparks.attach(src) /obj/item/assembly/igniter/Destroy() - if(sparks) - qdel(sparks) - sparks = null - . = ..() + QDEL_NULL(sparks) + return ..() /obj/item/assembly/igniter/activate() if(!..()) @@ -38,14 +35,16 @@ if(location) location.hotspot_expose(heat, EXPOSED_VOLUME) if(holder) - SEND_SIGNAL(holder.loc, COMSIG_IGNITER_ACTIVATE) + SEND_SIGNAL(holder.loc, COMSIG_IGNITER_ACTIVATE, src) if(QDELETED(src)) return TRUE sparks.start() return TRUE /obj/item/assembly/igniter/attack_self(mob/user) - activate() + // Don't trigger when interacting with assemblies + if (!holder) + activate() add_fingerprint(user) /obj/item/assembly/igniter/ignition_effect(atom/A, mob/user) @@ -59,7 +58,7 @@ desc = "A small electronic device able to chill their surroundings." icon_state = "freezer" custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2.5, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 3) - heat = 200 + heat = MIN_FREEZE_TEMP /obj/item/assembly/igniter/condenser/activate() . = ..() @@ -68,9 +67,8 @@ var/turf/location = get_turf(loc) if(location) var/datum/gas_mixture/enviro = location.return_air() - enviro.temperature = clamp(min(ROOM_TEMP, enviro.temperature*0.85),MIN_FREEZE_TEMP,MAX_FREEZE_TEMP) + enviro.temperature = clamp(min(ROOM_TEMP, enviro.temperature * 0.85), MIN_FREEZE_TEMP, MAX_FREEZE_TEMP) location.air_update_turf(FALSE, FALSE) - sparks.start() #undef EXPOSED_VOLUME #undef ROOM_TEMP diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 64cd36ca239e..d215c1c68030 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -887,9 +887,7 @@ var/obj/effect/particle_effect/fluid/foam/foam = locate() in location var/obj/structure/foamedmetal/resin = locate() in location if(heat_efficiency > HALON_COMBUSTION_MINIMUM_RESIN_MOLES && isopenturf(location) && !foam && !resin) // Don't resin if there is aleady resin or we are not in an open turf. - 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() + do_foam(amount = HALON_COMBUSTION_RESIN_VOLUME, holder = holder, location = location, foam_type = /datum/effect_system/fluid_spread/foam/metal/resin/halon) . |= VOLATILE_REACTION . |= REACTING diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm index 943a10766bb6..9e3b30f08253 100644 --- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm @@ -167,13 +167,10 @@ return FALSE if(!prob(prb)) return FALSE //you lucked out, no shock for you - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(5, 1, src) - s.start() //sparks always. + do_sparks(5, TRUE, src) if (electrocute_mob(user, get_area(src), src, 1, TRUE)) return TRUE - else - return FALSE + return FALSE /obj/item/electronics/airalarm name = "air alarm electronics" diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm index 0e6e899778cd..97d61b51103b 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_main_processes.dm @@ -457,8 +457,10 @@ // If we have a preposterous amount of mass in the fusion mix, things get bad extremely fast if(internal_fusion.total_moles() >= HYPERTORUS_HYPERCRITICAL_MOLES) - var/hypercritical_damage_taken = max((internal_fusion.total_moles() - HYPERTORUS_HYPERCRITICAL_MOLES) * HYPERTORUS_HYPERCRITICAL_SCALE, 0) - critical_threshold_proximity = max(critical_threshold_proximity + min(hypercritical_damage_taken, HYPERTORUS_HYPERCRITICAL_MAX_DAMAGE), 0) * seconds_per_tick + var/moles_over_limit = internal_fusion.total_moles() - HYPERTORUS_HYPERCRITICAL_MOLES + var/hypercritical_damage_taken = max(moles_over_limit * HYPERTORUS_HYPERCRITICAL_SCALE, 0) + hypercritical_damage_taken = min(hypercritical_damage_taken, HYPERTORUS_HYPERCRITICAL_MAX_DAMAGE) * seconds_per_tick + critical_threshold_proximity = max(critical_threshold_proximity + hypercritical_damage_taken, 0) warning_damage_flags |= HYPERTORUS_FLAG_HIGH_FUEL_MIX_MOLE // High power fusion might create other matter other than helium, iron is dangerous inside the machine, damage can be seen diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm index 69bf48fe2aec..440be922316e 100644 --- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm +++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm @@ -48,12 +48,5 @@ /obj/item/nitrium_crystal/attack_self(mob/user) . = ..() - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new - var/turf/location = get_turf(src) - create_reagents(5) - reagents.add_reagent(/datum/reagent/nitrium_low_metabolization, 3) - reagents.add_reagent(/datum/reagent/nitrium_high_metabolization, 2) - smoke.attach(location) - smoke.set_up(cloud_size, holder = src, location = location, carry = reagents, silent = TRUE) - smoke.start() + do_chem_smoke(cloud_size, src, get_turf(src), list(/datum/reagent/nitrium_low_metabolization = 3, /datum/reagent/nitrium_high_metabolization = 2)) qdel(src) diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index 6d338e5ec269..2fa38219a1f0 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -29,9 +29,7 @@ SpeakPeace(list("Welcome to the error handling room.","Something's goofed up bad to send you here.","You should probably tell an admin what you were doing, or make a bug report.")) for(var/obj/structure/signpost/salvation/sign in orange(7)) sign.SetInvisibility(INVISIBILITY_NONE) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(1, holder = src, location = sign.loc) - smoke.start() + do_smoke(1, src, sign.loc) break if(1) SpeakPeace(list("Take that ladder up.","It'll send you back to the station.","Hopefully you'll never need to see this place again.")) diff --git a/code/modules/bitrunning/components/bitrunning_points.dm b/code/modules/bitrunning/components/bitrunning_points.dm index b800d586e941..039f3a9d3384 100644 --- a/code/modules/bitrunning/components/bitrunning_points.dm +++ b/code/modules/bitrunning/components/bitrunning_points.dm @@ -32,9 +32,5 @@ var/turf/tile = parent var/obj/structure/closet/crate/secure/bitrunning/encrypted/crate = new() crate.forceMove(tile) // Triggers any on-move effects on that turf - - var/datum/effect_system/spark_spread/quantum/sparks = new(tile) - sparks.set_up(number = 5, location = tile) - sparks.start() - + do_sparks(5, FALSE, tile, spark_type = /datum/effect_system/basic/spark_spread/quantum) qdel(src) diff --git a/code/modules/bitrunning/objects/byteforge.dm b/code/modules/bitrunning/objects/byteforge.dm index a4ceb6fb534e..5fccb167a5cf 100644 --- a/code/modules/bitrunning/objects/byteforge.dm +++ b/code/modules/bitrunning/objects/byteforge.dm @@ -60,10 +60,7 @@ /obj/machinery/byteforge/proc/flash(atom/movable/thing) playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE) - var/datum/effect_system/spark_spread/quantum/sparks = new() - sparks.set_up(5, 1, loc) - sparks.start() - + do_sparks(5, TRUE, loc, spark_type = /datum/effect_system/basic/spark_spread/quantum) set_light(l_on = FALSE) /// Forge begins to process diff --git a/code/modules/bitrunning/objects/quantum_console.dm b/code/modules/bitrunning/objects/quantum_console.dm index d79ae60c3a70..37c4c25b66d8 100644 --- a/code/modules/bitrunning/objects/quantum_console.dm +++ b/code/modules/bitrunning/objects/quantum_console.dm @@ -76,13 +76,13 @@ switch(action) if("random_domain") - server.cold_boot_map(server.get_random_domain_id()) + server.cold_boot_map(server.get_random_domain_id(), was_random_selection = TRUE) return TRUE if("refresh") ui.send_full_update() return TRUE if("set_domain") - server.cold_boot_map(params["id"]) + server.cold_boot_map(params["id"], was_random_selection = FALSE) return TRUE if("stop_domain") server.begin_shutdown(usr) diff --git a/code/modules/bitrunning/server/map_handling.dm b/code/modules/bitrunning/server/map_handling.dm index 58dd8dd4edaa..96a10d60bbf5 100644 --- a/code/modules/bitrunning/server/map_handling.dm +++ b/code/modules/bitrunning/server/map_handling.dm @@ -28,7 +28,7 @@ /// Links all the loading processes together - does validation for booting a map -/obj/machinery/quantum_server/proc/cold_boot_map(map_key) +/obj/machinery/quantum_server/proc/cold_boot_map(map_key, was_random_selection) if(!is_ready) return FALSE @@ -53,8 +53,20 @@ scrub_vdom() is_ready = TRUE return FALSE - - SSblackbox.record_feedback("tally", "bitrunning_domain_loaded", 1, map_key) + + + //We will want to record how the domain was selected. Either entirely randomly, with the name redacted, or with full information. + //Without this, it is difficult to determine what domains are selected more often intentionallly, vs unintentionally. + var/selection_type + + if(was_random_selection) + selection_type = "random selection" + else + if(generated_domain.can_view_name(scanner_tier, points)) + selection_type = "full information" + else + selection_type = "redacted information" + SSblackbox.record_feedback("nested tally", "bitrunning_domain_loaded", 1, list(selection_type, map_key)) is_ready = TRUE diff --git a/code/modules/bitrunning/server/signal_handlers.dm b/code/modules/bitrunning/server/signal_handlers.dm index 5b7156752e7a..f14db4509e3e 100644 --- a/code/modules/bitrunning/server/signal_handlers.dm +++ b/code/modules/bitrunning/server/signal_handlers.dm @@ -76,6 +76,11 @@ boss.make_virtual_megafauna() continue + if(istype(creature, /mob/living/basic/boss)) + var/mob/living/basic/boss/boss = creature + boss.make_virtual_megafauna() + continue + mutation_candidate_refs.Add(WEAKREF(creature)) continue diff --git a/code/modules/bitrunning/server/util.dm b/code/modules/bitrunning/server/util.dm index ce79ee7aa5bd..ae15698f09da 100644 --- a/code/modules/bitrunning/server/util.dm +++ b/code/modules/bitrunning/server/util.dm @@ -135,9 +135,7 @@ /// Do some magic teleport sparks /obj/machinery/quantum_server/proc/spark_at_location(obj/cache) playsound(cache, 'sound/effects/magic/blink.ogg', 50, vary = TRUE) - var/datum/effect_system/spark_spread/quantum/sparks = new() - sparks.set_up(5, location = get_turf(cache)) - sparks.start() + do_sparks(5, FALSE, get_turf(cache), spark_type = /datum/effect_system/basic/spark_spread/quantum) /// Starts building a new avatar for the player. diff --git a/code/modules/bitrunning/util/virtual_megafauna.dm b/code/modules/bitrunning/util/virtual_megafauna.dm index 4daf00141978..811a7ca4acb0 100644 --- a/code/modules/bitrunning/util/virtual_megafauna.dm +++ b/code/modules/bitrunning/util/virtual_megafauna.dm @@ -1,4 +1,4 @@ -/// Removes all the loot and achievements from megafauna for bitrunning related +/// Removes all the loot and achievements from megafauna for bitrunning related (/simple_animal/hostile/megafauna version) /mob/living/simple_animal/hostile/megafauna/proc/make_virtual_megafauna() var/new_max = clamp(maxHealth * 0.5, 600, 1300) maxHealth = new_max @@ -26,3 +26,26 @@ loot.Cut() loot += /obj/structure/closet/crate/secure/bitrunning/encrypted + +/// Removes all the loot and achievements from megafauna for bitrunning related (/basic/boss version) +/mob/living/basic/boss/proc/make_virtual_megafauna() + var/new_max = clamp(maxHealth * 0.5, 600, 1300) + maxHealth = new_max + health = new_max + + // rebuild the achievement element's arguments to remove it appropriately + if (achievements) + var/list/achievements_list = list(/datum/award/achievement/boss/boss_killer, /datum/award/score/boss_score) + achievements_list += achievements + RemoveElement(/datum/element/kill_achievement, string_list(achievements_list), crusher_achievement_type, /datum/memory/megafauna_slayer) + + // remove the crusher loot element's arguments also to remove it appropriately + RemoveElement(\ + /datum/element/crusher_loot,\ + trophy_type = string_list(crusher_loot),\ + guaranteed_drop = 0.6,\ + drop_immediately = DEL_ON_DEATH,\ + ) + + RemoveElement(/datum/element/death_drops, string_list(regular_loot)) + AddElement(/datum/element/death_drops, /obj/structure/closet/crate/secure/bitrunning/encrypted) diff --git a/code/modules/bitrunning/virtual_domain/virtual_domain.dm b/code/modules/bitrunning/virtual_domain/virtual_domain.dm index 9ebd82bd43d8..8fc3173df951 100644 --- a/code/modules/bitrunning/virtual_domain/virtual_domain.dm +++ b/code/modules/bitrunning/virtual_domain/virtual_domain.dm @@ -85,6 +85,13 @@ /// The role that ghosts will get. Only used for poll text. var/spawner_role = "Antagonist" + +/datum/lazy_template/virtual_domain/proc/can_view_name(scanner_tier, server_points) + return difficulty < scanner_tier && cost <= server_points + 5 + +/datum/lazy_template/virtual_domain/proc/can_view_reward(scanner_tier, server_points) + return difficulty < (scanner_tier + 1) && cost <= server_points + 3 + /datum/lazy_template/virtual_domain/Destroy(force) QDEL_NULL(ghost_spawners) QDEL_NULL(ghost_mobs) diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index 4f34ee452a8d..2f707c11fe07 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -4,7 +4,7 @@ var/datum/reagent/wanted_reagent /datum/bounty/reagent/can_claim() - return ..() && shipped_volume >= required_volume + return shipped_volume >= required_volume /datum/bounty/reagent/print_required() return "[shipped_volume]/[required_volume] u" @@ -211,7 +211,7 @@ var/wanted_vol = 30 /datum/bounty/pill/can_claim() - return ..() && shipped_ammount >= required_ammount + return shipped_ammount >= required_ammount /datum/bounty/pill/applies_to(obj/shipped) if(!istype(shipped, /obj/item/reagent_containers/applicator/pill)) diff --git a/code/modules/cargo/bounties/virus.dm b/code/modules/cargo/bounties/virus.dm index caab0e7d924b..a021166c0600 100644 --- a/code/modules/cargo/bounties/virus.dm +++ b/code/modules/cargo/bounties/virus.dm @@ -17,7 +17,7 @@ return "At least 1u" /datum/bounty/virus/can_claim() - return ..() && shipped + return shipped /datum/bounty/virus/applies_to(obj/export) if(shipped) diff --git a/code/modules/cargo/markets/market_telepad.dm b/code/modules/cargo/markets/market_telepad.dm index 445cd3296030..6383be5e95c5 100644 --- a/code/modules/cargo/markets/market_telepad.dm +++ b/code/modules/cargo/markets/market_telepad.dm @@ -366,11 +366,7 @@ receiving.post_purchase_effects(receiving.item) use_energy(energy_usage_per_teleport / power_efficiency) - var/datum/effect_system/spark_spread/sparks = new - sparks.set_up(5, 1, get_turf(src)) - sparks.attach(receiving.item) - sparks.start() - + do_sparks(5, TRUE, src, receiving.item) transmitting = receiving receiving = null diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 21478178a096..1423122d5a10 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -51,9 +51,9 @@ if(!bank) return ITEM_INTERACT_BLOCKING var/dolla = tool.get_item_credit_value() - to_chat(user, span_notice("You insert [dolla] dollars into [src].")) + to_chat(user, span_notice("You insert [dolla] [MONEY_NAME] into [src].")) bank.adjust_money(dolla, "Supply Console: Deposit") - to_chat(usr, span_notice("You have deposited [dolla] dollars into the account. The new balance is [bank.account_balance] dollars.")) + to_chat(usr, span_notice("You have deposited [dolla] [MONEY_NAME] into the account. The new balance is [bank.account_balance] [MONEY_NAME].")) qdel(tool) return ITEM_INTERACT_SUCCESS // DARKPACK EDIT ADD END diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3d6da8268a0e..82d83f3ebf85 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //Job preferences 2.0 - indexed by job title , no key or value implies never var/list/job_preferences = list() - // DARKPACK EDIT ADD START - STORYTELLR_STATS + // DARKPACK EDIT ADD START - STORYTELLER_STATS var/list/preference_storyteller_stats = list() // DARKPACK EDIT ADD END // DARKPACK EDIT ADD START - ALTERNATIVE_JOB_TITLES diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm index de01b73dc92c..c3fa4733a0e1 100644 --- a/code/modules/client/preferences/_preference.dm +++ b/code/modules/client/preferences/_preference.dm @@ -42,11 +42,11 @@ /// Preferences relating to World of Darkness TTRPG elements #define PREFERENCE_PRIORITY_WORLD_OF_DARKNESS 11 -#define PREFERENCE_PRIORITY_REQUIRES_CLAN 12 +#define PREFERENCE_PRIORITY_REQUIRES_SUBSPLAT 12 // DARKPACK EDIT ADD END - TTRPG preferences /// The maximum preference priority, keep this updated, but don't use it for `priority`. -#define MAX_PREFERENCE_PRIORITY PREFERENCE_PRIORITY_REQUIRES_CLAN // DARKPACK EDIT CHANGE - TTRPG Preferences +#define MAX_PREFERENCE_PRIORITY PREFERENCE_PRIORITY_REQUIRES_SUBSPLAT // DARKPACK EDIT CHANGE - TTRPG Preferences /// For choiced preferences, this key will be used to set display names in constant data. #define CHOICED_PREFERENCE_DISPLAY_NAMES "display_names" diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index b8ad5c462902..061ab6c4b806 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -62,6 +62,9 @@ data["default_quirk_balance"] = CONFIG_GET(number/default_quirk_points) data["species_disallowed_quirks"] = get_species_compatibility() data["splat_disallowed_quirks"] = get_splat_compatibility() // DARKPACK EDIT ADD - SPLATS + data["quirk_balance"] = get_quirk_balance() // DARKPACK EDIT ADD - MERITS/FLAWS + data["freebie_points"] = get_freebie_points() // DARKPACK EDIT ADD - MERITS/FLAWS + data["clan_disallowed_quirks"] = get_clan_compatibility() // DARKPACK EDIT ADD - MERITS/FLAWS return data @@ -73,6 +76,8 @@ data["selected_quirks"] = get_selected_quirks() data["species_disallowed_quirks"] = get_species_compatibility() data["splat_disallowed_quirks"] = get_splat_compatibility() // DARKPACK EDIT ADD - SPLATS + data["freebie_points"] = get_freebie_points() // DARKPACK EDIT ADD - MERITS/FLAWS + data["clan_disallowed_quirks"] = get_clan_compatibility() // DARKPACK EDIT ADD - MERITS/FLAWS return data @@ -112,7 +117,11 @@ /datum/preference_middleware/quirks/proc/give_quirk(list/params, mob/user) var/quirk_name = params["quirk"] - + // DARKPACK EDIT ADD - MERITS/FLAWS + var/datum/st_stat/freebie/freebie_points = preferences.preference_storyteller_stats["[STAT_FREEBIE_POINTS]"] + var/datum/quirk/quirk_type = SSquirks.quirks[quirk_name] + freebie_points.decrease_points(quirk_type.value) + // DARKPACK EDIT END - MERITS/FLAWS preferences.validate_quirks() var/list/new_quirks = preferences.all_quirks | quirk_name if (SSquirks.filter_invalid_quirks(new_quirks) != new_quirks) @@ -130,7 +139,11 @@ /datum/preference_middleware/quirks/proc/remove_quirk(list/params, mob/user) var/quirk_name = params["quirk"] - + // DARKPACK EDIT ADD - MERITS/FLAWS + var/datum/st_stat/freebie/freebie_points = preferences.preference_storyteller_stats["[STAT_FREEBIE_POINTS]"] + var/datum/quirk/quirk_type = SSquirks.quirks[quirk_name] + freebie_points.increase_points(quirk_type.value) + // DARKPACK EDIT END - MERITS/FLAWS var/list/new_quirks = preferences.all_quirks - quirk_name if ( \ !(quirk_name in preferences.all_quirks) \ @@ -155,3 +168,47 @@ selected_quirks += sanitize_css_class_name(quirk) return selected_quirks + +//DARKPACK EDIT ADD - MERITS/FLAWS + +/datum/preference_middleware/quirks/proc/get_freebie_points() + var/datum/st_stat/freebie/freebie_stat = preferences.preference_storyteller_stats["[STAT_FREEBIE_POINTS]"] + if(!freebie_stat) + return null + + var/base_points = 15 + var/spent_on_stats = freebie_stat.freebie_cost_spent + var/quirk_balance = get_quirk_balance() + + return base_points - spent_on_stats + quirk_balance + +/datum/preference_middleware/quirks/proc/get_quirk_balance() + var/total_cost = 0 + for(var/quirk_name in preferences.all_quirks) + var/datum/quirk/quirk_type = SSquirks.quirks[quirk_name] + total_cost -= quirk_type.value + return total_cost + +/datum/preference_middleware/quirks/proc/get_clan_compatibility() + var/list/clan_blacklist = list() + var/clan_name = preferences.read_preference(/datum/preference/choiced/vampire_clan) + + if(!clan_name) + return clan_blacklist + + //clan_name is clan.name which is "Brujah" vampire clan list is "name" ("Brujah") = typepath, vampire_clans is typepath = datum. we need the datum for the id, which is... just a lowercase name... + var/datum/vampire_clan/clan = GLOB.vampire_clans[GLOB.vampire_clan_list[clan_name]] + for(var/quirk_path in SSquirks.quirk_prototypes) + var/datum/quirk/quirk_prototype = SSquirks.quirk_prototypes[quirk_path] + + // clan exclusion is only going to reasonably appear on darkpack quirks + if(!istype(quirk_prototype, /datum/quirk/darkpack)) + continue + + var/datum/quirk/darkpack/darkpack_quirk = quirk_prototype + if(!darkpack_quirk.is_clan_appropriate(clan)) + clan_blacklist += quirk_prototype.name + + return clan_blacklist + +//DARKPACK EDIT END - MERITS/FLAWS diff --git a/code/modules/client/preferences/persistent_scars.dm b/code/modules/client/preferences/persistent_scars.dm index db3402fb6b78..4db17afdce26 100644 --- a/code/modules/client/preferences/persistent_scars.dm +++ b/code/modules/client/preferences/persistent_scars.dm @@ -1,5 +1,5 @@ /datum/preference/toggle/persistent_scars - category = PREFERENCE_CATEGORY_NON_CONTEXTUAL + category = PREFERENCE_CATEGORY_SECONDARY_FEATURES // DARKPACK EDIT, ORIGINAL: category = PREFERENCE_CATEGORY_NON_CONTEXTUAL savefile_key = "persistent_scars" savefile_identifier = PREFERENCE_CHARACTER diff --git a/code/modules/client/preferences/sounds.dm b/code/modules/client/preferences/sounds.dm index 3fa9c16ca34d..e6434afdd328 100644 --- a/code/modules/client/preferences/sounds.dm +++ b/code/modules/client/preferences/sounds.dm @@ -20,6 +20,11 @@ savefile_key = "sound_breathing" savefile_identifier = PREFERENCE_PLAYER +/datum/preference/toggle/sound_breathing/apply_to_client_updated(client/client, value) + var/mob/living/carbon/carbon_mob = client.mob + if(istype(carbon_mob) && !value) + carbon_mob.breathing_loop.stop() + /// Controls hearing announcement sounds /datum/preference/toggle/sound_announcements category = PREFERENCE_CATEGORY_GAME_PREFERENCES diff --git a/code/modules/clothing/chameleon/_chameleon_action.dm b/code/modules/clothing/chameleon/_chameleon_action.dm index 88ca8e51fe86..fd05f481bad3 100644 --- a/code/modules/clothing/chameleon/_chameleon_action.dm +++ b/code/modules/clothing/chameleon/_chameleon_action.dm @@ -8,7 +8,7 @@ check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_INCAPACITATED|AB_CHECK_HANDS_BLOCKED /// Typecache of all item types we explicitly cannot pick /// Note that abstract items are already excluded - VAR_FINAL/list/chameleon_blacklist = list() + VAR_FINAL/list/chameleon_blacklist /// Typecache of typepaths we can turn into VAR_FINAL/list/chameleon_typecache /// Assoc list of item name + icon state to item typepath @@ -31,10 +31,18 @@ qdel(src) return + name = "Change [chameleon_name] Appearance" + build_all_button_icons() + + LAZYINITLIST(chameleon_blacklist) + LAZYINITLIST(chameleon_typecache) + LAZYINITLIST(chameleon_list) + initialize_blacklist() initialize_disguises() + if(active_type) - if(chameleon_blacklist[active_type]) + if(is_type_in_typecache(active_type, chameleon_blacklist)) stack_trace("[type] has an active type defined in init which is blacklisted ([active_type])") active_type = null else @@ -73,31 +81,40 @@ var/datum/action/chameleon_outfit/outfit_action = locate() in remove_from.actions QDEL_NULL(outfit_action) +/// Basic initialization of the chameleon items we cannot pick from /datum/action/item_action/chameleon/change/proc/initialize_blacklist() chameleon_blacklist |= typecacheof(target.type) +/// Basic initialization of the chameleon items we can pick from /datum/action/item_action/chameleon/change/proc/initialize_disguises() - name = "Change [chameleon_name] Appearance" - build_all_button_icons() - - LAZYINITLIST(chameleon_typecache) - LAZYINITLIST(chameleon_list) - if(!ispath(chameleon_type, /obj/item)) stack_trace("Non-item chameleon type defined on [type] ([chameleon_type])") return add_chameleon_items(chameleon_type) -/datum/action/item_action/chameleon/change/proc/add_chameleon_items(type_to_add) - - chameleon_typecache |= typecacheof(type_to_add) - for(var/obj/item/item_type as anything in chameleon_typecache) - if(chameleon_blacklist[item_type] || (item_type::item_flags & ABSTRACT) || item_type == item_type::abstract_type || !item_type::icon_state) +/// Used for formatting a typepath into something human readable for selection +/datum/action/item_action/chameleon/change/proc/format_readable_name(datum/format_type) + if(ispath(format_type, /obj/item)) + var/obj/item/format_item = format_type + return "[format_item::name] ([replacetext(format_item::post_init_icon_state || format_item::icon_state, "_", " ")])" + + return "[format_type]" + +/** + * Adds items of the given type or types to the chameleon selection list + * + * * type_or_types_to_add: A single typepath or a list of typepaths to add to the chameleon selection + * * only_root: If TRUE, only add the literal type or types passed, not their children + * * ignore_root: If TRUE, only add children of the type or types passed, not the literal types + */ +/datum/action/item_action/chameleon/change/proc/add_chameleon_items(type_or_types_to_add, only_root = FALSE, ignore_root = FALSE) + var/list/new_items = typecacheof(type_or_types_to_add, only_root_path = only_root, ignore_root_path = ignore_root) + for(var/obj/item/item_type as anything in new_items - chameleon_typecache) + if(is_type_in_typecache(item_type, chameleon_blacklist) || (item_type::item_flags & ABSTRACT) || item_type == item_type::abstract_type || !item_type::icon_state) continue - var/chameleon_item_name = "[item_type::name] ([item_type::post_init_icon_state || item_type::icon_state])" - chameleon_list[chameleon_item_name] = item_type - + chameleon_list[format_readable_name(item_type)] = item_type + chameleon_typecache |= new_items /datum/action/item_action/chameleon/change/proc/select_look(mob/user) var/picked_name = tgui_input_list(user, "Select [chameleon_name] to change into", "Chameleon Settings", sort_list(chameleon_list, GLOBAL_PROC_REF(cmp_typepaths_asc))) diff --git a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm index 956b0892e335..6f86cb487987 100644 --- a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm +++ b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm @@ -136,6 +136,45 @@ stack_trace("Adding chameleon ID action to non-chameleon id ([target])") qdel(src) +/datum/action/item_action/chameleon/change/id/format_readable_name(datum/format_type) + if(ispath(format_type, /obj/item/card/id/advanced)) + var/obj/item/card/id/advanced/format_card = format_type + var/list/basesplit_state = splittext(format_card::post_init_icon_state || format_card::icon_state, "_") + if(basesplit_state[1] == "card") // kind of evil, but so is making icon state user visible + basesplit_state.Cut(1, 2) + + var/list/assignedsplit_state = splittext(format_card::assigned_icon_state, "_") + if(assignedsplit_state[1] == "assigned") // kind of evil, but so is making icon state user visible + assignedsplit_state.Cut(1, 2) + + var/final_state_string = "[jointext(basesplit_state, " ")], [jointext(assignedsplit_state, " ") || "unassigned"]" + + return "[format_card::name] ([final_state_string])" + + return ..() + +/datum/action/item_action/chameleon/change/id/initialize_disguises() + // basic id types + add_chameleon_items(list( + /obj/item/card/id/advanced, + /obj/item/card/id/advanced/black, + /obj/item/card/id/advanced/bountyhunter, + /obj/item/card/id/advanced/centcom, + /obj/item/card/id/advanced/gold, + /obj/item/card/id/advanced/platinum, + /obj/item/card/id/advanced/prisoner, + /obj/item/card/id/advanced/rainbow, + /obj/item/card/id/advanced/robotic, + /obj/item/card/id/advanced/silver, + ), only_root = TRUE) + + // all black cards (they're all syndie cards, which are IC anyways) + add_chameleon_items(/obj/item/card/id/advanced/black) + // all centcom cards (they should all be IC anyways) + add_chameleon_items(/obj/item/card/id/advanced/centcom) + // explicitly include the captain's spare id, even though it could be manually constructed from the gold id, for ease + add_chameleon_items(/obj/item/card/id/advanced/gold/captains_spare, only_root = TRUE) + /datum/action/item_action/chameleon/change/id/update_item(obj/item/picked_item) . = ..() var/obj/item/card/id/advanced/chameleon/agent_card = target @@ -151,15 +190,14 @@ // If there has not, we set the assignment to the copied card's default as well as copying over the the // default registered name from the copied card. if(!agent_card.forged) - if(!agent_card.assignment) - agent_card.assignment = initial(copied_card.assignment) - + agent_card.assignment ||= initial(copied_card.assignment) agent_card.registered_name = initial(copied_card.registered_name) agent_card.icon_state = initial(copied_card.icon_state) if(ispath(copied_card, /obj/item/card/id/advanced)) var/obj/item/card/id/advanced/copied_advanced_card = copied_card agent_card.assigned_icon_state = initial(copied_advanced_card.assigned_icon_state) + agent_card.inherent_assigned_name = initial(copied_advanced_card.inherent_assigned_name) agent_card.update_label() agent_card.update_appearance(UPDATE_ICON) @@ -204,26 +242,40 @@ stack_trace("Adding chameleon ID trim action to non-chameleon id ([target])") qdel(src) +/datum/action/item_action/chameleon/change/id_trim/format_readable_name(datum/format_type) + if(istype(format_type, /datum/id_trim)) + var/datum/id_trim/trim = format_type + var/list/trimstate_split = splittext(trim.trim_state, "_") + if(trimstate_split[1] == "trim") // kind of evil, but so is making icon state user visible + trimstate_split.Cut(1, 2) + + return "[trim.assignment] ([jointext(trimstate_split, " ")])" + + return ..() + /datum/action/item_action/chameleon/change/id_trim/initialize_blacklist() - return + chameleon_blacklist |= typecacheof(/datum/id_trim/centcom/corpse) /datum/action/item_action/chameleon/change/id_trim/initialize_disguises() - // Little bit of copypasta but we only use trim datums rather than item paths - name = "Change [chameleon_name] Appearance" - build_all_button_icons() - - LAZYINITLIST(chameleon_typecache) - LAZYINITLIST(chameleon_list) + var/list/chameleon_whitelist = typecacheof(list( + /datum/id_trim/battlecruiser, + /datum/id_trim/bit_avatar, + /datum/id_trim/bounty_hunter, + /datum/id_trim/centcom, + /datum/id_trim/job, + /datum/id_trim/pirate, + /datum/id_trim/syndicom, + /datum/id_trim/technician_id, + )) - for(var/datum/id_trim/trim_path as anything in typesof(/datum/id_trim)) - if(chameleon_blacklist[trim_path]) + for(var/trim_path in chameleon_whitelist) + if(is_type_in_typecache(trim_path, chameleon_blacklist)) continue var/datum/id_trim/trim = SSid_access.trim_singletons_by_path[trim_path] if(trim && trim.trim_state && trim.assignment) - var/chameleon_item_name = "[trim.assignment] ([trim.trim_state])" - chameleon_list[chameleon_item_name] = trim_path + chameleon_list[format_readable_name(trim)] = trim_path chameleon_typecache[trim_path] = TRUE /datum/action/item_action/chameleon/change/id_trim/update_item(picked_trim_path) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 258fd7540426..eeba73207354 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -589,7 +589,10 @@ /obj/item/clothing/glasses/thermal/xray name = "syndicate xray goggles" desc = "A pair of xray goggles manufactured by the Syndicate." + icon_state = "material" + color_cutoffs = null vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS + glass_colour_type = /datum/client_colour/glass_colour/lightblue /obj/item/clothing/glasses/thermal/xray/equipped(mob/living/carbon/human/user, slot) . = ..() diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 90f85d352f04..ee8e2b49e43f 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -73,6 +73,7 @@ post_init_icon_state = "beret" greyscale_config = /datum/greyscale_config/beret greyscale_config_worn = /datum/greyscale_config/beret/worn + greyscale_config_onfloor = /datum/greyscale_config/beret/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#972A2A" dog_fashion = /datum/dog_fashion/head/beret hair_mask = /datum/hair_mask/standard_hat_middle @@ -104,6 +105,7 @@ post_init_icon_state = "beret_flat" greyscale_config = /datum/greyscale_config/beret greyscale_config_worn = /datum/greyscale_config/beret/worn + greyscale_config_onfloor = /datum/greyscale_config/beret/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#8F7654" inhand_icon_state = null flags_1 = parent_type::flags_1 | NO_NEW_GAGS_PREVIEW_1 diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm index 93c085f9fc1a..7a307d37b540 100644 --- a/code/modules/clothing/head/hat.dm +++ b/code/modules/clothing/head/hat.dm @@ -107,6 +107,7 @@ post_init_icon_state = "beret_flat" greyscale_config = /datum/greyscale_config/beret greyscale_config_worn = /datum/greyscale_config/beret/worn + greyscale_config_onfloor = /datum/greyscale_config/beret/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#8F7654" inhand_icon_state = null diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 44c04771dbc3..11689e4b1b35 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -132,6 +132,7 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#0070B7#FFCE5B" hair_mask = /datum/hair_mask/standard_hat_middle @@ -393,6 +394,7 @@ post_init_icon_state = "beret" greyscale_config = /datum/greyscale_config/beret greyscale_config_worn = /datum/greyscale_config/beret/worn + greyscale_config_onfloor = /datum/greyscale_config/beret/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#972A2A" flags_1 = IS_PLAYER_COLORABLE_1 hair_mask = /datum/hair_mask/standard_hat_middle @@ -454,6 +456,7 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#39393f#f0cc8f" hair_mask = /datum/hair_mask/standard_hat_middle @@ -571,6 +574,7 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#a52f29#F2F2F2" armor_type = /datum/armor/cosmetic_sec strip_delay = 6 SECONDS @@ -613,6 +617,7 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#7e1980#c9cbcb" //Medical @@ -797,6 +802,7 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#C5D4F3#ECF1F8" armor_type = /datum/armor/beret_durathread @@ -826,6 +832,7 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#46b946#f2c42e" armor_type = /datum/armor/beret_centcom_formal strip_delay = 10 SECONDS @@ -855,5 +862,6 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS greyscale_colors = "#43523d#a2abb0" armor_type = /datum/armor/cosmetic_sec diff --git a/code/modules/clothing/head/perceptomatrix.dm b/code/modules/clothing/head/perceptomatrix.dm index b2cdb061bdf0..f37532241383 100644 --- a/code/modules/clothing/head/perceptomatrix.dm +++ b/code/modules/clothing/head/perceptomatrix.dm @@ -164,17 +164,6 @@ var/stagger_duration = 3 SECONDS /// The amount of hallucination to apply var/hallucination_duration = 25 SECONDS - /// Spark system - var/datum/effect_system/spark_spread/quantum/spark_sys - -/datum/action/cooldown/spell/pointed/percept_hallucination/New(Target) - . = ..() - - spark_sys = new /datum/effect_system/spark_spread/quantum - -/datum/action/cooldown/spell/pointed/percept_hallucination/Destroy() - QDEL_NULL(spark_sys) - return ..() /datum/action/cooldown/spell/pointed/percept_hallucination/is_valid_target(atom/cast_on) . = ..() @@ -216,11 +205,8 @@ /datum/action/cooldown/spell/pointed/percept_hallucination/proc/cast_fx(atom/cast_on) owner.Beam(cast_on, icon_state = "greyscale_lightning", beam_color = COLOR_FADED_PINK, time = 0.5 SECONDS) - - spark_sys.set_up(2, 1, get_turf(owner)) - spark_sys.start() - spark_sys.set_up(4, 1, get_turf(cast_on)) - spark_sys.start() + do_sparks(2, TRUE, get_turf(owner), spark_type = /datum/effect_system/basic/spark_spread/quantum) + do_sparks(4, TRUE, get_turf(owner), spark_type = /datum/effect_system/basic/spark_spread/quantum) /datum/action/cooldown/spell/pointed/percept_hallucination/cast(mob/living/carbon/human/cast_on) . = ..() diff --git a/code/modules/clothing/head/tophat.dm b/code/modules/clothing/head/tophat.dm index 1efa8210db7b..add97bc164a2 100644 --- a/code/modules/clothing/head/tophat.dm +++ b/code/modules/clothing/head/tophat.dm @@ -22,7 +22,7 @@ COOLDOWN_START(src, rabbit_cooldown, RABBIT_CD_TIME) playsound(get_turf(src), 'sound/items/weapons/emitter.ogg', 70) - do_smoke(amount = DIAMOND_AREA(1), holder = src, location = src, smoke_type=/obj/effect/particle_effect/fluid/smoke/quick) + do_smoke(1, src, src, effect_type = /obj/effect/particle_effect/fluid/smoke/quick) if(prob(10)) magician.visible_message(span_danger("[magician] taps [src] with [hitby_wand], then reaches in and pulls out a bu- wait, those are bees!"), span_danger("You tap [src] with your [hitby_wand.name] and pull out... BEES!")) diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 49f5a7412b73..7d6df307725e 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -270,7 +270,7 @@ switch (body_part) if(BODY_ZONE_CHEST)//Listening to the chest user.visible_message(span_notice("[user] places [src] against [carbon_patient]'s [body_part] and listens attentively."), ignored_mobs = user) - if(!user.can_hear()) + if(HAS_TRAIT(user, TRAIT_DEAF)) to_chat(user, span_notice("You place [src] against [carbon_patient]'s [body_part]. Fat load of good it does you though, since you can't hear.")) return else diff --git a/code/modules/clothing/spacesuits/specialops.dm b/code/modules/clothing/spacesuits/specialops.dm index d0f06f89a67e..dc55e3ec0d50 100644 --- a/code/modules/clothing/spacesuits/specialops.dm +++ b/code/modules/clothing/spacesuits/specialops.dm @@ -6,6 +6,7 @@ post_init_icon_state = "beret_badge" greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn + greyscale_config_onfloor = /datum/greyscale_config/beret_badge/onfloor // DARKPACK EDIT ADD - ONFLOOR_ICONS inhand_icon_state = null greyscale_colors = "#397F3F#FFCE5B" clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index e74144abedc3..2f5249158204 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -240,9 +240,7 @@ var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE /obj/item/clothing/suit/armor/reactive/tesla/cooldown_activation(mob/living/carbon/human/owner) - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread - sparks.set_up(1, 1, src) - sparks.start() + do_sparks(1, TRUE, src) ..() /obj/item/clothing/suit/armor/reactive/tesla/reactive_activation(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -337,9 +335,7 @@ clothing_traits = list(TRAIT_MADNESS_IMMUNE) /obj/item/clothing/suit/armor/reactive/hallucinating/cooldown_activation(mob/living/carbon/human/owner) - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread - sparks.set_up(1, 1, src) - sparks.start() + do_sparks(1, TRUE, src) return ..() /obj/item/clothing/suit/armor/reactive/hallucinating/reactive_activation(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -392,9 +388,7 @@ r_legs = typesof(/obj/item/bodypart/leg/right) /obj/item/clothing/suit/armor/reactive/bioscrambling/cooldown_activation(mob/living/carbon/human/owner) - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread - sparks.set_up(1, 1, src) - sparks.start() + do_sparks(1, TRUE, src) ..() /obj/item/clothing/suit/armor/reactive/bioscrambling/reactive_activation(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -508,8 +502,7 @@ owner.visible_message(span_danger("The reactive armor alters the weather around [owner], shielding [owner.p_them()] from [attack_text]!")) playsound(src, 'sound/effects/magic/lightningshock.ogg', 33, TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) - var/datum/effect_system/steam_spread/steam = new() - steam.set_up(10, FALSE, owner.loc) + var/datum/effect_system/basic/steam_spread/steam = new(owner.loc, 10, FALSE) steam.start() var/list/affected_turfs = list() @@ -531,8 +524,7 @@ owner.visible_message(span_danger("The reactive armor malfunctions, calling down a storm upon [owner.p_them()]!")) playsound(src, 'sound/effects/magic/lightningshock.ogg', 33, TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) - var/datum/effect_system/steam_spread/steam = new() - steam.set_up(2, FALSE, owner.loc) + var/datum/effect_system/basic/steam_spread/steam = new(owner.loc, 2, FALSE) steam.start() owner.adjust_wet_stacks(10) diff --git a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm index 96254bba8fd2..9f64535e13b7 100644 --- a/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm +++ b/code/modules/clothing/under/jobs/Plasmaman/civilian_service.dm @@ -176,8 +176,4 @@ addtimer(CALLBACK(src, PROC_REF(check_fire_state)), extinguish_cooldown) owner.visible_message(span_warning("[owner]'s suit spews space lube everywhere!"), span_warning("Your suit spews space lube everywhere!")) owner.extinguish_mob() - var/datum/effect_system/fluid_spread/foam/foam = new - var/datum/reagents/foamreagent = new /datum/reagents(15) - foamreagent.add_reagent(/datum/reagent/lube, 15) - foam.set_up(4, holder = src, location = get_turf(owner), carry = foamreagent) - foam.start() //Truly terrifying. + do_foam(4, src, get_turf(owner), /datum/reagent/lube, 15) diff --git a/code/modules/clothing/under/jobs/civilian/clown_mime.dm b/code/modules/clothing/under/jobs/civilian/clown_mime.dm index bb0c33e7e2f7..a452c6c98e04 100644 --- a/code/modules/clothing/under/jobs/civilian/clown_mime.dm +++ b/code/modules/clothing/under/jobs/civilian/clown_mime.dm @@ -31,7 +31,7 @@ inhand_icon_state = "clown" female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY can_adjust = FALSE - supports_variations_flags = CLOTHING_NO_VARIATION + supports_variations_flags = NONE /obj/item/clothing/under/rank/civilian/clown/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index eb06c86fbe49..7110fab35bca 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -10,7 +10,7 @@ gender = PLURAL body_parts_covered = GROIN female_sprite_flags = NO_FEMALE_UNIFORM - supports_variations_flags = CLOTHING_NO_VARIATION + supports_variations_flags = NONE can_adjust = FALSE species_exception = list(/datum/species/golem) flags_1 = IS_PLAYER_COLORABLE_1 diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm index 797dd9d3856b..5c0f8b3fe9d1 100644 --- a/code/modules/economy/account.dm +++ b/code/modules/economy/account.dm @@ -244,7 +244,7 @@ if(!card_holder.client || (!(get_chat_toggles(card_holder.client) & CHAT_BANKCARD) && !force)) return - if(card_holder.can_hear()) + if(!HAS_TRAIT(card_holder, TRAIT_DEAF)) card_holder.playsound_local(get_turf(card_holder), 'sound/machines/beep/twobeep_high.ogg', 50, TRUE) to_chat(card_holder, "[icon2html(icon_source, card_holder)] [span_notice("[message]")]") else if(isturf(card.loc)) //If on the ground @@ -252,7 +252,7 @@ for(var/mob/potential_hearer in hearers(1,card_location)) if(!potential_hearer.client || (!(get_chat_toggles(potential_hearer.client) & CHAT_BANKCARD) && !force)) continue - if(potential_hearer.can_hear()) + if(!HAS_TRAIT(potential_hearer, TRAIT_DEAF)) potential_hearer.playsound_local(card_location, 'sound/machines/beep/twobeep_high.ogg', 50, TRUE) to_chat(potential_hearer, "[icon2html(icon_source, potential_hearer)] [span_notice("[message]")]") else @@ -262,7 +262,7 @@ continue if(!sound_atom) sound_atom = card.drop_location() //in case we're inside a bodybag in a crate or something. doing this here to only process it if there's a valid mob who can hear the sound. - if(potential_hearer.can_hear()) + if(!HAS_TRAIT(potential_hearer, TRAIT_DEAF)) potential_hearer.playsound_local(get_turf(sound_atom), 'sound/machines/beep/twobeep_high.ogg', 50, TRUE) to_chat(potential_hearer, "[icon2html(icon_source, potential_hearer)] [span_notice("[message]")]") diff --git a/code/modules/events/immovable_rod/immovable_rod.dm b/code/modules/events/immovable_rod/immovable_rod.dm index 3a52689c8c1a..e2404bbc0906 100644 --- a/code/modules/events/immovable_rod/immovable_rod.dm +++ b/code/modules/events/immovable_rod/immovable_rod.dm @@ -164,9 +164,7 @@ // they ALSO collapse into a singulo. if(istype(clong, /obj/effect/immovablerod)) visible_message(span_danger("[src] collides with [clong]! This cannot end well.")) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(2, holder = src, location = get_turf(src)) - smoke.start() + do_smoke(2, src, get_turf(src)) var/obj/singularity/bad_luck = new(get_turf(src)) bad_luck.energy = 800 qdel(clong) diff --git a/code/modules/events/radiation_leak.dm b/code/modules/events/radiation_leak.dm index a5aee22a8b26..56e6e87b9a9b 100644 --- a/code/modules/events/radiation_leak.dm +++ b/code/modules/events/radiation_leak.dm @@ -135,13 +135,9 @@ /// Helper to shoot some smoke into the air around the passed atom /datum/round_event/radiation_leak/proc/puff_some_smoke(atom/where) + // Causes radioation and mutations var/turf/below_where = get_turf(where) - var/datum/effect_system/fluid_spread/smoke/chem/gross_smoke = new() - gross_smoke.chemholder.add_reagent(/datum/reagent/toxin/polonium, 10) // Polonium (it causes radiation) - gross_smoke.chemholder.add_reagent(/datum/reagent/toxin/mutagen, 10) // Mutagen (it causes mutations. Also it's green... Primarily because it's green.) - gross_smoke.attach(below_where) - gross_smoke.set_up(2, holder = where, location = below_where, silent = TRUE) - gross_smoke.start() + do_chem_smoke(2, where, below_where, list(/datum/reagent/toxin/polonium = 10, /datum/reagent/toxin/mutagen = 10)) playsound(below_where, 'sound/effects/smoke.ogg', 50, vary = TRUE) /** diff --git a/code/modules/events/wisdomcow.dm b/code/modules/events/wisdomcow.dm index fbe824c06e6b..18f0213c5d70 100644 --- a/code/modules/events/wisdomcow.dm +++ b/code/modules/events/wisdomcow.dm @@ -32,7 +32,7 @@ else targetloc = get_safe_random_station_turf() var/mob/living/basic/cow/wisdom/wise = new(targetloc, selected_wisdom, selected_experience, forced_reagent_type) - do_smoke(1, holder = wise, location = targetloc) + do_smoke(1, wise, targetloc) announce_to_ghosts(wise) /datum/event_admin_setup/set_location/wisdom_cow diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index ab305bbff99b..e05bd86b6816 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -83,9 +83,7 @@ victims += target for(var/mob/living/carbon/human/victim as anything in victims) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = victim, location = victim.loc) - smoke.start() + do_smoke(0, victim, victim.loc) #undef BIG_FAT_DOOBIE #undef BOXING diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm index 43517ec26dd4..e2c9416c5fc3 100644 --- a/code/modules/events/wizard/rpgloot.dm +++ b/code/modules/events/wizard/rpgloot.dm @@ -34,10 +34,9 @@ can_backfire = TRUE return ..() - /obj/item/upgradescroll/pre_attack(obj/item/target, mob/living/user, list/modifiers, list/attack_modifiers) . = ..() - if(. || !istype(target) || !user.combat_mode) + if(. || !istype(target)) return target.AddComponent(/datum/component/fantasy, upgrade_amount, null, null, can_backfire, TRUE) uses -= 1 diff --git a/code/modules/events/wizard/shuffle.dm b/code/modules/events/wizard/shuffle.dm index 460fe7b8a2f6..b7961fa4cfa9 100644 --- a/code/modules/events/wizard/shuffle.dm +++ b/code/modules/events/wizard/shuffle.dm @@ -34,9 +34,7 @@ moblocs.len -= 1 for(var/mob/living/carbon/human/victim in GLOB.alive_mob_list) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = victim, location = victim.loc) - smoke.start() + do_smoke(0, victim, victim.loc) //---// @@ -69,9 +67,7 @@ mobnames.len -= 1 for(var/mob/living/carbon/human/victim in GLOB.alive_mob_list) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = victim, location = victim.loc) - smoke.start() + do_smoke(0, victim, victim.loc) //---// @@ -107,6 +103,4 @@ qdel(swapper) for(var/mob/living/carbon/human/alive_human in GLOB.alive_mob_list) - var/datum/effect_system/fluid_spread/smoke/smoke = new() - smoke.set_up(0, holder = alive_human, location = alive_human.loc) - smoke.start() + do_smoke(0, alive_human, alive_human.loc) diff --git a/code/modules/explorer_drone/exodrone.dm b/code/modules/explorer_drone/exodrone.dm index 08fc0ae9142a..ad2a55592e5b 100644 --- a/code/modules/explorer_drone/exodrone.dm +++ b/code/modules/explorer_drone/exodrone.dm @@ -437,7 +437,7 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) */ /obj/machinery/exodrone_launcher/proc/launch_effect() playsound(src,'sound/effects/podwoosh.ogg',50, FALSE) - do_smoke(1, holder = src, location = get_turf(src)) + do_smoke(1, src, get_turf(src)) /obj/machinery/exodrone_launcher/Exited(atom/movable/gone, direction) . = ..() diff --git a/code/modules/fishing/fish/types/rift.dm b/code/modules/fishing/fish/types/rift.dm index 641336f0dbee..626be1ecde0f 100644 --- a/code/modules/fishing/fish/types/rift.dm +++ b/code/modules/fishing/fish/types/rift.dm @@ -636,7 +636,7 @@ to_chat(screeched, span_notice("You resist the psychic wail!")) continue var/power = 1 - if(!screeched.can_hear()) // bit weaker if deaf. but its still psychic + if(HAS_TRAIT(screeched, TRAIT_DEAF)) // bit weaker if deaf. but its still psychic power *= 0.5 var/affect_time = 15 SECONDS * power // it really fucks you up diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 01d1d3c0c12a..d3c9088aec5f 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -371,7 +371,7 @@ user = user || loc if (!isliving(user) || !user.mind || !user.is_holding(src)) return - . += round(user.st_get_stat(STAT_STRENGTH) * 0.3) // DARKPACK EDIT CHANGE - STORYTELLR_STATS + . += round(user.st_get_stat(STAT_STRENGTH) * 0.3) // DARKPACK EDIT CHANGE - STORYTELLER_STATS return max(., 1) /obj/item/fishing_rod/dropped(mob/user, silent) diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm index 050ebd9ba49d..0152332dac43 100644 --- a/code/modules/food_and_drinks/machinery/gibber.dm +++ b/code/modules/food_and_drinks/machinery/gibber.dm @@ -297,7 +297,7 @@ for(var/obj/item/result as anything in results) if (victim.reagents) victim.reagents.trans_to(result, victim.reagents.total_volume / reagents_in_produced, remove_blacklisted = TRUE) - result.reagents?.add_reagent(/datum/reagent/consumable/nutriment/fat, victim.nutrition / 15 / reagents_in_produced) + result.reagents?.add_reagent(/datum/reagent/consumable/nutriment/fat, victim.nutrition / /datum/reagent/consumable/nutriment/fat::nutriment_factor / reagents_in_produced) /obj/machinery/gibber/proc/finish_gibbing(list/obj/item/results, gibs_type, list/datum/disease/diseases) playsound(src.loc, 'sound/effects/splat.ogg', 50, TRUE) diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm index 75c8a06359dd..e6e664eb3461 100644 --- a/code/modules/food_and_drinks/machinery/grill.dm +++ b/code/modules/food_and_drinks/machinery/grill.dm @@ -43,9 +43,7 @@ new /obj/item/stack/rods(loc, 5) if(grill_fuel > 0) - var/datum/effect_system/fluid_spread/smoke/bad/smoke = new - smoke.set_up(1, holder = src, location = loc) - smoke.start() + do_smoke(1, src, loc, smoke_type = /datum/effect_system/fluid_spread/smoke/bad) /obj/machinery/grill/add_context(atom/source, list/context, obj/item/held_item, mob/user) . = NONE @@ -273,9 +271,7 @@ //use fuel, create smoke puffs for immersion grill_fuel -= fuel_usage if(SPT_PROB(0.5, seconds_per_tick)) - var/datum/effect_system/fluid_spread/smoke/bad/smoke = new - smoke.set_up(1, holder = src, location = loc) - smoke.start() + do_smoke(1, src, loc, smoke_type = /datum/effect_system/fluid_spread/smoke/bad) fuel_usage = GRILL_FUELUSAGE_ACTIVE * seconds_per_tick if(!QDELETED(grilled_item)) diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm index 2235b5b243bc..fce07350527f 100644 --- a/code/modules/food_and_drinks/machinery/microwave.dm +++ b/code/modules/food_and_drinks/machinery/microwave.dm @@ -643,9 +643,7 @@ /obj/machinery/microwave/proc/spark() visible_message(span_warning("Sparks fly around [src]!")) - var/datum/effect_system/spark_spread/sparks = new - sparks.set_up(2, 1, src) - sparks.start() + do_sparks(2, TRUE, src) /** * The start of the cook loop diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm index ff9e49dbffcc..f046278142d1 100644 --- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm @@ -205,10 +205,7 @@ if(holder.total_volume >= holder.maximum_volume * 0.95) below_pot.visible_message(span_warning("[pot] starts to boil over!")) // Create a spread of dirty foam - var/datum/effect_system/fluid_spread/foam/dirty/soup_mess = new() - soup_mess.reagent_scale = 0.1 // (Just a little) - soup_mess.set_up(range = 1, holder = pot, location = below_pot, carry = holder, stop_reactions = TRUE) - soup_mess.start() + do_foam(1, pot, below_pot, carry = holder, foam_type = /datum/effect_system/fluid_spread/foam/dirty, stop_reactions = TRUE, reagent_scale = 0.1) // Loses a bit from the foam for(var/datum/reagent/reagent as anything in holder.reagent_list) reagent.volume *= 0.5 diff --git a/code/modules/hallucination/battle.dm b/code/modules/hallucination/battle.dm index 985709b90d02..60e2555e3873 100644 --- a/code/modules/hallucination/battle.dm +++ b/code/modules/hallucination/battle.dm @@ -5,7 +5,7 @@ hallucination_tier = HALLUCINATION_TIER_COMMON /datum/hallucination/battle/start() - if(!hallucinator.can_hear()) + if(HAS_TRAIT(hallucinator, TRAIT_DEAF)) return FALSE // for subtypes diff --git a/code/modules/hallucination/fake_sound.dm b/code/modules/hallucination/fake_sound.dm index 7b2e2ee88255..b78095486305 100644 --- a/code/modules/hallucination/fake_sound.dm +++ b/code/modules/hallucination/fake_sound.dm @@ -11,7 +11,7 @@ var/sound_type /datum/hallucination/fake_sound/start() - if(!hallucinator.can_hear()) + if(HAS_TRAIT(hallucinator, TRAIT_DEAF)) return FALSE var/sound_to_play = islist(sound_type) ? pick(sound_type) : sound_type diff --git a/code/modules/hallucination/station_message.dm b/code/modules/hallucination/station_message.dm index a8bddedcdad3..33f20cb10146 100644 --- a/code/modules/hallucination/station_message.dm +++ b/code/modules/hallucination/station_message.dm @@ -8,7 +8,7 @@ var/require_hearing = TRUE /datum/hallucination/station_message/start() - if(require_hearing && !hallucinator.can_hear()) + if(require_hearing && HAS_TRAIT(hallucinator, TRAIT_DEAF)) return FALSE if(do_fake_alert() == CANCEL_FAKE_ALERT) return FALSE diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index fbff1b5a861e..55535d4b5707 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -36,9 +36,7 @@ /obj/effect/holodeck_effect/sparks/activate(obj/machinery/computer/holodeck/HC) var/turf/T = get_turf(src) if(T) - var/datum/effect_system/spark_spread/s = new - s.set_up(3, 1, T) - s.start() + do_sparks(3, TRUE, T) T.temperature = 5000 //Why? not quite sure to be honest with you T.hotspot_expose(50000,50000,1) @@ -63,7 +61,7 @@ our_mob.flags_1 |= HOLOGRAM_1 // these vars are not really standardized but all would theoretically create stuff on death - our_mob.add_traits(list(TRAIT_PERMANENTLY_MORTAL, TRAIT_NO_BLOOD_OVERLAY, TRAIT_NOBLOOD, TRAIT_NOHUNGER), INNATE_TRAIT) + our_mob.add_traits(list(TRAIT_PERMANENTLY_MORTAL, TRAIT_NO_BLOOD_OVERLAY, TRAIT_NOBLOOD, TRAIT_NOHUNGER, TRAIT_SPAWNED_MOB), INNATE_TRAIT) RegisterSignal(our_mob, COMSIG_QDELETING, PROC_REF(handle_mob_delete)) return our_mob diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index 45f4d1251ded..326c4ac761ae 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -50,12 +50,8 @@ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/onion_slice/red, 2, 15, screentip_verb = "Cut") /obj/item/food/grown/onion/UsedforProcessing(mob/living/user, obj/item/I, list/chosen_option, list/created_atoms) - var/datum/effect_system/fluid_spread/smoke/chem/cry_about_it = new //Since the onion is destroyed when it's sliced, var/splat_location = get_turf(src) //we need to set up the smoke beforehand - cry_about_it.attach(splat_location) - cry_about_it.set_up(0, holder = src, location = splat_location, carry = reagents, silent = FALSE) - cry_about_it.start() - qdel(cry_about_it) + do_chem_smoke(0, src, splat_location, carry = reagents, silent = FALSE) return ..() /obj/item/food/onion_slice diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 13f001b337c1..aa379ce01a8b 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -382,18 +382,16 @@ //This is where stability mutations exist now. if(myseed.instability >= 80) - var/mutation_chance = myseed.instability - 75 - mutate(0, 0, 0, 0, 0, 0, 0, mutation_chance, 0) //Scaling odds of a random trait or chemical + traitmutate(myseed.instability - 75) //Scaling odds of a random trait or chemical if(myseed.instability >= 60) if(prob((myseed.instability)/2) && !self_sustaining && LAZYLEN(myseed.mutatelist) && !myseed.get_gene(/datum/plant_gene/trait/never_mutate)) //Minimum 30%, Maximum 50% chance of mutating every age tick when not on autogrow or having Prosophobic Inclination trait. mutatespecie() myseed.set_instability(myseed.instability/2) - if(myseed.instability >= 40) - if(prob(myseed.instability) && !myseed.get_gene(/datum/plant_gene/trait/stable_stats)) //No hardmutation if Symbiotic Resilience trait is present. - hardmutate() - if(myseed.instability >= 20 ) - if(prob(myseed.instability) && !myseed.get_gene(/datum/plant_gene/trait/stable_stats)) //No mutation if Symbiotic Resilience trait is present. - mutate() + if(myseed.instability >= 20 && prob(myseed.instability) && !myseed.get_gene(/datum/plant_gene/trait/stable_stats)) //No hardmutation if Symbiotic Resilience trait is present. + if(myseed.instability >= 40) + hardmutate(stabmut = myseed.instability >= 80 ? 5 : 0) + else + mutate(stabmut = 0) //Health & Age/////////////////////////////////////////////////////////// @@ -677,15 +675,50 @@ set_pestlevel(0) // Reset visible_message(span_warning("The [oldPlantName] is overtaken by some [myseed.plantname]!")) +/// Mutates the stats of the current seed /obj/machinery/hydroponics/proc/mutate(lifemut = 2, endmut = 5, productmut = 1, yieldmut = 2, potmut = 25, wrmut = 2, wcmut = 5, traitmut = 0, stabmut = 3) // Mutates the current seed - if(!myseed) - return - myseed.mutate(lifemut, endmut, productmut, yieldmut, potmut, wrmut, wcmut, traitmut, stabmut) + myseed?.mutate( + lifemut = lifemut, + endmut = endmut, + productmut = productmut, + yieldmut = yieldmut, + potmut = potmut, + wrmut = wrmut, + wcmut = wcmut, + traitmut = traitmut, + stabmut = stabmut, + ) +/// Mutate but with higher default values /obj/machinery/hydroponics/proc/hardmutate(lifemut = 4, endmut = 10, productmut = 2, yieldmut = 4, potmut = 50, wrmut = 4, wcmut = 10, traitmut = 0, stabmut = 4) - mutate(lifemut, endmut, productmut, yieldmut, potmut, wrmut, wcmut, traitmut, stabmut) + myseed?.mutate( + lifemut = lifemut, + endmut = endmut, + productmut = productmut, + yieldmut = yieldmut, + potmut = potmut, + wrmut = wrmut, + wcmut = wcmut, + traitmut = traitmut, + stabmut = stabmut, + ) + +/// Mutate but only introduce a random trait +/obj/machinery/hydroponics/proc/traitmutate(traitmut = 1) + myseed?.mutate( + lifemut = 0, + endmut = 0, + productmut = 0, + yieldmut = 0, + potmut = 0, + wrmut = 0, + wcmut = 0, + traitmut = traitmut, + stabmut = 0, + ) -/obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant! +/// Mutate the species of the plant into one of its mutations +/obj/machinery/hydroponics/proc/mutatespecie() if(!myseed || plant_status == HYDROTRAY_PLANT_DEAD || !LAZYLEN(myseed.mutatelist)) return @@ -701,7 +734,8 @@ var/message = span_warning("[oldPlantName] suddenly mutates into [myseed.plantname]!") addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) -/obj/machinery/hydroponics/proc/polymorph() // Polymorph a plant into another plant +/// Transform the plant into a completely random species +/obj/machinery/hydroponics/proc/polymorph() if(!myseed || plant_status == HYDROTRAY_PLANT_DEAD) return @@ -717,7 +751,8 @@ var/message = span_warning("[oldPlantName] suddenly polymorphs into [myseed.plantname]!") addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) -/obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent instead. Mind you, this pretty much destroys the old plant +/// Mutates the weeds in the tray into a random weed plant (which can overtake existing plants) +/obj/machinery/hydroponics/proc/mutateweed() if(weedlevel <= 5) visible_message(span_warning("The few weeds in [src] seem to react, but only for a moment...")) return diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 0844708b3ff8..2835d49908f2 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -691,13 +691,10 @@ SIGNAL_HANDLER our_plant.investigate_log("made smoke at [AREACOORD(target)]. Last touched by: [our_plant.fingerprintslast].", INVESTIGATE_BOTANY) - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new () var/obj/item/seeds/our_seed = our_plant.get_plant_seed() var/splat_location = get_turf(target) var/range = sqrt(our_seed.potency * 0.1) - smoke.attach(splat_location) - smoke.set_up(round(range), holder = our_plant, location = splat_location, carry = our_plant.reagents, silent = FALSE) - smoke.start(log = TRUE) + do_chem_smoke(round(range), our_plant, splat_location, carry = our_plant.reagents, silent = FALSE, log = TRUE) our_plant.reagents.clear_reagents() /// Makes the plant and its seeds fireproof. From lavaland plants. diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 8d6dfcf1853e..831986982ce4 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -136,6 +136,9 @@ /// If set, look for a policy with this instead of the job title var/policy_override + /// How desensitized this job is to seeing death as a base - applied with the job + var/desensitized_base = 1.0 + /datum/job/New() . = ..() // DARKPACK EDIT ADD START - ALTERNATIVE_JOB_TITLES @@ -155,6 +158,8 @@ if(length(mind_traits)) spawned.mind.add_traits(mind_traits, JOB_TRAIT) + spawned.mind.desensitized_level = clamp(desensitized_base, DESENSITIZED_MINIMUM, spawned.mind.desensitized_level) + var/obj/item/organ/liver/liver = spawned.get_organ_slot(ORGAN_SLOT_LIVER) if(liver && length(liver_traits)) liver.add_traits(liver_traits, JOB_TRAIT) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 718751bf7876..a3ad2d52aa85 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -22,7 +22,8 @@ paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SEC - mind_traits = list(HEAD_OF_STAFF_MIND_TRAITS, TRAIT_DESENSITIZED) + mind_traits = list(HEAD_OF_STAFF_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_ROYAL_METABOLISM) display_order = JOB_DISPLAY_ORDER_CAPTAIN diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm index 75fd0a7c00a7..d4c39db5beea 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain.dm @@ -12,7 +12,8 @@ outfit = /datum/outfit/job/chaplain plasmaman_outfit = /datum/outfit/plasmaman/chaplain - mind_traits = list(TRAIT_SPIRITUAL, TRAIT_DESENSITIZED) + mind_traits = list(TRAIT_SPIRITUAL) + desensitized_base = DESENSITIZED_THRESHOLD paycheck = PAYCHECK_CREW paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm index d02915d63196..5e67c8de35bf 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm @@ -19,6 +19,7 @@ GLOBAL_LIST_INIT(nullrod_variants, init_nullrod_variants()) Harms you if you dismiss the scythe without first causing harm to a creature. \ The shard also causes you to become Morbid, shifting your interests towards the macabre." rods[/obj/item/melee/skateboard/holyboard] = "A skateboard that grants you flight and anti-magic abilities while ridden. Fits in your bag." + rods[/obj/item/storage/belt/sheath/hanzo_katana] = "A sharp katana which provides a low chance of blocking incoming melee attacks. Can be worn on the back or belt, wearing the sheath on belt allows for a swift counterattack." for(var/obj/item/melee/energy/sword/nullrod/energy_nullrod_type as anything in typesof(/obj/item/melee/energy/sword/nullrod)) rods[energy_nullrod_type] = "An energy sword, but with a lower force, no armour penetration and a low chance of blocking. Can be switched on and off. \ @@ -46,8 +47,6 @@ GLOBAL_LIST_INIT(nullrod_variants, init_nullrod_variants()) var/chaplain_spawnable = TRUE /// Short description of what this item is capable of, for radial menu uses. var/menu_description = "A standard chaplain's weapon. Fits in pockets. Can be worn on the belt." - /// Lazylist, tracks refs()s to all cultists which have been crit or killed by this nullrod. - var/list/cultists_slain /// Affects GLOB.holy_weapon_type. Disable to allow null rods to change at will and without affecting the station's type. var/station_holy_item = TRUE @@ -71,26 +70,6 @@ GLOBAL_LIST_INIT(nullrod_variants, init_nullrod_variants()) user.visible_message(span_suicide("[user] is killing [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to get closer to god!")) return (BRUTELOSS|FIRELOSS) -/obj/item/nullrod/attack(mob/living/target_mob, mob/living/user, list/modifiers, list/attack_modifiers) - if(!user.mind?.holy_role) - return ..() - if(!IS_CULTIST(target_mob) || istype(target_mob, /mob/living/carbon/human/cult_ghost)) - return ..() - - var/old_stat = target_mob.stat - . = ..() - if(old_stat < target_mob.stat) - LAZYOR(cultists_slain, REF(target_mob)) - return . - -/obj/item/nullrod/examine(mob/user) - . = ..() - if(!IS_CULTIST(user) || !GET_ATOM_BLOOD_DNA_LENGTH(src)) - return - - var/num_slain = LAZYLEN(cultists_slain) - . += span_cult_italic("It has the blood of [num_slain] fallen cultist[num_slain == 1 ? "" : "s"] on it. \ - Offering it to Nar'sie will transform it into a [num_slain >= 3 ? "powerful" : "standard"] cult weapon.") /obj/item/nullrod/non_station station_holy_item = FALSE @@ -174,8 +153,9 @@ GLOBAL_LIST_INIT(nullrod_variants, init_nullrod_variants()) desc = "Capable of cutting clean through a holy claymore." icon_state = "katana" inhand_icon_state = "katana" - worn_icon_state = "katana" - menu_description = "A sharp katana which provides a low chance of blocking incoming melee attacks. Can be worn on the back or belt." + pickup_sound = 'sound/items/unsheath.ogg' + slot_flags = NONE + chaplain_spawnable = FALSE /obj/item/nullrod/claymore/multiverse name = "extradimensional blade" @@ -611,6 +591,7 @@ GLOBAL_LIST_INIT(nullrod_variants, init_nullrod_variants()) lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' force = 15 + obj_flags = parent_type::obj_flags | UNIQUE_RENAME offspring_type = /obj/item/toy/plush/carpplushie divine = TRUE diff --git a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm index f2c7ed53d40f..91823a073c8b 100644 --- a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm +++ b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm @@ -45,6 +45,7 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and armour_penetration = 50 //Very good armor penetration to make up for our abysmal force reach = 2 //why yes, this does have reach slot_flags = null + obj_flags = UNIQUE_RENAME sharpness = SHARP_EDGED attack_verb_continuous = list("chops", "slices", "cuts", "reaps") attack_verb_simple = list("chop", "slice", "cut", "reap") diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 4cab7531da43..3b4a856a1189 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -26,7 +26,8 @@ paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_MED - mind_traits = list(HEAD_OF_STAFF_MIND_TRAITS, MEDICAL_MIND_TRAITS) + mind_traits = list(HEAD_OF_STAFF_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_MEDICAL_METABOLISM, TRAIT_ROYAL_METABOLISM) display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER diff --git a/code/modules/jobs/job_types/cook.dm b/code/modules/jobs/job_types/cook.dm index 672d2f616e59..aebe1b9ca803 100644 --- a/code/modules/jobs/job_types/cook.dm +++ b/code/modules/jobs/job_types/cook.dm @@ -15,7 +15,7 @@ paycheck = PAYCHECK_CREW paycheck_department = ACCOUNT_SRV - mind_traits = list(TRAIT_DESENSITIZED) // butcher + desensitized_base = DESENSITIZED_THRESHOLD // butcher liver_traits = list(TRAIT_CULINARY_METABOLISM) display_order = JOB_DISPLAY_ORDER_COOK @@ -37,6 +37,7 @@ /obj/item/reagent_containers/condiment/flour = 7, /obj/item/reagent_containers/condiment/rice = 7, /obj/item/reagent_containers/condiment/ketchup = 7, + /obj/item/reagent_containers/condiment/mustard = 7, /obj/item/reagent_containers/condiment/enzyme = 7, /obj/item/reagent_containers/condiment/soymilk = 7, /obj/item/kitchen/spoon/soup_ladle = 6, diff --git a/code/modules/jobs/job_types/coroner.dm b/code/modules/jobs/job_types/coroner.dm index ddb1ad7e83f3..150d029d35cd 100644 --- a/code/modules/jobs/job_types/coroner.dm +++ b/code/modules/jobs/job_types/coroner.dm @@ -12,7 +12,8 @@ outfit = /datum/outfit/job/coroner plasmaman_outfit = /datum/outfit/plasmaman/coroner - mind_traits = list(TRAIT_MORBID, MEDICAL_MIND_TRAITS) + mind_traits = list(TRAIT_MORBID) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_CORONER_METABOLISM) paycheck = PAYCHECK_CREW diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index e56225c42a1a..4926749c6367 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -22,7 +22,7 @@ paycheck = PAYCHECK_CREW paycheck_department = ACCOUNT_SEC - mind_traits = list(SECURITY_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_DETECTIVE diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index 4fcad1b97af9..936028f86f01 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -23,7 +23,8 @@ /datum/job_department/command, ) - mind_traits = list(HEAD_OF_STAFF_MIND_TRAITS, SECURITY_MIND_TRAITS) + mind_traits = list(HEAD_OF_STAFF_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM, TRAIT_ROYAL_METABOLISM) paycheck = PAYCHECK_COMMAND diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index d7963faeedf2..f357bcac8aca 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -15,7 +15,7 @@ paycheck = PAYCHECK_CREW paycheck_department = ACCOUNT_MED - mind_traits = list(MEDICAL_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_MEDICAL_METABOLISM) display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 85aae2f1f945..ad9244333b87 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -15,7 +15,7 @@ paycheck = PAYCHECK_CREW paycheck_department = ACCOUNT_MED - mind_traits = list(MEDICAL_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_MEDICAL_METABOLISM) display_order = JOB_DISPLAY_ORDER_PARAMEDIC @@ -79,4 +79,3 @@ mask = /obj/item/clothing/mask/breath/medical r_pocket = /obj/item/flashlight/pen internals_slot = ITEM_SLOT_SUITSTORE - diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 78ea30f1fc16..06c78c25f1c7 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -19,7 +19,7 @@ paycheck = PAYCHECK_CREW paycheck_department = ACCOUNT_SEC - mind_traits = list(SECURITY_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) display_order = JOB_DISPLAY_ORDER_SECURITY_OFFICER diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index c759552c0497..bcc07dfd2d66 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -20,7 +20,7 @@ paycheck = PAYCHECK_CREW paycheck_department = ACCOUNT_SEC - mind_traits = list(SECURITY_MIND_TRAITS) + desensitized_base = DESENSITIZED_THRESHOLD liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM, TRAIT_PRETENDER_ROYAL_METABOLISM) display_order = JOB_DISPLAY_ORDER_WARDEN diff --git a/code/modules/language/_language_manuals.dm b/code/modules/language/_language_manuals.dm index 507d663ef869..9cb4cc19e036 100644 --- a/code/modules/language/_language_manuals.dm +++ b/code/modules/language/_language_manuals.dm @@ -45,10 +45,9 @@ /obj/item/language_manual/proc/use_charge(mob/user) charges-- if(!charges) - var/turf/T = get_turf(src) - T.visible_message(span_warning("The cover and contents of [src] start shifting and changing! It slips out of your hands!")) - - new /obj/item/book/manual/random(T) + user.visible_message(span_notice("The cover of [user]'s book start shifting and changing! It falls out of [user.p_their()] hands!"), + span_warning("The cover and contents of [src] start shifting and changing! It slips out of your hands!")) + new /obj/item/book/manual/random(get_turf(src)) qdel(src) /obj/item/language_manual/codespeak_manual diff --git a/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm b/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm index dee9f5d53c54..c025b21069a4 100644 --- a/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm +++ b/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm @@ -12,7 +12,7 @@ max_integrity = 100 /// list of emotes whose cd is overridden by this skillchip. can be edited in mapping or ingame var/list/affected_emotes = list("spin", "flip", "backflip") - var/datum/effect_system/spark_spread/sparks + var/datum/effect_system/basic/spark_spread/sparks /// you can use this without lowering integrity! let's be honest. nobody's doing that var/allowed_usage = 5 /// How many seconds does it take for it to recover one allowed usage @@ -49,7 +49,8 @@ take_damage(1, sound_effect = FALSE) if(!sparks) - sparks = new(src) + sparks = new(src, 5, FALSE) + sparks.attach(src) // minimum roll is by default capped at 50, with the min value lowering as integrity is reduced. var/mintegrity = clamp(50 - (100 - get_integrity()), 1, 100) @@ -84,8 +85,7 @@ // does not necessarily kill you directly. instead it causes cranial fissure + something to drop from your head. could be eyes, tongue, ears, brain, even implants new /obj/effect/gibspawner/generic(get_turf(bozo), bozo) - - sparks.set_up(15, cardinals_only = FALSE, location = get_turf(src)) + sparks.amount = 15 sparks.start() qdel(src) @@ -101,8 +101,7 @@ bozo.set_eye_blur_if_lower(10 SECONDS) // but the rest of the effects will happen either way bozo.adjust_organ_loss(ORGAN_SLOT_BRAIN, 20 - get_integrity()) - - sparks.set_up(5, cardinals_only = FALSE, location = get_turf(src)) + sparks.amount = 5 sparks.start() // brain Smoking. you should probably stop now @@ -142,8 +141,7 @@ particle_effect.set_particle_position(-2, 12, 0) bozo.apply_status_effect(/datum/status_effect/temperature_over_time/chip_overheat, 15 SECONDS) QDEL_IN(particle_effect, 15 SECONDS) - - sparks.set_up(10, cardinals_only = FALSE, location = get_turf(src)) + sparks.amount = 10 sparks.start() // hey, something isn't right... @@ -152,7 +150,7 @@ span_warning("[bozo]'s head sparks."), ) - sparks.set_up(rand(1,2), cardinals_only = TRUE, location = get_turf(src)) + sparks.amount = rand(1, 2) sparks.start() return COMPONENT_EMOTE_COOLDOWN_BYPASS diff --git a/code/modules/library/skill_learning/job_skillchips/_job.dm b/code/modules/library/skill_learning/job_skillchips/_job.dm index 23381d06066b..de3a75056273 100644 --- a/code/modules/library/skill_learning/job_skillchips/_job.dm +++ b/code/modules/library/skill_learning/job_skillchips/_job.dm @@ -2,5 +2,5 @@ skillchip_flags = SKILLCHIP_RESTRICTED_CATEGORIES chip_category = SKILLCHIP_CATEGORY_JOB incompatibility_list = list(SKILLCHIP_CATEGORY_JOB) - abstract_parent_type = /obj/item/skillchip/job + abstract_type = /obj/item/skillchip/job slot_use = 2 diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm index e4fce399a760..c00dd40878be 100644 --- a/code/modules/library/skill_learning/skillchip.dm +++ b/code/modules/library/skill_learning/skillchip.dm @@ -6,6 +6,10 @@ icon_state = "skillchip" custom_price = PAYCHECK_CREW * 3 w_class = WEIGHT_CLASS_SMALL + /// Used to determine if this is an abstract type or not. + /// If this is meant to be an abstract type, set it to the type's path. + /// Will be overridden by subsequent abstract parents. + abstract_type = /obj/item/skillchip /// Traits automatically granted by this chip, optional. Lazylist. var/list/auto_traits @@ -35,10 +39,6 @@ var/cooldown = 5 MINUTES /// Cooldown for chip actions. COOLDOWN_DECLARE(chip_cooldown) - /// Used to determine if this is an abstract type or not. - /// If this is meant to be an abstract type, set it to the type's path. - /// Will be overridden by subsequent abstract parents. - var/abstract_parent_type = /obj/item/skillchip /// Set to TRUE when the skill chip's effects are applied. Set to FALSE when they're not. var/active = FALSE /// Brain that holds this skillchip. diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm index defb470356c2..7f93eec9c93d 100644 --- a/code/modules/loadout/loadout_items.dm +++ b/code/modules/loadout/loadout_items.dm @@ -140,6 +140,10 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories()) allowed_configs += "[initial(item_path.greyscale_config_inhand_left)]" if(initial(item_path.greyscale_config_inhand_right)) allowed_configs += "[initial(item_path.greyscale_config_inhand_right)]" + // DARKPACK EDIT ADD START - ONFLOOR_ICONS + if(initial(item_path.greyscale_config_onfloor)) + allowed_configs += "[initial(item_path.greyscale_config_onfloor)]" + // DARKPACK EDIT ADD END var/datum/greyscale_modify_menu/menu = new( manager, diff --git a/code/modules/lootpanel/_lootpanel.dm b/code/modules/lootpanel/_lootpanel.dm index ab13a7c21167..f7cfab8d8cd4 100644 --- a/code/modules/lootpanel/_lootpanel.dm +++ b/code/modules/lootpanel/_lootpanel.dm @@ -38,9 +38,14 @@ ui.open() +/datum/lootpanel/ui_host(mob/user) + return source_turf + + /datum/lootpanel/ui_close(mob/user) . = ..() + UnregisterSignal(source_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON)) source_turf = null reset_contents() @@ -55,13 +60,6 @@ return data -/datum/lootpanel/ui_status(mob/user, datum/ui_state/state) - if(user.incapacitated) - return UI_DISABLED - - return UI_INTERACTIVE - - /datum/lootpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if(.) @@ -70,7 +68,5 @@ switch(action) if("grab") return grab(usr, params) - if("refresh") - return populate_contents() return FALSE diff --git a/code/modules/lootpanel/contents.dm b/code/modules/lootpanel/contents.dm index 2fcd4201d8a7..1fa72ae1372b 100644 --- a/code/modules/lootpanel/contents.dm +++ b/code/modules/lootpanel/contents.dm @@ -21,19 +21,38 @@ if(!istype(thing)) stack_trace("Non-atom in the contents of [source_turf]!") continue - if(QDELETED(thing)) - continue - if(thing.mouse_opacity == MOUSE_OPACITY_TRANSPARENT) - continue - if(thing.IsObscured()) - continue - if(thing.invisibility > owner.mob.see_invisible) - continue - // convert - var/datum/search_object/index = new(owner, thing) - add_to_index(index) + add_new_searchable(thing, FALSE) + + queue_update() + +/datum/lootpanel/proc/on_source_turf_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs) + SIGNAL_HANDLER + + // async because the same move handler we register with this can trigger on the /datum/search_object later in this event + // deleting it just as we added it + addtimer(CALLBACK(src, PROC_REF(add_new_searchable), arrived, TRUE), 0) + +/datum/lootpanel/proc/add_new_searchable(atom/movable/thing, from_signal) + if(QDELETED(thing)) + return + if(thing.mouse_opacity == MOUSE_OPACITY_TRANSPARENT) + return + if(thing.IsObscured()) + return + if(thing.invisibility > owner.mob.see_invisible) + return + if(from_signal && (!source_turf || !(thing in source_turf.contents))) + return + + // convert + var/datum/search_object/index = new(owner, thing) + add_to_index(index) + + if(from_signal) + queue_update() +/datum/lootpanel/proc/queue_update() var/datum/tgui/window = SStgui.get_open_ui(owner.mob, src) window?.send_update() diff --git a/code/modules/lootpanel/misc.dm b/code/modules/lootpanel/misc.dm index 4fc3af2da29b..8f510cd43313 100644 --- a/code/modules/lootpanel/misc.dm +++ b/code/modules/lootpanel/misc.dm @@ -1,5 +1,10 @@ /// Helper to open the panel /datum/lootpanel/proc/open(turf/tile) + if (tile != source_turf) + if (source_turf) + UnregisterSignal(source_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON)) + RegisterSignals(tile, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON), PROC_REF(on_source_turf_entered)) + source_turf = tile #if !defined(OPENDREAM) && !defined(UNIT_TESTS) diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm index 84e74858c2a4..0674ff97cb83 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm @@ -91,7 +91,6 @@ icon_state = "puddle-oil" capacity = 20 dispensedreagent = /datum/reagent/fuel/oil - pixel_shift = 0 /obj/structure/sink/oil_well/Initialize(mapload) . = ..() @@ -99,34 +98,30 @@ //Thankfully, the user can cast the line from a distance. AddComponent(/datum/component/fishing_spot, /datum/fish_source/oil_well) +/obj/structure/sink/oil_well/find_and_mount_on_atom(mark_for_late_init, late_init) + ///Oil wells exist indepent of any wall structure + return FALSE + /obj/structure/sink/oil_well/attack_hand(mob/user, list/modifiers) flick("puddle-oil-splash",src) reagents.expose(user, TOUCH, 20) //Covers target in 20u of oil. to_chat(user, span_notice("You touch the pool of oil, only to get oil all over yourself. It would be wise to wash this off with water.")) -/obj/structure/sink/oil_well/attackby(obj/item/O, mob/living/user, list/modifiers, list/attack_modifiers) +/obj/structure/sink/oil_well/wrench_act(mob/living/user, obj/item/tool) + //we deconstruct with a shovel + return NONE + +/obj/structure/sink/oil_well/item_interaction(mob/living/user, obj/item/tool, list/modifiers) flick("puddle-oil-splash",src) - if(O.tool_behaviour == TOOL_SHOVEL) //attempt to deconstruct the puddle with a shovel + if(tool.tool_behaviour == TOOL_SHOVEL) //attempt to deconstruct the puddle with a shovel to_chat(user, "You fill in the oil well with soil.") - O.play_tool_sound(src) - deconstruct() - return 1 - if(is_reagent_container(O)) //Refilling bottles with oil - var/obj/item/reagent_containers/RG = O - if(RG.is_refillable()) - if(!RG.reagents.holder_full()) - RG.reagents.add_reagent(dispensedreagent, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - to_chat(user, span_notice("You fill [RG] from [src].")) - return TRUE - to_chat(user, span_notice("\The [RG] is full.")) - return FALSE - if(!user.combat_mode) - to_chat(user, span_notice("You won't have any luck getting \the [O] out if you drop it in the oil.")) - return 1 - else - return ..() + tool.play_tool_sound(src) + deconstruct(TRUE) + return ITEM_INTERACT_SUCCESS + + return ..() -/obj/structure/sink/oil_well/drop_materials() +/obj/structure/sink/oil_well/atom_deconstruct(dissambled = TRUE) new /obj/effect/decal/cleanable/blood/oil(loc) //***Grave mounds. diff --git a/code/modules/meteors/meteor_dark_matteor.dm b/code/modules/meteors/meteor_dark_matteor.dm index acf21a3c434b..051f53c412d7 100644 --- a/code/modules/meteors/meteor_dark_matteor.dm +++ b/code/modules/meteors/meteor_dark_matteor.dm @@ -14,7 +14,7 @@ /// distortion to really give you that sense of oh shit var/atom/movable/warp_effect/warp /// and another oh shit in the form of quantum sparks - var/datum/effect_system/spark_spread/quantum/spark_system + var/datum/effect_system/basic/spark_spread/quantum/spark_system /// in case we miss, we can go back to the previous security level var/previous_security_level @@ -26,8 +26,7 @@ SSsecurity_level.set_level(SEC_LEVEL_RED) warp = new(src) vis_contents += warp - spark_system = new /datum/effect_system/spark_spread/quantum() - spark_system.set_up(4, TRUE, src) + spark_system = new /datum/effect_system/basic/spark_spread/quantum(src, 4, TRUE) spark_system.attach(src) START_PROCESSING(SSobj, src) diff --git a/code/modules/mining/equipment/miningradio.dm b/code/modules/mining/equipment/miningradio.dm index 61d80bfce6fa..69da0ada1af2 100644 --- a/code/modules/mining/equipment/miningradio.dm +++ b/code/modules/mining/equipment/miningradio.dm @@ -19,5 +19,6 @@ state_normal = "weatherwarning", \ state_warning = "urgentwarning", \ state_danger = "direwarning", \ + radar_z_trait = ZTRAIT_MINING, \ ) set_frequency(FREQ_SUPPLY) diff --git a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm index 27729c240313..b76bcaba2ebe 100644 --- a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm +++ b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm @@ -47,7 +47,7 @@ /// Make a cloud which applies brimdust to everyone nearby /obj/item/organ/monster_core/brimdust_sac/on_triggered_internal() var/turf/origin_turf = get_turf(owner) - do_smoke(range = 2, holder = owner, location = origin_turf, smoke_type = /obj/effect/particle_effect/fluid/smoke/bad/brimdust) + do_smoke(2, owner, origin_turf, effect_type = /obj/effect/particle_effect/fluid/smoke/bad/brimdust) /// Smoke which applies brimdust to you, and is also bad for your lungs /obj/effect/particle_effect/fluid/smoke/bad/brimdust diff --git a/code/modules/mob/living/basic/basic_defense.dm b/code/modules/mob/living/basic/basic_defense.dm index b4100a73cc16..636021dac1ac 100644 --- a/code/modules/mob/living/basic/basic_defense.dm +++ b/code/modules/mob/living/basic/basic_defense.dm @@ -21,8 +21,19 @@ if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, span_warning("You don't want to hurt [src]!")) return TRUE - var/obj/item/bodypart/arm/active_arm = user.get_active_hand() - var/damage = (basic_mob_flags & IMMUNE_TO_FISTS) ? 0 : rand(active_arm.unarmed_damage_low, active_arm.unarmed_damage_high) + + // DARKPACK EDIT CHANGE START - STORYTELLER_STATS + // ROLL TO HIT // DARKPACK TODO + // var/successes = SSroll.storyteller_roll(user.st_get_stat(STAT_DEXTERITY) + user.st_get_stat(STAT_BRAWL), 6, user) + // ROLL TO DAMAGE + var/damage_output + if(HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER)) + damage_output = user.st_get_stat(STAT_STRENGTH) + else + var/datum/storyteller_roll/damage/damage_roll = new() + damage_output = damage_roll.st_roll(user, src) + var/damage = (basic_mob_flags & IMMUNE_TO_FISTS) ? 0 : damage_output TTRPG_DAMAGE // DARKPACK EDIT CHANGE - STORYTELLER_STATS + // DARKPACK EDIT CHANGE END if(check_block(user, damage, "[user]'s punch", UNARMED_ATTACK, 0, BRUTE)) return user.do_attack_animation(src, ATTACK_EFFECT_PUNCH) diff --git a/code/modules/mob/living/basic/boss/blood_drunk_miner/_blood_drunk_miner.dm b/code/modules/mob/living/basic/boss/blood_drunk_miner/_blood_drunk_miner.dm index 16a7f6e4c173..7462974381e0 100644 --- a/code/modules/mob/living/basic/boss/blood_drunk_miner/_blood_drunk_miner.dm +++ b/code/modules/mob/living/basic/boss/blood_drunk_miner/_blood_drunk_miner.dm @@ -43,9 +43,7 @@ Difficulty: Medium victor_memory_type = /datum/memory/megafauna_slayer crusher_loot = list(/obj/item/crusher_trophy/miner_eye, /obj/item/knife/hunting/wildhunter) - - /// Loot dropped on death in normal circumstances - var/list/regular_loot = list(/obj/item/melee/cleaving_saw, /obj/item/gun/energy/recharge/kinetic_accelerator) + regular_loot = list(/obj/item/melee/cleaving_saw, /obj/item/gun/energy/recharge/kinetic_accelerator) /// Their little saw var/obj/item/melee/cleaving_saw/miner/miner_saw @@ -71,7 +69,6 @@ Difficulty: Medium ai_controller.set_blackboard_key(BB_BDM_RANGED_ATTACK_COOLDOWN, ranged_attack_cooldown_duration) RegisterSignals(ai_controller, list(AI_CONTROLLER_BEHAVIOR_QUEUED(/datum/ai_behavior/basic_melee_attack), AI_CONTROLLER_BEHAVIOR_QUEUED(/datum/ai_behavior/targeted_mob_ability)), PROC_REF(handle_saw_transformation)) - AddElement(/datum/element/death_drops, string_list(regular_loot)) RegisterSignal(src, COMSIG_LIVING_DROP_LOOT, PROC_REF(death_effect)) AddComponent(/datum/component/boss_music, 'sound/music/boss/bdm_boss.ogg', COMSIG_AI_BLACKBOARD_KEY_SET(BB_BASIC_MOB_CURRENT_TARGET)) diff --git a/code/modules/mob/living/basic/boss/boss.dm b/code/modules/mob/living/basic/boss/boss.dm index bf3b4676f582..5db790bd9583 100644 --- a/code/modules/mob/living/basic/boss/boss.dm +++ b/code/modules/mob/living/basic/boss/boss.dm @@ -23,6 +23,8 @@ /// What crusher trophy/trophies this mob drops, if any /// Should be wrapped in a list for sanity when we pass it to the element. var/list/crusher_loot = null + /// Loot dropped on death in normal circumstances + var/list/regular_loot = list() /// What achievements do we give our defeater? var/list/achievements = null @@ -40,6 +42,7 @@ add_traits(list(TRAIT_NO_TELEPORT, TRAIT_MARTIAL_ARTS_IMMUNE, TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE, TRAIT_NO_FLOATING_ANIM), MEGAFAUNA_TRAIT) AddComponent(/datum/component/seethrough_mob) AddElement(/datum/element/simple_flying) + AddElement(/datum/element/death_drops, string_list(regular_loot)) handle_crusher_loot() handle_achievements() diff --git a/code/modules/mob/living/basic/bots/cleanbot/cleanbot_abilities.dm b/code/modules/mob/living/basic/bots/cleanbot/cleanbot_abilities.dm index 9c334b413389..0073f472e5d3 100644 --- a/code/modules/mob/living/basic/bots/cleanbot/cleanbot_abilities.dm +++ b/code/modules/mob/living/basic/bots/cleanbot/cleanbot_abilities.dm @@ -29,8 +29,6 @@ /datum/action/cooldown/mob_cooldown/bot/foam/Activate(mob/living/firer, atom/target) owner.visible_message(span_danger("[owner] whirs and bubbles violently, before releasing a plume of froth!")) - var/datum/effect_system/fluid_spread/foam/foam = new - foam.set_up(foam_range, holder = owner, location = owner.loc) - foam.start() + do_foam(foam_range, owner, owner.loc) StartCooldown() return TRUE diff --git a/code/modules/mob/living/basic/bots/firebot/firebot.dm b/code/modules/mob/living/basic/bots/firebot/firebot.dm index b6ef076c6293..b49aa011bbbf 100644 --- a/code/modules/mob/living/basic/bots/firebot/firebot.dm +++ b/code/modules/mob/living/basic/bots/firebot/firebot.dm @@ -134,9 +134,7 @@ /mob/living/basic/bot/firebot/atmos_expose(datum/gas_mixture/air, exposed_temperature) if(!COOLDOWN_FINISHED(src, foam_cooldown)) return - var/datum/effect_system/fluid_spread/foam/firefighting/foam = new - foam.set_up(3, holder = src, location = loc) - foam.start() + do_foam(3, src, loc, foam_type = /datum/effect_system/fluid_spread/foam/firefighting) COOLDOWN_START(src, foam_cooldown, FOAM_INTERVAL) /mob/living/basic/bot/firebot/proc/spray_water(atom/attacked_atom, list/modifiers) diff --git a/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm b/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm index eb4dd4565fd2..4c8d04c63913 100644 --- a/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm +++ b/code/modules/mob/living/basic/bots/hygienebot/hygienebot.dm @@ -68,9 +68,7 @@ RegisterSignal(src, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_attack)) /mob/living/basic/bot/hygienebot/explode() - var/datum/effect_system/fluid_spread/foam/foam = new - foam.set_up(2, holder = src, location = loc) - foam.start() + do_foam(2, src, loc) return ..() /mob/living/basic/bot/hygienebot/generate_speak_list() diff --git a/code/modules/mob/living/basic/farm_animals/chicken/chick.dm b/code/modules/mob/living/basic/farm_animals/chicken/chick.dm index cc9b33d3e803..3c888145005a 100644 --- a/code/modules/mob/living/basic/farm_animals/chicken/chick.dm +++ b/code/modules/mob/living/basic/farm_animals/chicken/chick.dm @@ -34,6 +34,7 @@ var/grow_as = /mob/living/basic/chicken /datum/emote/chick + abstract_type = /datum/emote/chick mob_type_allowed_typecache = /mob/living/basic/chick mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm b/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm index 0032353dca31..533f1c1a75b3 100644 --- a/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm +++ b/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm @@ -39,6 +39,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) var/fertile = TRUE /datum/emote/chicken + abstract_type = /datum/emote/chicken mob_type_allowed_typecache = /mob/living/basic/chicken mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/farm_animals/cow/_cow.dm b/code/modules/mob/living/basic/farm_animals/cow/_cow.dm index 72d1d892e623..d55869f751dc 100644 --- a/code/modules/mob/living/basic/farm_animals/cow/_cow.dm +++ b/code/modules/mob/living/basic/farm_animals/cow/_cow.dm @@ -37,6 +37,7 @@ var/milked_reagent = /datum/reagent/consumable/milk /datum/emote/cow + abstract_type = /datum/emote/cow mob_type_allowed_typecache = /mob/living/basic/cow mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/farm_animals/cow/cow_wisdom.dm b/code/modules/mob/living/basic/farm_animals/cow/cow_wisdom.dm index 674077dbc281..4452ae3100f2 100644 --- a/code/modules/mob/living/basic/farm_animals/cow/cow_wisdom.dm +++ b/code/modules/mob/living/basic/farm_animals/cow/cow_wisdom.dm @@ -44,7 +44,7 @@ if(!stat && !user.combat_mode) to_chat(user, span_nicegreen("[src] whispers you some intense wisdoms and then disappears!")) user.mind?.adjust_experience(granted_wisdom, granted_experience) - do_smoke(1, holder = src, location = get_turf(src)) + do_smoke(1, src, get_turf(src)) qdel(src) return return ..() diff --git a/code/modules/mob/living/basic/farm_animals/gorilla/gorilla_emotes.dm b/code/modules/mob/living/basic/farm_animals/gorilla/gorilla_emotes.dm index 063e6bfb6599..41aea3b7f72a 100644 --- a/code/modules/mob/living/basic/farm_animals/gorilla/gorilla_emotes.dm +++ b/code/modules/mob/living/basic/farm_animals/gorilla/gorilla_emotes.dm @@ -1,4 +1,5 @@ /datum/emote/gorilla + abstract_type = /datum/emote/gorilla mob_type_allowed_typecache = /mob/living/basic/gorilla mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/farm_animals/pig.dm b/code/modules/mob/living/basic/farm_animals/pig.dm index 7654933c0d0f..6762c7badf7e 100644 --- a/code/modules/mob/living/basic/farm_animals/pig.dm +++ b/code/modules/mob/living/basic/farm_animals/pig.dm @@ -29,6 +29,7 @@ ai_controller = /datum/ai_controller/basic_controller/pig /datum/emote/pig + abstract_type = /datum/emote/pig mob_type_allowed_typecache = /mob/living/basic/pig mob_type_blacklist_typecache = list() @@ -39,6 +40,7 @@ emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE vary = TRUE sound = SFX_PIG_OINK + /mob/living/basic/pig/Initialize(mapload) . = ..() AddElement(/datum/element/pet_bonus, "oink") diff --git a/code/modules/mob/living/basic/farm_animals/pony.dm b/code/modules/mob/living/basic/farm_animals/pony.dm index 6598b70606c1..0989fabae0ff 100644 --- a/code/modules/mob/living/basic/farm_animals/pony.dm +++ b/code/modules/mob/living/basic/farm_animals/pony.dm @@ -34,6 +34,7 @@ var/list/ponycolors = list("#cc8c5d", "#cc8c5d") /datum/emote/pony + abstract_type = /datum/emote/pony mob_type_allowed_typecache = /mob/living/basic/pony mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/farm_animals/rabbit.dm b/code/modules/mob/living/basic/farm_animals/rabbit.dm index 6e1940f4a289..ca09405ca230 100644 --- a/code/modules/mob/living/basic/farm_animals/rabbit.dm +++ b/code/modules/mob/living/basic/farm_animals/rabbit.dm @@ -40,10 +40,11 @@ var/icon_prefix = "rabbit" /datum/emote/rabbit + abstract_type = /datum/emote/rabbit mob_type_allowed_typecache = /mob/living/basic/rabbit mob_type_blacklist_typecache = list() -/datum/emote/rabbit +/datum/emote/rabbit/hop key = "hop" key_third_person = "hops" message = "hops around happily!" diff --git a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm index 7a5cdef49eaa..c2c597dfd31b 100644 --- a/code/modules/mob/living/basic/lavaland/goliath/goliath.dm +++ b/code/modules/mob/living/basic/lavaland/goliath/goliath.dm @@ -96,7 +96,7 @@ . += span_info("Someone appears to have attached a saddle to this one.") // Goliaths can summon tentacles more frequently as they take damage, scary. -/mob/living/basic/mining/goliath/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item) +/mob/living/basic/mining/goliath/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item, wound_clothing) . = ..() if (. <= 0) return diff --git a/code/modules/mob/living/basic/lavaland/legion/legion.dm b/code/modules/mob/living/basic/lavaland/legion/legion.dm index 26c909186726..10878ac45a66 100644 --- a/code/modules/mob/living/basic/lavaland/legion/legion.dm +++ b/code/modules/mob/living/basic/lavaland/legion/legion.dm @@ -164,12 +164,13 @@ pixel_x = -16 sentience_type = SENTIENCE_BOSS has_emissive = FALSE + var/spawn_type = /mob/living/basic/mining/legion /mob/living/basic/mining/legion/large/Initialize(mapload) . = ..() AddComponent(\ /datum/component/spawner,\ - spawn_types = list(/mob/living/basic/mining/legion),\ + spawn_types = list(spawn_type),\ spawn_time = 20 SECONDS,\ max_spawned = 3,\ spawn_text = "peels itself off from",\ diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm index 640cdc103388..5c5107162cfb 100644 --- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm +++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm @@ -171,6 +171,7 @@ var/was_tamed = FALSE /datum/emote/lobstrosity_juvenile + abstract_type = /datum/emote/lobstrosity_juvenile mob_type_allowed_typecache = /mob/living/basic/mining/lobstrosity/juvenile mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/minebots/minebot_abilities.dm b/code/modules/mob/living/basic/minebots/minebot_abilities.dm index 95948b328f78..58ee70181c77 100644 --- a/code/modules/mob/living/basic/minebots/minebot_abilities.dm +++ b/code/modules/mob/living/basic/minebots/minebot_abilities.dm @@ -153,9 +153,7 @@ /obj/effect/temp_visual/falling_rocket/proc/create_explosion() playsound(src, 'sound/items/weapons/minebot_rocket.ogg', 100, FALSE) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(1, holder = src) - smoke.start() + do_smoke(1, src, loc) for(var/mob/living/living_target in oview(explosion_radius, src)) if(living_target.incorporeal_move) continue @@ -171,9 +169,7 @@ /obj/effect/mine/minebot/mineEffect(mob/living/victim) if(!istype(victim)) return - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src) - smoke.start() + do_smoke(0, src, loc) playsound(src, 'sound/effects/explosion/explosion3.ogg', 100) victim.apply_damage(damage_to_apply) diff --git a/code/modules/mob/living/basic/pets/cat/cat.dm b/code/modules/mob/living/basic/pets/cat/cat.dm index aea56dbf8788..560d61af23c2 100644 --- a/code/modules/mob/living/basic/pets/cat/cat.dm +++ b/code/modules/mob/living/basic/pets/cat/cat.dm @@ -69,6 +69,7 @@ /datum/emote/cat + abstract_type = /datum/emote/cat mob_type_allowed_typecache = /mob/living/basic/pet/cat mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/pets/dog/_dog.dm b/code/modules/mob/living/basic/pets/dog/_dog.dm index 2a92ee494ecd..b9cdb078cfac 100644 --- a/code/modules/mob/living/basic/pets/dog/_dog.dm +++ b/code/modules/mob/living/basic/pets/dog/_dog.dm @@ -92,6 +92,7 @@ // DARKPACK EDIT ADD END /datum/emote/dog + abstract_type = /datum/emote/dog mob_type_allowed_typecache = /mob/living/basic/pet/dog mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/pets/fox.dm b/code/modules/mob/living/basic/pets/fox.dm index 88dd9d5342b3..16b3b6662175 100644 --- a/code/modules/mob/living/basic/pets/fox.dm +++ b/code/modules/mob/living/basic/pets/fox.dm @@ -39,6 +39,7 @@ ) /datum/emote/fox + abstract_type = /datum/emote/fox mob_type_allowed_typecache = /mob/living/basic/pet/fox mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/pets/penguin/penguin.dm b/code/modules/mob/living/basic/pets/penguin/penguin.dm index 9e0be0681619..beb9fab31db7 100644 --- a/code/modules/mob/living/basic/pets/penguin/penguin.dm +++ b/code/modules/mob/living/basic/pets/penguin/penguin.dm @@ -20,6 +20,7 @@ var/obj/carried_egg /datum/emote/penguin + abstract_type = /datum/emote/penguin mob_type_allowed_typecache = /mob/living/basic/pet/penguin mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/pets/sloth.dm b/code/modules/mob/living/basic/pets/sloth.dm index fac460da7323..a6d6b4f6a479 100644 --- a/code/modules/mob/living/basic/pets/sloth.dm +++ b/code/modules/mob/living/basic/pets/sloth.dm @@ -38,6 +38,7 @@ GLOBAL_DATUM(cargo_sloth, /mob/living/basic/sloth) ai_controller = /datum/ai_controller/basic_controller/sloth /datum/emote/sloth + abstract_type = /datum/emote/sloth mob_type_allowed_typecache = /mob/living/basic/sloth mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/slime/emote.dm b/code/modules/mob/living/basic/slime/emote.dm index 617d33b9809c..ca72f726d656 100644 --- a/code/modules/mob/living/basic/slime/emote.dm +++ b/code/modules/mob/living/basic/slime/emote.dm @@ -1,4 +1,5 @@ /datum/emote/slime + abstract_type = /datum/emote/slime mob_type_allowed_typecache = /mob/living/basic/slime mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm index dd6c2bd112bc..91a508b87cd8 100644 --- a/code/modules/mob/living/basic/slime/slime.dm +++ b/code/modules/mob/living/basic/slime/slime.dm @@ -157,7 +157,7 @@ /mob/living/basic/slime/random /mob/living/basic/slime/random/Initialize(mapload, new_colour, new_life_stage) - return ..(mapload, null, prob(50) ? SLIME_LIFE_STAGE_ADULT : SLIME_LIFE_STAGE_BABY) + return ..(mapload, SLIME_TYPE_RANDOM, prob(50) ? SLIME_LIFE_STAGE_ADULT : SLIME_LIFE_STAGE_BABY) ///Friendly docile subtype /mob/living/basic/slime/pet @@ -197,10 +197,11 @@ if(slime_type.transparent) alpha = SLIME_TRANSPARENCY_ALPHA + icon_living = "[slime_type.colour]-[life_stage]" icon_dead = !cores ? "[slime_type.colour]-cut" : "[slime_type.colour]-[life_stage]-dead" if(stat != DEAD) - icon_state = "[slime_type.colour]-[life_stage]" + icon_state = icon_living if(current_mood && current_mood != SLIME_MOOD_NONE && !stat) add_overlay("aslime-[current_mood]") else @@ -273,8 +274,8 @@ /// Sets the slime's type, name and its icons. /// If not provided with a type it will instead be random -/mob/living/basic/slime/proc/set_slime_type(new_type = null) - if(isnull(new_type)) +/mob/living/basic/slime/proc/set_slime_type(new_type = SLIME_TYPE_RANDOM) + if(new_type == SLIME_TYPE_RANDOM) new_type = pick(subtypesof(/datum/slime_type)) slime_type = possible_slime_types[new_type] diff --git a/code/modules/mob/living/basic/space_fauna/ant.dm b/code/modules/mob/living/basic/space_fauna/ant.dm index 60b91c5dcc21..5dc63c95d5a1 100644 --- a/code/modules/mob/living/basic/space_fauna/ant.dm +++ b/code/modules/mob/living/basic/space_fauna/ant.dm @@ -37,6 +37,7 @@ ai_controller = /datum/ai_controller/basic_controller/ant /datum/emote/ant + abstract_type = /datum/emote/ant mob_type_allowed_typecache = /mob/living/basic/ant mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp.dm b/code/modules/mob/living/basic/space_fauna/carp/carp.dm index 1bfb0071fa35..ea679a382350 100644 --- a/code/modules/mob/living/basic/space_fauna/carp/carp.dm +++ b/code/modules/mob/living/basic/space_fauna/carp/carp.dm @@ -84,6 +84,7 @@ )) /datum/emote/carp + abstract_type = /datum/emote/carp mob_type_allowed_typecache = /mob/living/basic/carp mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm index c484a8b977c1..e04649353ffc 100644 --- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm +++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_abilities.dm @@ -119,9 +119,7 @@ continue light.visible_message(span_boldwarning("[light] suddenly flares brightly and begins to spark!")) - var/datum/effect_system/spark_spread/light_sparks = new /datum/effect_system/spark_spread() - light_sparks.set_up(4, 0, light) - light_sparks.start() + do_sparks(4, FALSE, light) new /obj/effect/temp_visual/revenant(get_turf(light)) addtimer(CALLBACK(src, PROC_REF(overload_shock), light, caster), 2 SECONDS) diff --git a/code/modules/mob/living/basic/space_fauna/roro.dm b/code/modules/mob/living/basic/space_fauna/roro.dm index 5cb306d62927..b9c4c9e759c2 100644 --- a/code/modules/mob/living/basic/space_fauna/roro.dm +++ b/code/modules/mob/living/basic/space_fauna/roro.dm @@ -37,6 +37,7 @@ ai_controller = /datum/ai_controller/basic_controller/simple/simple_retaliate /datum/emote/roro + abstract_type = /datum/emote/roro mob_type_allowed_typecache = /mob/living/basic/roro mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider.dm b/code/modules/mob/living/basic/space_fauna/spider/spider.dm index 9d3df866c551..8cf805697669 100644 --- a/code/modules/mob/living/basic/space_fauna/spider/spider.dm +++ b/code/modules/mob/living/basic/space_fauna/spider/spider.dm @@ -55,6 +55,7 @@ var/apply_spider_antag = TRUE /datum/emote/spider + abstract_type = /datum/emote/spider mob_type_allowed_typecache = /mob/living/basic/spider mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/vermin/lizard.dm b/code/modules/mob/living/basic/vermin/lizard.dm index 3d2d529697f6..3c5852699013 100644 --- a/code/modules/mob/living/basic/vermin/lizard.dm +++ b/code/modules/mob/living/basic/vermin/lizard.dm @@ -47,6 +47,7 @@ )) /datum/emote/lizard + abstract_type = /datum/emote/lizard mob_type_allowed_typecache = /mob/living/basic/lizard mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/vermin/mothroach/mothroach.dm b/code/modules/mob/living/basic/vermin/mothroach/mothroach.dm index 75508c3e5427..94acd65a3dac 100644 --- a/code/modules/mob/living/basic/vermin/mothroach/mothroach.dm +++ b/code/modules/mob/living/basic/vermin/mothroach/mothroach.dm @@ -42,6 +42,7 @@ ) /datum/emote/mothroach + abstract_type = /datum/emote/mothroach mob_type_allowed_typecache = /mob/living/basic/mothroach mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm index 05efcfc5cef3..698eb30c752c 100644 --- a/code/modules/mob/living/basic/vermin/mouse.dm +++ b/code/modules/mob/living/basic/vermin/mouse.dm @@ -45,6 +45,7 @@ ) /datum/emote/mouse + abstract_type = /datum/emote/mouse mob_type_allowed_typecache = /mob/living/basic/mouse mob_type_blacklist_typecache = list() diff --git a/code/modules/mob/living/blood_types.dm b/code/modules/mob/living/blood_types.dm index f9d84a4cc9d8..7335bd2204f1 100644 --- a/code/modules/mob/living/blood_types.dm +++ b/code/modules/mob/living/blood_types.dm @@ -349,6 +349,7 @@ // Ensures that lighter slimefolk look half-decent when wounded and bleeding /datum/blood_type/slime/get_wound_color(mob/living/carbon/victim) return victim.dna?.features?[FEATURE_MUTANT_COLOR] || get_color() + /datum/blood_type/slime/get_damage_color(mob/living/carbon/victim) return victim.dna?.features?[FEATURE_MUTANT_COLOR] || get_color() diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 4864a5fb05eb..c4c9193d7de7 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -506,6 +506,7 @@ TRAIT_EXPERT_FISHER, // live off land, fish from river TRAIT_ROUGHRIDER, // ride beast, chase down prey, flee from danger TRAIT_BEAST_EMPATHY, // know the way of beast, calm with food + TRAIT_NECROPOLIS_WORSHIP, TRAIT_TACKLING_TAILED_DEFENDER, ) diff --git a/code/modules/mob/living/brain/emote.dm b/code/modules/mob/living/brain/emote.dm index c93e3acf4b24..443b578f3257 100644 --- a/code/modules/mob/living/brain/emote.dm +++ b/code/modules/mob/living/brain/emote.dm @@ -1,4 +1,5 @@ /datum/emote/brain + abstract_type = /datum/emote/brain mob_type_allowed_typecache = list(/mob/living/brain) mob_type_blacklist_typecache = list() emote_type = EMOTE_AUDIBLE diff --git a/code/modules/mob/living/carbon/alien/emote.dm b/code/modules/mob/living/carbon/alien/emote.dm index 774a69ee5042..0bd641ff3635 100644 --- a/code/modules/mob/living/carbon/alien/emote.dm +++ b/code/modules/mob/living/carbon/alien/emote.dm @@ -1,4 +1,5 @@ /datum/emote/living/alien + abstract_type = /datum/emote/living/alien mob_type_allowed_typecache = list(/mob/living/carbon/alien) /datum/emote/living/alien/gnarl diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e803ba657c91..501068d9defe 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -70,8 +70,8 @@ var/victim_stamathletics = victim_stamina + victim.st_get_stat(STAT_ATHLETICS) var/victim_keephigher = max(victim_stambrawl, victim_stamathletics) - var/attacker_roll = SSroll.storyteller_roll(dice = attacker_keephigher, difficulty = 6, numerical = TRUE) - var/victim_roll = SSroll.storyteller_roll(dice = victim_keephigher, difficulty = 6, mobs_to_show_output = list(victim), alert_atom = victim, numerical = TRUE) + var/attacker_roll = SSroll.storyteller_roll(dice = attacker_keephigher, difficulty = 6, roller = thrower, numerical = TRUE) + var/victim_roll = SSroll.storyteller_roll(dice = victim_keephigher, difficulty = 6, roller = victim, numerical = TRUE) if(victim_roll > attacker_roll) blocked = TRUE @@ -1360,3 +1360,18 @@ if(!CAN_HAVE_BLOOD(src)) return return dna?.blood_type + +/mob/living/carbon/update_nutrition() + . = ..() + // Force a weight update in case we're stasis'd and don't tick + if (HAS_TRAIT_FROM(src, TRAIT_FAT, OBESITY)) + if (overeatduration >= 200 SECONDS) + return + + to_chat(src, span_notice("You feel fit again!")) + remove_traits(list(TRAIT_FAT, TRAIT_OFF_BALANCE_TACKLER), OBESITY) + return + + if (overeatduration >= 200 SECONDS) + to_chat(src, span_danger("You suddenly feel blubbery!")) + add_traits(list(TRAIT_FAT, TRAIT_OFF_BALANCE_TACKLER), OBESITY) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 5dac58d31233..5dc3cbd7d705 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -30,9 +30,7 @@ /mob/living/carbon/get_ear_protection(ignore_deafness = FALSE) var/obj/item/organ/ears/ears = get_organ_slot(ORGAN_SLOT_EARS) - if(!ears) - return INFINITY - return ..() + ears.bang_protect + return ..() + ears?.bang_protect /mob/living/carbon/is_mouth_covered(check_flags = ALL) if((check_flags & ITEM_SLOT_HEAD) && head && (head.flags_cover & HEADCOVERSMOUTH)) @@ -535,15 +533,6 @@ if(hit_clothes) hit_clothes.take_damage(damage_amount, damage_type, damage_flag, 0) -/mob/living/carbon/can_hear() - . = FALSE - var/obj/item/organ/ears/ears = get_organ_slot(ORGAN_SLOT_EARS) - if(ears && !HAS_TRAIT(src, TRAIT_DEAF)) - . = TRUE - if(health <= hardcrit_threshold && !HAS_TRAIT(src, TRAIT_NOHARDCRIT)) - . = FALSE - - /mob/living/carbon/adjust_oxy_loss(amount, updating_health = TRUE, forced, required_biotype, required_respiration_type) if(!forced && HAS_TRAIT(src, TRAIT_NOBREATH)) amount = min(amount, 0) //Prevents oxy damage but not healing diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 19d5039de929..2a39bb6ab162 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -295,7 +295,6 @@ continue if(isnull(damage_overlay) && (iter_part.brutestate || iter_part.burnstate)) damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "blank", -DAMAGE_LAYER, appearance_flags = KEEP_TOGETHER) - damage_overlay.color = iter_part.damage_overlay_color if(iter_part.brutestate) var/mutable_appearance/blood_damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "[iter_part.dmg_overlay_type]_[iter_part.body_zone]_[iter_part.brutestate]0", appearance_flags = RESET_COLOR) //we're adding icon_states of the base image as overlays blood_damage_overlay.color = get_bloodtype()?.get_damage_color(src) @@ -548,6 +547,11 @@ . += "[husk_type]" . += "-husk" . += "-[body_zone]" + var/list/blood_dna = blood_dna_info || owner?.get_blood_dna_list() + if (LAZYLEN(blood_dna)) + . += "-[get_color_from_blood_list(blood_dna)]" + else + . += "-[BLOOD_COLOR_RED]" if(ishuman(owner)) var/mob/living/carbon/human/human_owner = owner . += "-[human_owner.mob_height]" diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index b226427dfb55..b1f790814140 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -1,4 +1,5 @@ /datum/emote/living/carbon + abstract_type = /datum/emote/living/carbon mob_type_allowed_typecache = list(/mob/living/carbon) /datum/emote/living/carbon/airguitar diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 10c45dbdc39b..4d79a1b841e4 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -185,7 +185,7 @@ if(-INFINITY to BLOOD_VOLUME_BAD) . += span_deadsay("[t_He] resemble[p_s()] a crushed, empty juice pouch.") - . += display_darkpack_examine_text() // DARKPACK EDIT ADD + . += display_darkpack_examine_text(user) // DARKPACK EDIT ADD if(is_bleeding()) var/list/obj/item/bodypart/bleeding_limbs = list() diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 914d894b6446..4c2a0e8ab5ac 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -814,24 +814,20 @@ GLOBAL_LIST_EMPTY(features_by_species) //Someone in a grapple is much more vulnerable to being harmed by punches. var/grappled = (target.pulledby && target.pulledby.grab_state >= GRAB_AGGRESSIVE) - // Our lower and upper unarmed damage values. Damage is rolled between these two values. - var/lower_unarmed_damage = attacking_bodypart.unarmed_damage_low - var/upper_unarmed_damage = attacking_bodypart.unarmed_damage_high - - // The presence of TRAIT_STRENGTH increases our upper unarmed damage. This is a damage cap increase. - upper_unarmed_damage += HAS_TRAIT(user, TRAIT_STRENGTH) ? 2 : 0 - - // DARKPACK EDIT ADD - Storyteller Stats - var/damage_multiplier = 1 + ((user.st_get_stat(STAT_STRENGTH) - 2) / 5) - upper_unarmed_damage *= damage_multiplier - // DARKPACK EDIT ADD - Storyteller Stats - - // Out athletics skill is used to set our potential base damage roll. It won't increase our potential damage roll, but will make our unarmed attack more consistent. - // For a normal human arm, this would cap at 10, and for a normal human leg, this would go up to 14. - lower_unarmed_damage = min(lower_unarmed_damage + user.st_get_stat(STAT_BRAWL), upper_unarmed_damage) // DARKPACK EDIT CHANGE - STORYTELLER_STATS + // DARKPACK EDIT CHANGE START - STORYTELLER_STATS + // ROLL TO HIT // DARKPACK TODO + // var/successes = SSroll.storyteller_roll(user.st_get_stat(STAT_DEXTERITY) + user.st_get_stat(STAT_BRAWL), 6, list(user), user) + // ROLL TO DAMAGE + var/damage_output + if(HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER)) + damage_output = user.st_get_stat(STAT_STRENGTH) + else + var/datum/storyteller_roll/damage/damage_roll = new() + damage_output = damage_roll.st_roll(user, target) + // DARKPACK EDIT CHANGE END // The actual damage roll. May still be augmented by further factors. - var/damage = rand(lower_unarmed_damage, upper_unarmed_damage) + var/damage = damage_output TTRPG_DAMAGE // DARKPACK EDIT CHANGE - STORYTELLER_STATS // Limb accuracy is used to determine miss probabilities (higher the value, the less likely you are to miss), armor penetration (if entitled) and the possible result from a stagger combo hit. var/limb_accuracy = attacking_bodypart.unarmed_effectiveness // Limb sharpness determines the type of wounds this unarmed strike could possibly roll. By default, most limbs are blunt and have no sharpness. @@ -873,7 +869,7 @@ GLOBAL_LIST_EMPTY(features_by_species) var/obj/item/bodypart/affecting = target.get_bodypart(hit_zone) var/miss_chance = 100//calculate the odds that a punch misses entirely. considers stamina and brute damage of the puncher. punches miss by default to prevent weird cases - if(lower_unarmed_damage) + if(damage) // DARKPACK EDIT CHANGE - STORYTELLER_STATS if((target.body_position == LYING_DOWN) || HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER) || staggered || user_drunkenness && HAS_TRAIT(user, TRAIT_DRUNKEN_BRAWLER)) //kicks and attacks against staggered targets never miss (provided your species deals more than 0 damage). Drunken brawlers while drunk also don't miss miss_chance = 0 else @@ -945,12 +941,12 @@ GLOBAL_LIST_EMPTY(features_by_species) SEND_SIGNAL(target, COMSIG_HUMAN_GOT_PUNCHED, user, damage, attack_type, affecting, final_armor_block, kicking, limb_sharpness) SEND_SIGNAL(user, COMSIG_HUMAN_PUNCHED, target, damage, attack_type, affecting, final_armor_block, kicking, limb_sharpness) - // DARKPACK EDIT ADD - Knockdown chance system from old harm proc + // DARKPACK EDIT ADD START - (Knockdown chance system from old harm proc) if((target.stat != DEAD) && (!target.IsKnockdown())) var/roll = SSroll.storyteller_roll( dice = user.st_get_stat(STAT_STRENGTH), difficulty = target.st_get_stat(STAT_DEXTERITY), - mobs_to_show_output = list(target, user)) + roller = user) if(roll == ROLL_SUCCESS) target.visible_message(span_danger("[user] knocks [target] down!"), \ @@ -959,7 +955,7 @@ GLOBAL_LIST_EMPTY(features_by_species) to_chat(user, span_danger("You knock [target] down!")) target.apply_effect(2 SECONDS, EFFECT_KNOCKDOWN, armor_block) log_combat(user, target, "got a stun punch with their previous punch") - // DARKPACK EDIT END + // DARKPACK EDIT ADD END // If our target is staggered and has sustained enough damage, we can apply a randomly determined status effect to inflict when we punch them. // The effects are based on the punching effectiveness of our attacker. Some effects are not reachable by the average human, and require augmentation to reach or being a species with a heavy punch effectiveness. diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index ba947e114e1c..7dc7906b2f9e 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -53,8 +53,10 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift) return readout /mob/living/carbon/human/proc/makeSkeleton() - ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC) set_species(/datum/species/skeleton) + var/obj/item/bodypart/head = get_bodypart(BODY_ZONE_HEAD) + if(head) + ADD_TRAIT(head, TRAIT_DISFIGURED, INNATE_TRAIT) return TRUE /mob/living/carbon/proc/Drain() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 61a9166a36bb..e8069416015a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -55,6 +55,8 @@ /mob/living/carbon/human/proc/setup_organless_effects() // All start without eyes, and get them via set species become_blind(NO_EYES) + // And no ears, and get them via set species + ADD_TRAIT(src, TRAIT_DEAF, NO_EARS) // Mobs cannot taste anything without a tongue; the tongue organ removes this on Insert ADD_TRAIT(src, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) @@ -64,7 +66,6 @@ /mob/living/carbon/human/Destroy() QDEL_NULL(physiology) GLOB.human_list -= src - GLOB.kindred_list -= src // DARKPACK EDIT ADD if (mob_mood) QDEL_NULL(mob_mood) @@ -801,10 +802,8 @@ if(!check_rights(R_SPAWN)) return var/list/options = list("Clear"="Clear") - for(var/type in subtypesof(/datum/quirk)) + for(var/type in valid_subtypesof(/datum/quirk)) var/datum/quirk/quirk_type = type - if(initial(quirk_type.abstract_parent_type) == type) - continue var/qname = initial(quirk_type.name) options[has_quirk(quirk_type) ? "[qname] (Remove)" : "[qname] (Add)"] = quirk_type var/result = input(usr, "Choose quirk to add/remove","Quirk Mod") as null|anything in sort_list(options) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 53e72908af09..fedc4d6e58cf 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -508,7 +508,7 @@ emote("scream") set_facial_hairstyle("Shaved", update = FALSE) set_hairstyle("Bald") //This calls update_body_parts() - ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC) + ADD_TRAIT(affecting, TRAIT_DISFIGURED, TRAIT_GENERIC) apply_damage(acidity * damage_mod, BRUTE, affecting) apply_damage(acidity * damage_mod * 2, BURN, affecting) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index f2721606a863..a5a3f700fac6 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -50,11 +50,11 @@ return signal_face // no need to null-check, because force_set will always set a signal_face var/face_name = isnull(signal_face) ? get_face_name() : signal_face // DARKPACK EDIT, ORIGINAL: var/face_name = isnull(signal_face) ? get_face_name("") : signal_face - var/id_name = isnull(signal_id) ? get_id_name("", honorifics = TRUE) : signal_id + var/id_name = isnull(signal_id) ? get_id_name("", honorifics = add_id_name) : signal_id // We need to account for real name if(force_real_name) - var/disguse_name = get_visible_name(add_id_name = TRUE, force_real_name = FALSE) + var/disguse_name = get_visible_name(add_id_name = add_id_name, force_real_name = FALSE) return "[real_name][disguse_name == real_name ? "" : " (as [disguse_name])"]" // We're just some unknown guy @@ -97,7 +97,7 @@ if(obscured_slots & HIDEFACE) return TRUE var/obj/item/bodypart/head = get_bodypart(BODY_ZONE_HEAD) - if(isnull(head) || HAS_TRAIT(src, TRAIT_DISFIGURED) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) //disfigured. use id-name if possible + if(isnull(head) || HAS_TRAIT(head, TRAIT_DISFIGURED) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) //disfigured. use id-name if possible return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm index de58a63183a7..923ec33f2128 100644 --- a/code/modules/mob/living/carbon/human/init_signals.dm +++ b/code/modules/mob/living/carbon/human/init_signals.dm @@ -14,7 +14,6 @@ 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)) //DARKPACK EDIT ADD START - POWERS - (Obfuscate Discipline) RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_OBFUSCATED), PROC_REF(make_invisible)) RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_OBFUSCATED), PROC_REF(make_visible)) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 4714ba39cb12..e32b3b53619e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -47,6 +47,10 @@ handle_liver(seconds_per_tick) // For special species interactions dna.species.spec_life(src, seconds_per_tick) + // DARKPACK EDIT ADD START - SPLATS + for(var/datum/splat/splat in splats) + splat.splat_life(seconds_per_tick) + // DARKPACK EDIT ADD END return stat != DEAD /mob/living/carbon/human/calculate_affecting_pressure(pressure) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index bd7fcd60bd18..2c9c1127edf2 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -267,7 +267,6 @@ if (!istype(detached_head)) return // It's so over detached_head.real_name = headless.real_name - detached_head.name = headless.real_name name = headless.real_name detached_head.voice = headless.voice detached_head.pitch = pitch diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index c34dba20112f..c87c52b52357 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -9,12 +9,14 @@ payday_modifier = 1.1 /datum/species/human/prepare_human_for_preview(mob/living/carbon/human/human) -// human.set_haircolor("#bb9966", update = FALSE) // brown // DARKPACK EDIT START + // DARKPACK EDIT CHANGE START + // human.set_haircolor("#bb9966", update = FALSE) // brown human.set_hairstyle("Bald", update = TRUE) human.set_facial_hairstyle("Beard (Goatee)", update = TRUE) human.set_facial_haircolor("#7E3F00") human.undershirt = "T-Shirt (Yellow)" - human.update_body() // DARKPACK EDIT END + human.update_body() + // DARKPACK EDIT CHANGE END /datum/species/human/get_scream_sound(mob/living/carbon/human/human) if(human.physique == MALE) diff --git a/code/modules/mob/living/carbon/init_signals.dm b/code/modules/mob/living/carbon/init_signals.dm index a46acd8c5201..da1cf59de617 100644 --- a/code/modules/mob/living/carbon/init_signals.dm +++ b/code/modules/mob/living/carbon/init_signals.dm @@ -141,3 +141,7 @@ SIGNAL_HANDLER cure_trauma_type(/datum/brain_trauma/severe/split_personality, TRAUMA_LIMIT_ABSOLUTE) + +/mob/living/carbon/on_hearing_loss(datum/source) + . = ..() + breathing_loop.stop() diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index e933de8ff40d..1e2c1942651c 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -26,16 +26,14 @@ if(.) //not dead handle_blood(seconds_per_tick) - if(stat != DEAD) + if(stat != DEAD) // still not dead (blood could have changed that) + for(var/key in mind?.addiction_points) + SSaddiction.all_addictions[key].process_addiction(src, seconds_per_tick) handle_brain_damage(seconds_per_tick) if(stat != DEAD) handle_bodyparts(seconds_per_tick) - if(. && mind) //. == not dead - for(var/key in mind.addiction_points) - var/datum/addiction/addiction = SSaddiction.all_addictions[key] - addiction.process_addiction(src, seconds_per_tick) if(stat != DEAD) return TRUE @@ -121,19 +119,13 @@ loc_as_obj.handle_internal_lifeform(src,0) if(check_breath(breath) && is_on_internals) - try_breathing_sound(breath) + // successful breath from internals, try to play the breathing sound + if(!HAS_TRAIT(src, TRAIT_DEAF) && client?.prefs?.read_preference(/datum/preference/toggle/sound_breathing)) + breathing_loop.start() if(breath) loc.assume_air(breath) -//Tries to play the carbon a breathing sound when using internals, also invokes check_breath -/mob/living/carbon/proc/try_breathing_sound(breath) - var/should_be_on = canon_client?.prefs?.read_preference(/datum/preference/toggle/sound_breathing) - if(should_be_on && !breathing_loop.timer_id && canon_client?.mob.can_hear()) - breathing_loop.start() - else if((!should_be_on && breathing_loop.timer_id) || !canon_client?.mob.can_hear()) - breathing_loop.stop() - /mob/living/carbon/proc/has_smoke_protection() if(HAS_TRAIT(src, TRAIT_NOBREATH)) return TRUE diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 3b85f8554b2e..61850f26f10a 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -144,23 +144,23 @@ * Simply a wrapper for calling mob adjustXLoss() procs to heal a certain damage type, * when you don't know what damage type you're healing exactly. */ -/mob/living/proc/heal_damage_type(heal_amount = 0, damagetype = BRUTE) +/mob/living/proc/heal_damage_type(heal_amount = 0, damagetype = BRUTE, update_health = TRUE) heal_amount = abs(heal_amount) * -1 switch(damagetype) if(BRUTE) - return adjust_brute_loss(heal_amount) + return adjust_brute_loss(heal_amount, update_health) if(BURN) - return adjust_fire_loss(heal_amount) + return adjust_fire_loss(heal_amount, update_health) if(TOX) - return adjust_tox_loss(heal_amount) + return adjust_tox_loss(heal_amount, update_health) if(OXY) - return adjust_oxy_loss(heal_amount) + return adjust_oxy_loss(heal_amount, update_health) if(STAMINA) - return adjust_stamina_loss(heal_amount) + return adjust_stamina_loss(heal_amount, update_health) // DARKPACK EDIT ADD START - AGGRAVATED_DAMAGE if(AGGRAVATED) - return adjust_agg_loss(heal_amount) + return adjust_agg_loss(heal_amount, update_health) // DARPACK EDIT ADD END /// return the damage amount for the type given @@ -569,12 +569,14 @@ updatehealth() ///heal up to amount damage, in a given order -/mob/living/proc/heal_ordered_damage(amount, list/damage_types) +/mob/living/proc/heal_ordered_damage(amount, list/damage_types, update_health = TRUE) . = 0 //we'll return the amount of damage healed for(var/damagetype in damage_types) var/amount_to_heal = min(abs(amount), get_current_damage_of_type(damagetype)) //heal only up to the amount of damage we have if(amount_to_heal) - . += heal_damage_type(amount_to_heal, damagetype) + . += heal_damage_type(amount_to_heal, damagetype, FALSE) amount -= amount_to_heal //remove what we healed from our current amount if(!amount) break + if(. && update_health) + updatehealth() diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index e87b425acd7c..80189ae49024 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -180,9 +180,13 @@ return for(var/mob/living/nearby in viewers(src)) - if(nearby.stat >= UNCONSCIOUS || nearby.is_blind()) + if(nearby == src || nearby.stat >= UNCONSCIOUS || nearby.is_blind()) continue nearby.add_mood_event("saw_death", /datum/mood_event/conditional/see_death, src, dusted, gibbed) + nearby.mind?.witnessed_death(src) + + if(!gibbed && !dusted) + mind?.experienced_death() /mob/living/silicon/send_death_moodlets(dusted = FALSE, gibbed = FALSE) return // You are a machine (Future todo, roboticists feel sad though) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index a5b546f9cdc1..bef9780b390e 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -1,6 +1,7 @@ /* EMOTE DATUMS */ /datum/emote/living + abstract_type = /datum/emote/living mob_type_allowed_typecache = /mob/living mob_type_blacklist_typecache = list(/mob/living/brain) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index a46f8ec02f71..cfb84489b996 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -754,7 +754,7 @@ add_traits(list(TRAIT_UI_BLOCKED, TRAIT_PULL_BLOCKED, TRAIT_UNDENSE), LYING_DOWN_TRAIT) if(HAS_TRAIT(src, TRAIT_FLOORED) && !(dir & (NORTH|SOUTH))) setDir(pick(NORTH, SOUTH)) // We are and look helpless. - if(rotate_on_lying) + if(rotate_on_lying && !HAS_TRAIT(src, TRAIT_NO_LYING_ANGLE)) // DARKPACK EDIT CHANGE - WEREWOLF add_offsets(LYING_DOWN_TRAIT, y_add = PIXEL_Y_OFFSET_LYING) /// Proc to append behavior related to lying down. @@ -1232,19 +1232,15 @@ //We only resist our grab state if we are currently in a grab equal to or greater than GRAB_AGGRESSIVE (1). Otherwise, break out immediately! if(effective_grab_state >= GRAB_AGGRESSIVE) // Grabber is the "action taker" so he is the "owner" - var/success = ROLL_SUCCESS - if(pulledby && isliving(pulledby)) - var/mob/living/living_puller = pulledby - success = SSroll.opposed_roll( - player_a = living_puller, - player_b = src, - dice_a = living_puller.st_get_stat(STAT_STRENGTH)+living_puller.st_get_stat(STAT_BRAWL), - dice_b = st_get_stat(STAT_DEXTERITY)+st_get_stat(STAT_BRAWL), - show_player_a = TRUE, - show_player_b = TRUE, - alert_atom = src, - draw_goes_to_b = TRUE - ) + var/success = ROLL_FAILURE + if(isliving(pulledby)) + var/datum/storyteller_roll/grappling/pulled_roll = new() + var/puller_result = pulled_roll.st_roll(pulledby, src) + var/datum/storyteller_roll/grappled/our_roll = new() + var/our_result = our_roll.st_roll(src, pulledby) + + if(puller_result > our_result) + success = ROLL_SUCCESS if(!success) visible_message(span_danger("[src] breaks free of [pulledby]'s grip!"), \ @@ -1259,7 +1255,7 @@ span_warning("You struggle as you fail to break free of [pulledby]'s grip!"), null, null, pulledby) to_chat(pulledby, span_danger("[src] struggles as they fail to break free of your grip!")) if(moving_resist && client) //we resisted by trying to move - client.move_delay = world.time + 4 SECONDS + client.move_delay = world.time + 1 TURNS else pulledby.stop_pulling() return FALSE @@ -1372,6 +1368,10 @@ return /mob/living/can_hold_items(obj/item/I) + // DARKPACK EDIT ADD START + if(I && (I.w_class <= WEIGHT_CLASS_SMALL) && HAS_TRAIT(src, TRAIT_SMALL_HANDS)) + return FALSE + // DARKPACK EDIT ADD END return ..() && HAS_TRAIT(src, TRAIT_CAN_HOLD_ITEMS) && usable_hands /mob/living/can_perform_action(atom/target, action_bitflags) @@ -2452,7 +2452,9 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(HARD_CRIT) if(stat != UNCONSCIOUS) cure_blind(UNCONSCIOUS_TRAIT) + REMOVE_TRAIT(src, TRAIT_DEAF, STAT_TRAIT) if(DEAD) + REMOVE_TRAIT(src, TRAIT_DEAF, STAT_TRAIT) remove_from_dead_mob_list() add_to_alive_mob_list() switch(stat) //Current stat. @@ -2480,17 +2482,14 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(. != UNCONSCIOUS) become_blind(UNCONSCIOUS_TRAIT) ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) + ADD_TRAIT(src, TRAIT_DEAF, STAT_TRAIT) log_combat(src, src, "entered hard crit") if(DEAD) REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT) + ADD_TRAIT(src, TRAIT_DEAF, STAT_TRAIT) remove_from_alive_mob_list() add_to_dead_mob_list() log_combat(src, src, "died") - if(!can_hear()) - stop_sound_channel(CHANNEL_AMBIENCE) - refresh_looping_ambience() - - ///Reports the event of the change in value of the buckled variable. /mob/living/proc/set_buckled(new_buckled) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index bafaeafe7d49..68bcf1fee298 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -142,7 +142,7 @@ apply_projectile_effects(proj, def_zone, blocked) /mob/living/proc/apply_projectile_effects(obj/projectile/proj, def_zone, armor_check) - apply_damage( + var/damage_dealt = apply_damage( damage = proj.damage, damagetype = proj.damage_type, def_zone = def_zone, @@ -154,6 +154,10 @@ attacking_item = proj, ) + if(proj.damage_type == BRUTE && damage_dealt >= 10 && proj.speed >= 1 && prob(0.1)) + var/obj/item/organ/brain/a_brain = locate() in get_bodypart(def_zone) + a_brain?.cure_trauma_type(resilience = TRAUMA_RESILIENCE_LOBOTOMY) + apply_effects( stun = proj.stun, knockdown = proj.knockdown, @@ -175,6 +179,10 @@ if (proj.damage && armor_check < 100) create_projectile_hit_effects(proj, def_zone, armor_check) + if(proj.fired_from) + SEND_SIGNAL(proj.fired_from, COMSIG_PROJECTILE_POST_HIT_LIVING, src, def_zone, armor_check) + SEND_SIGNAL(proj, COMSIG_PROJECTILE_SELF_POST_HIT_LIVING, src, def_zone, armor_check) + /mob/living/proc/create_projectile_hit_effects(obj/projectile/proj, def_zone, blocked) if (proj.damage_type != BRUTE) return @@ -473,7 +481,7 @@ if(.) return TRUE - if(!combat_mode && HAS_TRAIT(src, TRAIT_READY_TO_OPERATE) && user.perform_surgery(src)) + if(!user.combat_mode && HAS_TRAIT(src, TRAIT_READY_TO_OPERATE) && user.perform_surgery(src)) return TRUE return FALSE diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index c5acae150852..885647b905d0 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -321,7 +321,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( // But we can still see them speak if(speaker_is_signing) deaf_message = "[span_name("[speaker]")] [speaker.get_default_say_verb()] something, but the motions are too subtle to make out from afar." - else if(can_hear()) // If we can't hear we want to continue to the default deaf message + else if(!HAS_TRAIT(src, TRAIT_DEAF)) // If we can't hear we want to continue to the default deaf message if(isliving(speaker)) var/mob/living/living_speaker = speaker var/mouth_hidden = living_speaker.is_mouth_covered() || HAS_TRAIT(living_speaker, TRAIT_FACE_COVERED) @@ -375,7 +375,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( deaf_type = MSG_AUDIBLE // Since you should be able to hear yourself without looking // Create map text prior to modifying message for goonchat - if (use_runechat && can_hear()) + if (use_runechat && !HAS_TRAIT(src, TRAIT_DEAF)) if (message_mods[MODE_CUSTOM_SAY_ERASE_INPUT]) create_chat_message(speaker, null, message_mods[MODE_CUSTOM_SAY_EMOTE], spans, EMOTE_MESSAGE) else diff --git a/code/modules/mob/living/living_update_icons.dm b/code/modules/mob/living/living_update_icons.dm index 274a5a4f101d..e11457a49a23 100644 --- a/code/modules/mob/living/living_update_icons.dm +++ b/code/modules/mob/living/living_update_icons.dm @@ -8,7 +8,7 @@ var/final_dir = dir var/changed = FALSE - if(lying_angle != lying_prev && rotate_on_lying) + if(lying_angle != lying_prev && (rotate_on_lying && !HAS_TRAIT(src, TRAIT_NO_LYING_ANGLE))) // DARKPACK EDIT CHANGE - WEREWOLF changed = TRUE if(lying_angle && lying_prev == 0) if(current_translate) @@ -25,7 +25,7 @@ if(resize != RESIZE_DEFAULT_SIZE) changed = TRUE - var/is_vertical = !lying_angle || !rotate_on_lying + var/is_vertical = !lying_angle || !rotate_on_lying || HAS_TRAIT(src, TRAIT_NO_LYING_ANGLE) // DARKPACK EDIT CHANGE - WEREWOLF var/new_translation = get_transform_translation_size(resize * current_size) // scaling also affects translation, so we've to undo the old translate beforehand. if(is_vertical && current_translate) @@ -41,6 +41,14 @@ if(is_vertical && new_translation) ntransform.Translate(0, new_translation) + // DARKPACK EDIT ADD START - WEREWOLF + if(HAS_TRAIT(src, TRAIT_TRANSFORM_UPDATES_ICON)) + update_body() + update_damage_overlays() + // regenerate_icons, as much as it should be what is called, happens to call this, creating a infinite loop. + // regenerate_icons() + // DARKPACK EDIT ADD END + if(!changed) //Nothing has been changed, nothing has to be done. return FALSE diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 60cfb34eebb2..1075ee898ff9 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -57,8 +57,7 @@ INVOKE_ASYNC(src, PROC_REF(set_core_display_icon), null, client) - spark_system = new /datum/effect_system/spark_spread() - spark_system.set_up(5, 0, src) + spark_system = new /datum/effect_system/basic/spark_spread(src, 5, FALSE) spark_system.attach(src) add_verb(src, /mob/living/silicon/ai/proc/show_laws_verb) diff --git a/code/modules/mob/living/silicon/ai/ai_defines.dm b/code/modules/mob/living/silicon/ai/ai_defines.dm index 1dbf35d33421..6ffcd8bc66c8 100644 --- a/code/modules/mob/living/silicon/ai/ai_defines.dm +++ b/code/modules/mob/living/silicon/ai/ai_defines.dm @@ -172,4 +172,4 @@ /// Used as a fake multitool in tcomms machinery VAR_FINAL/obj/item/multitool/aiMulti /// Helper effect that creates sparks when the AI is damaged - VAR_FINAL/datum/effect_system/spark_spread/spark_system + VAR_FINAL/datum/effect_system/basic/spark_spread/spark_system diff --git a/code/modules/mob/living/silicon/ai/ai_say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm index 26f2cc2f64a5..88abc47ab378 100644 --- a/code/modules/mob/living/silicon/ai/ai_say.dm +++ b/code/modules/mob/living/silicon/ai/ai_say.dm @@ -171,7 +171,7 @@ // Play voice for all mobs in the z level for(var/mob/player_mob as anything in GLOB.player_list) var/pref_volume = safe_read_pref(player_mob.client, /datum/preference/numeric/volume/sound_ai_vox) - if(!player_mob.can_hear() || !pref_volume) + if(HAS_TRAIT(player_mob, TRAIT_DEAF) || !pref_volume) continue var/turf/player_turf = get_turf(player_mob) diff --git a/code/modules/mob/living/silicon/ai/emote.dm b/code/modules/mob/living/silicon/ai/emote.dm index c73a2b95c0d7..8779eb90c571 100644 --- a/code/modules/mob/living/silicon/ai/emote.dm +++ b/code/modules/mob/living/silicon/ai/emote.dm @@ -1,8 +1,9 @@ /datum/emote/ai + abstract_type = /datum/emote/ai mob_type_allowed_typecache = /mob/living/silicon/ai mob_type_blacklist_typecache = list() - +// This might be worth making an abstract type. /datum/emote/ai/emotion_display key = "blank" var/emotion = AI_EMOTION_BLANK diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index f304cbbc400d..27556eadc506 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -1,4 +1,5 @@ /datum/emote/silicon + abstract_type = /datum/emote/silicon trait_required = TRAIT_SILICON_EMOTES_ALLOWED emote_type = EMOTE_AUDIBLE diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 75cbaaa97aaf..176caf3f346f 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1,6 +1,5 @@ /mob/living/silicon/robot/Initialize(mapload) - spark_system = new /datum/effect_system/spark_spread() - spark_system.set_up(5, 0, src) + spark_system = new /datum/effect_system/basic/spark_spread(src, 5, FALSE) spark_system.attach(src) add_traits(list(TRAIT_CAN_STRIP, TRAIT_FORCED_STANDING, TRAIT_KNOW_ENGI_WIRES, TRAIT_IGNORE_SURGERY_MODIFIERS), INNATE_TRAIT) @@ -250,8 +249,7 @@ return if(!ion_trail) - ion_trail = new - ion_trail.set_up(src) + ion_trail = new(src) ionpulse_on = !ionpulse_on to_chat(src, span_notice("You [ionpulse_on ? null :"de"]activate your ion thrusters.")) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index e4af75d9025a..e32fb1d3c7ba 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -536,7 +536,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real . = 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) +/mob/living/silicon/robot/apply_damage(damage, damagetype, def_zone, blocked, forced, spread_damage, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item, wound_clothing) var/mob/living/silicon/robot/borg = src var/obj/item/shield_module/shield = locate() in borg if(!shield) diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index 8ae9d1cf0c6b..2cf30e5a5d92 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -116,7 +116,7 @@ ///Whether the robot has no charge left. var/low_power_mode = FALSE ///So they can initialize sparks whenever/N - var/datum/effect_system/spark_spread/spark_system + var/datum/effect_system/basic/spark_spread/spark_system ///Smoke particle type for brute damage var/smoke_particles ///Spark particle type for burn damage diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index b68e70589e26..86f50e6246ad 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -707,10 +707,7 @@ Pass a positive integer as an argument to override a bot's default speed. bot_reset() //Reset a bot before setting it to call mode. - //For giving the bot temporary all-access. This method is bad and makes me feel bad. Refactoring access to a component is for another PR. - //Easier then building the list ourselves. I'm sorry. - var/static/obj/item/card/id/all_access = new /obj/item/card/id/advanced/gold/captains_spare() - set_path(get_path_to(src, waypoint, max_distance=200, access = all_access.GetAccess())) + set_path(get_path_to(src, waypoint, max_distance=200, access = REGION_ACCESS_ALL_STATION)) calling_ai = summoner //Link the AI to the bot! ai_waypoint = waypoint diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index b6c0b63d65d6..bd6024c74ad4 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -59,10 +59,11 @@ var/security_mode_flags = SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET // Selections: SECBOT_DECLARE_ARRESTS | SECBOT_CHECK_IDS | SECBOT_CHECK_WEAPONS | SECBOT_CHECK_RECORDS | SECBOT_HANDCUFF_TARGET - ///On arrest, charges the violator this much. If they don't have that much in their account, they will get beaten instead - var/fair_market_price_arrest = 25 - ///Charged each time the violator is stunned on detain - var/fair_market_price_detain = 5 + /// On arrest, charges the violator this much. + /// If they don't have that much in their account, they will get beaten instead + var/price_arrest = 0 + /// Charged each time the violator is stunned on detain + var/price_detain = 0 ///Force of the harmbaton used on them var/weapon_force = 20 ///The department the secbot will deposit collected money into @@ -319,10 +320,7 @@ return ..() var/mob/living/carbon/carbon_target = attack_target if(!carbon_target.IsParalyzed() || !(security_mode_flags & SECBOT_HANDCUFF_TARGET)) - if(!check_nap_violations()) - stun_attack(attack_target, TRUE) - else - stun_attack(attack_target) + stun_attack(attack_target, payment_check()) else if(carbon_target.canBeHandcuffed() && !carbon_target.handcuffed) start_handcuffing(attack_target) @@ -407,11 +405,7 @@ back_to_idle() return if(Adjacent(target) && isturf(target.loc)) // if right next to perp - if(!check_nap_violations()) - stun_attack(target, TRUE) - else - stun_attack(target) - + stun_attack(target, payment_check()) set_anchored(TRUE) return @@ -448,11 +442,11 @@ frustration = 0 return - if(target.handcuffed) //no target or target cuffed? back to idle. - if(!check_nap_violations()) + if(target.handcuffed) // target is cuffed, mission accomplished + if(payment_check()) // try to fine them - give them a love tap if they fail stun_attack(target, TRUE) - return - back_to_idle() + else // otherwise return to idle state + back_to_idle() return if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && !HAS_TRAIT(target, TRAIT_FLOORED))) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. @@ -569,36 +563,26 @@ return knockOver(C) -/// Returns false if the current target is unable to pay the fair_market_price for being arrested/detained -/mob/living/simple_animal/bot/secbot/proc/check_nap_violations() - if(!SSeconomy.full_ancap) - return TRUE - if(!target) - return TRUE +/// Returns true if the current target is unable to pay to be detained/arrested +/mob/living/simple_animal/bot/secbot/proc/payment_check() + var/fair_market_price = (security_mode_flags & SECBOT_HANDCUFF_TARGET) ? price_arrest : price_detain + if(fair_market_price <= 0) + return FALSE if(!ishuman(target)) - return TRUE + return FALSE var/mob/living/carbon/human/human_target = target var/obj/item/card/id/target_id = human_target.get_idcard() if(!target_id) - say("Suspect NAP Violation: No ID card found.") - nap_violation(target) - return FALSE + say("Unable to pay fine: No ID card found.") + return TRUE var/datum/bank_account/insurance = target_id.registered_account if(!insurance) - say("Suspect NAP Violation: No bank account found.") - nap_violation(target) - return FALSE - var/fair_market_price = (security_mode_flags & SECBOT_HANDCUFF_TARGET ? fair_market_price_detain : fair_market_price_arrest) - if(!insurance.adjust_money(-fair_market_price)) - say("Suspect NAP Violation: Unable to pay.") - nap_violation(target) - return FALSE - var/datum/bank_account/beepsky_department_account = SSeconomy.get_dep_account(payment_department) - say("Thank you for your compliance. Your account been charged [fair_market_price] [MONEY_NAME].") - if(beepsky_department_account) - beepsky_department_account.adjust_money(fair_market_price) + say("Unable to pay fine: No bank account found.") + return TRUE + if(!insurance.adjust_money(-fair_market_price, "Securitron fine")) + say("Unable to pay fine: Not enough funds in account.") return TRUE -/// Does nothing -/mob/living/simple_animal/bot/secbot/proc/nap_violation(mob/violator) - return + SSeconomy.get_dep_account(payment_department)?.adjust_money(fair_market_price) + say("Fine paid: Thank you for your compliance. Your account been charged [fair_market_price] [MONEY_NAME].") + return FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm index b43b9742b89f..905c5d4ba74d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/clockwork_knight.dm @@ -23,7 +23,7 @@ I'd rather there be something than the clockwork ruin be entirely empty though s armour_penetration = 40 melee_damage_lower = 20 melee_damage_upper = 20 - mob_biotypes = MOB_ROBOTIC|MOB_SPECIAL|MOB_MINING|MOB_MINERAL + mob_biotypes = MOB_SPECIAL|MOB_MINING|MOB_MINERAL vision_range = 9 aggro_vision_range = 9 speed = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index b029c442e4c3..8ddcdf02aa55 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -53,7 +53,7 @@ Difficulty: Hard armour_penetration = 50 melee_damage_lower = 15 melee_damage_upper = 15 - mob_biotypes = MOB_ROBOTIC|MOB_SPECIAL|MOB_MINING + mob_biotypes = MOB_SPECIAL|MOB_MINING speed = 10 move_to_delay = 10 ranged = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm index 1210cb357ad4..5b5178ac5a83 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm @@ -231,9 +231,7 @@ visible_message(span_boldwarning("[src] spews smoke from the tip of their spine!")) else visible_message(span_boldwarning("[src] spews smoke from its maw!")) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(2, holder = src, location = smoke_location) - smoke.start() + do_smoke(2, src, smoke_location) //The legionnaire's head. Basically the same as any legion head, but we have to tell our creator when we die so they can generate another head. /mob/living/simple_animal/hostile/asteroid/elite/legionnairehead diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index 1a6009e3bc34..3945413cb373 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -36,7 +36,7 @@ speed = 3 move_to_delay = 10 mouse_opacity = MOUSE_OPACITY_ICON - mob_biotypes = MOB_ROBOTIC|MOB_MINING|MOB_MINERAL + mob_biotypes = MOB_MINING|MOB_MINERAL death_sound = 'sound/effects/magic/repulse.ogg' death_message = "'s lights flicker, before its top part falls down." loot_drop = /obj/item/clothing/accessory/pandora_hope diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index ddab116113e9..4fbd0bf66a2b 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -513,7 +513,6 @@ REMOVE_TRAIT(src, TRAIT_HUSK, source) if(HAS_TRAIT(src, TRAIT_HUSK)) return FALSE - REMOVE_TRAIT(src, TRAIT_DISFIGURED, "husk") update_body() UnregisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UNHUSKABLE)) return TRUE @@ -525,7 +524,6 @@ ADD_TRAIT(src, TRAIT_HUSK, source) if (was_husk) return - ADD_TRAIT(src, TRAIT_DISFIGURED, "husk") update_body() RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UNHUSKABLE), PROC_REF(became_unhuskable)) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index d3217bb736fd..691a36a8b658 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -100,7 +100,7 @@ update_mouse_pointer() update_ambience_area(get_area(src)) - if(!can_hear()) + if(HAS_TRAIT(src, TRAIT_DEAF)) stop_sound_channel(CHANNEL_AMBIENCE) if(client) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index da960af8c704..b04cba60081e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -243,7 +243,7 @@ type = alt_type . = FALSE - if(type & MSG_AUDIBLE && !can_hear())//Hearing related + if(type & MSG_AUDIBLE && HAS_TRAIT(src, TRAIT_DEAF))//Hearing related if(!alt_msg) return FALSE else @@ -372,7 +372,7 @@ continue if(self_message && hearing_mob == src) continue - if(audible_message_flags & EMOTE_MESSAGE && runechat_prefs_check(hearing_mob, audible_message_flags) && hearing_mob.can_hear()) + if(audible_message_flags & EMOTE_MESSAGE && runechat_prefs_check(hearing_mob, audible_message_flags) && !HAS_TRAIT(hearing_mob, TRAIT_DEAF)) hearing_mob.create_chat_message(src, raw_message = raw_msg, runechat_flags = audible_message_flags) hearing_mob.show_message(message, MSG_AUDIBLE, deaf_message, MSG_VISUAL) @@ -948,7 +948,7 @@ var/result = perform_hand_swap(held_index) if (result) - SEND_SIGNAL(src, COMSIG_MOB_SWAP_HANDS) + SEND_SIGNAL(src, COMSIG_MOB_SWAP_HANDS, get_active_held_item(), held_item) return result diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index d48bbd9ac232..02e382c7117e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -403,10 +403,6 @@ var/mob/living/T = pick(nearby_mobs) ClickOn(T) -///Can the mob hear -/mob/proc/can_hear() - return !HAS_TRAIT(src, TRAIT_DEAF) - /** * Get the list of keywords for policy config * diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm index 401366afbb6f..3fb0e2f8f7a0 100644 --- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm @@ -231,6 +231,8 @@ return ..() /obj/effect/mob_spawn/ghost_role/human/ash_walker/allow_spawn(mob/user, silent = FALSE) + if(isnull(team)) + return FALSE if(!(user.ckey in team.players_spawned))//one per person unless you get a bonus spawn return TRUE if(!silent) diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 7f07997a5277..b4e4a78826a3 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -36,8 +36,7 @@ /obj/item/mod/control/pre_equipped/uninstall(obj/item/mod/module/old_module, deleting) . = ..() - if(default_pins[old_module.type]) - default_pins -= old_module + default_pins -= old_module.type /obj/item/mod/control/pre_equipped/standard applied_modules = list( diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index e45e59c5f2ab..092bdd654b94 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -1026,6 +1026,4 @@ /obj/item/mod/module/shock_absorber/proc/mob_batoned(datum/source) SIGNAL_HANDLER drain_power(use_energy_cost) - var/datum/effect_system/lightning_spread/sparks = new /datum/effect_system/lightning_spread - sparks.set_up(number = 5, cardinals_only = TRUE, location = mod.wearer.loc) - sparks.start() + do_sparks(5, TRUE, mod.wearer.loc) diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm index d4723b04ca68..ae72a93df3ac 100644 --- a/code/modules/mod/modules/modules_ninja.dm +++ b/code/modules/mod/modules/modules_ninja.dm @@ -265,30 +265,31 @@ var/maxcapacity = FALSE //Safety check for batteries var/drain = 0 //Drain amount from batteries var/drain_total = 0 - if(cell?.charge) - var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() - spark_system.set_up(5, 0, loc) - while(cell.charge> 0 && !maxcapacity) - drain = rand(NINJA_MIN_DRAIN, NINJA_MAX_DRAIN) - if(cell.charge < drain) - drain = cell.charge - if(hacking_module.mod.get_charge() + drain > hacking_module.mod.get_max_charge()) - drain = hacking_module.mod.get_max_charge() - hacking_module.mod.get_charge() - maxcapacity = TRUE//Reached maximum battery capacity. - if (do_after(ninja, 1 SECONDS, target = src, hidden = TRUE)) - spark_system.start() - playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - cell.use(drain) - hacking_module.mod.add_charge(drain) - drain_total += drain - else - break - if(!(obj_flags & EMAGGED)) - flick("apc-spark", hacking_module) + if(!cell?.charge) + hacking_module.charge_message(src, drain_total) + return + var/datum/effect_system/basic/spark_spread/spark_system = new(loc, 5, FALSE) + while(cell.charge> 0 && !maxcapacity) + drain = rand(NINJA_MIN_DRAIN, NINJA_MAX_DRAIN) + if(cell.charge < drain) + drain = cell.charge + if(hacking_module.mod.get_charge() + drain > hacking_module.mod.get_max_charge()) + drain = hacking_module.mod.get_max_charge() - hacking_module.mod.get_charge() + maxcapacity = TRUE//Reached maximum battery capacity. + if (do_after(ninja, 1 SECONDS, target = src, hidden = TRUE)) + spark_system.start() playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - obj_flags |= EMAGGED - locked = FALSE - update_appearance() + cell.use(drain) + hacking_module.mod.add_charge(drain) + drain_total += drain + else + break + if(!(obj_flags & EMAGGED)) + flick("apc-spark", hacking_module) + playsound(loc, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + obj_flags |= EMAGGED + locked = FALSE + update_appearance() hacking_module.charge_message(src, drain_total) //SMES, Drains power to supply your modsuit @@ -302,8 +303,7 @@ var/maxcapacity = FALSE //Safety check for batteries var/drain = 0 //Drain amount from batteries var/drain_total = 0 - var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() - spark_system.set_up(5, 0, loc) + var/datum/effect_system/basic/spark_spread/spark_system = new(loc, 5, FALSE) while(charge > 0 && !maxcapacity) drain = rand(NINJA_MIN_DRAIN, NINJA_MAX_DRAIN) if(charge < drain) @@ -525,9 +525,7 @@ //20 uses for a standard cell. 200 for high capacity cells. if(hacking_module.mod.subtract_charge(DEFAULT_CHARGE_DRAIN*10)) //Got that electric touch - var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread() - spark_system.set_up(5, 0, loc) - spark_system.start() + do_sparks(5, FALSE, loc) visible_message(span_danger("[ninja] electrocutes [src] with [ninja.p_their()] touch!"), span_userdanger("[ninja] electrocutes you with [ninja.p_their()] touch!")) addtimer(CALLBACK(src, PROC_REF(ninja_knockdown)), 0.3 SECONDS) return NONE diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index a519651ce816..9f5f1a257b96 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -91,12 +91,7 @@ /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) - var/datum/effect_system/fluid_spread/smoke/chem/quick/smoke = new - smoke.set_up(1, holder = src, location = get_turf(src), carry = capsaicin_holder) - smoke.start(log = TRUE) - QDEL_NULL(capsaicin_holder) // Reagents have a ref to their holder which has a ref to them. No leaks please. + do_chem_smoke(1, src, get_turf(src), /datum/reagent/consumable/condensedcapsaicin, 10, log = TRUE, smoke_type = /datum/effect_system/fluid_spread/smoke/chem/quick) /obj/item/mod/module/pepper_shoulders/proc/on_check_block() SIGNAL_HANDLER diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm index c40e3552bce4..1ef5a55b5c5f 100644 --- a/code/modules/mod/modules/modules_service.dm +++ b/code/modules/mod/modules/modules_service.dm @@ -49,17 +49,13 @@ balloon_alert(mod.wearer, "not in storage!") return var/obj/item/microwave_target = target - var/datum/effect_system/spark_spread/spark_effect = new() - spark_effect.set_up(2, 1, mod.wearer) - spark_effect.start() + do_sparks(2, TRUE, mod.wearer) mod.wearer.Beam(target,icon_state="lightning[rand(1,12)]", time = 5) if(microwave_target.microwave_act(microwaver = mod.wearer) & COMPONENT_MICROWAVE_SUCCESS) playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, FALSE) else balloon_alert(mod.wearer, "can't be microwaved!") - var/datum/effect_system/spark_spread/spark_effect_two = new() - spark_effect_two.set_up(2, 1, microwave_target) - spark_effect_two.start() + do_sparks(2, TRUE, microwave_target) drain_power(use_energy_cost) //Waddle - Makes you waddle and squeak. diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 5163557eb04e..d1c035d14522 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -34,8 +34,7 @@ if(computer.internal_cell && prob(25)) QDEL_NULL(computer.internal_cell) computer.visible_message(span_notice("\The [computer]'s battery explodes in rain of sparks.")) - var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread - spark_system.start() + do_sparks(3, FALSE, src) /datum/computer_file/program/revelation/ui_act(action, params, datum/tgui/ui, datum/ui_state/state) . = ..() diff --git a/code/modules/modular_computers/file_system/programs/dept_order.dm b/code/modules/modular_computers/file_system/programs/dept_order.dm index 09ef7f9753af..538fe27aae68 100644 --- a/code/modules/modular_computers/file_system/programs/dept_order.dm +++ b/code/modules/modular_computers/file_system/programs/dept_order.dm @@ -48,6 +48,8 @@ GLOBAL_VAR(department_cd_override) /datum/computer_file/program/department_order/proc/set_linked_department(datum/job_department/department) linked_department = department var/datum/job_department/linked_department_real = SSjob.get_department_type(linked_department) + if (isnull(linked_department_real)) + return // Heads of staff can download LAZYOR(download_access, linked_department_real.head_of_staff_access) // Heads of staff + anyone in the dept can run it diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index bd81b2e719b6..961ee5341284 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -179,7 +179,6 @@ var/atom/movable/node = popleft(queue) if(visited[node]) continue - visited[node] = TRUE //visit all neighbours of this pipe as well pipe = node @@ -195,15 +194,22 @@ for(var/atom/movable/subnode in pipe.neighbours) queue += subnode + visited[node] = TRUE continue //assign machines to new network for(var/datum/component/plumbing/plumbing as anything in node.GetComponents(/datum/component/plumbing)) + //disconnect old net for(var/dirtext in plumbing.ducts) if(plumbing.ducts[dirtext] == net) net.remove_plumber(plumbing) - if(newnet) - newnet.add_plumber(plumbing, text2num(dirtext)) + //assign new net + if(newnet) + for(pipe as anything in newnet.ducts) + var/dir = pipe.neighbours[node] + if(dir) + newnet.add_plumber(plumbing, REVERSE_DIR(dir)) + disconnect() return ..() @@ -300,18 +306,16 @@ if(!user.is_holding(src)) return if(new_layer) - duct_layer = new_layer + duct_layer = GLOB.plumbing_layers[new_layer] var/new_color = tgui_input_list(user, "Select a color", "Color", GLOB.pipe_paint_colors, GLOB.pipe_color_name[duct_color]) if(!user.is_holding(src)) return if(new_color) - duct_color = new_color - add_atom_colour(GLOB.pipe_paint_colors[new_color], FIXED_COLOUR_PRIORITY) + duct_color = GLOB.pipe_paint_colors[new_color] + add_atom_colour(duct_color, FIXED_COLOUR_PRIORITY) /obj/item/stack/ducts/wrench_act(mob/living/user, obj/item/tool) - . = check_attach_turf(loc) - if(!.) - . = ITEM_INTERACT_FAILURE + return check_attach_turf(loc) /obj/item/stack/ducts/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) // Turn into a duct stack and then merge to the in-hand stack. diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index 16fd62d4aec2..9efcd05fcee8 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -8,6 +8,7 @@ icon = 'icons/obj/pipes_n_cables/hydrochem/plumbers.dmi' icon_state = "pump" density = TRUE + subsystem_type = /datum/controller/subsystem/processing/plumbing processing_flags = START_PROCESSING_MANUALLY active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 2.75 resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF @@ -22,6 +23,8 @@ /obj/machinery/plumbing/Initialize(mapload) . = ..() set_anchored(mapload) + if(mapload) + begin_processing() create_reagents(buffer, reagent_flags) AddElement(/datum/element/simple_rotation) register_context() diff --git a/code/modules/plumbing/plumbers/destroyer.dm b/code/modules/plumbing/plumbers/destroyer.dm index db3100f10f87..b86d206f22fb 100644 --- a/code/modules/plumbing/plumbers/destroyer.dm +++ b/code/modules/plumbing/plumbers/destroyer.dm @@ -1,25 +1,94 @@ +//Maximum disposal rate +#define MAX_DISPOSAL_RATE 25 + /obj/machinery/plumbing/disposer name = "chemical disposer" desc = "Breaks down chemicals and annihilates them." icon_state = "disposal" + base_icon_state = "disposal" pass_flags_self = PASSMACHINE | LETPASSTHROW // Small + active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 4 - ///we remove 5 reagents per second + ///Reagents to remove per second var/disposal_rate = 5 + ///Is this machine switched on + var/on = FALSE /obj/machinery/plumbing/disposer/Initialize(mapload, layer) . = ..() - AddComponent(/datum/component/plumbing/simple_demand, layer) + AddComponent(/datum/component/plumbing/simple_demand/disposer, layer) + RegisterSignal(reagents, COMSIG_REAGENTS_HOLDER_UPDATED, PROC_REF(update)) + +/obj/machinery/plumbing/disposer/examine(mob/user) + . = ..() + . += span_notice("It is disposing [disposal_rate]u reagents per second.") + . += span_notice("Use hand to change disposal rate.") + +/obj/machinery/plumbing/disposer/add_context(atom/source, list/context, obj/item/held_item, mob/user) + if(isnull(held_item)) + context[SCREENTIP_CONTEXT_LMB] = "Set transfer rate" + return CONTEXTUAL_SCREENTIP_SET + + return ..() + +/obj/machinery/plumbing/disposer/proc/update() + SIGNAL_HANDLER + + update_appearance(UPDATE_ICON_STATE) + +/obj/machinery/plumbing/disposer/update_icon_state() + icon_state = "[base_icon_state][is_operational && anchored && on && reagents.total_volume ? "_working" : ""]" + return ..() + +/obj/machinery/plumbing/disposer/on_set_is_operational(old_value) + . = ..() + update_appearance(UPDATE_ICON_STATE) + +/obj/machinery/plumbing/disposer/wrench_act(mob/living/user, obj/item/tool) + . = ..() + if(. == ITEM_INTERACT_SUCCESS) + update_appearance(UPDATE_ICON_STATE) + +/obj/machinery/plumbing/disposer/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ChemDisposer", name) + ui.open() + +/obj/machinery/plumbing/disposer/ui_static_data(mob/user) + return list( + max_volume = MAX_DISPOSAL_RATE + ) + +/obj/machinery/plumbing/disposer/ui_data(mob/user) + return list( + enabled = on, + disposal_rate = disposal_rate + ) + +/obj/machinery/plumbing/disposer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + switch(action) + if("toggle_power") + on = !on + update_appearance(UPDATE_ICON_STATE) + return TRUE + + if("change_volume") + var/num = text2num(params["volume"]) + if(!isnum(num)) + return FALSE + + disposal_rate = round(clamp(num, 0.1, MAX_DISPOSAL_RATE), CHEMICAL_VOLUME_ROUNDING) + return TRUE /obj/machinery/plumbing/disposer/process(seconds_per_tick) - if(!is_operational) + if(!is_operational || !reagents.total_volume || !on) return - if(reagents.total_volume) - if(icon_state != initial(icon_state) + "_working") //threw it here instead of update icon since it only has two states - icon_state = initial(icon_state) + "_working" - reagents.remove_all(disposal_rate * seconds_per_tick) - use_energy(active_power_usage * seconds_per_tick) - else - if(icon_state != initial(icon_state)) - icon_state = initial(icon_state) + reagents.remove_all(disposal_rate * seconds_per_tick) + use_energy((disposal_rate / MAX_DISPOSAL_RATE) * active_power_usage * seconds_per_tick) +#undef MAX_DISPOSAL_RATE diff --git a/code/modules/plumbing/plumbers/iv_drip.dm b/code/modules/plumbing/plumbers/iv_drip.dm index 1982d8a09ed5..1077844ae63a 100644 --- a/code/modules/plumbing/plumbers/iv_drip.dm +++ b/code/modules/plumbing/plumbers/iv_drip.dm @@ -6,10 +6,13 @@ base_icon_state = "plumb" density = TRUE use_internal_storage = TRUE + subsystem_type = /datum/controller/subsystem/processing/plumbing processing_flags = START_PROCESSING_MANUALLY /obj/machinery/iv_drip/plumbing/Initialize(mapload, layer) . = ..() + if(mapload) + begin_processing() AddComponent(/datum/component/plumbing/automated_iv, layer) AddElement(/datum/element/simple_rotation) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 5d8024216e8a..f917abf0ba2f 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -132,7 +132,9 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list( ///Clear the linked indicator bitflags /obj/structure/cable/proc/disconnect_cable() - for(var/check_dir in linked_dirs) + for(var/check_dir in GLOB.cardinals) + if(!(linked_dirs & check_dir)) + continue var/inverse = REVERSE_DIR(check_dir) var/turf/check_turf = get_step(loc, check_dir) for(var/obj/structure/cable/other_cable in check_turf) diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index e6c6e61b01ec..6a0654d98733 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -242,7 +242,7 @@ color_set = color if(reagents || !is_full_charge()) START_PROCESSING(SSmachines, src) - if (reagents.spark_act(active_power_usage, TRUE) & SPARK_ACT_DESTRUCTIVE) + if (reagents?.spark_act(active_power_usage, SPARK_ACT_ENCLOSED) & SPARK_ACT_DESTRUCTIVE) message_admins("A rigged lightbulb at [AREACOORD(src)] has exploded.") qdel(src) return @@ -281,7 +281,7 @@ else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE * SSMACHINES_DT) && !turned_off()) use_power = IDLE_POWER_USE low_power_mode = TRUE - if (reagents?.spark_act(idle_power_usage, TRUE) & SPARK_ACT_DESTRUCTIVE) + if (reagents?.spark_act(idle_power_usage, SPARK_ACT_ENCLOSED) & SPARK_ACT_DESTRUCTIVE) message_admins("A rigged lightbulb at [AREACOORD(src)] has exploded.") qdel(src) return @@ -759,7 +759,7 @@ /obj/machinery/light/floor/is_mountable_turf(turf/target) return !isgroundlessturf(target) -/obj/machinery/light/floor/get_moutable_objects() +/obj/machinery/light/floor/get_mountable_objects() var/static/list/attachables = list( /obj/structure/thermoplastic, /obj/structure/lattice/catwalk, diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm index c83c4171914b..8dbadb5d06cd 100644 --- a/code/modules/power/lighting/light_construct.dm +++ b/code/modules/power/lighting/light_construct.dm @@ -184,3 +184,9 @@ icon_state = "floor-construct-stage1" fixture_type = "floor" sheets_refunded = 1 + +/obj/structure/light_construct/floor/get_turfs_to_mount_on() + return list(get_turf(src)) + +/obj/structure/light_construct/floor/is_mountable_turf(turf/target) + return !isgroundlessturf(target) diff --git a/code/modules/power/lighting/light_mapping_helpers.dm b/code/modules/power/lighting/light_mapping_helpers.dm index 460e096f1b12..89a99bd91677 100644 --- a/code/modules/power/lighting/light_mapping_helpers.dm +++ b/code/modules/power/lighting/light_mapping_helpers.dm @@ -126,8 +126,7 @@ if(ishuman(arrived)) var/mob/living/L = arrived if(L.client) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(5, 1, get_turf(src)) + var/datum/effect_system/basic/spark_spread/s = new(get_turf(src), 5, 1) s.start() playsound(loc, 'modular_darkpack/modules/electricity/sounds/generator_break.ogg', 100, TRUE) qdel(src) diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm index 22539a5ed28b..63b7a9ec8e1a 100644 --- a/code/modules/power/power_store.dm +++ b/code/modules/power/power_store.dm @@ -206,7 +206,7 @@ return FALSE if (!corrupted) - if (!(reagents?.spark_act(check_charge, TRUE) & SPARK_ACT_DESTRUCTIVE)) + if (!(reagents?.spark_act(check_charge, SPARK_ACT_ENCLOSED) & SPARK_ACT_DESTRUCTIVE)) return FALSE message_admins("[ADMIN_LOOKUPFLW(usr)] has triggered a rigged power cell explosion at [AREACOORD(loc)].") usr?.log_message("triggered a rigged power cell explosion", LOG_GAME) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index b2064b0acdfe..7bde7c5e829b 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -46,7 +46,7 @@ ///What's the projectile sound? var/projectile_sound = 'sound/items/weapons/emitter.ogg' ///Sparks emitted with every shot - var/datum/effect_system/spark_spread/sparks + var/datum/effect_system/basic/spark_spread/sparks ///Stores the type of gun we are using inside the emitter var/obj/item/gun/energy/gun ///List of all the properties of the inserted gun @@ -74,9 +74,8 @@ set_anchored(TRUE) connect_to_network() - sparks = new + sparks = new(src, 5, TRUE) sparks.attach(src) - sparks.set_up(5, TRUE, src) AddElement(/datum/element/simple_rotation) AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index acdecca4b00a..da0e31fc9301 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -100,11 +100,8 @@ /obj/item/ammo_casing/shotgun/buckshot/old/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from) . = ..() - if(!fired_from) - return - - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = fired_from, location = fired_from) + if(fired_from) + do_smoke(0, fired_from, fired_from) /obj/item/ammo_casing/shotgun/buckshot/milspec name = "milspec buckshot shell" diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 011deb00f701..72c7ae3bc37a 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -146,8 +146,10 @@ var/obj/item/suppressor/suppressor = null /// Sound played when the burst mode is changed var/burst_select_sound = SFX_FIRE_MODE_SWITCH - COOLDOWN_DECLARE(recoil_skill_check) // DARKPACK EDIT ADD - + // DARKPACK EDIT ADD START - STORYTELLER_DICE + COOLDOWN_DECLARE(recoil_skill_check) + var/datum/storyteller_roll/shooting/recoil_roll + // DARKPACK EDIT ADD END // DARKPACK EDIT ADD START - FORENSICS /// Base serial number prefix, whatever's here will come before the numbers. Blank means no number/obliterated number. var/serial_type = "" @@ -238,11 +240,10 @@ // DARKPACK EDIT ADD END if(selector_switch_icon) - switch(burst_fire_selection) - if(FALSE) - . += "[initial(icon_state)]_semi" - if(TRUE) - . += "[initial(icon_state)]_burst" + if(burst_fire_selection) + . += "[initial(icon_state)]_burst" + else + . += "[initial(icon_state)]_semi" if(show_bolt_icon) if (bolt_type == BOLT_TYPE_LOCKING) @@ -607,11 +608,15 @@ if(sawn_off) bonus_spread += SAWN_OFF_ACC_PENALTY - // DARKPACK EDIT ADD - recoil + // DARKPACK EDIT ADD START - STORYTELLER_DICE + if(!recoil_roll) + recoil_roll = new() + if(COOLDOWN_FINISHED(src, recoil_skill_check)) - var/recoil_reduction = SSroll.storyteller_roll(user.st_get_stat(STAT_FIREARMS), initial(recoil), user, numerical = TRUE) + var/recoil_reduction = recoil_roll.st_roll(user, src) recoil = max(initial(recoil) - recoil_reduction, 0) COOLDOWN_START(src, recoil_skill_check, 1 SCENES) + // DARKPACK EDIT ADD END // DARKPACK EDIT ADD START - FORENSICS if(serial_type && serial_shown) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index b1dea5902681..cceeb6b547b4 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -13,6 +13,8 @@ clumsy_check = FALSE trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead pin = /obj/item/firing_pin/magic + /// If true, our fire sound gets lower as our charges decrease + var/pitch_with_charges = TRUE /// What kind of magic is this var/school = SCHOOL_EVOCATION /// What kind of antimagic resists this @@ -49,11 +51,18 @@ return ..() /obj/item/gun/magic/fire_sounds() - var/frequency_to_use = sin((90/max_charges) * charges) + var/pitch_to_use = 1 + + if (pitch_with_charges && max_charges > 1) + pitch_to_use = LERP(1, 0.4, (1 - (charges/max_charges)) ** 2) + + var/sound/playing_sound = sound(suppressed ? suppressed_sound : fire_sound) + playing_sound.pitch = pitch_to_use + if(suppressed) - playsound(src, suppressed_sound, suppressed_volume, vary_fire_sound, ignore_walls = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0, frequency = frequency_to_use) + playsound(src, playing_sound, suppressed_volume, vary_fire_sound, ignore_walls = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0) else - playsound(src, fire_sound, fire_sound_volume, vary_fire_sound, frequency = frequency_to_use) + playsound(src, playing_sound, fire_sound_volume, vary_fire_sound) /** * Signal proc for [COMSIG_ITEM_MAGICALLY_CHARGED] diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index f7ff0ddf2aa4..53667d5e1229 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -195,17 +195,13 @@ /obj/item/gun/magic/wand/teleport/zap_self(mob/living/user, suicide = FALSE) if(do_teleport(user, user, 10, channel = TELEPORT_CHANNEL_MAGIC)) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(3, holder = src, location = user.loc) - smoke.start() + do_smoke(3, src, user.loc) charges-- return ..() /obj/item/gun/magic/wand/teleport/do_suicide(mob/living/user) playsound(loc, fire_sound, 50, TRUE, -1) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(3, holder = src, location = user.loc) - smoke.start() + do_smoke(3, src, user.loc) if (!iscarbon(user)) return SHAME @@ -247,11 +243,11 @@ var/turf/origin = get_turf(user) var/turf/destination = find_safe_turf(extended_safety_checks = TRUE) - if(do_teleport(user, destination, channel=TELEPORT_CHANNEL_MAGIC)) - for(var/t in list(origin, destination)) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src, location = t) - smoke.start() + if(!do_teleport(user, destination, channel = TELEPORT_CHANNEL_MAGIC)) + return ..() + + for(var/turf/smoke_turf as anything in list(origin, destination)) + do_smoke(0, src, smoke_turf) return ..() /obj/item/gun/magic/wand/safety/do_suicide(mob/living/user) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index e067bcbd13e9..e07268cbeac0 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -234,8 +234,6 @@ var/log_override = FALSE /// If true, the projectile won't cause any logging whatsoever. Used for hallucinations and shit. var/do_not_log = FALSE - /// We ignore mobs with these factions. - var/list/ignored_factions /// Turf that we have registered connect_loc signal - this is done for performance, as we're moving ~a dozen turfs per tick /// and registering and unregistering signal for every single one of them is stupid. Unregistering the signal from the correct turf in case we get moved by smth else is important var/turf/last_tick_turf @@ -644,9 +642,9 @@ var/mob/firer_mob = firer if (firer_mob.buckled == target) return FALSE - if(ignored_factions?.len && ismob(target) && !direct_target) + if(LAZYLEN(faction) && ismob(target) && !direct_target) var/mob/target_mob = target - if(target_mob.has_faction(ignored_factions)) + if(FAST_FACTION_CHECK(faction, target_mob.get_faction(), allies, target_mob.allies, FALSE)) return FALSE if(target.density || cross_failed) //This thing blocks projectiles, hit it regardless of layer/mob stuns/etc. return TRUE diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 33d8e98b373a..b5890679eae3 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -95,13 +95,13 @@ if(!isturf(target)) teleloc = target.loc for(var/atom/movable/stuff in teleloc) - if(!stuff.anchored && stuff.loc && !isobserver(stuff)) - if(do_teleport(stuff, stuff, 10, channel = TELEPORT_CHANNEL_MAGIC)) - teleammount++ - var/smoke_range = max(round(4 - teleammount), 0) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(smoke_range, holder = src, location = stuff.loc) //Smoke drops off if a lot of stuff is moved for the sake of sanity - smoke.start() + if(stuff.anchored || isobserver(stuff)) + continue + if(!do_teleport(stuff, stuff, 10, channel = TELEPORT_CHANNEL_MAGIC)) + continue + teleammount++ + var/smoke_range = max(round(4 - teleammount), 0) + do_smoke(smoke_range, src, stuff.loc) /// Teleports you somewhere on the station where the local conditions won't kill you /obj/projectile/magic/safety @@ -116,11 +116,11 @@ var/turf/origin_turf = get_turf(target) var/turf/destination_turf = find_safe_turf(extended_safety_checks = TRUE) - if(do_teleport(target, destination_turf, channel=TELEPORT_CHANNEL_MAGIC)) - for(var/t in list(origin_turf, destination_turf)) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src, location = t) - smoke.start() + if(!do_teleport(target, destination_turf, channel = TELEPORT_CHANNEL_MAGIC)) + return + + for(var/turf/smoke_turf as anything in list(origin_turf, destination_turf)) + do_smoke(0, src, smoke_turf) /// Turns walls into doors, or opens doors /obj/projectile/magic/door diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm index 2efa09635561..b13010cca424 100644 --- a/code/modules/reagents/chem_splash.dm +++ b/code/modules/reagents/chem_splash.dm @@ -79,11 +79,8 @@ */ /proc/spread_reagents(datum/reagents/source, atom/epicenter, spread_range) spread_range = min(spread_range, 20) // Fuck off with trying to do more then this - var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() - steam.set_up(10, 0, epicenter) - steam.attach(epicenter) - steam.start() - + var/datum/effect_system/basic/steam_spread/steam = new /datum/effect_system/basic/steam_spread(epicenter, 10, FALSE) + steam.attach(epicenter).start() // This is a basic floodfill algorithm of atmos connected tiles // Turfs will be stored in the form turf -> TRUE var/chem_temp = source.chem_temp diff --git a/code/modules/reagents/chemistry/holder/holder.dm b/code/modules/reagents/chemistry/holder/holder.dm index a03c360e3287..78e9c1bce798 100644 --- a/code/modules/reagents/chemistry/holder/holder.dm +++ b/code/modules/reagents/chemistry/holder/holder.dm @@ -792,10 +792,10 @@ * Call in case of electrical current exposure, rapid heating or blunt force, things that would set off explosives and alike * Arguments: * * power_charge - If we were triggered from electric current, how much power was dumped into us? - * * enclosed - Is the reaction happening in an enclosed container or not? Doesn't use reagent holder's flags as it might be called on reagents "exiting" the container + * * spark_flags - Set of flags describing the interaction * * banned_reagents - List of reagent types which we may want to have custom handling for and should avoid checking in here */ -/datum/reagents/proc/spark_act(power_charge, enclosed, list/banned_reagents) +/datum/reagents/proc/spark_act(power_charge, spark_flags, list/banned_reagents) if (!islist(banned_reagents)) banned_reagents = list(banned_reagents) var/result = NONE @@ -803,7 +803,7 @@ for (var/datum/reagent/reagent as anything in reagent_list) if (is_type_in_list(reagent, banned_reagents)) continue - var/reagent_result = reagent.on_spark_act(power_charge, enclosed) + var/reagent_result = reagent.on_spark_act(power_charge, spark_flags) if (!reagent_result) continue result |= (reagent_result & SPARK_ACT_RETURNS) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 8a1bc7479b6e..a2dbaf3860e5 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -9,6 +9,10 @@ resistance_flags = FIRE_PROOF | ACID_PROOF circuit = /obj/item/circuitboard/machine/chem_dispenser processing_flags = NONE + // DARKPACK EDIT ADD START - STORYTELER_STATS + skill_required_for_use = STAT_SCIENCE + skill_dots_minimum = 1 + // DARKPACK EDIT ADD END /// The cell used to dispense reagents var/obj/item/stock_parts/power_store/cell @@ -375,7 +379,7 @@ if("save_recording") if(!is_operational) return - var/name = tgui_input_text(ui.user, "What do you want to name this recipe?", "Recipe Name", max_length = MAX_NAME_LEN) + var/name = tgui_input_text(ui.user, "What do you want to name this recipe?", "Recipe Name", max_length = MAX_NAME_LEN, encode = FALSE) if(!ui.user.can_perform_action(src, ALLOW_SILICON_REACH)) return if(saved_recipes[name] && tgui_alert(ui.user, "\"[name]\" already exists, do you want to overwrite it?",, list("Yes", "No")) == "No") @@ -633,6 +637,8 @@ ) base_reagent_purity = 0.5 + skill_required_for_use = null // DARKPACK EDIT ADD - STORYTELER_STATS + /obj/machinery/chem_dispenser/drinks/Initialize(mapload) if(dispensable_reagents != null && !dispensable_reagents.len) dispensable_reagents = drinks_dispensable_reagents diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index e41296a589aa..d1c33fc4a294 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -30,14 +30,6 @@ opacity = FALSE alpha = 100 -/datum/effect_system/fluid_spread/smoke/chem/smoke_machine/set_up(range = 1, amount = DIAMOND_AREA(range), atom/holder, atom/location, datum/reagents/carry, efficiency = 10, silent = FALSE) - src.holder = holder - src.location = get_turf(location) - src.amount = amount - if(carry) - carry.trans_to(chemholder, 20, copy_only = TRUE) - carry.remove_all(amount / efficiency) - /obj/machinery/smoke_machine/Initialize(mapload) create_reagents(REAGENTS_BASE_VOLUME, INJECTABLE) @@ -163,12 +155,14 @@ return PROCESS_KILL var/turf/location = get_turf(src) - if(!(locate(/obj/effect/particle_effect/fluid/smoke) in location)) - var/datum/effect_system/fluid_spread/smoke/chem/smoke_machine/smoke = new() - smoke.set_up(setting * 3, holder = src, location = location, carry = reagents, efficiency = efficiency) - smoke.start() - use_energy(active_power_usage * (setting / max_range)) - update_appearance(UPDATE_ICON_STATE) + if(locate(/obj/effect/particle_effect/fluid/smoke) in location) + return + + var/smoke_amount = DIAMOND_AREA(setting * 3) + do_chem_smoke(amount = smoke_amount, holder = src, location = location, carry = reagents, carry_limit = 20, smoke_type = /datum/effect_system/fluid_spread/smoke/chem/smoke_machine) + reagents.remove_all(smoke_amount / efficiency) + use_energy(active_power_usage * (setting / max_range)) + update_appearance(UPDATE_ICON_STATE) /obj/machinery/smoke_machine/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 273268f1c30b..8a2dcaa0e538 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -242,9 +242,9 @@ * Probably shouldn't be called from within a mob's bloodstream, unless you're ready for some very explosive results * Arguments: * * power_charge - If we were triggered from electric current, how much power was dumped into us? - * * enclosed - Is the reaction happening in an enclosed container or not? Doesn't use reagent holder's flags as it might be called on reagents "exiting" the container + * * spark_flags - Flags specific to the interaction, is it in an enclosed space, should we nerf common reagents, etc. */ -/datum/reagent/proc/on_spark_act(power_charge = 0, enclosed = TRUE) +/datum/reagent/proc/on_spark_act(power_charge = 0, spark_flags = NONE) return NONE /** diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 2304ee0fff5b..6a7ad214695e 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -408,7 +408,7 @@ return if(trans_volume >= 0.4) //prevents cheesing with ultralow doses. - exposed_mob.adjust_tox_loss((-3 * min(2, trans_volume) * REM) * normalise_creation_purity(), required_biotype = affected_biotype) //This is to promote iv pole use for that chemotherapy feel. + exposed_mob.adjust_tox_loss((-1.5 * min(2, trans_volume)) * normalise_creation_purity(), required_biotype = affected_biotype) //This is to promote iv pole use for that chemotherapy feel. var/obj/item/organ/liver/L = exposed_mob.organs_slot[ORGAN_SLOT_LIVER] if(!L || L.organ_flags & ORGAN_FAILING) return diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index 31f69d54e11f..977e3db847a8 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -103,6 +103,7 @@ taste_description = "sourness" ph = 2 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + default_container = /obj/item/reagent_containers/cup/glass/bottle/juice/lemonjuice /datum/reagent/consumable/banana name = "Banana Juice" diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 80810adeedec..421f980b2a82 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -115,21 +115,26 @@ if(SPT_PROB(2.5, seconds_per_tick)) to_chat(affected_mob, span_notice("[high_message]")) affected_mob.add_mood_event("smacked out", /datum/mood_event/narcotic_heavy) - if(current_cycle == 36 && creation_purity <= 0.6) - if(!istype(affected_mob.dna.species, /datum/species/human/krokodil_addict)) - to_chat(affected_mob, span_userdanger("Your skin falls off easily!")) - var/mob/living/carbon/human/affected_human = affected_mob - affected_human.set_facial_hairstyle("Shaved", update = FALSE) - affected_human.set_hairstyle("Bald", update = FALSE) - affected_mob.set_species(/datum/species/human/krokodil_addict) - if(affected_mob.adjust_brute_loss(50 * REM, updating_health = FALSE, required_bodytype = affected_bodytype)) // holy shit your skin just FELL THE FUCK OFF - return UPDATE_MOB_HEALTH + + if(current_cycle != 36 || creation_purity > 0.6) + return + + if(istype(affected_mob.dna.species, /datum/species/human/krokodil_addict)) + return + + to_chat(affected_mob, span_userdanger("Your skin falls off easily!")) + var/mob/living/carbon/human/affected_human = affected_mob + affected_human.set_facial_hairstyle("Shaved", update = FALSE) + affected_human.set_hairstyle("Bald", update = FALSE) + affected_mob.set_species(/datum/species/human/krokodil_addict) + + if(affected_mob.adjust_brute_loss(25, updating_health = FALSE, required_bodytype = affected_bodytype)) // holy shit your skin just FELL THE FUCK OFF + return UPDATE_MOB_HEALTH /datum/reagent/drug/krokodil/overdose_process(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() - var/need_mob_update - need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.25 * metabolization_ratio * seconds_per_tick, required_organ_flag = affected_organ_flags) - need_mob_update = affected_mob.adjust_tox_loss(0.25 * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) + var/need_mob_update = affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.25 * metabolization_ratio * seconds_per_tick, required_organ_flag = affected_organ_flags) + need_mob_update |= affected_mob.adjust_tox_loss(0.25 * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype) if(need_mob_update) return UPDATE_MOB_HEALTH diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 7633a00f0502..db0d3e190a6b 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -351,6 +351,15 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/condiment/ketchup +/datum/reagent/consumable/mustard + name = "Mustard" + description = "Spicy, tangy sauce, made from the mustard plant." + nutriment_factor = 5 + color = "#ffd129" + taste_description = "mustard" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + default_container = /obj/item/reagent_containers/condiment/mustard + /datum/reagent/consumable/capsaicin name = "Capsaicin Oil" description = "This is what makes chilis hot." diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index 2b89e0dbc3bf..13f14d3af2c9 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -767,18 +767,18 @@ Basically, we fill the time between now and 2s from now with hands based off the . = ..() random_span = pick("clown", "small", "big", "hypnophrase", "alien", "cult", "alert", "danger", "emote", "yell", "brass", "sans", "papyrus", "robot", "his_grace", "phobia") RegisterSignal(affected_mob, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear)) - to_chat(affected_mob, span_warning("Your hearing seems to be a bit off[affected_mob.can_hear() ? "!" : " - wait, that's normal."]")) + to_chat(affected_mob, span_warning("Your hearing seems to be a bit off[!HAS_TRAIT(affected_mob, TRAIT_DEAF) ? "!" : " - wait, that's normal."]")) /datum/reagent/impurity/inacusiate/on_mob_end_metabolize(mob/living/affected_mob) . = ..() UnregisterSignal(affected_mob, COMSIG_MOVABLE_HEAR) - to_chat(affected_mob, span_notice("You start hearing things normally again[affected_mob.can_hear() ? "" : " - no, wait, no you don't"].")) + to_chat(affected_mob, span_notice("You start hearing things normally again[!HAS_TRAIT(affected_mob, TRAIT_DEAF) ? "" : " - no, wait, no you don't"].")) /datum/reagent/impurity/inacusiate/proc/owner_hear(mob/living/owner, list/hearing_args) SIGNAL_HANDLER // don't skip messages that the owner says or can't understand (since they still make sounds) - if(!owner.can_hear()) + if(HAS_TRAIT(owner, TRAIT_DEAF)) return // not technically hearing var/atom/movable/speaker = hearing_args[HEARING_SPEAKER] @@ -1220,7 +1220,7 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/reagent/inverse/colorful_reagent/overdose_start(mob/living/affected_mob) . = ..() - metabolization_rate = 0.04 * REM + metabolization_rate = 0.1 * REAGENTS_METABOLISM /datum/reagent/inverse/colorful_reagent/on_mob_metabolize(mob/living/carbon/affected_mob) . = ..() diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index c5357772f049..57e21242b34f 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -159,7 +159,9 @@ for(var/i in affected_mob.all_wounds) var/datum/wound/iter_wound = i iter_wound.on_xadone(0.5 * power * metabolization_ratio * seconds_per_tick) - REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration + var/obj/item/bodypart/head = affected_mob.get_bodypart(BODY_ZONE_HEAD) + if (head) + REMOVE_TRAIT(head, TRAIT_DISFIGURED, TRAIT_GENERIC) //fixes common causes for disfiguration if(need_mob_update) return UPDATE_MOB_HEALTH @@ -178,29 +180,32 @@ /datum/reagent/medicine/pyroxadone/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() - if(affected_mob.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) - var/power = 0 - switch(affected_mob.bodytemperature) - if(BODYTEMP_HEAT_DAMAGE_LIMIT to 400) - power = 2 - if(400 to 460) - power = 3 - else - power = 5 - if(affected_mob.on_fire) - power *= 2 + if(affected_mob.bodytemperature <= BODYTEMP_HEAT_DAMAGE_LIMIT) + return + var/power = 0 + switch(affected_mob.bodytemperature) + if(BODYTEMP_HEAT_DAMAGE_LIMIT to 400) + power = 2 + if(400 to 460) + power = 3 + else + power = 5 + if(affected_mob.on_fire) + power *= 2 - var/need_mob_update - need_mob_update = affected_mob.adjust_oxy_loss(-1 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) - need_mob_update += affected_mob.adjust_brute_loss(-0.5 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) - need_mob_update += affected_mob.adjust_fire_loss(-0.75 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) - need_mob_update += affected_mob.adjust_tox_loss(-0.5 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) - if(need_mob_update) - . = UPDATE_MOB_HEALTH - for(var/i in affected_mob.all_wounds) - var/datum/wound/iter_wound = i - iter_wound.on_xadone(0.5 * power * metabolization_ratio * seconds_per_tick) - REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) + var/need_mob_update + need_mob_update = affected_mob.adjust_oxy_loss(-1 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + need_mob_update += affected_mob.adjust_brute_loss(-0.5 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) + need_mob_update += affected_mob.adjust_fire_loss(-0.75 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, required_bodytype = affected_bodytype) + need_mob_update += affected_mob.adjust_tox_loss(-0.5 * power * metabolization_ratio * seconds_per_tick, updating_health = FALSE, forced = TRUE, required_biotype = affected_biotype) + if(need_mob_update) + . = UPDATE_MOB_HEALTH + for(var/i in affected_mob.all_wounds) + var/datum/wound/iter_wound = i + iter_wound.on_xadone(0.5 * power * metabolization_ratio * seconds_per_tick) + var/obj/item/bodypart/head = affected_mob.get_bodypart(BODY_ZONE_HEAD) + if (head) + REMOVE_TRAIT(head, TRAIT_DISFIGURED, TRAIT_GENERIC) /datum/reagent/medicine/rezadone name = "Rezadone" @@ -223,7 +228,9 @@ required_bodytype = affected_biotype )) . = UPDATE_MOB_HEALTH - REMOVE_TRAIT(affected_mob, TRAIT_DISFIGURED, TRAIT_GENERIC) + var/obj/item/bodypart/head = affected_mob.get_bodypart(BODY_ZONE_HEAD) + if (head) + REMOVE_TRAIT(head, TRAIT_DISFIGURED, TRAIT_GENERIC) /datum/reagent/medicine/rezadone/overdose_process(mob/living/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -922,7 +929,7 @@ . = ..() if(creation_purity >= 1) ADD_TRAIT(affected_mob, TRAIT_GOOD_HEARING, type) - if(affected_mob.can_hear()) + if(!HAS_TRAIT(affected_mob, TRAIT_DEAF)) to_chat(affected_mob, span_nicegreen("You can feel your hearing drastically improve!")) /datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) @@ -938,7 +945,7 @@ /datum/reagent/medicine/inacusiate/on_mob_delete(mob/living/affected_mob) . = ..() REMOVE_TRAIT(affected_mob, TRAIT_GOOD_HEARING, type) - if(affected_mob.can_hear()) + if(!HAS_TRAIT(affected_mob, TRAIT_DEAF)) to_chat(affected_mob, span_notice("Your hearing returns to its normal acuity.")) /datum/reagent/medicine/atropine @@ -951,7 +958,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED inverse_chem_val = 0.35 inverse_chem = /datum/reagent/inverse/atropine - added_traits = list(TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION) + added_traits = list(TRAIT_NOCRITDAMAGE, TRAIT_PREVENT_IMPLANT_AUTO_EXPLOSION) /datum/reagent/medicine/atropine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() @@ -1021,6 +1028,7 @@ /datum/reagent/medicine/epinephrine/metabolize_reagent(mob/living/carbon/affected_mob, seconds_per_tick, metabolized_volume) if(holder.has_reagent(/datum/reagent/toxin/lexorin)) + // REM is intentional here holder.remove_reagent(/datum/reagent/toxin/lexorin, 1 * REM * metabolized_volume * seconds_per_tick) holder.remove_reagent(/datum/reagent/medicine/epinephrine, 0.5 * REM * metabolized_volume * seconds_per_tick) return ..() diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 5624bb737259..e52275d312ac 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -351,8 +351,8 @@ /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() - - data["deciseconds_metabolized"] += (seconds_per_tick * 1 SECONDS * REM) + // Microdosing holy water is less effective than just gulping it down + data["deciseconds_metabolized"] += seconds_per_tick * 1 SECONDS * metabolization_ratio affected_mob.adjust_jitter_up_to(2 SECONDS * metabolization_ratio * seconds_per_tick, 20 SECONDS) var/need_mob_update = FALSE @@ -1028,7 +1028,7 @@ /datum/reagent/chlorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() - if(affected_mob.take_bodypart_damage(0.5*REM*seconds_per_tick, 0)) + if(affected_mob.take_bodypart_damage(0.25 * metabolization_ratio * seconds_per_tick, 0)) return UPDATE_MOB_HEALTH /datum/reagent/fluorine @@ -1048,7 +1048,7 @@ /datum/reagent/fluorine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() - if(affected_mob.adjust_tox_loss(0.5*REM*seconds_per_tick, updating_health = FALSE)) + if(affected_mob.adjust_tox_loss(0.25 * metabolization_ratio * seconds_per_tick, updating_health = FALSE)) return UPDATE_MOB_HEALTH /datum/reagent/sodium @@ -1149,7 +1149,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/effect/decal/cleanable/greenglow /// How much tox damage to deal per tick - var/tox_damage = 0.5 + var/tox_damage = 0.25 /// How radioactive is this reagent var/rad_power = 1 @@ -1159,7 +1159,8 @@ var/chance = min(volume / (20 - rad_power * 5), rad_power) if(SPT_PROB(chance, seconds_per_tick)) // ignore rad protection calculations bc it's inside of us affected_mob.AddComponent(/datum/component/irradiated) - if(affected_mob.adjust_tox_loss(tox_damage * seconds_per_tick * REM, updating_health = FALSE)) + + if(affected_mob.adjust_tox_loss(tox_damage * seconds_per_tick * metabolization_rate, updating_health = FALSE)) return UPDATE_MOB_HEALTH /datum/reagent/uranium/expose_obj(obj/exposed_obj, reac_volume, methods=TOUCH, show_message=TRUE) @@ -1226,7 +1227,7 @@ description = "Radium is an alkaline earth metal. It is extremely radioactive." color = "#00CC00" // ditto taste_description = "the colour blue and regret" - tox_damage = 1 + tox_damage = 0.5 material = null ph = 10 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -1320,14 +1321,18 @@ if(pool) pool.burn_amount = max(min(round(reac_volume / 5), 10), 1) -/datum/reagent/fuel/on_spark_act(power_charge, enclosed) +/datum/reagent/fuel/on_spark_act(power_charge, spark_flags) // Doesn't go boom in open air unless we pass a REALLY high current or if we're hot enough - if (!enclosed && power_charge < STANDARD_BATTERY_VALUE && holder.chem_temp < 474) + if (!(spark_flags & SPARK_ACT_ENCLOSED) && power_charge < STANDARD_BATTERY_VALUE && holder.chem_temp < 474) var/turf/our_turf = get_turf(holder.my_atom) our_turf?.hotspot_expose(holder.chem_temp * 10, volume) return NONE - reagent_explode(holder, volume, strengthdiv = 10, clear_holder_reagents = FALSE) + var/strengthdiv = 10 + if (spark_flags & SPARK_ACT_WEAKEN_COMMON) + strengthdiv *= 3 // Noticeably weaker than waterpot, at least put some effort in, cmon + + reagent_explode(holder, volume, strengthdiv = strengthdiv, clear_holder_reagents = FALSE, flame_factor = 1) return SPARK_ACT_DESTRUCTIVE | SPARK_ACT_CLEAR_ALL /datum/reagent/space_cleaner diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index d6c65db9324a..a768c47fd1a5 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -29,8 +29,8 @@ if(affected_mob.adjust_organ_loss(ORGAN_SLOT_HEART, -0.5 * metabolization_ratio * seconds_per_tick * normalise_creation_purity(), required_organ_flag = affected_organ_flags)) return UPDATE_MOB_HEALTH -/datum/reagent/nitroglycerin/on_spark_act(power_charge, enclosed) - reagent_explode(holder, volume, strengthdiv = 2, clear_holder_reagents = FALSE) +/datum/reagent/nitroglycerin/on_spark_act(power_charge, spark_flags) + reagent_explode(holder, volume, strengthdiv = 2, clear_holder_reagents = FALSE, flame_factor = 1) return SPARK_ACT_DESTRUCTIVE | SPARK_ACT_CLEAR_ALL /datum/reagent/stabilizing_agent @@ -89,7 +89,7 @@ taste_description = "air and bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/sorium/on_spark_act(power_charge, enclosed) +/datum/reagent/sorium/on_spark_act(power_charge, spark_flags) var/range = clamp(sqrt(volume), 1, 6) goonchem_vortex(get_turf(holder.my_atom), 1, range) return SPARK_ACT_NON_DESTRUCTIVE @@ -101,7 +101,7 @@ taste_description = "compressed bitterness" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/liquid_dark_matter/on_spark_act(power_charge, enclosed) +/datum/reagent/liquid_dark_matter/on_spark_act(power_charge, spark_flags) var/range = clamp(sqrt(volume / 2), 1, 6) goonchem_vortex(get_turf(holder.my_atom), 0, range) return SPARK_ACT_NON_DESTRUCTIVE @@ -129,12 +129,11 @@ if(source.flags_1 & PREVENT_CONTENTS_EXPLOSION_1) return var/location = get_turf(holder.my_atom) - var/datum/effect_system/reagents_explosion/e = new() - e.set_up(1 + round(volume / 6, 1), location, message = FALSE) - e.start(holder.my_atom) + var/datum/effect_system/reagents_explosion/expl = new(location, 1 + round(volume / 6, 1), message = FALSE) + expl.start(holder.my_atom) holder.clear_reagents() -/datum/reagent/gunpowder/on_spark_act(power_charge, enclosed) +/datum/reagent/gunpowder/on_spark_act(power_charge, spark_flags) // Gunpowder doesn't blow in presence of stabilizing agent but instead consumes it every time it'd get triggered var/agent_volume = holder.get_reagent_amount(/datum/reagent/stabilizing_agent) if (agent_volume) @@ -144,11 +143,11 @@ return if (power_charge >= STANDARD_CELL_CHARGE || holder.chem_temp >= 474) - reagent_explode(holder, volume, modifier = 5, strengthdiv = 10, clear_holder_reagents = FALSE) + reagent_explode(holder, volume, modifier = 5, strengthdiv = 10, clear_holder_reagents = FALSE, flame_factor = 1) return SPARK_ACT_DESTRUCTIVE | SPARK_ACT_CLEAR_ALL holder.my_atom.visible_message(span_boldnotice("Sparks start flying around the gunpowder!")) - if (!enclosed) + if (!(spark_flags & SPARK_ACT_ENCLOSED)) do_sparks(2, TRUE, get_turf(holder.my_atom)) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reagent_explode), holder, volume, 5, 10), rand(5 SECONDS, 10 SECONDS)) return SPARK_ACT_NON_DESTRUCTIVE // just wait a bit... @@ -160,15 +159,15 @@ taste_description = "salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/rdx/on_spark_act(power_charge, enclosed) +/datum/reagent/rdx/on_spark_act(power_charge, spark_flags) if (power_charge) // Okay but what if we made a REALLY big boom? var/power_coeff = log(2, power_charge / STANDARD_CELL_CHARGE) - reagent_explode(holder, volume, modifier = min(2 * power_coeff, 8), strengthdiv = 7 / min(power_coeff, 4), clear_holder_reagents = FALSE) + reagent_explode(holder, volume, modifier = min(2 * power_coeff, 8), strengthdiv = 7 / min(power_coeff, 4), clear_holder_reagents = FALSE, flame_factor = 1) else if (holder.chem_temp >= 474) - reagent_explode(holder, volume, modifier = 2, strengthdiv = 7, clear_holder_reagents = FALSE) + reagent_explode(holder, volume, modifier = 2, strengthdiv = 7, clear_holder_reagents = FALSE, flame_factor = 1) else - reagent_explode(holder, volume, strengthdiv = 8, clear_holder_reagents = FALSE) + reagent_explode(holder, volume, strengthdiv = 8, clear_holder_reagents = FALSE, flame_factor = 1) return SPARK_ACT_DESTRUCTIVE | SPARK_ACT_CLEAR_ALL /datum/reagent/tatp @@ -178,8 +177,8 @@ taste_description = "death" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/tatp/on_spark_act(power_charge, enclosed) - reagent_explode(holder, volume, strengthdiv = 1.5 + rand() * 1.5, clear_holder_reagents = FALSE) +/datum/reagent/tatp/on_spark_act(power_charge, spark_flags) + reagent_explode(holder, volume, strengthdiv = 1.5 + rand() * 1.5, clear_holder_reagents = FALSE, flame_factor = 1) return SPARK_ACT_DESTRUCTIVE | SPARK_ACT_CLEAR_ALL /datum/reagent/flash_powder @@ -189,11 +188,14 @@ taste_description = "salt" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/flash_powder/on_spark_act(power_charge, enclosed) +/datum/reagent/flash_powder/on_spark_act(power_charge, spark_flags) // Even weaker version of the normal flash effect var/turf/location = get_turf(holder.my_atom) - if (!enclosed) + if (!(spark_flags & SPARK_ACT_ENCLOSED)) do_sparks(2, TRUE, location) + else if (!(holder.flags & TRANSPARENT) || (!isturf(holder.my_atom.loc) && !ismob(holder.my_atom.loc))) // nope + return SPARK_ACT_NON_DESTRUCTIVE + var/range = round(volume / 15, 1) holder.my_atom.flash_lighting_fx(range = (range + 2)) for(var/mob/living/victim in get_hearers_in_view(range, location)) @@ -216,21 +218,19 @@ taste_description = "smoke" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/smoke_powder/on_spark_act(power_charge, enclosed) +/datum/reagent/smoke_powder/on_spark_act(power_charge, spark_flags) // Can't really make a cloud of smoke if we're inside of an enclosed container // ...unless we're a mob, in which case this is pretty cursed - if (enclosed && !ismob(holder.my_atom)) + if ((spark_flags & SPARK_ACT_ENCLOSED) && !ismob(holder.my_atom)) return var/location = get_turf(holder.my_atom) - var/datum/effect_system/fluid_spread/smoke/chem/smoke_system = new() playsound(location, 'sound/effects/smoke.ogg', 50, TRUE, -3) if (iscarbon(holder.my_atom)) var/mob/living/carbon/victim = holder.my_atom if (victim.stat != DEAD) victim.visible_message(span_warning("[victim] starts violently coughing up smoke!")) victim.adjust_organ_loss(ORGAN_SLOT_LUNGS, volume / 15) - smoke_system.set_up(amount = volume / 1.5, holder = holder.my_atom, location = location, carry = holder, silent = FALSE) - smoke_system.start(log = TRUE) + do_chem_smoke(amount = volume / 1.5, holder = holder.my_atom, location = location, carry = holder, silent = FALSE, log = TRUE) return SPARK_ACT_NON_DESTRUCTIVE | SPARK_ACT_CLEAR_ALL /datum/reagent/sonic_powder @@ -240,7 +240,7 @@ taste_description = "loud noises" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED -/datum/reagent/sonic_powder/on_spark_act(power_charge, enclosed) +/datum/reagent/sonic_powder/on_spark_act(power_charge, spark_flags) // Even weaker version of the normal flash effect var/turf/location = get_turf(holder.my_atom) var/range = round(volume / 15, 1) @@ -270,8 +270,8 @@ if(metabolizer.adjust_fire_loss(0.15 * max(metabolizer.fire_stacks, 0.15) * metabolization_ratio * seconds_per_tick, updating_health = FALSE)) return UPDATE_MOB_HEALTH -/datum/reagent/phlogiston/on_spark_act(power_charge, enclosed) - if (enclosed && !ismob(holder.my_atom)) +/datum/reagent/phlogiston/on_spark_act(power_charge, spark_flags) + if ((spark_flags & SPARK_ACT_ENCLOSED) && !ismob(holder.my_atom)) if (!holder.my_atom.uses_integrity) return // Spicy! @@ -308,8 +308,8 @@ if(istype(exposed_mob) && (methods & (TOUCH|VAPOR|PATCH))) exposed_mob.adjust_fire_stacks(min(reac_volume / 4, 20)) -/datum/reagent/napalm/on_spark_act(power_charge, enclosed) - if (enclosed && !ismob(holder.my_atom)) +/datum/reagent/napalm/on_spark_act(power_charge, spark_flags) + if ((spark_flags & SPARK_ACT_ENCLOSED) && !ismob(holder.my_atom)) if (!holder.my_atom.uses_integrity) return // Spicy! @@ -361,7 +361,7 @@ /datum/reagent/cryostylane/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() - metabolization_rate = 0.25 * REM//faster consumption when alive + metabolization_rate = 0.625 * REAGENTS_METABOLISM //faster consumption when alive if(affected_mob.reagents.has_reagent(/datum/reagent/oxygen)) affected_mob.reagents.remove_reagent(/datum/reagent/oxygen, 1 * metabolization_ratio * seconds_per_tick) affected_mob.adjust_bodytemperature(-30 * metabolization_ratio * seconds_per_tick) @@ -445,7 +445,7 @@ var/mob/living/carbon/human/affected_human = affected_mob affected_human.physiology.siemens_coeff *= 0.5 -/datum/reagent/teslium/on_spark_act(power_charge, enclosed) +/datum/reagent/teslium/on_spark_act(power_charge, spark_flags) tesla_zap(source = holder.my_atom, zap_range = round(volume / 5, 1), power = volume * 20 + power_charge, cutoff = 1 KILO JOULES, zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN) playsound(holder.my_atom, 'sound/machines/defib/defib_zap.ogg', 50, TRUE) return SPARK_ACT_NON_DESTRUCTIVE diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 944fcac731fe..70bbb61993ac 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -67,7 +67,7 @@ /datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) . = ..() - if(affected_mob.adjust_tox_loss(0.5 * seconds_per_tick * REM, required_biotype = affected_biotype)) + if(affected_mob.adjust_tox_loss(0.25 * seconds_per_tick * metabolization_ratio, required_biotype = affected_biotype)) return UPDATE_MOB_HEALTH /datum/reagent/toxin/mutagen/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user) @@ -82,6 +82,7 @@ #define LIQUID_PLASMA_BP (50+T0C) #define LIQUID_PLASMA_IG (325+T0C) #define LIQUID_PLASMA_CHARGE_COEFF 2.7 +#define LIQUID_PLASMA_VOLUME_POWER_CAP 7 /datum/reagent/toxin/plasma name = "Plasma" @@ -150,7 +151,16 @@ exposed_mob.adjust_fire_stacks(reac_volume / 5) return -/datum/reagent/toxin/plasma/on_spark_act(power_charge, enclosed) +/datum/reagent/toxin/plasma/on_spark_act(power_charge, spark_flags) + // Tape up your plasma IEDs + if ((spark_flags & SPARK_ACT_WEAKEN_COMMON) && !(spark_flags & SPARK_ACT_ENCLOSED)) + if(holder.chem_temp < LIQUID_PLASMA_BP) + return NONE + var/turf/holder_turf = get_turf(holder) + if (holder_turf) + holder_turf.atmos_spawn_air("[GAS_PLASMA]=[volume];[TURF_TEMPERATURE(holder.chem_temp)]") + return SPARK_ACT_NON_DESTRUCTIVE + // If we have any stabilizing agent in the mix, we need 0.2% of a standard cell value per mol of agent to be spent at once to blow // This should allow for some more creative traps to be made with plasma var/agent_volume = holder.get_reagent_amount(/datum/reagent/stabilizing_agent) @@ -158,13 +168,21 @@ return NONE // Plasma explosions become stronger with higher current, and don't care about if they're enclosed or not - var/power_modifier = max(0, round(power_charge / STANDARD_CELL_CHARGE * LIQUID_PLASMA_CHARGE_COEFF, 1) - 1) - reagent_explode(holder, volume, modifier = power_modifier, strengthdiv = 5, clear_holder_reagents = FALSE) + var/power_modifier = max(0, round(sqrt(power_charge / STANDARD_CELL_CHARGE) * LIQUID_PLASMA_CHARGE_COEFF, 1) - 1) + var/strengthdiv = 5 + if (spark_flags & SPARK_ACT_WEAKEN_COMMON) + strengthdiv *= 3 // Stronger than waterpot, weaker than methbombs + var/current_limit = round(volume / LIQUID_PLASMA_VOLUME_POWER_CAP, 1) + // High current can only get you so far before you get a sharp dropoff + if (power_modifier > current_limit) + power_modifier = round(current_limit + log(power_modifier - current_limit + 1), 1) + reagent_explode(holder, volume, modifier = power_modifier, strengthdiv = strengthdiv, clear_holder_reagents = FALSE, flame_factor = 1) return SPARK_ACT_DESTRUCTIVE | SPARK_ACT_CLEAR_ALL #undef LIQUID_PLASMA_BP #undef LIQUID_PLASMA_IG #undef LIQUID_PLASMA_CHARGE_COEFF +#undef LIQUID_PLASMA_VOLUME_POWER_CAP /datum/reagent/toxin/hot_ice name = "Hot Ice Slush" @@ -296,7 +314,7 @@ /datum/reagent/toxin/zombiepowder/proc/zombify(mob/living/holder_mob) PRIVATE_PROC(TRUE) - holder_mob.adjust_oxy_loss(0.5*REM, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) + holder_mob.adjust_oxy_loss(0.25, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type) if((data?["method"] & (INGEST|INHALE)) && holder_mob.stat != DEAD) holder_mob.apply_status_effect(/datum/status_effect/reagent_effect/fakedeath, type) @@ -855,8 +873,7 @@ /datum/reagent/toxin/itching_powder/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, metabolization_ratio) var/scratched = FALSE - var/scratch_damage = 0.2 * REM - + var/scratch_damage = 0.25 * metabolization_ratio var/obj/item/bodypart/head = affected_mob.get_bodypart(BODY_ZONE_HEAD) if(!isnull(head) && SPT_PROB(8, seconds_per_tick)) scratched = affected_mob.itch(damage = scratch_damage, target_part = head) diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index e07c14d04846..ff4438037a06 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -305,8 +305,7 @@ if (!istype(holder.my_atom, /obj/machinery/plumbing)) //excludes standard plumbing equipment from spamming admins with this shit message_admins("Reagent explosion reaction occurred at [ADMIN_VERBOSEJMP(our_turf)][inside_msg]. Last Fingerprint: [touch_msg].") log_game("Reagent explosion reaction occurred at [AREACOORD(our_turf)]. Last Fingerprint: [lastkey ? lastkey : "N/A"]." ) - var/datum/effect_system/reagents_explosion/explosion_system = new() - explosion_system.set_up(power, our_turf, flash_fact = flash_factor, flame_fact = flame_factor) + var/datum/effect_system/reagents_explosion/explosion_system = new(our_turf, power, flash_fact = flash_factor, flame_fact = flame_factor) explosion_system.start(holder.my_atom) if (istype(holder.my_atom, /obj/item/organ/stomach)) @@ -370,7 +369,6 @@ //Spews out the inverse of the chems in the beaker of the products/reactants only /datum/chemical_reaction/proc/explode_invert_smoke(datum/reagents/holder, datum/equilibrium/equilibrium, force_range = 0, clear_products = TRUE, clear_reactants = TRUE, accept_impure = TRUE) var/datum/reagents/invert_reagents = new (2100, NO_REACT)//I think the biggest size we can get is 2100? - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new() var/sum_volume = 0 invert_reagents.my_atom = holder.my_atom //Give the gas a fingerprint for(var/datum/reagent/reagent as anything in holder.reagent_list) //make gas for reagents, has to be done this way, otherwise it never stops Exploding @@ -386,8 +384,7 @@ if(!force_range) force_range = (sum_volume/6) + 3 if(invert_reagents.reagent_list) - smoke.set_up(force_range, holder = holder.my_atom, location = holder.my_atom, carry = invert_reagents) - smoke.start(log = TRUE) + do_chem_smoke(force_range, holder.my_atom, holder.my_atom, carry = invert_reagents, log = TRUE) holder.my_atom.audible_message("The [holder.my_atom] suddenly explodes, launching the aerosolized reagents into the air!") if(clear_reactants) clear_reactants(holder) @@ -397,7 +394,6 @@ //Spews out the corrisponding reactions reagents (products/required) of the beaker in a smokecloud. Doesn't spew catalysts /datum/chemical_reaction/proc/explode_smoke(datum/reagents/holder, datum/equilibrium/equilibrium, force_range = 0, clear_products = TRUE, clear_reactants = TRUE) var/datum/reagents/reagents = new/datum/reagents(2100, NO_REACT)//Lets be safe first - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new() reagents.my_atom = holder.my_atom //fingerprint var/sum_volume = 0 for (var/datum/reagent/reagent as anything in holder.reagent_list) @@ -407,8 +403,7 @@ if(!force_range) force_range = (sum_volume/6) + 3 if(reagents.reagent_list) - smoke.set_up(force_range, holder = holder.my_atom, location = holder.my_atom, carry = reagents) - smoke.start(log = TRUE) + do_chem_smoke(force_range, holder = holder.my_atom, location = holder.my_atom, carry = reagents, log = TRUE) holder.my_atom.audible_message("The [holder.my_atom] suddenly explodes, launching the aerosolized reagents into the air!") if(clear_reactants) clear_reactants(holder) diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm index f4f89f6af366..8b563bb9b1a4 100644 --- a/code/modules/reagents/chemistry/recipes/drugs.dm +++ b/code/modules/reagents/chemistry/recipes/drugs.dm @@ -72,9 +72,8 @@ if(!istype(holder.my_atom, /obj/machinery/plumbing)) //excludes standard plumbing equipment from spamming admins with this shit message_admins("Reagent explosion reaction occurred at [ADMIN_VERBOSEJMP(T)][inside_msg]. Last Fingerprint: [touch_msg].") log_game("Reagent explosion reaction occurred at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"]." ) - var/datum/effect_system/reagents_explosion/e = new() - e.set_up(power, T) - e.start(holder.my_atom) + var/datum/effect_system/reagents_explosion/expl = new(T, power) + expl.start(holder.my_atom) holder.clear_reagents() ///Amount of meth required to make a crystal diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 876bfc6d78ed..d627f119cd97 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -393,12 +393,8 @@ return holder.remove_reagent(/datum/reagent/smoke_powder, created_volume * 3) var/location = get_turf(holder.my_atom) - var/datum/effect_system/fluid_spread/smoke/chem/S = new - S.attach(location) + do_chem_smoke(amount = created_volume * 3, holder = holder.my_atom, location = location, carry = holder, silent = FALSE, log = TRUE) playsound(location, 'sound/effects/smoke.ogg', 50, TRUE, -3) - if(S) - S.set_up(amount = created_volume * 3, holder = holder.my_atom, location = location, carry = holder, silent = FALSE) - S.start(log = TRUE) if(holder?.my_atom) holder.clear_reagents() if (!iscarbon(holder?.my_atom)) @@ -417,12 +413,8 @@ /datum/chemical_reaction/smoke_powder_smoke/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/location = get_turf(holder.my_atom) - var/datum/effect_system/fluid_spread/smoke/chem/S = new - S.attach(location) + do_chem_smoke(amount = created_volume, holder = holder.my_atom, location = location, carry = holder, log = TRUE, silent = FALSE) playsound(location, 'sound/effects/smoke.ogg', 50, TRUE, -3) - if(S) - S.set_up(amount = created_volume, holder = holder.my_atom, location = location, carry = holder, silent = FALSE) - S.start(log = TRUE) if(holder?.my_atom) holder.clear_reagents() if(holder?.my_atom) diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index cd2d8e6821ff..56c1c26654d4 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -329,6 +329,13 @@ list_reagents = list(/datum/reagent/consumable/ketchup = 50) fill_icon_thresholds = null +/obj/item/reagent_containers/condiment/mustard + name = "mustard" + desc = "A spicy and tangy sauce made out of the mustard plant. Great on hotdogs!" + icon_state = "mustard" + list_reagents = list(/datum/reagent/consumable/mustard = 50) + fill_icon_thresholds = null + /obj/item/reagent_containers/condiment/worcestershire name = "worcestershire sauce" desc = "A fermented sauce of legend from old England. Makes almost anything better." diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm index cc65cb3d9e97..e76832500a2f 100644 --- a/code/modules/reagents/reagent_containers/cups/_cup.dm +++ b/code/modules/reagents/reagent_containers/cups/_cup.dm @@ -11,31 +11,53 @@ righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' reagent_container_liquid_sound = SFX_DEFAULT_LIQUID_SLOSH - ///Like Edible's food type, what kind of drink is this? + /// Like Edible's food type, what kind of drink is this? var/drink_type = NONE - ///The last time we have checked for taste. + /// The last time we have checked for taste. var/last_check_time - ///How much we drink at once, shot glasses drink more. + /// How much we drink at once, shot glasses drink more. var/gulp_size = 5 - ///Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it. + /// Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it. var/isGlass = FALSE - ///What kind of chem transfer method does this cup use. Defaults to INGEST + /// What kind of chem transfer method does this cup use. Defaults to INGEST var/reagent_consumption_method = INGEST - ///What sound does our consumption play on consuming from the container? + /// What sound does our consumption play on consuming from the container? var/consumption_sound = 'sound/items/drink.ogg' - ///Whether to allow heating up the contents with a source of flame. + /// Whether to allow heating up the contents with a source of flame. var/heatable = TRUE + /// Can we put a lid on this container? + var/can_lid = FALSE + /// Does this container have a lid on right now? + var/has_lid = FALSE + /// Assembly attached to our lid + var/obj/item/assembly_holder/lid_assembly = null + /// Power cell duct-taped to the side of the beaker + var/obj/item/stock_parts/power_store/cell/attached_cell = null + /// Have we added wiring to the cell? + var/cell_wired = FALSE + /// Visual y-offset for the assembly on our lid + var/assembly_pixel_y = 0 /obj/item/reagent_containers/cup/Initialize(mapload, vol) . = ..() if(heatable) AddElement(/datum/element/reagents_item_heatable) +/obj/item/reagent_containers/cup/Destroy(force) + QDEL_NULL(lid_assembly) + QDEL_NULL(attached_cell) + return ..() + /obj/item/reagent_containers/cup/examine(mob/user) . = ..() if(drink_type) var/list/types = bitfield_to_list(drink_type, FOOD_FLAGS) . += span_notice("The label says it contains [LOWER_TEXT(english_list(types))] ingredients.") + if(can_lid) + if(has_lid) + . += span_notice("Its sealed with a bright orange rubber lid[!isnull(lid_assembly) ? "with an assembly attached ontop of it" : ""].") + else + . += span_notice("It can be sealed with a lid using [EXAMINE_HINT("Alt-Click")].") /** * Checks if the mob actually liked drinking this cup. @@ -141,8 +163,58 @@ return NONE /obj/item/reagent_containers/cup/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(has_lid && istype(tool, /obj/item/assembly_holder)) + if (lid_assembly) + to_chat(user, span_warning("[src]'s lid already has an assembly attached to it!")) + return ITEM_INTERACT_BLOCKING + + if (attach_assembly(tool, user)) + playsound(src, 'sound/machines/click.ogg', 50, TRUE) + return ITEM_INTERACT_SUCCESS + return ITEM_INTERACT_BLOCKING + + if (lid_assembly && istype(tool, /obj/item/stock_parts/power_store/cell)) + if (attached_cell) + to_chat(user, span_warning("[src] already has \a [attached_cell] attached to it!")) + return ITEM_INTERACT_BLOCKING + + if (isnull(locate(/obj/item/assembly/igniter) in lid_assembly)) + to_chat(user, span_warning("[lid_assembly] doesn't have an igniter to connect [src] to!")) + return ITEM_INTERACT_BLOCKING + + if (!user.transferItemToLoc(tool, src)) + to_chat(user, span_warning("[tool] is stuck to your hand!")) + return ITEM_INTERACT_BLOCKING + + to_chat(user, span_notice("You attach [tool] underneath [src]'s lid.")) + add_fingerprint(user) + log_bomber(user, "attached [tool.name] to", src) + attached_cell = tool + attached_cell.pixel_y = 0 + attached_cell.pixel_z = -4 + update_appearance() + playsound(src, 'sound/machines/click.ogg', 50, TRUE) + return ITEM_INTERACT_SUCCESS + + if (attached_cell && istype(tool, /obj/item/stack/cable_coil)) + if (cell_wired) + to_chat(user, span_warning("[attached_cell] is already wired to [lid_assembly]!")) + return ITEM_INTERACT_BLOCKING + + var/obj/item/stack/cable_coil/cable = tool + if (!cable.use(5)) + to_chat(user, span_warning("You need at least 5 cable pieces to wire [attached_cell]!")) + return ITEM_INTERACT_BLOCKING + + to_chat(user, span_notice("You wire [attached_cell] to [lid_assembly].")) + add_fingerprint(user) + cell_wired = TRUE + update_appearance() + return ITEM_INTERACT_SUCCESS + if(!is_open_container()) return NONE + if(istype(tool, /obj/item/food/egg)) //breaking eggs if(reagents.holder_full()) to_chat(user, span_notice("[src] is full.")) @@ -172,6 +244,125 @@ /obj/item/reagent_containers/cup/proc/on_cup_reset() drink_type = NONE +/obj/item/reagent_containers/cup/update_overlays() + . = ..() + if (has_lid) + . += mutable_appearance(icon, "[icon_state]_lid") + if (lid_assembly) + . += lid_assembly + if (attached_cell) + . += attached_cell + if (cell_wired) + . += mutable_appearance('icons/obj/machines/cell_charger.dmi', "ccharger-[attached_cell.connector_type]-on") + +// For player convinience, assume that the lids are rubber and can be pierced with a syringe +/obj/item/reagent_containers/cup/is_refillable() + return ..() && !has_lid + +/obj/item/reagent_containers/cup/is_drainable() + return ..() && !has_lid + +/obj/item/reagent_containers/cup/is_dunkable() + return ..() && !has_lid + +/obj/item/reagent_containers/cup/attack_self(mob/user) + if (!lid_assembly) + return ..() + lid_assembly.attack_self(user) + return TRUE + +/obj/item/reagent_containers/cup/click_alt(mob/user) + if (!can_lid) + return NONE + + if (cell_wired) + balloon_alert(user, "cut the wiring first!") + return CLICK_ACTION_BLOCKING + + if (attached_cell) + var/obj/item/our_cell = attached_cell + // Exited() automatically clears it + our_cell.forceMove(drop_location()) + user.put_in_hands(our_cell) + balloon_alert(user, "cell detached") + update_appearance() + return CLICK_ACTION_SUCCESS + + if (lid_assembly) + var/obj/item/our_assembly = lid_assembly + our_assembly.forceMove(drop_location()) + user.put_in_hands(our_assembly) + balloon_alert(user, "assembly detached") + update_appearance() + return CLICK_ACTION_SUCCESS + + has_lid = !has_lid + update_appearance() + balloon_alert(user, "lid [has_lid ? "sealed" : "unsealed"]") + if (has_lid) + add_container_flags(SEALED_CONTAINER) + else + reset_container_flags() + return CLICK_ACTION_SUCCESS + +/obj/item/reagent_containers/cup/wirecutter_act(mob/living/user, obj/item/tool) + if (user.combat_mode || !cell_wired) + return NONE + + new /obj/item/stack/cable_coil(drop_location(), 5) + cell_wired = FALSE + update_appearance() + balloon_alert(user, "wiring cut") + tool.play_tool_sound(src, 50) + return ITEM_INTERACT_SUCCESS + +/obj/item/reagent_containers/cup/proc/attach_assembly(obj/item/assembly_holder/assembly, mob/living/user) + if (!user.transferItemToLoc(assembly, src)) + to_chat(user, span_warning("[assembly] is stuck to your hand!")) + return FALSE + + to_chat(user, span_notice("You attach [assembly] to [src]'s lid.")) + add_fingerprint(user) + lid_assembly = assembly + lid_assembly.master = src + lid_assembly.pixel_y = 0 + lid_assembly.pixel_z = assembly_pixel_y + lid_assembly.on_attach() + RegisterSignal(src, COMSIG_IGNITER_ACTIVATE, PROC_REF(on_igniter_activate)) + log_bomber(user, "attached [lid_assembly.name] to", src) + update_appearance() + return TRUE + +/obj/item/reagent_containers/cup/Exited(atom/movable/gone, direction) + . = ..() + if (gone == lid_assembly) + lid_assembly = null + UnregisterSignal(src, COMSIG_IGNITER_ACTIVATE) + update_appearance() + else if (gone == attached_cell) + attached_cell = null + cell_wired = FALSE + update_appearance() + +/obj/item/reagent_containers/cup/proc/on_igniter_activate(datum/source, obj/item/assembly/igniter/igniter) + SIGNAL_HANDLER + // We've got an attached cell wired up, so we'll try to spend all of its current first + if (attached_cell && cell_wired) + var/power_spent = attached_cell.use(attached_cell.charge()) + // Power cell was rigged + if (QDELETED(src)) + return + + // We'll be nerfing plasma and welding fuel as they're very easy to get and make for boring bombs + if (power_spent > 0 && (reagents.spark_act(power_spent, SPARK_ACT_ENCLOSED | SPARK_ACT_WEAKEN_COMMON) & SPARK_ACT_DESTRUCTIVE)) + qdel(src) + return + + // Igniters heat, condensers chill + var/igniter_temp = igniter.get_temperature() + if (igniter_temp > 0) + reagents.expose_temperature(igniter_temp) + /obj/item/reagent_containers/cup/beaker name = "beaker" desc = "A beaker. It can hold up to 50 units." @@ -186,6 +377,8 @@ pickup_sound = 'sound/items/handling/beaker_pickup.ogg' drop_sound = 'sound/items/handling/beaker_place.ogg' sound_vary = TRUE + can_lid = TRUE + assembly_pixel_y = 4 /obj/item/reagent_containers/cup/beaker/Initialize(mapload) . = ..() @@ -199,6 +392,7 @@ desc = "A jar for honey. It can hold up to 50 units of sweet delight." icon = 'icons/obj/medical/chemical.dmi' icon_state = "vapour" + can_lid = FALSE /obj/item/reagent_containers/cup/beaker/large name = "large beaker" @@ -209,6 +403,7 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100) fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) + assembly_pixel_y = 8 /obj/item/reagent_containers/cup/beaker/plastic name = "x-large beaker" @@ -220,6 +415,7 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,60,120) fill_icon_thresholds = list(0, 1, 10, 20, 40, 60, 80, 100) + assembly_pixel_y = 8 /obj/item/reagent_containers/cup/beaker/meta name = "metamaterial beaker" @@ -231,6 +427,7 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,60,120,180) fill_icon_thresholds = list(0, 1, 10, 25, 35, 50, 60, 80, 100) + assembly_pixel_y = 10 /obj/item/reagent_containers/cup/beaker/noreact name = "cryostasis beaker" @@ -242,6 +439,7 @@ initial_reagent_flags = OPENCONTAINER | NO_REACT volume = 50 amount_per_transfer_from_this = 10 + can_lid = FALSE /obj/item/reagent_containers/cup/beaker/bluespace name = "bluespace beaker" @@ -254,6 +452,7 @@ volume = 300 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300) + can_lid = FALSE /obj/item/reagent_containers/cup/beaker/meta/omnizine list_reagents = list(/datum/reagent/medicine/omnizine = 180) @@ -529,3 +728,8 @@ possible_transfer_amounts = list(5, 10, 15, 30) volume = 30 fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) + can_lid = TRUE + +/obj/item/reagent_containers/cup/tube/attach_assembly(obj/item/assembly_holder/assembly, mob/living/user) + to_chat(user, span_warning("[src]'s lid is too small to fit [assembly]!")) + return FALSE diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm index 9557ef3a9f75..5a8e8bc5a7d5 100644 --- a/code/modules/reagents/reagent_containers/cups/bottle.dm +++ b/code/modules/reagents/reagent_containers/cups/bottle.dm @@ -11,6 +11,8 @@ possible_transfer_amounts = list(5, 10, 15, 25, 50) volume = 50 fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) + can_lid = TRUE + assembly_pixel_y = 4 /obj/item/reagent_containers/cup/bottle/Initialize(mapload) . = ..() @@ -505,6 +507,7 @@ fill_icon_thresholds = list(0, 20, 40, 60, 80, 100) possible_transfer_amounts = list(5, 10) amount_per_transfer_from_this = 5 + can_lid = FALSE /obj/item/reagent_containers/cup/bottle/syrup_bottle/Initialize(mapload) . = ..() diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index 872a365c2473..ef2943ae4fce 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -1043,6 +1043,14 @@ list_reagents = list(/datum/reagent/consumable/orangejuice = 100) drink_type = FRUIT | BREAKFAST +/obj/item/reagent_containers/cup/glass/bottle/juice/lemonjuice + name = "lemon juice" + desc = "Some like to pour a few drops of this over their fish." + icon = 'icons/obj/drinks/boxes.dmi' + icon_state = "lemonjuice" + list_reagents = list(/datum/reagent/consumable/lemonjuice = 100) + drink_type = FRUIT + /obj/item/reagent_containers/cup/glass/bottle/juice/cream name = "milk cream" desc = "It's cream. Made from milk. What else did you think you'd find in there?" diff --git a/code/modules/reagents/reagent_containers/cups/organ_jar.dm b/code/modules/reagents/reagent_containers/cups/organ_jar.dm index 52754f5836a7..b71b048de283 100644 --- a/code/modules/reagents/reagent_containers/cups/organ_jar.dm +++ b/code/modules/reagents/reagent_containers/cups/organ_jar.dm @@ -12,6 +12,7 @@ possible_transfer_amounts = list(20, 40, 60, 120) fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100) w_class = WEIGHT_CLASS_SMALL // Organs are small by default, so the jar should be at least small as well + can_lid = FALSE /// The organ that is currently inside the jar var/obj/item/organ/held_organ = null /// Whether the jar is filled to capacity with formaldehyde, preserving any organ inside diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm index a7fd8865cabd..33c984a61a85 100644 --- a/code/modules/reagents/reagent_containers/cups/soda.dm +++ b/code/modules/reagents/reagent_containers/cups/soda.dm @@ -22,6 +22,12 @@ throwforce = 12 // set to 0 upon being opened. Have you ever been domed by a soda can? Those things fucking hurt /// If the can hasn't been opened yet, this is the measure of how fizzed up it is from being shaken or thrown around. When opened, this is rolled as a percentage chance to burst var/fizziness = 0 + /// Have we been sealed with tape? And if so, what color is it? + var/tape_color = null + /// Color of our fuse, if any + var/fuse_color = null + /// Timer for our explosion + var/fuse_timer = null /obj/item/reagent_containers/cup/soda_cans/Initialize(mapload, vol) . = ..() @@ -39,7 +45,7 @@ H.visible_message(span_warning("[H] is trying to take a big sip from [src]... The can is empty!")) return SHAME if(!is_drainable()) - open_soda() + open_soda(H) sleep(1 SECONDS) H.visible_message(span_suicide("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!")) playsound(H,'sound/items/drink.ogg', 80, TRUE) @@ -67,24 +73,24 @@ return TOXLOSS /obj/item/reagent_containers/cup/soda_cans/interact_with_atom(atom/target, mob/living/user, list/modifiers) - if(iscarbon(target) && !reagents.total_volume && user.combat_mode && user.zone_selected == BODY_ZONE_HEAD) - if(target == user) - user.visible_message( - span_warning("[user] crushes the can of [src] on [user.p_their()] forehead!"), - span_notice("You crush the can of [src] on your forehead."), - ) - else - user.visible_message( - span_warning("[user] crushes the can of [src] on [target]'s forehead!"), - span_notice("You crush the can of [src] on [target]'s forehead."), - ) - playsound(src, 'sound/items/weapons/pierce.ogg', rand(10, 50), TRUE) - var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(target.drop_location()) - crushed_can.icon_state = icon_state - qdel(src) - return ITEM_INTERACT_SUCCESS - - return ..() + if(!iscarbon(target) || reagents.total_volume || !user.combat_mode || user.zone_selected != BODY_ZONE_HEAD) + return ..() + + if(target == user) + user.visible_message( + span_warning("[user] crushes the can of [src] on [user.p_their()] forehead!"), + span_notice("You crush the can of [src] on your forehead."), + ) + else + user.visible_message( + span_warning("[user] crushes the can of [src] on [target]'s forehead!"), + span_notice("You crush the can of [src] on [target]'s forehead."), + ) + playsound(src, 'sound/items/weapons/pierce.ogg', rand(10, 50), TRUE) + var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(target.drop_location()) + crushed_can.icon_state = icon_state + qdel(src) + return ITEM_INTERACT_SUCCESS /obj/item/reagent_containers/cup/soda_cans/bullet_act(obj/projectile/proj) . = ..() @@ -99,6 +105,14 @@ qdel(src) /obj/item/reagent_containers/cup/soda_cans/proc/open_soda(mob/user) + if(tape_color) + to_chat(user, "You rip off the tape covering [src]'s hole.") + playsound(user, 'sound/items/duct_tape/duct_tape_rip.ogg', 50, TRUE) + tape_color = null + add_container_flags(OPENCONTAINER) + update_appearance() + return + if(prob(fizziness)) user.visible_message(span_danger("[user] opens [src], and is suddenly sprayed by the fizzing contents!"), span_danger("You pull back the tab of [src], and are suddenly sprayed with a torrent of liquid! Ahhh!!")) burst_soda(user) @@ -135,9 +149,120 @@ reagents.clear_reagents() throwforce = 0 +/obj/item/reagent_containers/cup/soda_cans/wirecutter_act(mob/living/user, obj/item/tool) + if (!fuse_color) + return NONE + to_chat(user, span_notice("You snip [src]'s fuse off.")) + tool.play_tool_sound(src, 50) + add_fingerprint(user) + fuse_color = null + if (!isnull(fuse_timer)) + deltimer(fuse_timer) + fuse_timer = null + log_bomber(user, "has disarmed", src) + if (heatable) + AddElement(/datum/element/reagents_item_heatable) + update_appearance() + +/obj/item/reagent_containers/cup/soda_cans/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if (istype(tool, /obj/item/stack/cable_coil)) + if (fuse_color) + to_chat(user, span_warning("[src] already has a fuse attached to it!")) + return ITEM_INTERACT_BLOCKING + + if (tape_color) + to_chat(user, span_warning("[src]'s hole is covered up with tape!")) + return ITEM_INTERACT_BLOCKING + + if (!is_drainable()) + to_chat(user, span_warning("[src] hasn't been opened yet!")) + return ITEM_INTERACT_BLOCKING + + var/obj/item/stack/cable_coil/coil = tool + var/coil_color = GLOB.cable_colors[coil.cable_color] + add_fingerprint(user) + if (!coil.use(1)) + return ITEM_INTERACT_BLOCKING + + fuse_color = coil_color + // Heating replaced with lighting the fuse + RemoveElement(/datum/element/reagents_item_heatable) + to_chat(user, span_notice("You attach a fuse to [src].")) + log_bomber(user, "attached a fuse to", src) + update_appearance() + return ITEM_INTERACT_SUCCESS + + if (istype(tool, /obj/item/stack/sticky_tape)) + if (tape_color) + to_chat(user, span_warning("[src]'s hole is already covered up with tape!")) + return ITEM_INTERACT_BLOCKING + + if (!is_drainable()) + to_chat(user, span_warning("[src] hasn't been opened yet!")) + return ITEM_INTERACT_BLOCKING + + var/obj/item/stack/sticky_tape/tape = tool + var/list/tape_colors = SSgreyscale.ParseColorString(tape.greyscale_colors) + add_fingerprint(user) + if (!tape.use(1)) + return ITEM_INTERACT_BLOCKING + + tape_color = tape_colors[1] + to_chat(user, span_notice("You wrap [src] up in [tape].")) + reset_container_flags() + update_appearance() + return ITEM_INTERACT_SUCCESS + + if (!fuse_color || tool.get_temperature() < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + return ..() + + if (fuse_timer) + to_chat(user, span_warning("[src] is already lit!")) + return ITEM_INTERACT_BLOCKING + + add_fingerprint(user) + log_bomber(user, "has primed a rigged", src) + to_chat(user, span_warning("You light [src]'s fuse!")) + fuse_timer = addtimer(CALLBACK(src, PROC_REF(try_detonate)), rand(2 SECONDS, 4 SECONDS)) + update_appearance() + return ITEM_INTERACT_SUCCESS + +/obj/item/reagent_containers/cup/soda_cans/proc/try_detonate() + var/spark_flags = SPARK_ACT_WEAKEN_COMMON + if (tape_color) + spark_flags |= SPARK_ACT_ENCLOSED + + playsound(src, 'sound/effects/sparks/sparks1.ogg', 50, TRUE) + if (reagents.spark_act(0, spark_flags) & SPARK_ACT_DESTRUCTIVE) + qdel(src) + return + + // Was a dud + fuse_color = null + tape_color = null + add_container_flags(OPENCONTAINER) + if (heatable) + AddElement(/datum/element/reagents_item_heatable) + update_appearance() + +/obj/item/reagent_containers/cup/soda_cans/update_overlays() + . = ..() + if (fuse_color) + var/mutable_appearance/fuse_overlay = mutable_appearance('icons/obj/weapons/grenade.dmi', "improvised_grenade_fuse") + fuse_overlay.color = fuse_color + . += fuse_overlay + + if (tape_color) + var/mutable_appearance/tape_overlay = mutable_appearance('icons/obj/weapons/grenade.dmi', "improvised_grenade_tape") + tape_overlay.color = tape_color + . += tape_overlay + + if (fuse_timer) + . += mutable_appearance('icons/obj/weapons/grenade.dmi', "improvised_grenade_active") + /obj/item/reagent_containers/cup/soda_cans/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() - if(. || is_open_container() || !reagents.total_volume) // if it was caught, already opened, or has nothing in it + if(. || is_open_container() || !reagents.total_volume || tape_color) // if it was caught, already opened, or has nothing in it return fizziness += SODA_FIZZINESS_THROWN @@ -152,9 +277,14 @@ QDEL_IN(src, 1 SECONDS) // give it a second so it can still be logged for the throw impact /obj/item/reagent_containers/cup/soda_cans/attack_self(mob/user) + if(fuse_timer) + balloon_alert(user, "the fuse is on fire!") + return + if(!is_drainable()) open_soda(user) return + return ..() /obj/item/reagent_containers/cup/soda_cans/attack_self_secondary(mob/user) diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm index 181a7e1d6e1c..8a8faa72bae3 100644 --- a/code/modules/reagents/reagent_containers/inhaler.dm +++ b/code/modules/reagents/reagent_containers/inhaler.dm @@ -260,21 +260,11 @@ /obj/item/reagent_containers/inhaler_canister/handle_deconstruct(disassembled) if (!reagents?.total_volume) - return ..() - - var/datum/reagents/smoke_reagents = new/datum/reagents() // Lets be safe first, our own reagents may be qdelled if we get deleted - var/datum/effect_system/fluid_spread/smoke/chem/smoke_machine/smoke = new() - smoke_reagents.my_atom = src - for (var/datum/reagent/reagent as anything in reagents.reagent_list) - smoke_reagents.add_reagent(reagent.type, reagent.volume, added_purity = reagent.purity) - reagents.remove_reagent(reagent.type, reagent.volume) - if (smoke_reagents.reagent_list) - smoke.set_up(1, holder = src, location = get_turf(src), carry = smoke_reagents) - smoke.start(log = TRUE) - visible_message(span_warning("[src] breaks open and sprays its aerosilized contents everywhere!")) - else visible_message(span_warning("[src] breaks open - but is empty!")) + return ..() + do_chem_smoke(1, src, get_turf(src), carry = reagents, log = TRUE) + visible_message(span_warning("[src] breaks open and sprays its aerosilized contents everywhere!")) return ..() /obj/item/inhaler/medical diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 60af82540d22..b052473d55f8 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -211,11 +211,8 @@ return FALSE /obj/structure/reagent_dispensers/proc/knock_down() - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new () var/range = reagents.total_volume / REAGENT_SPILL_DIVISOR - smoke.attach(drop_location()) - smoke.set_up(round(range), holder = drop_location(), location = drop_location(), carry = reagents, silent = FALSE) - smoke.start(log = TRUE) + do_chem_smoke(round(range), drop_location(), drop_location(), carry = reagents, silent = FALSE, log = TRUE) reagents.clear_reagents() qdel(src) diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm index 8930450f2267..5d1cc61f92c8 100644 --- a/code/modules/religion/burdened/psyker.dm +++ b/code/modules/religion/burdened/psyker.dm @@ -40,9 +40,13 @@ limb_id = BODYPART_ID_PSYKER is_dimorphic = FALSE should_draw_greyscale = FALSE - bodypart_traits = list(TRAIT_DISFIGURED, TRAIT_BALD, TRAIT_SHAVED) + bodypart_traits = list(TRAIT_BALD, TRAIT_SHAVED) head_flags = HEAD_DEBRAIN | HEAD_NO_DISFIGURE // ignore disfigurement by damage, as we're always disfigured +/obj/item/bodypart/head/psyker/Initialize(mapload) + . = ..() + ADD_TRAIT(src, TRAIT_DISFIGURED, INNATE_TRAIT) + /// flavorful variant of psykerizing that deals damage and sends messages before calling psykerize() /mob/living/carbon/human/proc/slow_psykerize(blind_them = FALSE) if(stat == DEAD || !get_bodypart(BODY_ZONE_HEAD) || istype(get_bodypart(BODY_ZONE_HEAD), /obj/item/bodypart/head/psyker)) @@ -177,28 +181,10 @@ /obj/item/gun/ballistic/revolver/chaplain/Initialize(mapload) . = ..() - AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY) - AddComponent(/datum/component/effect_remover, \ - success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \ - success_forcesay = "BEGONE FOUL MAGIKS!!", \ - tip_text = "Clear rune", \ - on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \ - effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune, /obj/effect/cosmic_rune), \ - ) - AddElement(/datum/element/bane, mob_biotypes = MOB_SPIRIT, damage_multiplier = 0, added_damage = 25) + AddElement(/datum/element/nullrod_core, FALSE) name = pick(possible_names) desc = possible_names[name] -/obj/item/gun/ballistic/revolver/chaplain/proc/on_cult_rune_removed(obj/effect/target, mob/living/user) - SIGNAL_HANDLER - if(!istype(target, /obj/effect/rune)) - return - - var/obj/effect/rune/target_rune = target - if(target_rune.log_when_erased) - user.log_message("erased [target_rune.cultist_name] rune using [src]", LOG_GAME) - SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE - /obj/item/gun/ballistic/revolver/chaplain/suicide_act(mob/living/user) . = ..() name = "Habemus Papam" diff --git a/code/modules/research/anomaly/anomaly_core.dm b/code/modules/research/anomaly/anomaly_core.dm index 1d7b54c080ab..441a1108e8dc 100644 --- a/code/modules/research/anomaly/anomaly_core.dm +++ b/code/modules/research/anomaly/anomaly_core.dm @@ -100,3 +100,6 @@ desc = "The neutralized core of a weather anomaly. The sound of thunder can be heard in the distance. It'd probably be valuable for research." icon_state = "weather_core" anomaly_type = /obj/effect/anomaly/weather + + /// Used in weather towers to track uses before depleting + var/charges = 8 diff --git a/code/modules/research/designs/autolathe/multi-department_designs.dm b/code/modules/research/designs/autolathe/multi-department_designs.dm index bb7761c86fa1..bb6a1d478407 100644 --- a/code/modules/research/designs/autolathe/multi-department_designs.dm +++ b/code/modules/research/designs/autolathe/multi-department_designs.dm @@ -40,7 +40,10 @@ name = "Multitool" id = "multitool" build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*0.5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2) + materials = list( + /datum/material/iron =SMALL_MATERIAL_AMOUNT * 0.5, + /datum/material/glass =SMALL_MATERIAL_AMOUNT * 0.2 + ) build_path = /obj/item/multitool category = list( RND_CATEGORY_INITIAL, diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 6f7e8fc0d4e4..457b4cca52a4 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -233,9 +233,7 @@ use_energy(750 JOULES) /obj/machinery/rnd/experimentor/proc/throwSmoke(turf/where) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src, location = where) - smoke.start() + do_smoke(0, src, where) /obj/machinery/rnd/experimentor/proc/experiment(exp,obj/item/exp_on) recentlyExperimented = 1 @@ -307,27 +305,15 @@ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] destroys [exp_on], leaking dangerous gas!")) chosenchem = pick(/datum/reagent/carbon,/datum/reagent/uranium/radium,/datum/reagent/toxin,/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,/datum/reagent/drug/space_drugs,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/ethanol/beepsky_smash) - var/datum/reagents/tmp_holder = new/datum/reagents(50) - tmp_holder.my_atom = src - tmp_holder.add_reagent(chosenchem , 50) + do_chem_smoke(0, src, loc, chosenchem, 50) investigate_log("Experimentor has released [chosenchem] smoke.", INVESTIGATE_EXPERIMENTOR) - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new - smoke.set_up(0, holder = src, location = src, carry = tmp_holder, silent = TRUE) playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) - smoke.start() - qdel(tmp_holder) ejectItem(TRUE) else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src]'s chemical chamber has sprung a leak!")) chosenchem = pick(/datum/reagent/mutationtoxin/classic,/datum/reagent/cyborg_mutation_nanomachines,/datum/reagent/toxin/acid) - var/datum/reagents/tmp_holder = new/datum/reagents(50) - tmp_holder.my_atom = src - tmp_holder.add_reagent(chosenchem , 50) - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new - smoke.set_up(0, holder = src, location = src, carry = tmp_holder, silent = TRUE) + do_chem_smoke(0, src, loc, chosenchem, 50) playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) - smoke.start() - qdel(tmp_holder) ejectItem(TRUE) warn_admins(usr, "[chosenchem] smoke") investigate_log("Experimentor has released [chosenchem] smoke!", INVESTIGATE_EXPERIMENTOR) @@ -398,15 +384,9 @@ investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR) else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_danger("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")) - var/datum/reagents/tmp_holder = new/datum/reagents(50) - tmp_holder.my_atom = src - tmp_holder.add_reagent(/datum/reagent/consumable/frostoil, 50) + do_chem_smoke(0, src, loc, /datum/reagent/consumable/frostoil, 50) investigate_log("Experimentor has released frostoil gas.", INVESTIGATE_EXPERIMENTOR) - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new - smoke.set_up(0, holder = src, location = src, carry = tmp_holder, silent = TRUE) playsound(src, 'sound/effects/smoke.ogg', 50, TRUE, -3) - smoke.start() - qdel(tmp_holder) ejectItem(TRUE) else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, shattering [exp_on] and leaking cold air!")) @@ -419,9 +399,7 @@ ejectItem(TRUE) else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01)) visible_message(span_warning("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!")) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src, location = loc) - smoke.start() + do_smoke(0, src, loc) ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_OBLITERATE) @@ -571,19 +549,11 @@ COOLDOWN_DECLARE(cooldown) //What visual theme this artefact has. Current possible choices: "prototype", "necrotech" var/artifact_theme = "prototype" - var/datum/effect_system/spark_spread/sparks /obj/item/relic/Initialize(mapload) . = ..() - sparks = new() - sparks.set_up(5, 1, src) - sparks.attach(src) random_themed_appearance() -/obj/item/relic/Destroy(force) - QDEL_NULL(sparks) - . = ..() - /obj/item/relic/proc/random_themed_appearance() var/themed_name_prefix var/themed_name_suffix @@ -642,9 +612,7 @@ call(src, hidden_power)(user) /obj/item/relic/proc/throw_smoke(turf/where) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src, location = get_turf(where)) - smoke.start() + do_smoke(0, src, get_turf(where)) // Artefact Powers \\ @@ -740,7 +708,7 @@ /obj/item/relic/proc/drink_dispenser(mob/user) var/obj/item/reagent_containers/cup/glass/drinkingglass/freebie = new(get_step_rand(user)) playsound(freebie, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - sparks.start() + do_sparks(5, TRUE, src, src) addtimer(CALLBACK(src, PROC_REF(dispense_drink), freebie), 0.5 SECONDS) /obj/item/relic/proc/dispense_drink(obj/item/reagent_containers/cup/glass/glasser) diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index 8ccfc9c97bbc..a8a686d7a180 100644 --- a/code/modules/research/xenobiology/crossbreeding/burning.dm +++ b/code/modules/research/xenobiology/crossbreeding/burning.dm @@ -45,12 +45,7 @@ Burning extracts: /obj/item/slimecross/burning/orange/do_effect(mob/user) user.visible_message(span_danger("[src] boils over with a caustic gas!")) - var/datum/reagents/tmp_holder = new/datum/reagents(100) - tmp_holder.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 100) - - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new - smoke.set_up(7, holder = src, location = get_turf(user), carry = tmp_holder) - smoke.start(log = TRUE) + do_chem_smoke(7, user, get_turf(user), /datum/reagent/consumable/condensedcapsaicin, 100, log = TRUE) ..() /obj/item/slimecross/burning/purple @@ -120,12 +115,8 @@ Burning extracts: /obj/item/slimecross/burning/darkblue/do_effect(mob/user) user.visible_message(span_danger("[src] releases a burst of chilling smoke!")) - var/datum/reagents/tmp_holder = new/datum/reagents(100) - tmp_holder.add_reagent(/datum/reagent/consumable/frostoil, 40) user.reagents.add_reagent(/datum/reagent/medicine/regen_jelly, 10) - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new - smoke.set_up(7, holder = src, location = get_turf(user), carry = tmp_holder) - smoke.start(log = TRUE) + do_chem_smoke(7, user, get_turf(user), /datum/reagent/consumable/frostoil, 40, log = TRUE) ..() /obj/item/slimecross/burning/silver diff --git a/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm b/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm index 4a564b58b130..0b73e2351406 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm @@ -97,9 +97,7 @@ new /obj/effect/gibspawner/generic(get_turf(vat)) //Spawn some gibs. /datum/micro_organism/cell_line/proc/succeed_growing(obj/machinery/vatgrower/vat) - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = vat, location = vat.loc) - smoke.start() + do_smoke(0, vat, vat.loc) for(var/x in 1 to resulting_atom_count) var/atom/thing = new resulting_atom(get_turf(vat)) ADD_TRAIT(thing, TRAIT_VATGROWN, "vatgrowing") diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 5e38d9a18a01..65fcb3ffc388 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -254,7 +254,7 @@ ///Places one monkey, if possible /obj/machinery/computer/camera_advanced/xenobio/proc/feed_slime(mob/living/user, turf/open/target_turf) if(stored_monkeys < 1) - to_chat(user, span_warning("[src] needs to have at least 1 monkey stored. Currently has [stored_monkeys] stored_monkeys stored.")) + to_chat(user, span_warning("[src] needs to have at least 1 monkey stored. Currently has [stored_monkeys] monkeys stored.")) target_turf.balloon_alert(user, "not enough monkeys") return diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 90e30ea03f8a..1f5413a09edc 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -363,9 +363,7 @@ if(sparks_amt) do_sparks(sparks_amt, FALSE, get_turf(owner)) if(ispath(smoke_type, /datum/effect_system/fluid_spread/smoke)) - var/datum/effect_system/fluid_spread/smoke/smoke = new smoke_type() - smoke.set_up(smoke_amt, holder = owner, location = get_turf(owner)) - smoke.start() + do_smoke(smoke_amt, owner, get_turf(owner)) // Send signals last in case they delete the spell SEND_SIGNAL(owner, COMSIG_MOB_AFTER_SPELL_CAST, src, cast_on) diff --git a/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm b/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm index 58fcbb6ff503..96cf2a46cdf6 100644 --- a/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm +++ b/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm @@ -165,8 +165,7 @@ /// Does some steam effects from the jaunt at passed loc. /datum/action/cooldown/spell/jaunt/ethereal_jaunt/proc/do_steam_effects(turf/loc) - var/datum/effect_system/steam_spread/steam = new() - steam.set_up(10, FALSE, loc) + var/datum/effect_system/basic/steam_spread/steam = new(loc, 10, FALSE) steam.start() diff --git a/code/modules/spells/spell_types/pointed/swap.dm b/code/modules/spells/spell_types/pointed/swap.dm index 57b74fba0562..d8690754a62b 100644 --- a/code/modules/spells/spell_types/pointed/swap.dm +++ b/code/modules/spells/spell_types/pointed/swap.dm @@ -38,7 +38,7 @@ /datum/action/cooldown/spell/pointed/swap/InterceptClickOn(mob/living/clicker, params, atom/target) if(!LAZYACCESS(params2list(params), RIGHT_CLICK)) return ..() - + if(!IsAvailable(feedback = TRUE)) return FALSE if(!target) @@ -69,16 +69,13 @@ to_chat(cast_on, span_userdanger("You feel space bending.")) if(ispath(smoke_type, /datum/effect_system/fluid_spread/smoke)) - var/datum/effect_system/fluid_spread/smoke/smoke = new smoke_type() - smoke.set_up(smoke_amt, holder = owner, location = get_turf(owner)) - smoke.start() + do_smoke(smoke_amt, owner, get_turf(owner), smoke_type = smoke_type) + var/turf/target_location = get_turf(cast_on) if(!isnull(second_target) && get_dist(owner, second_target) <= cast_range && !(cast_on == second_target)) to_chat(second_target, span_userdanger("You feel space bending.")) if(ispath(smoke_type, /datum/effect_system/fluid_spread/smoke)) - var/datum/effect_system/fluid_spread/smoke/smoke = new smoke_type() - smoke.set_up(smoke_amt, holder = owner, location = get_turf(second_target)) - smoke.start() + do_smoke(smoke_amt, owner, get_turf(second_target)) var/turf/second_location = get_turf(second_target) do_teleport(second_target, owner.loc, no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC) do_teleport(cast_on, second_location, no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC) diff --git a/code/modules/spells/spell_types/projectile/juggernaut.dm b/code/modules/spells/spell_types/projectile/juggernaut.dm index 151b5cedc854..5958fa2ed94a 100644 --- a/code/modules/spells/spell_types/projectile/juggernaut.dm +++ b/code/modules/spells/spell_types/projectile/juggernaut.dm @@ -15,5 +15,5 @@ /datum/action/cooldown/spell/basic_projectile/juggernaut/fire_projectile(atom/target, mob/caster) var/obj/projectile/magic/aoe/juggernaut/to_fire = ..() - to_fire.ignored_factions = caster.get_faction() + SET_FACTION_AND_ALLIES_FROM(to_fire, caster) return to_fire diff --git a/code/modules/spells/spell_types/shapeshift/_shape_status.dm b/code/modules/spells/spell_types/shapeshift/_shape_status.dm index 5943a704c9bb..5aa380602071 100644 --- a/code/modules/spells/spell_types/shapeshift/_shape_status.dm +++ b/code/modules/spells/spell_types/shapeshift/_shape_status.dm @@ -178,6 +178,8 @@ // Only transfer blood if both mobs are supposed to have a blood volume if (CAN_HAVE_BLOOD(owner) && CAN_HAVE_BLOOD(caster_mob)) owner.set_blood_volume(caster_mob.get_blood_volume()) + owner.maxbloodpool = caster_mob.maxbloodpool // DARKPACK EDIT ADD + owner.set_blood_pool(caster_mob.bloodpool) // DARKPACK EDIT ADD for(var/datum/action/bodybound_action as anything in caster_mob.actions) if(bodybound_action.target != caster_mob) @@ -218,6 +220,7 @@ // Only transfer blood if both mobs are supposed to have a blood volume if (CAN_HAVE_BLOOD(owner) && CAN_HAVE_BLOOD(caster_mob)) caster_mob.set_blood_volume(owner.get_blood_volume()) + caster_mob.set_blood_pool(owner.bloodpool) // DARKPACK EDIT ADD /datum/status_effect/shapechange_mob/from_spell/on_shape_death(datum/source, gibbed) var/datum/action/cooldown/spell/shapeshift/source_spell = source_weakref.resolve() diff --git a/code/modules/spells/spell_types/summon/servant.dm b/code/modules/spells/spell_types/summon/servant.dm index 63f30e913a2a..12ad4de5775c 100644 --- a/code/modules/spells/spell_types/summon/servant.dm +++ b/code/modules/spells/spell_types/summon/servant.dm @@ -79,7 +79,7 @@ spawn_location.visible_message(span_userdanger("A Magical [servant_title] appears in a cloud of smoke!")) var/mob/living/carbon/human/human_servant = new(spawn_location) human_servant.equipOutfit(/datum/outfit/butler) - do_smoke(0, holder = src, location = spawn_location) + do_smoke(0, src, spawn_location) human_servant.PossessByPlayer(chosen_one.key) summon_weakref = WEAKREF(human_servant) diff --git a/code/modules/sprite_editing/flood_fill.dm b/code/modules/sprite_editing/flood_fill.dm new file mode 100644 index 000000000000..5e1b295dd326 --- /dev/null +++ b/code/modules/sprite_editing/flood_fill.dm @@ -0,0 +1,53 @@ +//a macro for the stringized key for coordinates to check later +#define CANVAS_COORD(x, y) "[x]:[y]" +#define IS_IN_BOUNDS(x, y) (x > 0 && x <= width && y > 0 && y <= height) +#define COLORS_ARE_EQUAL(a, b) ((a == b) || (endswith(a, "00") && endswith(b, "00"))) + +#define SHOULD_ADD_POINT(x, y) (!coord_cache[CANVAS_COORD(x, y)] && IS_IN_BOUNDS(x, y) && COLORS_ARE_EQUAL(grid[y][x], target_color)) + +#define ADD_POINT(x, y) \ + points += list(list((x) - 1, (y) - 1, target_color));\ + coord_cache[CANVAS_COORD(x, y)] = TRUE + +/proc/flood_fill(list/grid, x, y, width, height) + var/target_color = grid[y][x] + var/list/coord_cache = list() + var/list/points = list() + var/list/coord_queue = list(x, x, y, 1, x, x, y-1, -1) + var/span_start + var/column + var/span_end + var/row + var/row_shift + while(length(coord_queue)) + span_start = coord_queue[1] + column = span_start + span_end = coord_queue[2] + row = coord_queue[3] + row_shift = coord_queue[4] + coord_queue.Cut(1, 5) + if(SHOULD_ADD_POINT(column, row)) + while(SHOULD_ADD_POINT(column - 1, row)) + ADD_POINT(column - 1, row) + column-- + if(column < span_start) + coord_queue += list(column, span_start - 1, row - row_shift, -row_shift) + while(span_start <= span_end) + while(SHOULD_ADD_POINT(span_start, row)) + ADD_POINT(span_start, row) + span_start++ + if(span_start > column) + coord_queue += list(column, span_start - 1, row + row_shift, row_shift) + if(span_start - 1 > span_end) + coord_queue += list(span_end + 1, span_start - 1, row - row_shift, -row_shift) + span_start++ + while(span_start < span_end && !SHOULD_ADD_POINT(span_start, row)) + span_start++ + column = span_start + return points + +#undef ADD_POINT +#undef SHOULD_ADD_POINT +#undef COLORS_ARE_EQUAL +#undef IS_IN_BOUNDS +#undef CANVAS_COORD diff --git a/code/modules/sprite_editing/workspace.dm b/code/modules/sprite_editing/workspace.dm new file mode 100644 index 000000000000..9871c342fd1c --- /dev/null +++ b/code/modules/sprite_editing/workspace.dm @@ -0,0 +1,302 @@ +/datum/sprite_editor_workspace + var/width + var/height + var/dirs + var/backdrop + + var/color_mode = SPRITE_EDITOR_COLOR_MODE_RGBA + /// A bitfield specifying whether certain functions of the sprite editor should be performed if the corresponding ui actions are received - used to prevent href exploitation + var/config_flags = ALL + /// A bitfield specifying what tools we are allowed to use in the sprite editor + var/tool_flags = ALL + + var/list/layers + var/list/undo_stack = list() + var/list/undo_names = list() + var/list/redo_stack = list() + var/list/redo_names = list() + +/datum/sprite_editor_workspace/New( + width = 32, + height = 32, + dirs = 1, + backdrop = null, + color_mode = SPRITE_EDITOR_COLOR_MODE_RGBA, + config_flags = ALL, + tool_flags = ALL, + initial_layer_color = null) + . = ..() + src.width = width + src.height = height + src.dirs = dirs + src.color_mode = color_mode + src.config_flags = config_flags + src.tool_flags = tool_flags + src.backdrop = backdrop + layers = list(list("name" = "Background", visible = TRUE, "data" = create_layer_data(initial_layer_color))) + +/datum/sprite_editor_workspace/proc/copy(preserve_history = FALSE) + var/datum/sprite_editor_workspace/new_workspace = new(width, height, dirs, color_mode, config_flags, tool_flags) + new_workspace.layers = deep_copy_list_alt(layers) + if(preserve_history) + new_workspace.undo_names = undo_names.Copy() + new_workspace.undo_stack = deep_copy_list_alt(undo_stack) + new_workspace.redo_names = redo_names.Copy() + new_workspace.redo_stack = deep_copy_list_alt(redo_stack) + return new_workspace + +/datum/sprite_editor_workspace/proc/create_layer_data(color = "#00000000") + var/list/out = list() + for(var/i in 1 to dirs) + var/list/layer = list() + for(var/y in 1 to height) + var/list/row = list() + for(var/x in 1 to width) + row += color + layer += list(row) + out["[GLOB.alldirs_dmi_order[i]]"] = layer + return out + +/** + * Take a new transaction, perform it, and optionally add it to the undo history. + * Returns TRUE if the transaction was valid. + */ +/datum/sprite_editor_workspace/proc/new_transaction(transaction) + if(!can_transact(transaction)) + return + preprocess_new_transaction(transaction) + transact(transaction) + if(!(config_flags & SPRITE_EDITOR_ALLOW_UNDO)) + return TRUE + redo_stack.Cut() + redo_names.Cut() + undo_stack += list(transaction) + undo_names += transaction["name"] + return TRUE + +/datum/sprite_editor_workspace/proc/undo() + if(!(config_flags & SPRITE_EDITOR_ALLOW_UNDO)) + return + if(length(undo_stack)) + pop(undo_names) + var/transaction = pop(undo_stack) + reverse_transact(transaction) + redo_stack += list(transaction) + redo_names += transaction["name"] + +/datum/sprite_editor_workspace/proc/redo() + if(!(config_flags & SPRITE_EDITOR_ALLOW_UNDO)) + return + if(length(redo_stack)) + pop(redo_names) + var/transaction = pop(redo_stack) + transact(transaction) + undo_stack += list(transaction) + undo_names += transaction["name"] + +/datum/sprite_editor_workspace/proc/toggle_layer_visible(layer) + if(!(config_flags & SPRITE_EDITOR_ALLOW_LAYERS)) + return + if(!isnum(layer)) + return + if(layer < 1 || layer > length(layers)) + return + layers[layer]["visible"] = !layers[layer]["visible"] + +/datum/sprite_editor_workspace/proc/is_valid_color(color) + if(SEND_SIGNAL(src, COMSIG_SPRITE_EDITOR_VALIDATE_COLOR, color)) + return FALSE + var/list/rgb_color = split_color(color) + switch(color_mode) + if(SPRITE_EDITOR_COLOR_MODE_RGBA) + return TRUE + if(SPRITE_EDITOR_COLOR_MODE_RGB) + return rgb_color[4] == 255 + if(SPRITE_EDITOR_COLOR_MODE_GREYSCALE) + return rgb_color[1] == rgb_color[2] && rgb_color[2] == rgb_color[3] + else + return TRUE + +/datum/sprite_editor_workspace/proc/can_transact(list/transaction) + switch(transaction["type"]) + if("pencil") + return tool_flags & SPRITE_EDITOR_TOOL_PENCIL && is_valid_color(transaction["color"]) + if("eraser") + return tool_flags & SPRITE_EDITOR_TOOL_ERASER + if("bucket") + return tool_flags & SPRITE_EDITOR_TOOL_BUCKET && is_valid_color(transaction["color"]) + if("renameLayer", "moveLayerUp", "moveLayerDown", "flattenLayer", "addLayer", "deleteLayer") + return config_flags & SPRITE_EDITOR_ALLOW_LAYERS + else // Invalid transaction type, probably from href exploitation + return FALSE + +/datum/sprite_editor_workspace/proc/preprocess_new_transaction(list/transaction) + switch(transaction["type"]) + if("pencil", "eraser") + var/layer = transaction["layer"] + var/dir = transaction["dir"] + var/list/points = transaction["points"] + var/list/affected_frame = layers[layer]["data"][dir] + for(var/point in points) + var/x = point[1]+1 + var/y = point[2]+1 + point += affected_frame[y][x] + if("bucket") + var/layer = transaction["layer"] + var/dir = transaction["dir"] + var/list/affected_frame = layers[layer]["data"][dir] + var/list/point = transaction["point"] + var/x = point[1]+1 + var/y = point[2]+1 + transaction["points"] = flood_fill(affected_frame, x, y, width, height) + transaction -= "point" + if("flattenLayer") + var/layer = transaction["layer"] + var/list/top_layer = layers[layer] + var/list/bottom_layer = layers[layer-1] + transaction["oldTop"] = top_layer + transaction["oldBottom"] = deep_copy_list(bottom_layer) + if("deleteLayer") + var/layer = transaction["layer"] + var/list/old_layer = layers[layer] + transaction["oldLayer"] = old_layer + +/datum/sprite_editor_workspace/proc/transact(list/transaction) + switch(transaction["type"]) + if("pencil", "bucket") + var/layer = transaction["layer"] + var/dir = transaction["dir"] + var/color = transaction["color"] + var/list/points = transaction["points"] + var/list/affected_frame = layers[layer]["data"][dir] + for(var/list/point in points) + var/x = point[1]+1 + var/y = point[2]+1 + affected_frame[y][x] = blend_color(affected_frame[y][x], color) + if("eraser") + var/layer = transaction["layer"] + var/dir = transaction["dir"] + var/list/points = transaction["points"] + var/list/affected_frame = layers[layer]["data"][dir] + for(var/list/point in points) + var/x = point[1]+1 + var/y = point[2]+1 + affected_frame[y][x] = "#00000000" + if("renameLayer") + var/layer = transaction["layer"] + var/new_name = transaction["newName"] + layers[layer]["name"] = new_name + if("moveLayerUp") + var/layer = transaction["layer"] + layers.Swap(layer, layer+1) + if("moveLayerDown") + var/layer = transaction["layer"] + layers.Swap(layer, layer-1) + if("flattenLayer") + var/layer = transaction["layer"] + var/list/top_layer = layers[layer] + var/list/bottom_layer = layers[layer-1] + for(var/dir in 1 to dirs) + for(var/y in 1 to height) + for(var/x in 1 to width) + bottom_layer["[dir]"][y][x] = blend_color(bottom_layer["[dir]"][y][x], top_layer["[dir]"][y][x]) + layers.Cut(layer, layer+1) + if("addLayer") + layers += list(list("name" = "New Layer", "visible" = TRUE, "data" = create_layer_data())) + if("deleteLayer") + var/layer = transaction["layer"] + layers.Cut(layer, layer+1) + +/datum/sprite_editor_workspace/proc/reverse_transact(list/transaction) + switch(transaction["type"]) + if("pencil", "eraser", "bucket") + var/layer = transaction["layer"] + var/dir = transaction["dir"] + var/list/points = transaction["points"] + var/list/affected_frame = layers[layer]["data"][dir] + for(var/list/point in points) + var/x = point[1]+1 + var/y = point[2]+1 + affected_frame[y][x] = point[3] + if("renameLayer") + var/layer = transaction["layer"] + var/old_name = transaction["oldName"] + layers[layer]["name"] = old_name + if("moveLayerUp") + var/layer = transaction["layer"] + layers.Swap(layer, layer+1) + if("moveLayerDown") + var/layer = transaction["layer"] + layers.Swap(layer, layer-1) + if("flattenLayer") + var/layer = transaction["layer"] + var/top_layer = transaction["oldTop"] + var/bottom_layer = transaction["oldBottom"] + var/bottom_layer_index = layer-1 + var/old_visibility = layers[bottom_layer_index]["visible"] + layers[bottom_layer_index] = bottom_layer + layers[bottom_layer_index]["visible"] = old_visibility + layers.Insert(layer, top_layer) + if("addLayer") + pop(layers) + if("deleteLayer") + var/layer = transaction["layer"] + var/old_layer = transaction["oldLayer"] + layers.Insert(layer, old_layer) + +/datum/sprite_editor_workspace/proc/sprite_editor_ui_data() + return list( + "colorMode" = color_mode, + "toolFlags" = tool_flags, + "undoStack" = undo_names, + "redoStack" = redo_names, + "sprite" = list( + "width" = width, + "height" = height, + "dirs" = dirs, + "backdrop" = backdrop, + "layers" = layers, + ) + ) + +/// Get a reference to the pixel data for the first layer of the given dir +/datum/sprite_editor_workspace/proc/get_first_layer_pixel_data(dir = SOUTH) + return layers[1]["data"]["[dir]"] + +/datum/sprite_editor_workspace/proc/to_icon() + var/metadata = json_encode(list( + "width" = width, + "height" = height, + "states" = list(list( + "name" = "", + "dirs" = dirs, + )), + )) + var/list/ideal_dims = calculate_optimal_icon_grid_dimensions(width, height, dirs) + var/grid_width = ideal_dims[1] + var/grid_height = ideal_dims[2] + var/file_width = width * grid_width + var/file_height = height * grid_height + var/layer_count = length(layers) + var/temp_file_prefix = copytext(REF(src), 2, -1) + for(var/i in 1 to layer_count) + var/list/layer_frames = list() + for(var/dir_index in 1 to dirs) + layer_frames += list(layers[i]["data"]["[GLOB.alldirs_dmi_order[dir_index]]"]) + var/pixels = reorder_pixels(width, height, grid_width, grid_height, layer_frames) + var/temp_path = "tmp/[temp_file_prefix]_layer[i].dmi" + var/result = rustg_dmi_create_png(temp_path, "[file_width]", "[file_height]", pixels) + if(result) + stack_trace(result) + return TRUE + result = rustg_dmi_inject_metadata(temp_path, metadata) + if(result) + stack_trace(result) + return TRUE + var/datum/universal_icon/out_icon = uni_icon("tmp/[temp_file_prefix]_layer1.dmi", "") + for(var/i in 2 to layer_count) + out_icon.blend_icon(uni_icon("tmp/[temp_file_prefix]_layer[i].dmi", ""), ICON_OVERLAY) + var/icon/final_icon = out_icon.to_icon() + for(var/i in 1 to layer_count) + fdel("tmp/[temp_file_prefix]_layer[i].dmi") + return final_icon diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index d97a5364be40..68dd73532ae3 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -370,9 +370,7 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE) if(notice) return null //Totally nanite construction system not an immersion breaking spawning - var/datum/effect_system/fluid_spread/smoke/fourth_wall_guard = new - fourth_wall_guard.set_up(4, holder = src, location = get_turf(centerpiece)) - fourth_wall_guard.start() + do_smoke(4, get_turf(centerpiece), get_turf(centerpiece)) var/obj/machinery/bsa/full/cannon = new(get_turf(centerpiece),centerpiece.get_cannon_direction()) QDEL_NULL(centerpiece.front_ref) QDEL_NULL(centerpiece.back_ref) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index ea9722e0fc6b..404b9573d28e 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -116,8 +116,6 @@ ///the type of damage overlay (if any) to use when this bodypart is bruised/burned. var/dmg_overlay_type = "human" - ///a color (optionally matrix) for the damage overlays to give the limb - var/damage_overlay_color /// If we're bleeding, which icon are we displaying on this part var/bleed_overlay_icon @@ -1434,6 +1432,11 @@ husk_blood.blend_mode = BLEND_INSET_OVERLAY husk_blood.dir = thing_to_husk.dir husk_blood.layer = thing_to_husk.layer + var/list/blood_dna = blood_dna_info || owner?.get_blood_dna_list() + if (LAZYLEN(blood_dna)) + husk_blood.color = get_color_from_blood_list(blood_dna) + else + husk_blood.color = BLOOD_COLOR_RED return husk_blood ///Add a bodypart overlay and call the appropriate update procs diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 02dff71c3a9d..73a526361f0d 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -98,6 +98,11 @@ /// Can this head be dismembered normally? can_dismember = FALSE +/obj/item/bodypart/head/Initialize(mapload) + . = ..() + AddElement(/datum/element/toy_talk) + RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_DISFIGURED), SIGNAL_REMOVETRAIT(TRAIT_DISFIGURED)), PROC_REF(update_owner_name)) + /obj/item/bodypart/head/Destroy() QDEL_NULL(worn_ears_offset) QDEL_NULL(worn_glasses_offset) @@ -121,32 +126,39 @@ /obj/item/bodypart/head/examine(mob/user) . = ..() - if(show_organs_on_examine && IS_ORGANIC_LIMB(src)) - var/obj/item/organ/brain/brain = locate(/obj/item/organ/brain) in src - if(!brain) - . += span_info("The brain has been removed from [src].") - else if(brain.suicided || (brain.brainmob && HAS_TRAIT(brain.brainmob, TRAIT_SUICIDED))) - . += span_info("There's a miserable expression on [real_name]'s face; they must have really hated life. There's no hope of recovery.") - else if(brain.brainmob) - if(brain.brainmob?.health <= HEALTH_THRESHOLD_DEAD) - . += span_info("It's leaking some kind of... clear fluid? The brain inside must be in pretty bad shape.") - if(brain.brainmob.key || brain.brainmob.get_ghost(FALSE, TRUE)) - . += span_info("Its muscles are twitching slightly... It seems to have some life still in it.") - else - . += span_info("It's completely lifeless. Perhaps there'll be a chance for them later.") - else if(brain?.decoy_override) - . += span_info("It's completely lifeless. Perhaps there'll be a chance for them later.") + if(!show_organs_on_examine || !IS_ORGANIC_LIMB(src)) + return + var/shown_name = get_face_name() + var/obj/item/organ/brain/brain = locate(/obj/item/organ/brain) in src + if(!brain) + . += span_info("The brain has been removed from [src].") + else if(brain.suicided || (brain.brainmob && HAS_TRAIT(brain.brainmob, TRAIT_SUICIDED))) + . += span_info("There's a miserable expression on [shown_name]'s face; they must have really hated life. There's no hope of recovery.") + else if(brain.brainmob) + if(brain.brainmob?.health <= HEALTH_THRESHOLD_DEAD) + . += span_info("It's leaking some kind of... clear fluid? The brain inside must be in pretty bad shape.") + if(brain.brainmob.key || brain.brainmob.get_ghost(FALSE, TRUE)) + . += span_info("Its muscles are twitching slightly... It seems to have some life still in it.") else - . += span_info("It's completely lifeless.") + . += span_info("It's completely lifeless. Perhaps there'll be a chance for them later.") + else if(brain?.decoy_override) + . += span_info("It's completely lifeless. Perhaps there'll be a chance for them later.") + else + . += span_info("It's completely lifeless.") - if(!(locate(/obj/item/organ/eyes) in src)) - . += span_info("[real_name]'s eyes have been removed.") + if(!(locate(/obj/item/organ/eyes) in src)) + . += span_info("[shown_name]'s eyes have been removed.") - if(!(locate(/obj/item/organ/ears) in src)) - . += span_info("[real_name]'s ears have been removed.") + if(!(locate(/obj/item/organ/ears) in src)) + . += span_info("[shown_name]'s ears have been removed.") - if(!(locate(/obj/item/organ/tongue) in src)) - . += span_info("[real_name]'s tongue has been removed.") + if(!(locate(/obj/item/organ/tongue) in src)) + . += span_info("[shown_name]'s tongue has been removed.") + +/obj/item/bodypart/head/proc/get_face_name() + if (HAS_TRAIT(src, TRAIT_DISFIGURED)) + return "Unknown" + return real_name /obj/item/bodypart/head/can_dismember(obj/item/item) if (!can_dismember) @@ -171,10 +183,11 @@ /obj/item/bodypart/head/update_limb(dropping_limb, is_creating) . = ..() if(!isnull(owner)) - if(HAS_TRAIT(owner, TRAIT_HUSK)) - real_name = "Unknown" + real_name = owner.real_name + if(is_husked) + ADD_TRAIT(src, TRAIT_DISFIGURED, HUSK_TRAIT) else - real_name = owner.real_name + REMOVE_TRAIT(src, TRAIT_DISFIGURED, HUSK_TRAIT) update_hair_and_lips(dropping_limb, is_creating) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -222,12 +235,8 @@ . += eye_left . += eye_right -/obj/item/bodypart/head/Initialize(mapload) - . = ..() - AddElement(/datum/element/toy_talk) - /obj/item/bodypart/head/get_voice(add_id_name) - return "The head of [real_name]" + return "The head of [get_face_name()]" /obj/item/bodypart/head/update_bodypart_damage_state() if (head_flags & HEAD_NO_DISFIGURE) @@ -237,9 +246,16 @@ . = ..() var/new_states = brutestate + burnstate if(new_states >= HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES) - add_bodypart_trait(TRAIT_DISFIGURED) + ADD_TRAIT(src, TRAIT_DISFIGURED, BODYPART_TRAIT) else if(old_states >= HUMAN_DISFIGURATION_HEAD_DAMAGE_STATES) - remove_bodypart_trait(TRAIT_DISFIGURED) + REMOVE_TRAIT(src, TRAIT_DISFIGURED, BODYPART_TRAIT) + +/obj/item/bodypart/head/proc/update_owner_name(datum/source) + SIGNAL_HANDLER + + if (ishuman(owner)) + var/mob/living/carbon/human/as_human = owner + as_human?.update_visible_name() /obj/item/bodypart/head/monkey icon = 'icons/mob/human/species/monkey/bodyparts.dmi' diff --git a/code/modules/surgery/bodyparts/worn_feature_offset.dm b/code/modules/surgery/bodyparts/worn_feature_offset.dm index 24f4cedbff81..3fee7097d2d4 100644 --- a/code/modules/surgery/bodyparts/worn_feature_offset.dm +++ b/code/modules/surgery/bodyparts/worn_feature_offset.dm @@ -19,7 +19,6 @@ list/offset_y = list("south" = 0), ) attached_part.feature_offsets[feature_key] = src - owner = attached_part.owner src.attached_part = attached_part src.feature_key = feature_key src.offset_x = offset_x @@ -28,13 +27,20 @@ if (length(offset_x) <= 1 && length(offset_y) <= 1) return // We don't need to do any extra signal handling - if (!isnull(owner)) - changed_owner(owner) + changed_owner(owner, attached_part.owner) RegisterSignal(attached_part, COMSIG_BODYPART_CHANGED_OWNER, PROC_REF(changed_owner)) +/datum/worn_feature_offset/Destroy(force) + attached_part.feature_offsets -= feature_key + attached_part = null + changed_owner(null, null) + return ..() + /// Returns the current offset which should be used for this feature /datum/worn_feature_offset/proc/get_offset() var/current_dir = owner ? owner.dir : SOUTH + if(ISDIAGONALDIR(current_dir)) + current_dir = current_dir & (EAST|WEST) current_dir = dir2text(current_dir) var/x = length(offset_x) ? ((current_dir in offset_x) ? offset_x[current_dir] : offset_x["south"]) : 0 var/y = length(offset_y) ? ((current_dir in offset_y) ? offset_y[current_dir] : offset_y["south"]) : 0 @@ -49,9 +55,11 @@ /// When the owner of the bodypart changes, update our signal registrations /datum/worn_feature_offset/proc/changed_owner(obj/item/bodypart/part, mob/living/new_owner, mob/living/old_owner) SIGNAL_HANDLER + if(isnull(old_owner)) + old_owner = owner owner = new_owner if (!isnull(old_owner)) - UnregisterSignal(old_owner, COMSIG_ATOM_POST_DIR_CHANGE) + UnregisterSignal(old_owner, list(COMSIG_ATOM_POST_DIR_CHANGE, COMSIG_QDELETING)) if (!isnull(new_owner)) RegisterSignal(new_owner, COMSIG_ATOM_POST_DIR_CHANGE, PROC_REF(on_dir_change)) RegisterSignal(new_owner, COMSIG_QDELETING, PROC_REF(on_owner_deleted)) diff --git a/code/modules/surgery/operations/operation_add_limb.dm b/code/modules/surgery/operations/operation_add_limb.dm index 018e32d10670..ecdd579312e4 100644 --- a/code/modules/surgery/operations/operation_add_limb.dm +++ b/code/modules/surgery/operations/operation_add_limb.dm @@ -173,7 +173,7 @@ /obj/item/stack/sticky_tape = 2, ) time = 4.8 SECONDS - operation_flags = OPERATION_SELF_OPERABLE | OPERATION_STANDING_ALLOWED + operation_flags = OPERATION_SELF_OPERABLE | OPERATION_STANDING_ALLOWED | OPERATION_IGNORE_CLOTHES all_surgery_states_required = SURGERY_PROSTHETIC_UNSECURED /datum/surgery_operation/limb/secure_arbitrary_prosthetic/get_default_radial_image() diff --git a/code/modules/surgery/operations/operation_healing.dm b/code/modules/surgery/operations/operation_healing.dm index 2592ab7b7fd2..525d9746f053 100644 --- a/code/modules/surgery/operations/operation_healing.dm +++ b/code/modules/surgery/operations/operation_healing.dm @@ -138,7 +138,7 @@ var/progress_text - if(surgeon.is_holding_item_of_type(/obj/item/healthanalyzer)) + if(show_stats(surgeon, patient)) if(brute_healed > 0 && patient.get_brute_loss() > 0) progress_text += ". Remaining brute: [patient.get_brute_loss()]" if(burn_healed > 0 && patient.get_fire_loss() > 0) @@ -163,6 +163,21 @@ return progress_text +/// Checks whether we show precise damage stats during the surgery +/datum/surgery_operation/basic/tend_wounds/proc/show_stats(mob/living/surgeon, mob/living/patient) + if(surgeon.is_holding_item_of_type(/obj/item/healthanalyzer)) + return TRUE + for(var/obj/machinery/vitals_reader/vitals in view(4, patient)) + if(vitals.patient == patient) + return TRUE + for(var/obj/machinery/computer/operating/op_pc in range(1, patient)) + if(op_pc.table?.patient == patient) + return TRUE + for(var/obj/item/mod/control/modsuit in surgeon.get_equipped_items()) + if(modsuit.active && istype(modsuit.selected_module, /obj/item/mod/module/health_analyzer)) + return TRUE + return FALSE + #undef CONDITIONAL_DAMAGE_MESSAGE /datum/surgery_operation/basic/tend_wounds/on_success(mob/living/patient, mob/living/surgeon, tool, list/operation_args) diff --git a/code/modules/surgery/operations/operation_lipo.dm b/code/modules/surgery/operations/operation_lipo.dm index b04e856057fe..f876c744412b 100644 --- a/code/modules/surgery/operations/operation_lipo.dm +++ b/code/modules/surgery/operations/operation_lipo.dm @@ -41,7 +41,9 @@ /datum/surgery_operation/limb/lipoplasty/state_check(obj/item/bodypart/limb) if(limb.body_zone != BODY_ZONE_CHEST) return FALSE - if(!HAS_TRAIT_FROM(limb.owner, TRAIT_FAT, OBESITY) && limb.owner.nutrition < NUTRITION_LEVEL_WELL_FED) + if(HAS_TRAIT(limb.owner, TRAIT_NOHUNGER)) + return FALSE + if(!HAS_TRAIT_FROM(limb.owner, TRAIT_FAT, OBESITY) || limb.owner.nutrition < NUTRITION_LEVEL_WELL_FED) return FALSE return TRUE @@ -63,27 +65,29 @@ span_notice("[surgeon] successfully removes excess fat from [limb.owner]'s body!"), span_notice("[surgeon] finishes cutting away excess fat from [limb.owner]'s [limb.plaintext_zone]."), ) - limb.owner.overeatduration = 0 //patient is unfatted var/removednutriment = limb.owner.nutrition + limb.owner.overeatduration = 0 //patient is unfatted limb.owner.set_nutrition(NUTRITION_LEVEL_WELL_FED) removednutriment -= NUTRITION_LEVEL_WELL_FED //whatever was removed goes into the meat - var/typeofmeat = /obj/item/food/meat/slab/human if(limb.owner.flags_1 & HOLOGRAM_1) - typeofmeat = null - else if(limb.owner.dna?.species) - typeofmeat = limb.owner.dna.species.meat + return + + var/typeofmeat = null + for(var/meat_path in limb.butcher_drops) + if(ispath(meat_path, /obj/item/food/meat)) + typeofmeat = meat_path + break if(!typeofmeat) return - var/obj/item/food/meat/slab/newmeat = new typeofmeat() + var/obj/item/food/meat/slab/newmeat = new typeofmeat(limb.owner.drop_location()) newmeat.name = "fatty meat" newmeat.desc = "Extremely fatty tissue taken from a patient." newmeat.subjectname = limb.owner.real_name newmeat.subjectjob = limb.owner.job - newmeat.reagents.add_reagent(/datum/reagent/consumable/nutriment, (removednutriment / 15)) //To balance with nutriment_factor of nutriment - newmeat.forceMove(limb.owner.drop_location()) + newmeat.reagents.add_reagent(/datum/reagent/consumable/nutriment, (removednutriment / /datum/reagent/consumable/nutriment::nutriment_factor)) /datum/surgery_operation/limb/lipoplasty/mechanic name = "engage expulsion valve" //gross diff --git a/code/modules/surgery/operations/operation_plastic_surgery.dm b/code/modules/surgery/operations/operation_plastic_surgery.dm index 2ef9db9d8563..1203702d1d61 100644 --- a/code/modules/surgery/operations/operation_plastic_surgery.dm +++ b/code/modules/surgery/operations/operation_plastic_surgery.dm @@ -10,7 +10,7 @@ /obj/item/pen = 5, ) time = 6.4 SECONDS - operation_flags = OPERATION_MORBID | OPERATION_AFFECTS_MOOD | OPERATION_NOTABLE + operation_flags = OPERATION_MORBID | OPERATION_AFFECTS_MOOD | OPERATION_NOTABLE | OPERATION_NO_PATIENT_REQUIRED preop_sound = 'sound/items/handling/surgery/scalpel1.ogg' success_sound = 'sound/items/handling/surgery/scalpel2.ogg' all_surgery_states_required = SURGERY_SKIN_OPEN @@ -25,15 +25,18 @@ return limb.body_zone == BODY_ZONE_HEAD /datum/surgery_operation/limb/plastic_surgery/pre_preop(obj/item/bodypart/limb, mob/living/surgeon, obj/item/tool, list/operation_args) - if(HAS_TRAIT_FROM(limb.owner, TRAIT_DISFIGURED, TRAIT_GENERIC)) + if(HAS_TRAIT_FROM(limb, TRAIT_DISFIGURED, TRAIT_GENERIC)) return TRUE //skip name selection if fixing disfigurement var/list/names = list() if(isabductor(surgeon)) for(var/j in 1 to 9) names += "Subject [limb.owner.gender == MALE ? "i" : "o"]-[pick("a", "b", "c", "d", "e")]-[rand(10000, 99999)]" - names += limb.owner.generate_random_mob_name(TRUE) //give one normal name in case they want to do regular plastic surgery + if(limb.owner) + names += limb.owner.generate_random_mob_name(TRUE) //give one normal name in case they want to do regular plastic surgery + else + names += generate_random_name_species_based(pick(MALE, FEMALE), TRUE, GLOB.species_list[limb.limb_id] || /datum/species/human) else var/advanced = LIMB_HAS_SURGERY_STATE(limb, SURGERY_PLASTIC_APPLIED) var/obj/item/offhand = surgeon.get_inactive_held_item() @@ -44,8 +47,12 @@ else if(advanced) to_chat(surgeon, span_warning("You have no picture to base the appearance on!")) + for(var/i in 1 to 10) - names += limb.owner.generate_random_mob_name(TRUE) + if(limb.owner) + names += limb.owner.generate_random_mob_name(TRUE) + else + names += generate_random_name_species_based(pick(MALE, FEMALE), TRUE, GLOB.species_list[limb.limb_id] || /datum/species/human) operation_args[OPERATION_NEW_NAME] = tgui_input_list(surgeon, "New name to assign", "Plastic Surgery", names) return !!operation_args[OPERATION_NEW_NAME] @@ -54,34 +61,40 @@ display_results( surgeon, limb.owner, - span_notice("You begin to alter [limb.owner]'s appearance..."), - span_notice("[surgeon] begins to alter [limb.owner]'s appearance."), - span_notice("[surgeon] begins to make an incision in [limb.owner]'s [limb.plaintext_zone]."), + span_notice("You begin to alter [limb.owner || limb]'s appearance..."), + span_notice("[surgeon] begins to alter [limb.owner || limb]'s appearance."), + span_notice("[surgeon] begins to make an incision in [FORMAT_LIMB_OWNER(limb)]."), ) display_pain(limb.owner, "You feel a slicing pain across your face!") -/datum/surgery_operation/limb/plastic_surgery/on_success(obj/item/bodypart/limb, mob/living/surgeon, obj/item/tool, list/operation_args) - if(HAS_TRAIT_FROM(limb.owner, TRAIT_DISFIGURED, TRAIT_GENERIC)) - REMOVE_TRAIT(limb.owner, TRAIT_DISFIGURED, TRAIT_GENERIC) +/datum/surgery_operation/limb/plastic_surgery/on_success(obj/item/bodypart/head/limb, mob/living/surgeon, obj/item/tool, list/operation_args) + if(!istype(limb)) + CRASH("Plastic surgery finished on a non-head limb [limb]!") + + if(HAS_TRAIT_FROM(limb, TRAIT_DISFIGURED, TRAIT_GENERIC)) + REMOVE_TRAIT(limb, TRAIT_DISFIGURED, TRAIT_GENERIC) display_results( surgeon, limb.owner, - span_notice("You successfully restore [limb.owner]'s appearance."), - span_notice("[surgeon] successfully restores [limb.owner]'s appearance!"), - span_notice("[surgeon] finishes the operation on [limb.owner]'s face."), + span_notice("You successfully restore [limb.owner || limb]'s appearance."), + span_notice("[surgeon] successfully restores [limb.owner || limb]'s appearance!"), + span_notice("[surgeon] finishes the operation on [limb.owner ? "[limb.owner]'s face." : limb]"), ) display_pain(limb.owner, "The pain fades, your face feels normal again!") return - var/oldname = limb.owner.real_name - limb.owner.real_name = operation_args[OPERATION_NEW_NAME] - var/newname = limb.owner.real_name //something about how the code handles names required that I use this instead of target.real_name + var/oldname = limb.owner?.real_name || limb.real_name + if (limb.owner) + limb.owner.real_name = operation_args[OPERATION_NEW_NAME] + else + limb.real_name = operation_args[OPERATION_NEW_NAME] + display_results( surgeon, limb.owner, - span_notice("You alter [oldname]'s appearance completely, [limb.owner.p_they()] is now [newname]."), - span_notice("[surgeon] alters [oldname]'s appearance completely, [limb.owner.p_they()] is now [newname]!"), - span_notice("[surgeon] finishes the operation on [limb.owner]'s face."), + span_notice("You alter [oldname]'s appearance completely, [limb.owner.p_they()] is now [operation_args[OPERATION_NEW_NAME]]."), + span_notice("[surgeon] alters [oldname]'s appearance completely, [limb.owner.p_they()] is now [operation_args[OPERATION_NEW_NAME]]!"), + span_notice("[surgeon] finishes the operation on [limb.owner ? "[limb.owner]'s face." : limb]."), ) display_pain(limb.owner, "The pain fades, your face feels new and unfamiliar!") if(ishuman(limb.owner)) @@ -95,12 +108,12 @@ display_results( surgeon, limb.owner, - span_warning("Your screw up, leaving [limb.owner]'s appearance disfigured!"), - span_warning("[surgeon] screws up, disfiguring [limb.owner]'s appearance!"), - span_notice("[surgeon] finishes the operation on [limb.owner]'s face."), + span_warning("Your screw up, leaving [limb.owner || limb]'s appearance disfigured!"), + span_warning("[surgeon] screws up, disfiguring [limb.owner || limb]'s appearance!"), + span_notice("[surgeon] finishes the operation on [limb.owner ? "[limb.owner]'s face." : limb]."), ) display_pain(limb.owner, "Your face feels horribly scarred and deformed!") - ADD_TRAIT(limb.owner, TRAIT_DISFIGURED, TRAIT_GENERIC) + ADD_TRAIT(limb, TRAIT_DISFIGURED, TRAIT_GENERIC) #undef OPERATION_NEW_NAME @@ -111,7 +124,7 @@ /obj/item/stack/sheet/plastic = 1, ) time = 4.8 SECONDS - operation_flags = OPERATION_MORBID | OPERATION_LOCKED + operation_flags = OPERATION_MORBID | OPERATION_LOCKED | OPERATION_NO_PATIENT_REQUIRED preop_sound = 'sound/effects/blob/blobattack.ogg' success_sound = 'sound/effects/blob/attackblob.ogg' failure_sound = 'sound/effects/blob/blobattack.ogg' @@ -128,9 +141,9 @@ display_results( surgeon, limb.owner, - span_notice("You begin to apply plastic to [limb.owner]'s [limb.plaintext_zone]..."), - span_notice("[surgeon] begins to apply plastic to [limb.owner]'s [limb.plaintext_zone]."), - span_notice("[surgeon] begins to perform surgery on [limb.owner]'s [limb.plaintext_zone]."), + span_notice("You begin to apply plastic to [FORMAT_LIMB_OWNER(limb)]..."), + span_notice("[surgeon] begins to apply plastic to [FORMAT_LIMB_OWNER(limb)]."), + span_notice("[surgeon] begins to perform surgery on [FORMAT_LIMB_OWNER(limb)]."), ) display_pain(limb.owner, "You feel a strange sensation as something is applied to your face!") diff --git a/code/modules/surgery/organs/external/_visual_organs.dm b/code/modules/surgery/organs/external/_visual_organs.dm index ec576568ab2a..f7ba0b1ce6b6 100644 --- a/code/modules/surgery/organs/external/_visual_organs.dm +++ b/code/modules/surgery/organs/external/_visual_organs.dm @@ -163,6 +163,24 @@ Unlike normal organs, we're actually inside a persons limbs at all times organ_flags = parent_type::organ_flags | ORGAN_EXTERNAL + /// Offset to apply to equipment worn on the mouth we give to the head. + var/datum/worn_feature_offset/worn_mask_offset + +/obj/item/organ/snout/on_bodypart_insert(obj/item/bodypart/head/limb) + . = ..() + if(isnull(limb.worn_mask_offset)) + worn_mask_offset = limb.worn_mask_offset = new( + attached_part = limb, + feature_key = OFFSET_FACEMASK, + offset_x = list("east" = 1, "west" = -1), + ) + +/obj/item/organ/snout/on_bodypart_remove(obj/item/bodypart/head/limb, movement_flags) + if(worn_mask_offset) + QDEL_NULL(worn_mask_offset) + limb.worn_mask_offset = null + return ..() + /datum/bodypart_overlay/mutant/snout layers = EXTERNAL_ADJACENT feature_key = FEATURE_SNOUT diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm index 3f993dabdcf7..910c39c076f5 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm @@ -301,7 +301,7 @@ . = ..() if(!owner || . & EMP_PROTECT_SELF) return - to_chat(owner, span_warning("You feel sheering pain as your body is crushed like a soda can!")) + to_chat(owner, span_warning("You feel shearing pain as your body is crushed like a soda can!")) owner.apply_damage(20/severity, BRUTE, def_zone = BODY_ZONE_CHEST) /obj/item/organ/cyberimp/chest/spine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm index 510468ffa0f1..8765b0dc373b 100644 --- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm +++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm @@ -210,9 +210,7 @@ owner.set_stamina_loss(0) addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living, set_stamina_loss), 0), stun_resistance_time) - var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread - sparks.set_up(5, 1, src) - sparks.start() + do_sparks(5, TRUE, src) give_stun_buffs(owner) addtimer(CALLBACK(src, PROC_REF(remove_stun_buffs), owner), stun_resistance_time) diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm index fb086e8bd362..e1259f5c82d8 100644 --- a/code/modules/surgery/organs/internal/ears/_ears.dm +++ b/code/modules/surgery/organs/internal/ears/_ears.dm @@ -48,11 +48,16 @@ . = ..() if(temporary_deafness) on_deafened() + REMOVE_TRAIT(organ_owner, TRAIT_DEAF, NO_EARS) /obj/item/organ/ears/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) . = ..() if(temporary_deafness) on_undeafened(organ_owner) + // Do not apply with special flag, even if it would ultimately be redundant by new ears being hot-swapped in. + // This is so we don't trip signal_addtrait when hot-swapping ears, which could cause inappropriate behavior like nuking sound effects. + if(!special) + ADD_TRAIT(organ_owner, TRAIT_DEAF, NO_EARS) /obj/item/organ/ears/get_status_appendix(advanced, add_tooltips) if(owner.stat == DEAD || !HAS_TRAIT(owner, TRAIT_DEAF)) diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm index 20bf1ecfac55..b6152e8b0ce6 100644 --- a/code/modules/surgery/organs/internal/eyes/_eyes.dm +++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm @@ -620,10 +620,10 @@ name = "undead eyes" desc = "Somewhat counterintuitively, these half-rotten eyes actually have superior vision to those of a living human." color_cutoffs = list(25, 35, 5) - penlight_message = "are rotten and decayed" + penlight_message = "are rotten and decayed!" /obj/item/organ/eyes/zombie/penlight_examine(mob/living/viewer, obj/item/examtool) - return span_danger(penlight_message) + return span_danger("[owner.p_Their()] eyes [penlight_message]") /obj/item/organ/eyes/alien name = "alien eyes" @@ -707,8 +707,9 @@ eye_color_left = "#3cb8a5" eye_color_right = "#3cb8a5" sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS + flash_protect = FLASH_PROTECTION_SENSITIVE organ_traits = list(TRAIT_XRAY_VISION) - penlight_message = "replaced by small radiation emitters and detectors" + penlight_message = "are replaced by small radiation emitters and detectors" /obj/item/organ/eyes/robotic/thermals name = "thermal eyes" @@ -1090,7 +1091,7 @@ eye_color_left = "#3c4e52" eye_color_right = "#3c4e52" blink_animation = FALSE - flash_protect = FLASH_PROTECTION_SENSITIVE + flash_protect = FLASH_PROTECTION_HYPER_SENSITIVE pupils_name = "aperture clusters" /obj/item/organ/eyes/robotic/shield/moth @@ -1115,13 +1116,14 @@ penlight_message = "are bulbous clusters of LEDs and cameras" pupils_name = "aperture clusters" -/obj/item/organ/eyes/robotic/thermals/moth //we inherit flash weakness from thermals +/obj/item/organ/eyes/robotic/thermals/moth name = "thermal moth eyes" icon_state = "eyes_moth_cyber_thermal" eye_icon_state = "motheyes_white" eye_color_left = "#901f38" eye_color_right = "#901f38" blink_animation = FALSE + flash_protect = FLASH_PROTECTION_HYPER_SENSITIVE pupils_name = "sensor clusters" penlight_message = "are two clustered hemispheres of thermal sensors" @@ -1173,13 +1175,13 @@ low_light_cutoff = list(5, 12, 20) medium_light_cutoff = list(15, 20, 30) high_light_cutoff = list(30, 35, 50) - penlight_message = "glow a foggy red, sizzling under the light" + penlight_message = "glow a foggy red, sizzling under the light!" /obj/item/organ/eyes/night_vision/maintenance_adapted/penlight_examine(mob/living/viewer, obj/item/examtool) if(!owner.is_blind()) to_chat(owner, span_danger("Your eyes sizzle agonizingly as light is shone on them!")) apply_organ_damage(20 * examtool.light_power) //that's 0.5 lightpower for a penlight, so one penlight shining is equivalent to two seconds in a lit area - return span_danger("[owner.p_Their()] eyes [penlight_message].") + return span_danger("[owner.p_Their()] eyes [penlight_message]") /obj/item/organ/eyes/night_vision/maintenance_adapted/on_life(seconds_per_tick) if(owner.get_eye_protection() <= FLASH_PROTECTION_SENSITIVE && !owner.is_blind() && isturf(owner.loc) && owner.has_light_nearby(light_amount=0.5)) //we allow a little more than usual so we can produce light from the adapted eyes diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 89d25e98516b..60b45bf0eb46 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -287,6 +287,7 @@ ), ) var/data = custom_data || with_data && src_object.ui_data(user) + SEND_SIGNAL(src_object, COMSIG_UI_DATA, user, data) if(data) json_data["data"] = data var/static_data = with_static_data && src_object.ui_static_data(user) diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm index 594c2f443fe8..364c0e24c4ce 100644 --- a/code/modules/transport/tram/tram_controller.dm +++ b/code/modules/transport/tram/tram_controller.dm @@ -519,15 +519,11 @@ /datum/transport_controller/linear/tram/proc/set_status_code(code, value) if(code != DOORS_READY) log_transport("TC: [specific_transport_id] status change [value ? "+" : "-"][english_list(bitfield_to_list(code, TRANSPORT_FLAGS))].") - switch(value) - if(TRUE) - controller_status |= code - if(FALSE) - controller_status &= ~code - else - stack_trace("Transport controller received invalid status code request [code]/[value]") - return + if(value) + controller_status |= code + else + controller_status &= ~code send_transport_active_signal() /datum/transport_controller/linear/tram/proc/send_transport_active_signal() diff --git a/code/modules/transport/tram/tram_signals.dm b/code/modules/transport/tram/tram_signals.dm index e160e3184724..6ed73cb5471e 100644 --- a/code/modules/transport/tram/tram_signals.dm +++ b/code/modules/transport/tram/tram_signals.dm @@ -275,13 +275,11 @@ if(updated_controller.specific_transport_id != configured_transport_id) return - switch(new_status) - if(TRUE) - if(operating_status == TRANSPORT_REMOTE_FAULT) - operating_status = TRANSPORT_SYSTEM_NORMAL - if(FALSE) - if(operating_status == TRANSPORT_SYSTEM_NORMAL) - operating_status = TRANSPORT_REMOTE_FAULT + if(new_status) + if(operating_status == TRANSPORT_REMOTE_FAULT) + operating_status = TRANSPORT_SYSTEM_NORMAL + else if(operating_status == TRANSPORT_SYSTEM_NORMAL) + operating_status = TRANSPORT_REMOTE_FAULT /** * Update processing state. diff --git a/code/modules/tutorials/tutorials/drop.dm b/code/modules/tutorials/tutorials/drop.dm index 6ace8bb88a78..6be38f234d27 100644 --- a/code/modules/tutorials/tutorials/drop.dm +++ b/code/modules/tutorials/tutorials/drop.dm @@ -57,10 +57,10 @@ if (STAGE_PICK_SOMETHING_UP) show_instruction("Pick something up!") -/datum/tutorial/drop/proc/on_swap_hands() +/datum/tutorial/drop/proc/on_swap_hands(mob/living/source, obj/item/swapped_to, obj/item/swapped_from) SIGNAL_HANDLER - if (isnull(user.get_active_held_item())) + if (isnull(swapped_to)) if (stage != STAGE_PICK_SOMETHING_UP) stage = STAGE_PICK_SOMETHING_UP show_instructions() diff --git a/code/modules/tutorials/tutorials/switch_hands.dm b/code/modules/tutorials/tutorials/switch_hands.dm index d423667ac383..724d99fca81e 100644 --- a/code/modules/tutorials/tutorials/switch_hands.dm +++ b/code/modules/tutorials/tutorials/switch_hands.dm @@ -68,14 +68,14 @@ if (STAGE_PICK_UP_ITEM) show_instruction("Pick something up!") -/datum/tutorial/switch_hands/proc/on_swap_hands() +/datum/tutorial/switch_hands/proc/on_swap_hands(mob/living/source, obj/item/swapped_to, obj/item/swapped_from) SIGNAL_HANDLER //FIXME: this checking breaks easily - if (isnull(user.get_active_held_item())) + if (isnull(swapped_to)) stage = STAGE_PICK_UP_ITEM show_instructions() - else if (isnull(user.get_inactive_held_item())) + else if (isnull(swapped_from)) stage = STAGE_SHOULD_SWAP_HAND show_instructions() else diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 93f2059e84e7..01a901dd28fb 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -195,6 +195,8 @@ #include "hydroponics_harvest.dm" #include "hydroponics_self_mutations.dm" #include "hydroponics_validate_genes.dm" +#include "id_access.dm" +#include "id_card.dm" #include "inhands.dm" #include "interaction_door.dm" #include "interaction_silicon.dm" diff --git a/code/modules/unit_tests/combat.dm b/code/modules/unit_tests/combat.dm index 80ccbaf8dadd..113abac1339c 100644 --- a/code/modules/unit_tests/combat.dm +++ b/code/modules/unit_tests/combat.dm @@ -2,6 +2,7 @@ var/mob/living/carbon/human/puncher = allocate(/mob/living/carbon/human/consistent) var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent) + puncher.st_set_stat(STAT_STRENGTH, 1) // DARKPACK EDIT ADD // Avoid all randomness in tests ADD_TRAIT(puncher, TRAIT_PERFECT_ATTACKER, INNATE_TRAIT) diff --git a/code/modules/unit_tests/death_moodlets.dm b/code/modules/unit_tests/death_moodlets.dm index ded468abbb1d..4b1b2fc3512b 100644 --- a/code/modules/unit_tests/death_moodlets.dm +++ b/code/modules/unit_tests/death_moodlets.dm @@ -6,6 +6,7 @@ /datum/unit_test/death_moodlets/Run() var/mob/living/carbon/human/consistent/dummy = allocate(__IMPLIED_TYPE__) + dummy.mind_initialize() prepare_dummy(dummy) var/mob/living/dying = get_dying_mob() @@ -47,7 +48,7 @@ desired_moodlet = /datum/mood_event/conditional/see_death/desensitized /datum/unit_test/death_moodlets/human/desensitized/prepare_dummy(mob/living/carbon/human/consistent/dummy) - ADD_TRAIT(dummy, TRAIT_DESENSITIZED, TRAIT_SOURCE_UNIT_TESTS) + dummy.mind.desensitized_level = DESENSITIZED_THRESHOLD /// Test callous moodlet /datum/unit_test/death_moodlets/human/callous @@ -61,8 +62,8 @@ desired_moodlet = /datum/mood_event/conditional/see_death/dontcare /datum/unit_test/death_moodlets/human/desensitized_and_callous/prepare_dummy(mob/living/carbon/human/consistent/dummy) - ADD_TRAIT(dummy, TRAIT_DESENSITIZED, TRAIT_SOURCE_UNIT_TESTS) dummy.add_personality(/datum/personality/callous) + dummy.mind.desensitized_level = DESENSITIZED_THRESHOLD /// Test cultist positive moodlet /datum/unit_test/death_moodlets/human/cultist @@ -87,7 +88,7 @@ desired_moodlet = /datum/mood_event/conditional/see_death/pet /datum/unit_test/death_moodlets/pet/desensitized_to_pet/prepare_dummy(mob/living/carbon/human/consistent/dummy) - ADD_TRAIT(dummy, TRAIT_DESENSITIZED, TRAIT_SOURCE_UNIT_TESTS) + dummy.mind.desensitized_level = DESENSITIZED_THRESHOLD /// Tests callous moodlet when a pet dies /datum/unit_test/death_moodlets/pet/callous_to_pet @@ -102,3 +103,23 @@ /datum/unit_test/death_moodlets/pet/animal_disliker_to_pet/prepare_dummy(mob/living/carbon/human/consistent/dummy) dummy.add_personality(/datum/personality/animal_disliker) + +// This one just tests that the death desensitized status effect works as expected +/datum/unit_test/desensitized_status_effect + +/datum/unit_test/desensitized_status_effect/Run() + var/mob/living/carbon/human/consistent/normal_dummy = EASY_ALLOCATE() + var/mob/living/carbon/human/consistent/desensitized_dummy = EASY_ALLOCATE() + desensitized_dummy.mind_initialize() + + desensitized_dummy.apply_status_effect(/datum/status_effect/desensitized, TRAIT_SOURCE_UNIT_TESTS, DESENSITIZED_THRESHOLD) + TEST_ASSERT_EQUAL(desensitized_dummy.mind.desensitized_level, DESENSITIZED_THRESHOLD, "Desensitized level not set correctly on application of desensitized status effect.") + + desensitized_dummy.mind.transfer_to(normal_dummy) + TEST_ASSERT_EQUAL(normal_dummy.mind.desensitized_level, 1.0, "Desensitized level not reset to normal on transfer of mind from desensitized mob.") + + normal_dummy.mind.transfer_to(desensitized_dummy) + TEST_ASSERT_EQUAL(desensitized_dummy.mind.desensitized_level, DESENSITIZED_THRESHOLD, "Desensitized level not restored on transfer of mind back to desensitized mob.") + + desensitized_dummy.remove_status_effect(/datum/status_effect/desensitized, TRAIT_SOURCE_UNIT_TESTS) + TEST_ASSERT_EQUAL(desensitized_dummy.mind.desensitized_level, 1.0, "Desensitized level not reset to normal on removal of desensitized status effect.") diff --git a/code/modules/unit_tests/find_reference_sanity.dm b/code/modules/unit_tests/find_reference_sanity.dm index 4bc6445f0243..a9c1e60179f3 100644 --- a/code/modules/unit_tests/find_reference_sanity.dm +++ b/code/modules/unit_tests/find_reference_sanity.dm @@ -6,12 +6,14 @@ var/atom/movable/ref_test/test var/list/test_list = list() var/list/test_assoc_list = list() + var/alist/test_alist = alist() /atom/movable/ref_holder/Destroy() test = null static_test = null test_list.Cut() test_assoc_list.Cut() + test_alist.Cut() return ..() /atom/movable/ref_test @@ -45,14 +47,16 @@ testbed.test = victim testbed.test_list += victim testbed.test_assoc_list["baseline"] = victim + testbed.test_alist["baseline"] = victim var/refcount = refcount(victim) - TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") + TEST_ASSERT_EQUAL(refcount, 7, "Should be: test references: 4 + baseline references: 3 (victim var,loc,allocated list)") victim.DoSearchVar(testbed, "First Run") TEST_ASSERT(LAZYACCESS(victim.found_refs, "test"), "The ref-tracking tool failed to find a regular value") TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_list), "The ref-tracking tool failed to find a list entry") TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find an assoc list value") + TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_alist), "The ref-tracking tool failed to find an alist value") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_exotic/Run() @@ -64,15 +68,17 @@ testbed.overlays += victim testbed.vis_contents += victim testbed.test_assoc_list[victim] = TRUE + testbed.test_alist[victim] = TRUE var/refcount = refcount(victim) - TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") + TEST_ASSERT_EQUAL(refcount, 7, "Should be: test references: 4 + baseline references: 3 (victim var,loc,allocated list)") victim.DoSearchVar(testbed, "Second Run") //This is another sanity check TEST_ASSERT(!LAZYACCESS(victim.found_refs, testbed.overlays), "The ref-tracking tool found an overlays entry? That shouldn't be possible") TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.vis_contents), "The ref-tracking tool failed to find a vis_contents entry") TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find an assoc list key") + TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_alist), "The ref-tracking tool failed to find an alist key") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_esoteric/Run() @@ -86,15 +92,18 @@ testbed.test_list += list(to_find) var/list/to_find_assoc = list(victim) testbed.test_assoc_list["Nesting"] = to_find_assoc + var/list/to_find_alist = list(victim) + testbed.test_alist["Nesting"] = to_find_alist var/refcount = refcount(victim) - TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") + TEST_ASSERT_EQUAL(refcount, 7, "Should be: test references: 4 + baseline references: 3 (victim var,loc,allocated list)") victim.DoSearchVar(victim, "Third Run Self") victim.DoSearchVar(testbed, "Third Run Testbed") TEST_ASSERT(LAZYACCESS(victim.found_refs, "self_ref"), "The ref-tracking tool failed to find a self reference") TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find), "The ref-tracking tool failed to find a nested list entry") TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_assoc), "The ref-tracking tool failed to find a nested assoc list entry") + TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_alist), "The ref-tracking tool failed to find a nested alist entry") SSgarbage.should_save_refs = FALSE /datum/unit_test/find_reference_null_key_entry/Run() @@ -104,11 +113,13 @@ //Calm before the storm testbed.test_assoc_list = list(null = victim) + testbed.test_alist = alist(null = victim) var/refcount = refcount(victim) - TEST_ASSERT_EQUAL(refcount, 4, "Should be: test references: 1 + baseline references: 3 (victim var,loc,allocated list)") + TEST_ASSERT_EQUAL(refcount, 5, "Should be: test references: 2 + baseline references: 3 (victim var,loc,allocated list)") victim.DoSearchVar(testbed, "Fourth Run") TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_assoc_list), "The ref-tracking tool failed to find a null key'd assoc list entry") + TEST_ASSERT(LAZYACCESS(victim.found_refs, testbed.test_alist), "The ref-tracking tool failed to find a null key'd alist entry") /datum/unit_test/find_reference_assoc_investigation/Run() var/atom/movable/ref_test/victim = allocate(/atom/movable/ref_test) @@ -129,6 +140,28 @@ TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_null_assoc_nested), "The ref-tracking tool failed to find a null key'd nested assoc list entry") SSgarbage.should_save_refs = FALSE +/datum/unit_test/find_reference_alist_investigation/Run() + var/atom/movable/ref_test/victim = allocate(/atom/movable/ref_test) + var/atom/movable/ref_holder/testbed = allocate(/atom/movable/ref_holder) + SSgarbage.should_save_refs = TRUE + + //Alists are evil let's fuck em up a little + var/list/to_find_in_key = list(victim) + testbed.test_alist[to_find_in_key] = list("memes") + var/list/to_find_null_assoc_nested = list(victim) + testbed.test_alist[null] = to_find_null_assoc_nested + var/list/to_find_number_assoc_nested = list(victim) + testbed.test_alist[0] = to_find_number_assoc_nested + + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") + victim.DoSearchVar(testbed, "Sixth Run") + + TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_in_key), "The ref-tracking tool failed to find a nested assoc list key") + TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_null_assoc_nested), "The ref-tracking tool failed to find a null key'd nested assoc list entry") + TEST_ASSERT(LAZYACCESS(victim.found_refs, to_find_number_assoc_nested), "The ref-tracking tool failed to find a number key'd alist entry") + SSgarbage.should_save_refs = FALSE + /datum/unit_test/find_reference_static_investigation/Run() var/atom/movable/ref_test/victim = allocate(/atom/movable/ref_test) var/atom/movable/ref_holder/testbed = allocate(/atom/movable/ref_holder) @@ -146,7 +179,7 @@ var/refcount = refcount(victim) TEST_ASSERT_EQUAL(refcount, 5, "Should be: test references: 2 + baseline references: 3 (victim var,loc,allocated list)") - victim.DoSearchVar(global_vars, "Sixth Run") + victim.DoSearchVar(global_vars, "Seventh Run") TEST_ASSERT(LAZYACCESS(victim.found_refs, global_vars), "The ref-tracking tool failed to find a natively global variable") SSgarbage.should_save_refs = FALSE diff --git a/code/modules/unit_tests/font_awesome_icons.dm b/code/modules/unit_tests/font_awesome_icons.dm index 9ebba7657917..2e9b0019c0c2 100644 --- a/code/modules/unit_tests/font_awesome_icons.dm +++ b/code/modules/unit_tests/font_awesome_icons.dm @@ -32,10 +32,7 @@ * Verifies that all quirk icons are valid. */ /datum/unit_test/font_awesome_icons/proc/verify_quirk_icons() - for(var/datum/quirk/quirk as anything in subtypesof(/datum/quirk)) - if(quirk == initial(quirk.abstract_parent_type)) - continue - + for(var/datum/quirk/quirk as anything in valid_subtypesof(/datum/quirk)) var/quirk_icon = initial(quirk.icon) if(findtext(quirk_icon, "tg-") == 1) // TODO: Validate these as well continue diff --git a/code/modules/unit_tests/greyscale_config.dm b/code/modules/unit_tests/greyscale_config.dm index edd6df20c5aa..1c9663806a20 100644 --- a/code/modules/unit_tests/greyscale_config.dm +++ b/code/modules/unit_tests/greyscale_config.dm @@ -25,6 +25,13 @@ if(belt && !belt.icon_states[inside_belt_icon_state]) TEST_FAIL("[belt.DebugName()] is missing a sprite for the belt overlay for [item_path]. Expected icon state: '[inside_belt_icon_state]'") + // DARKPACK EDIT ADD START - ONFLOOR_ICONS + var/datum/greyscale_config/onfloor = SSgreyscale.configurations["[initial(item_path.greyscale_config_onfloor)]"] + var/onflooricon_state = item_path::onflooricon_state || item_path::post_init_icon_state || item_path::icon_state + if(onfloor && !onfloor.icon_states[onflooricon_state]) + TEST_FAIL("[onfloor.DebugName()] is missing a sprite for the onfloor icon for [item_path]. Expected icon state: '[onflooricon_state]'") + // DARKPACK EDIT ADD END + /// Makes sure objects using greyscale configs have, if any, the correct number of colors /datum/unit_test/greyscale_color_count diff --git a/code/modules/unit_tests/heretic_knowledge.dm b/code/modules/unit_tests/heretic_knowledge.dm index 134835a61693..c1f900d99903 100644 --- a/code/modules/unit_tests/heretic_knowledge.dm +++ b/code/modules/unit_tests/heretic_knowledge.dm @@ -26,11 +26,7 @@ all_knowledges += flatten_list(draft) - var/list/all_possible_knowledge = typesof(/datum/heretic_knowledge) - - for(var/datum/heretic_knowledge/knowledge_type as anything in all_possible_knowledge) - if(initial(knowledge_type.abstract_parent_type) == knowledge_type) - all_possible_knowledge -= knowledge_type + var/list/all_possible_knowledge = valid_subtypesof(/datum/heretic_knowledge) var/list/list_to_check = get_knowledge_unlockables(start_knowledges, all_knowledges) diff --git a/code/modules/unit_tests/id_access.dm b/code/modules/unit_tests/id_access.dm new file mode 100644 index 000000000000..1a25cd298514 --- /dev/null +++ b/code/modules/unit_tests/id_access.dm @@ -0,0 +1,52 @@ +/datum/unit_test/id_access + +/datum/unit_test/id_access/Run() + var/mob/living/carbon/human/consistent/subject = EASY_ALLOCATE() + subject.equip_to_appropriate_slot(new /obj/item/clothing/under/color/grey) + var/obj/item/card/id/advanced/card = EASY_ALLOCATE() + + card.set_access(list(ACCESS_HYDROPONICS), FORCE_ADD_ALL) + TEST_ASSERT_EQUAL(length(card.GetAccess()), 1, "ID card access length incorrect after setting access.") + + subject.put_in_hands(card) + TEST_ASSERT(check_access(subject, ACCESS_HYDROPONICS), "Subject did not have the access on holding ID card.") + subject.dropItemToGround(card) + TEST_ASSERT(check_access(subject, null), "Subject still had access after dropping ID card.") + subject.equip_to_appropriate_slot(card) + TEST_ASSERT(check_access(subject, ACCESS_HYDROPONICS), "Subject did not have the access on equipping ID card.") + subject.dropItemToGround(card) + TEST_ASSERT(check_access(subject, null), "Subject still had access after unequipping ID card.") + + var/obj/item/storage/wallet/wallet = EASY_ALLOCATE() + card.forceMove(wallet) + subject.equip_to_appropriate_slot(wallet) + TEST_ASSERT(check_access(subject, ACCESS_HYDROPONICS), "Subject did not have the access on equipping wallet with ID card inside.") + subject.dropItemToGround(wallet) + TEST_ASSERT(check_access(subject, null), "Subject still had access after unequipping wallet with ID card inside.") + subject.equip_to_appropriate_slot(wallet) + click_wrapper(subject, card) // withdraw id card from wallet + TEST_ASSERT(card.loc == subject && card == subject.get_active_held_item(), "Subject failed to withdraw ID card from wallet.") + click_wrapper(subject, wallet) // reinsert id card into wallet + TEST_ASSERT(card.loc == wallet, "Subject failed to reinsert ID card into wallet.") + TEST_ASSERT(check_access(subject, ACCESS_HYDROPONICS), "Subject did not have the access after reinserting ID card into equipped wallet.") + subject.dropItemToGround(wallet) + + var/obj/item/modular_computer/pda/pda = EASY_ALLOCATE() + pda.insert_id(card) + subject.equip_to_appropriate_slot(pda) + TEST_ASSERT(check_access(subject, ACCESS_HYDROPONICS), "Subject did not have the access on equipping PDA with ID card inside.") + subject.dropItemToGround(pda) + TEST_ASSERT(check_access(subject, null), "Subject still had access after unequipping PDA with ID card inside.") + subject.equip_to_appropriate_slot(pda) + pda.remove_id(subject) + TEST_ASSERT(card.loc == subject && card == subject.get_active_held_item(), "Subject failed to withdraw ID card from PDA.") + click_wrapper(subject, pda) // reinsert id card into pda + TEST_ASSERT(card.loc == pda, "Subject failed to reinsert ID card into PDA.") + TEST_ASSERT(check_access(subject, ACCESS_HYDROPONICS), "Subject did not have the access after reinserting ID card into equipped PDA.") + subject.dropItemToGround(pda) + +/datum/unit_test/id_access/proc/check_access(mob/living/carbon/human/consistent/subject, expected) + var/list/subject_access = subject.get_access() + if(isnull(expected)) + return length(subject_access) == 0 + return length(subject_access) == 1 && subject_access[1] == expected diff --git a/code/modules/unit_tests/id_card.dm b/code/modules/unit_tests/id_card.dm new file mode 100644 index 000000000000..b0658b558990 --- /dev/null +++ b/code/modules/unit_tests/id_card.dm @@ -0,0 +1,6 @@ +/// Ensures the captain's spare id keeps the name "captain's spare id", and doesn't get changed by id label +/datum/unit_test/spare_id_name + +/datum/unit_test/spare_id_name/Run() + var/obj/item/card/id/advanced/gold/captains_spare/card = EASY_ALLOCATE() + TEST_ASSERT_EQUAL(card.name, initial(card.name), "Captain's spare ID card should not change its name by default.") diff --git a/code/modules/unit_tests/quirks.dm b/code/modules/unit_tests/quirks.dm index 65864d2d58fa..3fe8c465b158 100644 --- a/code/modules/unit_tests/quirks.dm +++ b/code/modules/unit_tests/quirks.dm @@ -4,10 +4,7 @@ /datum/unit_test/quirk_icons/Run() var/list/used_icons = list() - for (var/datum/quirk/quirk_type as anything in subtypesof(/datum/quirk)) - if (initial(quirk_type.abstract_parent_type) == quirk_type) - continue - + for (var/datum/quirk/quirk_type as anything in valid_subtypesof(/datum/quirk)) var/icon = initial(quirk_type.icon) if (isnull(icon)) @@ -24,12 +21,10 @@ /datum/unit_test/quirk_initial_medical_records /datum/unit_test/quirk_initial_medical_records/Run() + /* DARKPACK EDIT REMOVAL - MERITS/FLAWS - we don't need this and darkpack quirk splat/clan exclusion makes it impossible to add to a random test character with no splats var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent) - for(var/datum/quirk/quirk_type as anything in subtypesof(/datum/quirk)) - if (initial(quirk_type.abstract_parent_type) == quirk_type) - continue - + for(var/datum/quirk/quirk_type as anything in valid_subtypesof(/datum/quirk)) if(!isnull(quirk_type.medical_record_text)) continue @@ -41,6 +36,7 @@ TEST_ASSERT_NOTNULL(quirk.medical_record_text,"[quirk_type] has no medical record description!") patient.remove_quirk(quirk_type) + */ /// Ensures the blood deficiency quirk updates its mail goodies correctly /datum/unit_test/blood_deficiency_mail @@ -53,6 +49,7 @@ ) /datum/unit_test/blood_deficiency_mail/Run() + /* DARKPACK EDIT REMOVAL - MERITS/FLAWS - we are not using /tg/ quirks var/mob/living/carbon/human/dummy = allocate(/mob/living/carbon/human/consistent) dummy.add_quirk(/datum/quirk/blooddeficiency) var/datum/quirk/blooddeficiency/quirk = dummy.get_quirk(/datum/quirk/blooddeficiency) @@ -79,6 +76,7 @@ if(!isnull(species_to_test[last_species])) TEST_ASSERT(!(species_to_test[last_species] in quirk.mail_goodies), \ "Blood deficiency quirk did not update correctly for [species_type]! ([last_species] did not get its blood bag removed)") + */ /// Ensures that all quirks correctly initialized when added /datum/unit_test/quirk_validity @@ -88,10 +86,12 @@ // Assigning this manually as config is empty GLOB.uncommon_roundstart_languages = list(/datum/language/uncommon) - for (var/datum/quirk/quirk_type as anything in subtypesof(/datum/quirk)) - if (initial(quirk_type.abstract_parent_type) == quirk_type) - continue - + for (var/datum/quirk/darkpack/quirk_type as anything in valid_subtypesof(/datum/quirk/darkpack)) // DARKPACK EDIT CHANGE - Original: for (var/datum/quirk/quirk_type as anything in valid_subtypesof(/datum/quirk)) + // DARKPACK EDIT ADD START - MERITS/FLAWS + var/list/forbidden_splats_test = quirk_type.forbidden_splats + var/list/allowed_splats_test = quirk_type.allowed_splats + var/list/excluded_clans_test = quirk_type.excluded_clans + // DARKPACK EDIT ADD END - MERITS/FLAWS var/mob/dead/new_player/abstract_player = allocate(/mob/dead/new_player) var/datum/client_interface/roundstart_mock_client = new() abstract_player.mock_client = roundstart_mock_client @@ -99,16 +99,58 @@ var/mob/living/carbon/human/new_character = allocate(/mob/living/carbon/human/consistent) new_character.mind_initialize() abstract_player.new_character = new_character - if (!new_character.add_quirk(quirk_type, roundstart_mock_client)) - TEST_FAIL("Failed to initialize quirk [quirk_type] on a roundstart character!") + + // DARKPACK EDIT ADD START - MERITS/FLAWS + // if allowed splats, add the allowed splat, then test, failure if its not added + if(allowed_splats_test) + for(var/datum/splat/allowed_splat in allowed_splats_test) + new_character.add_splat(allowed_splat) + if (!new_character.add_quirk(quirk_type, roundstart_mock_client)) + TEST_FAIL("Failed to initialize quirk [quirk_type] on a roundstart character with allowed splat [allowed_splat]!") + new_character.clear_splats() //clear after for the next test + + // if forbidden splats, add the disallowed splat, then test, failure if its added + if(forbidden_splats_test) + for(var/datum/splat/forbidden_splat in forbidden_splats_test) + new_character.add_splat(forbidden_splat) + if (new_character.add_quirk(quirk_type, roundstart_mock_client)) + TEST_FAIL("Successfully initialized quirk [quirk_type] on a roundstart character that had a forbidden splat [forbidden_splat]!") + new_character.clear_splats() + + // if all are null, then its an allowed quirk for all, failure if cannot add + if(!forbidden_splats_test && !allowed_splats_test && !excluded_clans_test) + if (!new_character.add_quirk(quirk_type, roundstart_mock_client)) + TEST_FAIL("Failed to initialize quirk [quirk_type] on a roundstart character!") + // DARKPACK EDIT ADD END - MERITS/FLAWS var/mob/living/carbon/human/latejoin_character = allocate(/mob/living/carbon/human/consistent) var/datum/client_interface/latejoin_mock_client = new() latejoin_mock_client.prefs = new(latejoin_mock_client) latejoin_character.mock_client = latejoin_mock_client latejoin_character.mind_initialize() - if (!latejoin_character.add_quirk(quirk_type, latejoin_mock_client)) - TEST_FAIL("Failed to initialize quirk [quirk_type] on a latejoin character!") + + // DARKPACK EDIT ADD - MERITS/FLAWS + // if allowed splats, add the allowed splat, then test, failure if its not added + if(allowed_splats_test) + for(var/datum/splat/allowed_splat in allowed_splats_test) + latejoin_character.add_splat(allowed_splat) + if (!latejoin_character.add_quirk(quirk_type, latejoin_mock_client)) + TEST_FAIL("Failed to initialize quirk [quirk_type] on a latejoin character with allowed splat [allowed_splat]!") + latejoin_character.clear_splats() + + // if forbidden splats, add the allowed splat, then test, failure if its added + if(forbidden_splats_test) + for(var/datum/splat/forbidden_splat in forbidden_splats_test) + latejoin_character.add_splat(forbidden_splat) + if (latejoin_character.add_quirk(quirk_type, latejoin_mock_client)) + TEST_FAIL("Successfully initialized quirk [quirk_type] on a latejoin character that had a forbidden splat [forbidden_splat]!") + latejoin_character.clear_splats() + + // if all are null, then its an allowed quirk for all, failure if cannot add + if(!forbidden_splats_test && !allowed_splats_test && !excluded_clans_test) + if (!latejoin_character.add_quirk(quirk_type, latejoin_mock_client)) + TEST_FAIL("Failed to initialize quirk [quirk_type] on a latejoin character!") + // DARKPACK EDIT ADD END - MERITS/FLAWS // Clean up after ourselves GLOB.uncommon_roundstart_languages.Cut() diff --git a/code/modules/unit_tests/screenshot_humanoids.dm b/code/modules/unit_tests/screenshot_humanoids.dm index c392b888e413..95ffe8e64d26 100644 --- a/code/modules/unit_tests/screenshot_humanoids.dm +++ b/code/modules/unit_tests/screenshot_humanoids.dm @@ -2,7 +2,7 @@ /datum/unit_test/screenshot_humanoids /datum/unit_test/screenshot_humanoids/Run() - var/list/testable_species = subtypesof(/datum/species) + var/list/testable_species = valid_subtypesof(/datum/species) // DARKPACK EDIT CHANGE // Test lizards as their own thing so we can get more coverage on their features var/mob/living/carbon/human/lizard = allocate(/mob/living/carbon/human/dummy/consistent) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_nightmare.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_nightmare.png index 853ef8453830..4e969bd71fb6 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_nightmare.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_nightmare.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_spaceninja.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_spaceninja.png index 8c8ad95aff7c..60e1196d47fc 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_spaceninja.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_spaceninja.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_bestial.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_bestial.png new file mode 100644 index 000000000000..456a5ce1a860 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_bestial.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_dire.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_dire.png new file mode 100644 index 000000000000..f881901300db Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_dire.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_feral.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_feral.png new file mode 100644 index 000000000000..bfb6d4dd4bab Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_feral.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_homid.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_homid.png new file mode 100644 index 000000000000..18687734ab1f Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_homid.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_war.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_war.png new file mode 100644 index 000000000000..f26cac5b753e Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_shifter_war.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png index 7f31e342050c..70beeb061b9f 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow_nightmare.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow_nightmare.png index 5cdeedeffca7..7490e063de0b 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow_nightmare.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow_nightmare.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_husk_body.png b/code/modules/unit_tests/screenshots/screenshot_husk_body.png index f695cacac7bd..2ebf1d5ef181 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_husk_body.png and b/code/modules/unit_tests/screenshots/screenshot_husk_body.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png b/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png index 07d36bb9664d..74d68bff9e0f 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png and b/code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png differ diff --git a/code/modules/unit_tests/spawn_humans.dm b/code/modules/unit_tests/spawn_humans.dm index e90473a7ba06..f89f59a4cbfe 100644 --- a/code/modules/unit_tests/spawn_humans.dm +++ b/code/modules/unit_tests/spawn_humans.dm @@ -13,3 +13,4 @@ var/mob/living/carbon/human/consistent/dummy = allocate(/mob/living/carbon/human/consistent) TEST_ASSERT(!HAS_TRAIT_FROM(dummy, TRAIT_AGEUSIA, NO_TONGUE_TRAIT), "Dummy has ageusia on init, when it should've been removed by its default tongue.") TEST_ASSERT(!dummy.is_blind_from(NO_EYES), "Dummy is blind on init, when it should've been removed by its default eyes.") + TEST_ASSERT(!HAS_TRAIT_FROM(dummy, TRAIT_DEAF, NO_EARS), "Dummy is deaf on init, when it should've been removed by its default ears.") diff --git a/code/modules/uplink/uplink_items/spy_unique.dm b/code/modules/uplink/uplink_items/spy_unique.dm index abc7449e567a..78afc487c123 100644 --- a/code/modules/uplink/uplink_items/spy_unique.dm +++ b/code/modules/uplink/uplink_items/spy_unique.dm @@ -174,7 +174,7 @@ /datum/uplink_item/spy_unique/katana name = "Katana" desc = "A really sharp Katana. Did I mention it's sharp?" - item = /obj/item/katana + item = /obj/item/storage/belt/sheath/katana cost = /datum/uplink_item/dangerous/doublesword::cost // Puts it in the same pool as Desword uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm index 1567eed0f97b..8137bca7509d 100644 --- a/code/modules/vehicles/atv.dm +++ b/code/modules/vehicles/atv.dm @@ -108,9 +108,7 @@ return PROCESS_KILL if(SPT_PROB(10, seconds_per_tick)) return - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src, location = src) - smoke.start() + do_smoke(0, src, src) /obj/vehicle/ridden/atv/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit, blocked) if(prob(50) || !LAZYLEN(buckled_mobs)) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 67424be210d7..0672586220c9 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -97,11 +97,7 @@ . = ..() if(prob(33)) visible_message(span_danger("[src] spews out a ton of space lube!")) - var/datum/effect_system/fluid_spread/foam/foam = new - var/datum/reagents/foamreagent = new /datum/reagents(25) - foamreagent.add_reagent(/datum/reagent/lube, 25) - foam.set_up(4, holder = src, location = loc, carry = foamreagent) - foam.start() + do_foam(4, src, loc, /datum/reagent/lube, 25) /obj/vehicle/sealed/car/clowncar/item_interaction(mob/living/user, obj/item/tool, list/modifiers) if(!istype(tool, /obj/item/food/grown/banana)) @@ -218,12 +214,7 @@ new /obj/item/grown/bananapeel/specialpeel(loc) if(2) visible_message(span_danger("[user] presses one of the colorful buttons on [src], and unknown chemicals flood out of it.")) - var/datum/reagents/randomchems = new/datum/reagents(300) - randomchems.my_atom = src - randomchems.add_reagent(get_random_reagent_id(), 100) - var/datum/effect_system/fluid_spread/foam/foam = new - foam.set_up(200, holder = src, location = loc, carry = randomchems) - foam.start(log = TRUE) + do_foam(200, src, loc, get_random_reagent_id(), 100, log = TRUE) if(3) visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car turns on its singularity disguise system.")) icon = 'icons/obj/machines/engine/singularity.dmi' @@ -231,13 +222,8 @@ addtimer(CALLBACK(src, PROC_REF(reset_icon)), 10 SECONDS) if(4) visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car spews out a cloud of laughing gas.")) - var/datum/reagents/funnychems = new/datum/reagents(300) - funnychems.my_atom = src - funnychems.add_reagent(/datum/reagent/consumable/superlaughter, 50) - var/datum/effect_system/fluid_spread/smoke/chem/smoke = new() - smoke.set_up(4, holder = src, location = src, carry = funnychems) - smoke.attach(src) - smoke.start(log = TRUE) + do_chem_smoke(4, src, src, /datum/reagent/consumable/superlaughter, 50, log = TRUE) + if(5) visible_message(span_danger("[user] presses one of the colorful buttons on [src], and the clown car starts dropping an oil trail.")) RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(cover_in_oil)) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 44690288175e..7bd4ffd709a4 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -59,7 +59,7 @@ var/mecha_flags = CAN_STRAFE | IS_ENCLOSED | HAS_LIGHTS | MMI_COMPATIBLE | BEACON_TRACKABLE | AI_COMPATIBLE | BEACON_CONTROLLABLE ///Spark effects are handled by this datum - var/datum/effect_system/spark_spread/spark_system + var/datum/effect_system/basic/spark_spread/spark_system ///How powerful our lights are var/lights_power = 6 ///Just stop the mech from doing anything @@ -230,13 +230,9 @@ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) - spark_system = new - spark_system.set_up(2, 0, src) + spark_system = new(src, 2, FALSE) spark_system.attach(src) - - smoke_system = new - smoke_system.set_up(3, holder = src, location = src) - smoke_system.attach(src) + smoke_system = new(src, 3, holder = src) cabin_air = new(cabin_volume) diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index 7e68aaf91cbc..d85189ea8ea7 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -265,7 +265,7 @@ playsound(chassis, 'sound/items/airhorn/airhorn.ogg', 100, TRUE) to_chat(source, "[icon2html(src, source)]HONK") for(var/mob/living/carbon/M in ohearers(6, chassis)) - if(!M.can_hear()) + if(HAS_TRAIT(M, TRAIT_DEAF)) continue var/turf/turf_check = get_turf(M) if(isspaceturf(turf_check) && !turf_check.Adjacent(src)) //in space nobody can hear you honk. diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index d3f1ff5ba10a..16d084cf5181 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -42,7 +42,7 @@ density = FALSE custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10) ///Sparks datum for when we grind on tables - var/datum/effect_system/spark_spread/sparks + var/datum/effect_system/basic/spark_spread/sparks ///Whether the board is currently grinding var/grinding = FALSE ///Stores the time of the last crash plus a short cooldown, affects availability and outcome of certain actions @@ -53,19 +53,23 @@ var/instability = 10 ///If true, riding the skateboard with walk intent on will prevent crashing. var/can_slow_down = TRUE + ///The actual item for the skateboard + var/obj/item/melee/skateboard/board_item -/obj/vehicle/ridden/scooter/skateboard/Initialize(mapload) +/obj/vehicle/ridden/scooter/skateboard/Initialize(mapload, obj/item/melee/skateboard/board_item) . = ..() - sparks = new - sparks.set_up(1, 0, src) + sparks = new(src, 1, FALSE) sparks.attach(src) + if(!istype(board_item)) + src.board_item = new board_item_type(src) + else + src.board_item = board_item /obj/vehicle/ridden/scooter/skateboard/make_ridable() AddElement(/datum/element/ridable, /datum/component/riding/vehicle/scooter/skateboard) /obj/vehicle/ridden/scooter/skateboard/Destroy() - if(sparks) - QDEL_NULL(sparks) + QDEL_NULL(sparks) return ..() /obj/vehicle/ridden/scooter/skateboard/relaymove(mob/living/user, direction) @@ -176,7 +180,7 @@ if(has_buckled_mobs()) to_chat(skater, span_warning("You can't lift this up when somebody's on it.")) return - skater.put_in_hands(new board_item_type(get_turf(skater))) + skater.put_in_hands(board_item) qdel(src) /obj/vehicle/ridden/scooter/skateboard/pro diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index b1af55c67e9d..4b69d9907623 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -41,7 +41,7 @@ if(istype(A, /obj/machinery/door)) var/obj/machinery/door/conditionalwall = A for(var/mob/occupant as anything in return_controllers_with_flag(access_provider_flags)) - if(conditionalwall.try_safety_unlock(occupant)) + if(conditionalwall.try_safety_unlock(occupant) || !conditionalwall.can_open_with_hands) return conditionalwall.bumpopen(occupant) diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index cf784e77ca47..86e26b735d3c 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -30,9 +30,7 @@ return PROCESS_KILL if(SPT_PROB(10, seconds_per_tick)) return - var/datum/effect_system/fluid_spread/smoke/smoke = new - smoke.set_up(0, holder = src, location = src) - smoke.start() + do_smoke(0, src, src) /obj/vehicle/ridden/secway/welder_act(mob/living/user, obj/item/W) if(user.combat_mode) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 09c7cbacb8f0..c03be93356ee 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -45,10 +45,11 @@ "icon" = "bottle-water", "products" = list( /obj/item/reagent_containers/cup/glass/ice = 10, + /obj/item/reagent_containers/cup/glass/bottle/juice/lemonjuice = 4, /obj/item/reagent_containers/cup/glass/bottle/juice/limejuice = 4, + /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4, /obj/item/reagent_containers/cup/glass/bottle/juice/menthol = 4, /obj/item/reagent_containers/cup/glass/bottle/juice/cream = 4, - /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice = 4, /obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice = 4, /obj/item/reagent_containers/cup/soda_cans/sodawater = 15, /obj/item/reagent_containers/cup/soda_cans/sol_dry = 8, diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm index 9ddb14e78c9c..6544830232fb 100644 --- a/code/modules/vending/liberation_toy.dm +++ b/code/modules/vending/liberation_toy.dm @@ -20,7 +20,7 @@ contraband = list( /obj/item/toy/balloon/syndicate = 1, /obj/item/gun/ballistic/shotgun/toy/crossbow/riot = 8, - /obj/item/toy/katana = 12, + /obj/item/storage/belt/sheath/katana/toy = 12, ) premium = list( /obj/item/toy/cards/deck/syndicate = 12, diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index fae9bbc5d466..500dac812948 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -20,7 +20,7 @@ contraband = list( /obj/item/toy/balloon/syndicate = 1, /obj/item/gun/ballistic/shotgun/toy/crossbow = 8, - /obj/item/toy/katana = 12, + /obj/item/storage/belt/sheath/katana/toy = 12, /obj/item/ammo_box/foambox/riot/mini = 20, ) premium = list( diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index 819ddbe22089..c339c2d687a9 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -24,7 +24,7 @@ ) premium = list( /obj/item/storage/belt/utility = 2, - /obj/item/multitool = 2, + /obj/item/multitool = 4, /obj/item/weldingtool/hugetank = 2, /obj/item/clothing/head/utility/welding = 2, /obj/item/clothing/gloves/color/yellow = 1, diff --git a/config/darkpack_config.txt b/config/darkpack_config.txt index 7cb2c1e362db..b540b9b946dd 100644 --- a/config/darkpack_config.txt +++ b/config/darkpack_config.txt @@ -21,6 +21,8 @@ TIME_TILL_ROUNDEND 216000 ## World of Darkness splats ROUNDSTART_SPLATS splat_kindred ROUNDSTART_SPLATS splat_ghoul +ROUNDSTART_SPLATS splat_kinfolk +ROUNDSTART_SPLATS splat_garou ## If dead people and ghosts can LOOC to people who are alive. DISABLE_GHOST_LOOC @@ -31,4 +33,7 @@ DISABLE_GHOST_LOOC MAX_SAVE_SLOTS 5 EXTRA_SAVE_SLOTS_BYOND_MEMBER 5 +## log stat and pref changes +LOG_STATS +#HUMANITY_SUNLIGHT_RESISTANCE diff --git a/config/game_options.txt b/config/game_options.txt index acb47502f499..a7e9527451c9 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -557,7 +557,7 @@ NEGATIVE_STATION_TRAITS 3 1 # Uncomment to disable Quirk point balancing for the server and clients. # If enabled, players will be able to select positive quirks without first selecting negative quirks. # If enabled, randomized Quirks will still use points internally, in order to maintain balance. -#DISABLE_QUIRK_POINTS +DISABLE_QUIRK_POINTS # The maximum amount of positive quirks one character can have at roundstart. # If set to -1, then players will be able to select any quantity of positive quirks. diff --git a/config/maps.txt b/config/maps.txt index 40d5971867a6..b2e5cd94593b 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -55,11 +55,15 @@ endmap minplayers 40 endmap -map westfieldmall +map special_francisco votable default endmap +map westfieldmall + votable +endmap + # Debug-only maps. map gateway_test diff --git a/html/changelogs/AutoChangeLog-pr-489.yml b/html/changelogs/AutoChangeLog-pr-489.yml new file mode 100644 index 000000000000..55ad941befe3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-489.yml @@ -0,0 +1,13 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - rscadd: "Readds garou" + - rscadd: "Moon phase is calculated mostly accurately based on in-game day" + - rscadd: "Rage gained from looking at the moon is now based on phase" + - rscadd: "Howl emote that can be used by dogs, dogs (garou), or dogs (gangrel)" + - rscadd: "Re-implements 1 gift for each auspice" + - bugfix: "Blood-pool icon is properly updated when its added to you" + - admin: "Adjustments to stats and important prefs can be properly viewed in the log viewers" + - balance: "Makes generic helpers to represent \"Heal this amount of \"dots\" of damage\". Gives this to garou at 1 dot every \"turn\" (5 seconds at the time of writing)" + - balance: "Punching basic mobs and humans now calculate damage based on strength" + - balance: "W20 silver bullet handling. No agg damage in breed form. 5 bullets are a guaranteed loss of gnosis." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-531.yml b/html/changelogs/AutoChangeLog-pr-531.yml deleted file mode 100644 index 6455110dc219..000000000000 --- a/html/changelogs/AutoChangeLog-pr-531.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "dwinters99, KCartridge, Major00" -delete-after: True -changes: - - rscadd: "DP Wolves" - - rscadd: "PSG1 magazine and ammo" - - code_imp: "gun code organization" - - rscadd: "undense bin" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-542.yml b/html/changelogs/AutoChangeLog-pr-542.yml new file mode 100644 index 000000000000..b6b359cac6d3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-542.yml @@ -0,0 +1,4 @@ +author: "chazzyjazzy" +delete-after: True +changes: + - code_imp: "makes the basic structure for merits and flaws" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-549.yml b/html/changelogs/AutoChangeLog-pr-549.yml new file mode 100644 index 000000000000..504a168d77bb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-549.yml @@ -0,0 +1,4 @@ +author: "chazzyjazzy, INFARED_BARON" +delete-after: True +changes: + - rscadd: "reimplements SWAT and NG ERTs with new roles" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-563.yml b/html/changelogs/AutoChangeLog-pr-563.yml deleted file mode 100644 index 4c2ec020eecd..000000000000 --- a/html/changelogs/AutoChangeLog-pr-563.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "XeonMations, yooriss, RatFromTheJungle, OrbisAnimal, FlufflesTheDog, sunnyaries" -delete-after: True -changes: - - rscadd: "Added Do emotes" - - rscadd: "Added subtle and subtler emotes" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-619.yml b/html/changelogs/AutoChangeLog-pr-619.yml new file mode 100644 index 000000000000..d7d8de36391b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-619.yml @@ -0,0 +1,6 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - qol: "you can set how many turns blood power is active for with right click" + - balance: "bonus to damage from bloodpower is based entirely on the stat buffs it grants" + - balance: "allows you to set buff granted by blood power according to your gen spending limit" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-652.yml b/html/changelogs/AutoChangeLog-pr-652.yml deleted file mode 100644 index 03006e15b8da..000000000000 --- a/html/changelogs/AutoChangeLog-pr-652.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "FalloutFalcon" -delete-after: True -changes: - - rscadd: "Pharmacy has sutures, gauze, and mesh" - - balance: "bruise packs and ointment is cheaper" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-654.yml b/html/changelogs/AutoChangeLog-pr-654.yml new file mode 100644 index 000000000000..dc9b3f3305e9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-654.yml @@ -0,0 +1,6 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - rscadd: "Readds old interactions of Lasombra's tech bane" + - balance: "Computers require at-least 1 dot in computer to not have a do_after" + - qol: "Candles last a full hour" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-657.yml b/html/changelogs/AutoChangeLog-pr-657.yml deleted file mode 100644 index a50383d4d91d..000000000000 --- a/html/changelogs/AutoChangeLog-pr-657.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "FalloutFalcon" -delete-after: True -changes: - - sound: "the canon round sound effect is 1/4 the default volume as the code intended" - - sound: "other sounds are now the intended volume" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-658.yml b/html/changelogs/AutoChangeLog-pr-658.yml deleted file mode 100644 index 4d550f9f61aa..000000000000 --- a/html/changelogs/AutoChangeLog-pr-658.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Knightscholar" -delete-after: True -changes: - - rscadd: "Hand tazers have cells in them" - - balance: "Hand tazers can hit twice per regular cell, instead of once." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-668.yml b/html/changelogs/AutoChangeLog-pr-668.yml new file mode 100644 index 000000000000..00b829cd6c48 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-668.yml @@ -0,0 +1,5 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - rscadd: "Particle effect when phones are ringing" + - image: "Tweaks smartphone onworld" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-671.yml b/html/changelogs/AutoChangeLog-pr-671.yml new file mode 100644 index 000000000000..55d48c175e95 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-671.yml @@ -0,0 +1,5 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - image: "Adds onfloors for berets" + - code_imp: "Onfloor sprites now support GAGS" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-675.yml b/html/changelogs/AutoChangeLog-pr-675.yml new file mode 100644 index 000000000000..ba2dac3e5a9e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-675.yml @@ -0,0 +1,4 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - rscadd: "Pool tables has balls and cue's that creates a little 8-Ball mini-game." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-651.yml b/html/changelogs/AutoChangeLog-pr-678.yml similarity index 54% rename from html/changelogs/AutoChangeLog-pr-651.yml rename to html/changelogs/AutoChangeLog-pr-678.yml index 5c8a84eda268..7af55ea813c0 100644 --- a/html/changelogs/AutoChangeLog-pr-651.yml +++ b/html/changelogs/AutoChangeLog-pr-678.yml @@ -1,4 +1,4 @@ author: "FalloutFalcon" delete-after: True changes: - - sound: "Makes thunder quieter" \ No newline at end of file + - bugfix: "Fixes final death sprite issue" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-681.yml b/html/changelogs/AutoChangeLog-pr-681.yml new file mode 100644 index 000000000000..db7dd41a0c28 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-681.yml @@ -0,0 +1,4 @@ +author: "chazzyjazzy" +delete-after: True +changes: + - rscadd: "Readds character height customization as a numerical preference slider" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-682.yml b/html/changelogs/AutoChangeLog-pr-682.yml new file mode 100644 index 000000000000..f95a381049d8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-682.yml @@ -0,0 +1,4 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - rscadd: "Readds the funny cardboard box waddle and sound effect" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-684.yml b/html/changelogs/AutoChangeLog-pr-684.yml new file mode 100644 index 000000000000..37e6829e5068 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-684.yml @@ -0,0 +1,4 @@ +author: "FalloutFalcon" +delete-after: True +changes: + - rscadd: "re-adds reporting masquerade violations and reinforcements" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-690.yml b/html/changelogs/AutoChangeLog-pr-690.yml new file mode 100644 index 000000000000..cbc548908f55 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-690.yml @@ -0,0 +1,4 @@ +author: "SELFHELL" +delete-after: True +changes: + - bugfix: "Necromancy tomes will properly spawn for Capo/La Squadra Roles" \ No newline at end of file diff --git a/html/changelogs/archive/2026-02.yml b/html/changelogs/archive/2026-02.yml index 02371a0b3f82..b6ddf6665193 100644 --- a/html/changelogs/archive/2026-02.yml +++ b/html/changelogs/archive/2026-02.yml @@ -42,3 +42,60 @@ 2026-02-09: XeonMations: - bugfix: Typhonic beasts now break the masquerade. +2026-02-16: + Beautiful TG coders: + - code_imp: TG Pull. Thank you TG. + FalloutFalcon: + - bugfix: tiles next to the graveyard gate are made dense automaticly + - refactor: Gravekeeper gate should behavior more consistently in line with atom + integrity + - rscadd: Custom dice rolling verbs for scenes and filling the gaps in unimplemented + content/rolls. + - rscadd: Most rolls now play a dice roll sound effect + - qol: Massively prettified the roll to_chat and fills it with useful information + for rolls + - refactor: Some dice rolls now use a new datumized system of rolling, most use + it with a wrapper through the old system so they dont gain as much new behavoir + - balance: Identifying artifacts only requires 3 occult but now has a roll on a + scene length cooldown + - rscadd: Pharmacy has sutures, gauze, and mesh + - balance: bruise packs and ointment is cheaper + - sound: Makes thunder quieter + - qol: first key checked on a door has no delay + - bugfix: abyss tentacles should be able to acctually make a sound as intended + - bugfix: fixed tranforming BP dupe + - bugfix: typhon brew is craftable + - bugfix: humanity 10 vamps wont burn in the sun (IF ENABLED VIA CONFIG) + - image: blood hunt skull uses its onfloor + - code_imp: more non-combat item interactions are no longer in attack-by + - code_imp: all changes in BP should update your hud + - bugfix: mobs are now cleared from the manifest upon matrixing + - bugfix: matrixing clears a breacher from the masq + - sound: the canon round sound effect is 1/4 the default volume as the code intended + - sound: other sounds are now the intended volume + - balance: Doubles the define for TTRPG damage to represent 10 instead of 5 force + FalloutFalcon, dwinters99: + - balance: More melee can be stored on the belt + FalloutFalcon, tzui5020, EnchantedCrocolisk: + - rscadd: New outfits have been added to the loadout and Hot Ishu inspired by the + scene girl era. + - rscadd: Three new shoes. + - rscadd: Two new hoodies. + Knightscholar: + - rscadd: Hand tazers have cells in them + - balance: Hand tazers can hit twice per regular cell, instead of once. + - rscadd: Added the ability to toggle Aura Perception + - rscdel: Removed Industrial SFX from The Spirit's Touch + SELFHELL: + - rscadd: Pentex FIRST Team ERT + XeonMations: + - qol: Made our character preferences nicer to look at. + - code_imp: Fixed some hard deletes + XeonMations, yooriss, RatFromTheJungle, OrbisAnimal, FlufflesTheDog, sunnyaries: + - rscadd: Added Do emotes + - rscadd: Added subtle and subtler emotes + dwinters99, KCartridge, Major00: + - rscadd: DP Wolves + - rscadd: PSG1 magazine and ammo + - code_imp: gun code organization + - rscadd: undense bin diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi index 23560e411eae..16bbde48e016 100644 Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index a7860bd720d1..0c36dc8d6864 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 5c45e80f426a..b3113ed457a8 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index a02c4fa668d5..06b8b4e1d9bc 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/human/bodyparts.dmi b/icons/mob/human/bodyparts.dmi index e7de7089b184..cc8a60276a81 100644 Binary files a/icons/mob/human/bodyparts.dmi and b/icons/mob/human/bodyparts.dmi differ diff --git a/icons/mob/human/species/monkey/bodyparts.dmi b/icons/mob/human/species/monkey/bodyparts.dmi index 9e95cbd0c72f..9dba64eb7d35 100644 Binary files a/icons/mob/human/species/monkey/bodyparts.dmi and b/icons/mob/human/species/monkey/bodyparts.dmi differ diff --git a/icons/mob/inhands/antag/nightmare_lefthand.dmi b/icons/mob/inhands/antag/nightmare_lefthand.dmi new file mode 100644 index 000000000000..b98dee3aa0aa Binary files /dev/null and b/icons/mob/inhands/antag/nightmare_lefthand.dmi differ diff --git a/icons/mob/inhands/antag/nightmare_righthand.dmi b/icons/mob/inhands/antag/nightmare_righthand.dmi new file mode 100644 index 000000000000..87f650059fe4 Binary files /dev/null and b/icons/mob/inhands/antag/nightmare_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/belt_lefthand.dmi b/icons/mob/inhands/equipment/belt_lefthand.dmi index 7675b73543b5..e312f6df4e46 100644 Binary files a/icons/mob/inhands/equipment/belt_lefthand.dmi and b/icons/mob/inhands/equipment/belt_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/belt_righthand.dmi b/icons/mob/inhands/equipment/belt_righthand.dmi index c1cb44abf4a7..d2e2117422ac 100644 Binary files a/icons/mob/inhands/equipment/belt_righthand.dmi and b/icons/mob/inhands/equipment/belt_righthand.dmi differ diff --git a/icons/obj/banner.dmi b/icons/obj/banner.dmi index fd5372de46e0..73ac08b94587 100644 Binary files a/icons/obj/banner.dmi and b/icons/obj/banner.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 39e8daa97425..58d0f4bfb8bc 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/devices/modular_laptop.dmi b/icons/obj/devices/modular_laptop.dmi index 1accc56f4c18..82afd2d1acee 100644 Binary files a/icons/obj/devices/modular_laptop.dmi and b/icons/obj/devices/modular_laptop.dmi differ diff --git a/icons/obj/devices/modular_pda.dmi b/icons/obj/devices/modular_pda.dmi index a427eb143ce1..c5610ccebe2b 100644 Binary files a/icons/obj/devices/modular_pda.dmi and b/icons/obj/devices/modular_pda.dmi differ diff --git a/icons/obj/drinks/boxes.dmi b/icons/obj/drinks/boxes.dmi index 0871bf550068..99676e79290d 100644 Binary files a/icons/obj/drinks/boxes.dmi and b/icons/obj/drinks/boxes.dmi differ diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index f20b54d9c31f..bd3bd177bfe5 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/machines/computer.dmi b/icons/obj/machines/computer.dmi index 17b6dc1973c2..5a6cd0c7e516 100644 Binary files a/icons/obj/machines/computer.dmi and b/icons/obj/machines/computer.dmi differ diff --git a/icons/obj/machines/modular_console.dmi b/icons/obj/machines/modular_console.dmi index 6a8348e1b8ec..1ec20af5013d 100644 Binary files a/icons/obj/machines/modular_console.dmi and b/icons/obj/machines/modular_console.dmi differ diff --git a/icons/obj/medical/chemical.dmi b/icons/obj/medical/chemical.dmi index 0bc3c3fd0751..8f3267c07d4a 100644 Binary files a/icons/obj/medical/chemical.dmi and b/icons/obj/medical/chemical.dmi differ diff --git a/icons/obj/medical/organs/shadow_organs.dmi b/icons/obj/medical/organs/shadow_organs.dmi index 303b4e11cb3b..8ed64bb5754d 100644 Binary files a/icons/obj/medical/organs/shadow_organs.dmi and b/icons/obj/medical/organs/shadow_organs.dmi differ diff --git a/icons/obj/mining_zones/terrain.dmi b/icons/obj/mining_zones/terrain.dmi index fd930fe709dc..5351cde085c3 100644 Binary files a/icons/obj/mining_zones/terrain.dmi and b/icons/obj/mining_zones/terrain.dmi differ diff --git a/icons/obj/weapons/Nightmare_items.dmi b/icons/obj/weapons/Nightmare_items.dmi new file mode 100644 index 000000000000..9a9f6e9e631e Binary files /dev/null and b/icons/obj/weapons/Nightmare_items.dmi differ diff --git a/icons/obj/weapons/baton.dmi b/icons/obj/weapons/baton.dmi index c9dc238a651b..181c635c72f5 100644 Binary files a/icons/obj/weapons/baton.dmi and b/icons/obj/weapons/baton.dmi differ diff --git a/icons/obj/weapons/grenade.dmi b/icons/obj/weapons/grenade.dmi index 415166f9c407..a70529cd60d7 100644 Binary files a/icons/obj/weapons/grenade.dmi and b/icons/obj/weapons/grenade.dmi differ diff --git a/icons/ui/achievements/achievements.dmi b/icons/ui/achievements/achievements.dmi index 80ebc9cd2972..d5bef5c42f87 100644 Binary files a/icons/ui/achievements/achievements.dmi and b/icons/ui/achievements/achievements.dmi differ diff --git a/modular_darkpack/master_files/code/_onclick/hud/hud.dm b/modular_darkpack/master_files/code/_onclick/hud/hud.dm index 5db6a23dda0d..a4ac881ee3bd 100644 --- a/modular_darkpack/master_files/code/_onclick/hud/hud.dm +++ b/modular_darkpack/master_files/code/_onclick/hud/hud.dm @@ -1,6 +1,10 @@ /datum/hud var/atom/movable/screen/block_icon var/atom/movable/screen/jump_icon - var/atom/movable/screen/bloodpool_icon - var/atom/movable/screen/rage_icon + var/atom/movable/screen/bloodpool/bloodpool_icon + var/atom/movable/screen/auspice/auspice_icon // WEREWOLF + var/atom/movable/screen/rage_and_gnosis/rage_and_gnosis_icon // WEREWOLF + var/atom/movable/screen/fera_transform/homid/homid_trans_icon // WEREWOLF + var/atom/movable/screen/fera_transform/war/war_trans_icon // WEREWOLF + var/atom/movable/screen/fera_transform/feral/feral_trans_icon // WEREWOLF var/atom/movable/screen/zone_icon diff --git a/modular_darkpack/master_files/code/_onclick/hud/living.dm b/modular_darkpack/master_files/code/_onclick/hud/living.dm index 157ee31eaf71..3c5ed1d1f62f 100644 --- a/modular_darkpack/master_files/code/_onclick/hud/living.dm +++ b/modular_darkpack/master_files/code/_onclick/hud/living.dm @@ -1,5 +1,6 @@ /datum/hud/living/New(mob/living/owner) ..() - bloodpool_icon = new /atom/movable/screen/bloodpool(null, src) + bloodpool_icon = new(null, src) infodisplay += bloodpool_icon + diff --git a/modular_darkpack/master_files/code/modules/mob/living/carbon/carbon.dm b/modular_darkpack/master_files/code/modules/mob/living/carbon/carbon.dm index 2591ada46031..28a1b83162b5 100644 --- a/modular_darkpack/master_files/code/modules/mob/living/carbon/carbon.dm +++ b/modular_darkpack/master_files/code/modules/mob/living/carbon/carbon.dm @@ -1,4 +1,13 @@ +/mob/living/carbon/Initialize(mapload) + . = ..() + if(!examine_panel_tgui) + examine_panel_tgui = new() + examine_panel_tgui.holder = src + /mob/living/carbon/Destroy() + examine_panel_tgui.holder = null + QDEL_NULL(examine_panel_tgui) + client?.images -= suckbar QDEL_NULL(suckbar) suckbar_loc = null GLOB.masquerade_breakers_list -= src diff --git a/modular_darkpack/master_files/code/modules/mob/living/carbon/examine.dm b/modular_darkpack/master_files/code/modules/mob/living/carbon/examine.dm index 629a2c982e78..72435558b539 100644 --- a/modular_darkpack/master_files/code/modules/mob/living/carbon/examine.dm +++ b/modular_darkpack/master_files/code/modules/mob/living/carbon/examine.dm @@ -1,4 +1,5 @@ -/mob/living/carbon/proc/display_darkpack_examine_text() +/mob/living/carbon/proc/display_darkpack_examine_text(mob/user) + . = list() if(obscured_slots & HIDEFACE) return @@ -23,19 +24,27 @@ . += span_danger("[p_They()] [p_are()] a decayed corpse!
") if(HAS_TRAIT(src, TRAIT_SERPENTIS_SKIN) && !(HIDEJUMPSUIT)) // 'hidden by modest clothing' - . += span_danger("[p_They()] [p_are()] covered in... scales!?") + . += span_danger("[p_They()] [p_are()] covered in... scales!?
") if(!(obscured_slots & HIDEFACE)) switch(st_get_stat(STAT_APPEARANCE)) if(0) - . += span_bolddanger("AGHH!!! WHAT THE HELL IS THAT THING!!!") + . += span_bolddanger("AGHH!!! WHAT THE HELL IS THAT THING!!!
") if(1) - . += span_danger("Eugh. [p_They()] [p_are()] really ugly.") + . += span_danger("Eugh. [p_They()] [p_are()] really ugly.
") if(2) - . += span_notice("[p_They()] [p_are()] about average looking.") + . += span_notice("[p_They()] [p_are()] about average looking.
") if(3) - . += span_nicegreen("[p_They()] [p_are()] quite nice looking!") + . += span_nicegreen("[p_They()] [p_are()] quite nice looking!
") if(4) - . += span_purple("[p_They()] [p_are()] very attractive!") + . += span_purple("[p_They()] [p_are()] very attractive!
") if(5 to INFINITY) - . += span_rose(span_bold("Oh... My God... [p_They()] [p_are()] absolutely stunning! You find yourself blushing just looking at them!")) + . += span_rose(span_bold("Oh... My God... [p_They()] [p_are()] absolutely stunning! You find yourself blushing just looking at them!
")) + if (HAS_TRAIT(src, TRAIT_PERMAFANGS)) + . += span_warning("[p_They()] [p_have()] visible fangs in [p_their()] mouth.
") + + // WEREWOLF + var/datum/splat/werewolf/werewolf_splat = iswerewolfsplat(user) + if(werewolf_splat && !(obscured_slots & HIDEFACE)) + . += werewolf_splat.examine_other_human(src) + // WEREWOLF diff --git a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/_species.dm b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/_species.dm new file mode 100644 index 000000000000..4c429d28433c --- /dev/null +++ b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/_species.dm @@ -0,0 +1,4 @@ + +/datum/species + /// Used in get_generic_name to replace gender + var/visible_gender_override diff --git a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/death.dm b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/death.dm index 5e1cc763e372..7ca2cf4febe0 100644 --- a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/death.dm +++ b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/death.dm @@ -1,39 +1,9 @@ /mob/living/carbon/human/death(gibbed) . = ..() + if(!.) + return . SEND_SIGNAL(SSdcs, COMSIG_GLOB_REPORT_CRIME, CRIME_MURDER, get_turf(src)) GLOB.masquerade_breakers_list -= src GLOB.sabbatites -= src - - if(!iskindred(src)) - return - can_be_embraced = FALSE - var/obj/item/organ/brain/brain = get_organ_slot(ORGAN_SLOT_BRAIN) //NO REVIVAL EVER - if(brain) - brain.organ_flags |= ORGAN_FAILING - - /* - if(HAS_TRAIT(src, TRAIT_IN_FRENZY)) - exit_frenzymod() - */ - SEND_SOUND(src, sound('modular_darkpack/modules/vampire_the_masquerade/sounds/final_death.ogg', volume = 50)) - - switch (chronological_age) - if(-INFINITY to 10) //normal corpse - return - if(10 to 50) - rot_body(1) //skin takes on a weird colouration - visible_message(span_notice("[src]'s skin loses some of its colour.")) - if(50 to 100) - rot_body(2) //looks slightly decayed - visible_message(span_notice("[src]'s skin rapidly decays.")) - if(100 to 150) - rot_body(3) //looks very decayed - visible_message(span_warning("[src]'s body rapidly decomposes!")) - if(150 to 200) - rot_body(4) //mummified skeletonised corpse - visible_message(span_warning("[src]'s body rapidly skeletonises!")) - if(200 to INFINITY) //turn to ash - playsound(src, 'modular_darkpack/modules/vampire_the_masquerade/sounds/burning_death.ogg', 80, TRUE) - dust(just_ash = TRUE, drop_items = TRUE, force = TRUE) diff --git a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human.dm b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human.dm index 0dd7c8a1eb1e..f78afb1a0081 100644 --- a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human.dm +++ b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human.dm @@ -1,9 +1,35 @@ /mob/living/carbon/human/Topic(href, href_list) // DARKPACK TODO - reimplement in a sane way. if(href_list["masquerade_violation"]) - return + if(!ismundane(usr)) + return + var/mob/living/carbon/human/reporter = usr + if(reporter.stat > UNCONSCIOUS) + return + if(usr == src) + return + var/reason = tgui_input_text(reporter, "Write a description of violation", "Spot a Masquerade violation", null, MAX_MESSAGE_LEN) + if(!reason) + return + reason = sanitize(reason) + if(!SEND_SIGNAL(reporter, COMSIG_SEEN_MASQUERADE_VIOLATION, src)) + return + message_admins("[ADMIN_LOOKUPFLW(reporter)] spotted [ADMIN_LOOKUPFLW(src)]'s Masquerade violation. Description: [reason]") + log_game("[ADMIN_LOOKUPFLW(reporter)] spotted [ADMIN_LOOKUPFLW(src)]'s Masquerade violation. Description: [reason]") + to_chat(src, span_danger("You were found to be violating the masquereade for: [reason]")) if(href_list["masquerade_reinforcement"]) - return + if(!ismundane(usr)) + return + var/mob/living/carbon/human/reporter = usr + if(reporter.stat > UNCONSCIOUS) + return + if(usr == src) + return + if(!SEND_SIGNAL(reporter, COMSIG_MASQUERADE_REINFORCE, src)) + return + message_admins("[ADMIN_LOOKUPFLW(reporter)] repaired [ADMIN_LOOKUPFLW(src)]'s Masquerade violation.") + log_game("[ADMIN_LOOKUPFLW(reporter)] repaired [ADMIN_LOOKUPFLW(src)]'s Masquerade violation.") + . = ..() diff --git a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human_defines.dm b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human_defines.dm index 37e038ebf4e8..5ef248c4bd44 100644 --- a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human_defines.dm +++ b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/human_defines.dm @@ -1,4 +1,8 @@ /mob/living/carbon/human + // Humans have a default bloodpool of 10 + maxbloodpool = 10 + bloodpool = 10 + // NPC humans get the area of effect, player humans dont. var/violation_aoe = FALSE /// List of ownership types the player has claimed keys for (e.g., "apartment", "car") @@ -6,6 +10,3 @@ // Visible adjectives, used for Guestbooks. var/visible_adjective = "" - // Humans have a default bloodpool of 10 - maxbloodpool = 10 - bloodpool = 10 diff --git a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/species_types/zombies.dm b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/species_types/zombies.dm index f4462420ba9e..351d0c9ad7af 100644 --- a/modular_darkpack/master_files/code/modules/mob/living/carbon/human/species_types/zombies.dm +++ b/modular_darkpack/master_files/code/modules/mob/living/carbon/human/species_types/zombies.dm @@ -33,13 +33,6 @@ C.maxHealth = 300 //tanky C.health = 300 - /* // DARKPACK TODO -- kj shit? - C.yang_chi = 0 - C.max_yang_chi = 0 - C.yin_chi = 6 - C.max_yin_chi = 6 - */ - //zombies resist vampire bites better than mortals RegisterSignal(C, COMSIG_MOB_VAMPIRE_SUCKED, PROC_REF(on_zombie_bitten)) ADD_TRAIT(C, TRAIT_MASQUERADE_VIOLATING_FACE, "zombie") diff --git a/modular_darkpack/master_files/code/modules/mob/living/living_defines.dm b/modular_darkpack/master_files/code/modules/mob/living/living_defines.dm index c2910fff93f8..318ed24e6997 100644 --- a/modular_darkpack/master_files/code/modules/mob/living/living_defines.dm +++ b/modular_darkpack/master_files/code/modules/mob/living/living_defines.dm @@ -6,7 +6,7 @@ var/list/drunked_of = list() var/discipline_time_plus = 0 - var/bloodpower_time_plus = 0 + var/blood_efficiency = 1 var/thaum_damage_plus = 0 var/resistant_to_disciplines = FALSE diff --git a/modular_darkpack/master_files/code/modules/rituals/code/ritual_rune_drawing.dm b/modular_darkpack/master_files/code/modules/rituals/code/ritual_rune_drawing.dm index d12162f03e49..acf8a2df62f2 100644 --- a/modular_darkpack/master_files/code/modules/rituals/code/ritual_rune_drawing.dm +++ b/modular_darkpack/master_files/code/modules/rituals/code/ritual_rune_drawing.dm @@ -72,7 +72,7 @@ if(do_after(user, draw_time, user)) new rune_path(user.loc) - user.bloodpool = max(user.bloodpool - rune_cost, 0) + user.adjust_blood_pool(-rune_cost) SEND_SIGNAL(user, COMSIG_MASQUERADE_VIOLATION) drawing = FALSE diff --git a/modular_darkpack/master_files/icons/mob/actions/backgrounds.dmi b/modular_darkpack/master_files/icons/mob/actions/backgrounds.dmi index 5035f0cdcb8f..96425f0b24dc 100644 Binary files a/modular_darkpack/master_files/icons/mob/actions/backgrounds.dmi and b/modular_darkpack/master_files/icons/mob/actions/backgrounds.dmi differ diff --git a/modular_darkpack/modules/aggravated_damage/code/generic_healing.dm b/modular_darkpack/modules/aggravated_damage/code/generic_healing.dm new file mode 100644 index 000000000000..938dd1c8db78 --- /dev/null +++ b/modular_darkpack/modules/aggravated_damage/code/generic_healing.dm @@ -0,0 +1,54 @@ +// Generic helpers to simulate the healing of the TTRPG + +/// Returns amount of dots healed +/mob/living/proc/heal_storyteller_health(dots_to_heal, heal_aggravated = FALSE, heal_scars = FALSE, heal_blood = FALSE) + if(dots_to_heal <= 0) + return 0 + + var/healed_dots = 0 + + if(heal_blood) + adjust_blood_volume(dots_to_heal * 2) + + if(heal_scars && dots_to_heal > 0) + healed_dots += heal_storyteller_scars(dots_to_heal) + + if(heal_aggravated) + while(dots_to_heal > 0 && get_agg_loss()+get_fire_loss() > 0) + heal_ordered_damage(1 TTRPG_DAMAGE, list(BURN, AGGRAVATED)) + dots_to_heal-- + healed_dots++ + + while(dots_to_heal > 0 && get_brute_loss()+get_tox_loss()+get_oxy_loss() > 0) + heal_ordered_damage(1 TTRPG_DAMAGE, list(BRUTE, TOX, OXY)) + dots_to_heal-- + healed_dots++ + + if(healed_dots) + updatehealth() + + return healed_dots + +/mob/living/proc/heal_storyteller_scars(dots_to_heal) + return + +/mob/living/carbon/heal_storyteller_scars(dots_to_heal) + var/healed_dots = 0 + + for(var/datum/wound/our_wound in all_wounds) + if(dots_to_heal <= 0) + break + our_wound.remove_wound() + dots_to_heal-- + healed_dots++ + + // W20 p. 259: describes "battle scars" to be inclusive of stuff like organ damage, brain damage or lost limbs. + for(var/obj/item/organ/target_organ as anything in organs) + if(!target_organ.damage) + continue + if(target_organ.apply_organ_damage(-dots_to_heal TTRPG_DAMAGE, required_organ_flag = ORGAN_ORGANIC)) + dots_to_heal-- + healed_dots++ + + return healed_dots + diff --git a/modular_darkpack/modules/antediluvian_sarcophagus/code/sarcophagus.dm b/modular_darkpack/modules/antediluvian_sarcophagus/code/sarcophagus.dm index afa3f69b8930..7f62b6e51eb5 100644 --- a/modular_darkpack/modules/antediluvian_sarcophagus/code/sarcophagus.dm +++ b/modular_darkpack/modules/antediluvian_sarcophagus/code/sarcophagus.dm @@ -80,6 +80,11 @@ GLOBAL_LIST_INIT(caesar_cipher, list( return final_message +/datum/storyteller_roll/sarcophagus_cipher + bumper_text = "examine" + difficulty = 10 + applicable_stats = list(STAT_INTELLIGENCE, STAT_OCCULT) + reroll_cooldown = 1 SCENES /obj/sarcophagus name = "unknown sarcophagus" @@ -90,9 +95,9 @@ GLOBAL_LIST_INIT(caesar_cipher, list( density = TRUE anchored = TRUE pixel_w = -8 - COOLDOWN_DECLARE(roll_cooldown) var/password = "Brongus" var/passkey = 5 + var/datum/storyteller_roll/sarcophagus_cipher/cipher_roll /obj/sarcophagus/Initialize(mapload) . = ..() @@ -102,15 +107,16 @@ GLOBAL_LIST_INIT(caesar_cipher, list( else passkey = rand(-15, -5) //to_chat(world, span_userdanger("UNKNOWN SARCOPHAGUS POSITION HAS BEEN LEAKED")) - SEND_SOUND(world, sound('modular_darkpack/master_files/sounds/announce.ogg')) + if(!mapload) + SEND_SOUND(world, sound('modular_darkpack/master_files/sounds/announce.ogg')) /obj/sarcophagus/examine(mob/user) . = ..() var/message = "You see an engraved text on it: [encipher(password, passkey)]." - if(isliving(user) && COOLDOWN_FINISHED(src, roll_cooldown)) - COOLDOWN_START(src, roll_cooldown, 1 SCENES) - var/mob/living/living_user = user - var/roll_result = SSroll.storyteller_roll(living_user.st_get_stat(STAT_INTELLIGENCE) + living_user.st_get_stat(STAT_OCCULT), 10, list(user), user) + if(isliving(user)) + if(!cipher_roll) + cipher_roll = new() + var/roll_result = cipher_roll.st_roll(user, src) if(roll_result == ROLL_SUCCESS) message += " It's an ancient cipher. You shift letters in your head till you end up with [uppertext(password)]." else diff --git a/modular_darkpack/modules/areas/code/interiors/city_interiors.dm b/modular_darkpack/modules/areas/code/interiors/city_interiors.dm index baaca99a3058..e92196985534 100644 --- a/modular_darkpack/modules/areas/code/interiors/city_interiors.dm +++ b/modular_darkpack/modules/areas/code/interiors/city_interiors.dm @@ -156,13 +156,6 @@ ambience_index = AMBIENCE_OFFICE fire_controled = TRUE -/area/vtm/interior/substation - name = "Grid Substation" - icon_state = "hotel" - music_index = MUSIC_CITY - ambience_index = AMBIENCE_OFFICE - fire_controled = TRUE - /area/vtm/interior/church name = "Church" icon_state = "church" @@ -172,18 +165,13 @@ /area/vtm/interior/church/staff name = "Church - Backrooms" - icon_state = "church" zone_type = ZONE_ELYSIUM music_index = MUSIC_CITY - ambience_index = AMBIENCE_OFFICE - fire_controled = TRUE /area/vtm/interior/church/haven name = "Church - Restricted Floor" icon_state = "old_clan_tzimisce" music_index = MUSIC_CITY - ambience_index = AMBIENCE_OFFICE - fire_controled = TRUE zone_type = ZONE_ELYSIUM /area/vtm/interior/elevator @@ -303,3 +291,6 @@ name = "Grid Substation" icon_state = "hotel" fire_controled = TRUE + music_index = MUSIC_CITY + ambience_index = AMBIENCE_OFFICE + fire_controled = TRUE diff --git a/modular_darkpack/modules/battering_ram/code/battering_ram.dm b/modular_darkpack/modules/battering_ram/code/battering_ram.dm index 90a11d3c9a98..51a2f4265e41 100644 --- a/modular_darkpack/modules/battering_ram/code/battering_ram.dm +++ b/modular_darkpack/modules/battering_ram/code/battering_ram.dm @@ -22,8 +22,8 @@ var/obj/structure/vampdoor/target_door = target if(target_door.door_broken) return COMPONENT_CANCEL_ATTACK_CHAIN - var/dice_result = SSroll.storyteller_roll(user.st_get_stat(STAT_STRENGTH)+user.st_get_stat(STAT_MELEE), 6, user, user, TRUE) - if(!do_after(user, ((5 SECONDS) / max(1, dice_result)), target)) + var/dice_result = SSroll.storyteller_roll(user.st_get_stat(STAT_STRENGTH)+user.st_get_stat(STAT_MELEE), 6, user, TRUE) + if(!do_after(user, ((1 TURNS) / max(1, dice_result)), target)) return COMPONENT_CANCEL_ATTACK_CHAIN if(prob(80 / max(1, dice_result)) || !dice_result) target_door.pixel_z = target_door.pixel_z+rand(-1, 1) diff --git a/modular_darkpack/modules/billiards/code/billiard.dm b/modular_darkpack/modules/billiards/code/billiard.dm new file mode 100644 index 000000000000..39caecbc5455 --- /dev/null +++ b/modular_darkpack/modules/billiards/code/billiard.dm @@ -0,0 +1,247 @@ +#define SOLID_BALL "Solid Ball" +#define STRIPED_BALL "Striped Ball" +#define EIGHT_BALL "8-Ball" +#define ZERO_BALL "0-Ball" + +#define TABLE_BOUNDS 11 + +/obj/item/pool_cue + name = "pool cue" + desc = "Used for playing a game of 8 ball." + icon = 'modular_darkpack/modules/billiards/icons/billiard.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/billiards/icons/billiard_onfloor.dmi') + icon_state = "cue" + base_icon_state = "cue" + worn_icon = 'modular_darkpack/modules/billiards/icons/back.dmi' + lefthand_file = 'modular_darkpack/modules/billiards/icons/lefthand.dmi' + righthand_file = 'modular_darkpack/modules/billiards/icons/righthand.dmi' + force = 10 + w_class = WEIGHT_CLASS_BULKY + slot_flags = ITEM_SLOT_BACK + throwforce = 15 + throw_speed = 2 + attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks") + attack_verb_simple = list("smash", "slam", "whack", "thwack") + +/obj/item/pool_cue/Initialize(mapload) + . = ..() + AddComponent(/datum/component/two_handed, \ + force_unwielded = /obj/item/pool_cue::force, \ + force_wielded = 15, \ + ) + +/obj/item/pool_cue/update_icon_state() + inhand_icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]" + return ..() + +/obj/item/pool_ball + name = "pool ball" + desc = "Used for playing a game of 8 ball." + icon = 'modular_darkpack/modules/billiards/icons/billiard.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/billiards/icons/billiard_onfloor.dmi') + icon_state = "0ball" + var/ball_number = 0 + +/obj/item/pool_ball/update_name(updates) + . = ..() + if(ball_number == 0) + name = "cue ball" + else + name = "\improper [ball_number]-ball" + +/obj/item/pool_ball/update_icon_state() + . = ..() + icon_state = "[ball_number]ball" + +/obj/item/pool_ball/random/Initialize(mapload) + . = ..() + ball_number = rand(0,15) + update_appearance() + +/obj/structure/table/wood/billiard + name = "billiard table" + desc = "Come here, play some BALLS. I know you want it so much..." + icon = 'modular_darkpack/modules/billiards/icons/32x48.dmi' + icon_state = "billiard1" + smoothing_flags = NONE + smoothing_groups = null + canSmoothWith = null + pixel_y = -16 + + can_flip = FALSE + + var/start_with_cues = TRUE + var/start_min_cues = 1 + var/start_max_cues = 4 + + var/start_with_balls = TRUE + +/obj/structure/table/wood/billiard/Initialize() + . = ..() + + var/turf/my_turf = get_turf(src) + if(start_with_balls) + for(var/ball_num in 0 to 15) + var/obj/item/pool_ball/new_ball = new(my_turf) + new_ball.ball_number = ball_num + new_ball.update_appearance() + new_ball.pixel_x += rand(-TABLE_BOUNDS,TABLE_BOUNDS) + new_ball.pixel_y += rand(-TABLE_BOUNDS-6,TABLE_BOUNDS) + + if(start_with_cues) + for(var/i in 1 to rand(start_min_cues, start_max_cues)) + var/obj/item/pool_cue/new_cue = new(my_turf) + new_cue.pixel_x += rand(-TABLE_BOUNDS,TABLE_BOUNDS) + new_cue.pixel_y += rand(-TABLE_BOUNDS,TABLE_BOUNDS) + +/obj/structure/table/wood/billiard/atom_deconstruct(disassembled) + . = ..() + dump_contents() + +/obj/structure/table/wood/billiard/dump_contents() + var/turf/my_turf = get_turf(src) + for(var/obj/item/ball in contents) + ball.forceMove(my_turf) + ball.pixel_x = rand(-TABLE_BOUNDS,TABLE_BOUNDS) + ball.pixel_y = rand(-TABLE_BOUNDS,TABLE_BOUNDS) + +/obj/structure/table/wood/billiard/examine(mob/user) + . = ..() + . += span_notice("There are [length(get_balls_on_table(SOLID_BALL))] solid and [length(get_balls_on_table(STRIPED_BALL))] striped balls left.") + if(!length(get_balls_on_table(EIGHT_BALL))) + . += span_warning("The 8-Ball has been sunk.") + +/obj/structure/table/wood/billiard/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) + . = ..() + + if(istype(held_item, /obj/item/pool_cue)) + context[SCREENTIP_CONTEXT_LMB] = "Strike ball" + . = CONTEXTUAL_SCREENTIP_SET + else if(!held_item) + context[SCREENTIP_CONTEXT_RMB] = "Reset Table" + . = CONTEXTUAL_SCREENTIP_SET + + return . || NONE + +/obj/structure/table/wood/billiard/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(istype(tool, /obj/item/pool_cue)) + var/static/list/cue_options = list( + SOLID_BALL = image(icon = 'modular_darkpack/modules/billiards/icons/billiard.dmi', icon_state = "1ball"), + STRIPED_BALL = image(icon = 'modular_darkpack/modules/billiards/icons/billiard.dmi', icon_state = "15ball"), + EIGHT_BALL = image(icon = 'modular_darkpack/modules/billiards/icons/billiard.dmi', icon_state = "8ball"), + ) + var/choice = show_radial_menu(user, src, cue_options, require_near = TRUE) + if(!choice) + return ITEM_INTERACT_BLOCKING + if(!length(get_balls_on_table(choice))) + to_chat(user, span_warning("You cant aim for a [lowertext(choice)] because they are all sunk!")) + return ITEM_INTERACT_BLOCKING + user.visible_message(span_notice("[user] begins lining up a shot to hit a [lowertext(choice)]."), span_notice("You begin lining up a shot to hit a [lowertext(choice)].")) + if(!do_after(user, 1 TURNS, src)) + return ITEM_INTERACT_BLOCKING + user.visible_message(span_notice("[user] strikes a [lowertext(choice)]!"), span_notice("You strike your target!")) + playsound(src, 'modular_darkpack/modules/billiards/sounds/poolball_strike.ogg', 75) + + var/datum/storyteller_roll/pool_aiming/accuracy_roll = new() + var/accuracy_result = accuracy_roll.st_roll(user, src) * 2 + var/datum/storyteller_roll/pool_hits/amount_to_hit_roll = new() + var/amount_to_hit_result = amount_to_hit_roll.st_roll(user, src) + for(var/i in 1 to amount_to_hit_result) + if(!length(get_balls_on_table())) + break + sink_ball(user, choice, accuracy_result, amount_to_hit_result) + return ITEM_INTERACT_SUCCESS + +/datum/storyteller_roll/pool_aiming + bumper_text = "billiard aiming" + applicable_stats = list(STAT_DEXTERITY) + numerical = TRUE + // spammy_roll = TRUE + difficulty = 4 + +/datum/storyteller_roll/pool_hits + bumper_text = "billiard hit" + applicable_stats = list(STAT_PERCEPTION, STAT_STREETWISE) + numerical = TRUE + // spammy_roll = TRUE + difficulty = 4 + +/obj/structure/table/wood/billiard/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + to_chat(user, span_notice("You begin reseting the table to play another game of 8-Ball.")) + if(do_after(user, 1 TURNS, src)) + reset_table() + user.visible_message(span_notice("[user] resets the table for another game of 8-Ball"), span_notice("You finish reseting the table. Ready for another game?")) + update_appearance() + return ITEM_INTERACT_SUCCESS + return ITEM_INTERACT_BLOCKING + +/obj/structure/table/wood/billiard/proc/sink_ball(mob/living/user, target_ball_type, accuracy_result, amount_to_hit_result, obj/item/pool_ball/sunk_ball) + if(!sunk_ball) + sunk_ball = random_ball(target_ball_type, accuracy_result) + + if(!sunk_ball) + return + if(num_to_ball_type(sunk_ball.ball_number) == EIGHT_BALL) + user.visible_message(span_warning("[user] [pick("Pitted", "Sank", "Sunk")] the 8-Ball.. Damn.."), span_warning("[pick("Fuck", "Shit", "Piss")].. You [pick("Pitted", "Sank", "Sunk")] the 8-Ball")) + else + user.visible_message(span_notice("[user] sinks [sunk_ball]. [length(get_balls_on_table(num_to_ball_type(sunk_ball.ball_number)))] left."), span_notice("You sink [sunk_ball]!")) + sunk_ball.forceMove(src) + + for(var/obj/item/pool_ball/ball in get_balls_on_table(list(SOLID_BALL, STRIPED_BALL, EIGHT_BALL, ZERO_BALL))) + if(prob(50 + amount_to_hit_result * 10)) + animate(ball, time = rand(0.5 SECONDS, 3 SECONDS) , pixel_x = rand(-TABLE_BOUNDS, TABLE_BOUNDS), pixel_y = rand(-TABLE_BOUNDS-6, TABLE_BOUNDS), easing = CUBIC_EASING|EASE_OUT) + +/obj/structure/table/wood/billiard/proc/random_ball(desired_ball_type, accuracy_result = 2) + var/list/obj/item/pool_ball/sorted_balls = get_balls_on_table() + var/list/obj/item/pool_ball/weighted_balls = list() + for(var/obj/item/pool_ball/entry in sorted_balls) + if(desired_ball_type == num_to_ball_type(entry.ball_number)) + weighted_balls[entry] = accuracy_result + else + weighted_balls[entry] = 1 + return pick_weight(weighted_balls) + +/obj/structure/table/wood/billiard/proc/reset_table() + var/turf/my_turf = get_turf(src) + for(var/obj/item/pool_ball/ball in contents) + ball.forceMove(my_turf) + ball.pixel_x = rand(-TABLE_BOUNDS,TABLE_BOUNDS) + ball.pixel_y = rand(-TABLE_BOUNDS-6,TABLE_BOUNDS) + +/obj/structure/table/wood/billiard/proc/get_balls_on_table(list/looking_for = list(SOLID_BALL, STRIPED_BALL, EIGHT_BALL), sorted = FALSE) + RETURN_TYPE(/list/obj/item/pool_ball) + + var/turf/my_turf = get_turf(src) + + // Lets us pass a single item and turn it into a list + if(looking_for && !islist(looking_for)) + looking_for = list(looking_for) + + var/list/all_balls = list() + for(var/obj/item/pool_ball/ball in my_turf) + if(!(num_to_ball_type(ball.ball_number) in looking_for)) + continue + all_balls += ball + + if(sorted) + all_balls = sort_list(all_balls, GLOBAL_PROC_REF(cmp_num_string_asc)) + return all_balls + +/obj/structure/table/wood/billiard/proc/num_to_ball_type(number) + switch(number) + if(1 to 7) + return SOLID_BALL + if(9 to 15) + return STRIPED_BALL + if(8) + return EIGHT_BALL + if(0) + return ZERO_BALL + +#undef SOLID_BALL +#undef STRIPED_BALL +#undef EIGHT_BALL +#undef ZERO_BALL + +#undef TABLE_BOUNDS diff --git a/modular_darkpack/modules/billiards/icons/32x48.dmi b/modular_darkpack/modules/billiards/icons/32x48.dmi new file mode 100644 index 000000000000..1ae617561d4c Binary files /dev/null and b/modular_darkpack/modules/billiards/icons/32x48.dmi differ diff --git a/modular_darkpack/modules/billiards/icons/back.dmi b/modular_darkpack/modules/billiards/icons/back.dmi new file mode 100644 index 000000000000..aa62e3c46fda Binary files /dev/null and b/modular_darkpack/modules/billiards/icons/back.dmi differ diff --git a/modular_darkpack/modules/billiards/icons/billiard.dmi b/modular_darkpack/modules/billiards/icons/billiard.dmi new file mode 100644 index 000000000000..bd8690c25e7d Binary files /dev/null and b/modular_darkpack/modules/billiards/icons/billiard.dmi differ diff --git a/modular_darkpack/modules/billiards/icons/billiard_onfloor.dmi b/modular_darkpack/modules/billiards/icons/billiard_onfloor.dmi new file mode 100644 index 000000000000..8da85d0e53e6 Binary files /dev/null and b/modular_darkpack/modules/billiards/icons/billiard_onfloor.dmi differ diff --git a/modular_darkpack/modules/billiards/icons/lefthand.dmi b/modular_darkpack/modules/billiards/icons/lefthand.dmi new file mode 100644 index 000000000000..06dfeaf61094 Binary files /dev/null and b/modular_darkpack/modules/billiards/icons/lefthand.dmi differ diff --git a/modular_darkpack/modules/billiards/icons/righthand.dmi b/modular_darkpack/modules/billiards/icons/righthand.dmi new file mode 100644 index 000000000000..4e7136d5c65d Binary files /dev/null and b/modular_darkpack/modules/billiards/icons/righthand.dmi differ diff --git a/modular_darkpack/modules/billiards/sounds/poolball_strike.ogg b/modular_darkpack/modules/billiards/sounds/poolball_strike.ogg new file mode 100644 index 000000000000..f693b8f29bab Binary files /dev/null and b/modular_darkpack/modules/billiards/sounds/poolball_strike.ogg differ diff --git a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm index af88af18c100..342545a73f1f 100644 --- a/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm +++ b/modular_darkpack/modules/blood_drinking/code/bite_helper_procs.dm @@ -2,19 +2,19 @@ /mob/living/proc/adjust_blood_pool(amount, updating_health = TRUE, on_spawn) if(on_spawn) bloodpool = 0 - if(iskindred(src)) - var/mob/living/carbon/human/kindred = src - var/datum/splat/vampire/kindred/kindred_species = iskindred(kindred) - var/hunger_threshold = 7 - (kindred_species.enlightenment ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) - var/previous_hunger = HAS_TRAIT(kindred, TRAIT_NEEDS_BLOOD) + + var/datum/splat/vampire/kindred/kindred_splat = iskindred(src) + if(kindred_splat) + var/hunger_threshold = 7 - (kindred_splat.enlightenment ? st_get_stat(STAT_INSTINCT) : st_get_stat(STAT_SELF_CONTROL)) + var/previous_hunger = HAS_TRAIT(src, TRAIT_NEEDS_BLOOD) var/will_be_hungry = (clamp(bloodpool + amount, 0, maxbloodpool) < hunger_threshold) if(!previous_hunger && will_be_hungry) // enter hunger - ADD_TRAIT(src, TRAIT_NEEDS_BLOOD, SPECIES_TRAIT) + ADD_TRAIT(src, TRAIT_NEEDS_BLOOD, TRAIT_GENERIC) to_chat(src, span_bolddanger("The Beast awakens as the pangs of hunger set in...")) else if(previous_hunger && !will_be_hungry) // leave hunger - REMOVE_TRAIT(src, TRAIT_NEEDS_BLOOD, SPECIES_TRAIT) + REMOVE_TRAIT(src, TRAIT_NEEDS_BLOOD, TRAIT_GENERIC) to_chat(src, span_notice("Your hunger is satisfied as the Beast inside retreats.")) //DARKPACK TODO: roll for frenzy when hungry and seeing, smelling, tasting blood, maybe like the old system where you roll every once in a while. the roll is @@ -23,6 +23,11 @@ if(updating_health) update_blood_hud() +/mob/living/proc/set_blood_pool(amount, updating_health = TRUE, on_spawn) + amount = amount - bloodpool + + adjust_blood_pool(amount, updating_health, on_spawn) + //runs a bite animation for biting people and biting people and biting p /mob/living/carbon/human/proc/add_bite_animation() remove_overlay(HALO_LAYER) @@ -38,7 +43,7 @@ //Here is where you handle any circumstantial modifiers to bloodpool gains //VTR has a lot of these. -/mob/living/carbon/human/proc/calculate_drink_modifier(var/mob/living/mob) +/mob/living/carbon/human/proc/calculate_drink_modifier(mob/living/drunk_from) var/drink_mod = 1 if(HAS_TRAIT(src, TRAIT_HUNGRY)) drink_mod *= 0.5 @@ -51,16 +56,16 @@ COOLDOWN_RESET(src, drinkblood_use_cd) if(client) client.images -= suckbar - qdel(suckbar) + QDEL_NULL(suckbar) return //Updates the circular suck bar that displays the amount of blood a victim has left. -/mob/living/carbon/human/proc/update_drinking_overlay(var/mob/living/mob) +/mob/living/carbon/human/proc/update_drinking_overlay(mob/living/drunk_from) if(client) client.images -= suckbar - qdel(suckbar) - suckbar_loc = mob - suckbar = image('modular_darkpack/modules/blood_drinking/icons/bloodcounter.dmi', suckbar_loc, "[round(14*(mob.bloodpool/mob.maxbloodpool))]", HUD_PLANE) + QDEL_NULL(suckbar) + suckbar_loc = drunk_from + suckbar = image('modular_darkpack/modules/blood_drinking/icons/bloodcounter.dmi', suckbar_loc, "[round(14*(drunk_from.bloodpool/drunk_from.maxbloodpool))]", HUD_PLANE) suckbar.pixel_z = 40 suckbar.plane = ABOVE_HUD_PLANE suckbar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA diff --git a/modular_darkpack/modules/blood_drinking/code/drinksomeblood.dm b/modular_darkpack/modules/blood_drinking/code/drinksomeblood.dm index 894985d9eee0..883508000700 100644 --- a/modular_darkpack/modules/blood_drinking/code/drinksomeblood.dm +++ b/modular_darkpack/modules/blood_drinking/code/drinksomeblood.dm @@ -1,87 +1,87 @@ -/mob/living/carbon/human/proc/drinksomeblood(var/mob/living/mob, first_drink = FALSE) +/mob/living/carbon/human/proc/drinksomeblood(mob/living/drunk_from, first_drink = FALSE) COOLDOWN_START(src, drinkblood_use_cd, 3 SECONDS) - update_drinking_overlay(mob) + update_drinking_overlay(drunk_from) if(HAS_TRAIT(src, TRAIT_BLOODY_SUCKER)) src.emote("moan") Immobilize(30, TRUE) - if(isnpc(mob)) - var/mob/living/carbon/human/npc/NPC = mob + if(isnpc(drunk_from)) + var/mob/living/carbon/human/npc/NPC = drunk_from NPC.danger_source = null - mob.Stun(40) //NPCs don't get to resist + drunk_from.Stun(40) //NPCs don't get to resist - if(mob.blood_volume <= BLOOD_VOLUME_BAD) + if(drunk_from.blood_volume <= BLOOD_VOLUME_BAD) to_chat(src, span_warning("Your victim's heart beats only weakly. Death comes for them.")) //Check if we can drink this person to death - if(mob.bloodpool <= 0 && !check_can_drink_dry(mob)) - remove_drinking_overlay(mob) + if(drunk_from.bloodpool <= 0 && !check_can_drink_dry(drunk_from)) + remove_drinking_overlay(drunk_from) return - if(mob.bloodpool <= 1 && mob.maxbloodpool > 1) + if(drunk_from.bloodpool <= 1 && drunk_from.maxbloodpool > 1) to_chat(src, span_warning("You feel small amount of BLOOD in your victim.")) if(!HAS_TRAIT(src, TRAIT_BLOODY_LOVER)) SEND_SIGNAL(src, COMSIG_MASQUERADE_VIOLATION) - if(!do_after(src, 3 SECONDS, target = mob, timed_action_flags = NONE, progress = FALSE)) - remove_drinking_overlay(mob) - if(!(SEND_SIGNAL(mob, COMSIG_MOB_VAMPIRE_SUCKED, mob) & COMPONENT_RESIST_VAMPIRE_KISS)) - mob.apply_status_effect(/datum/status_effect/kissed) + if(!do_after(src, 3 SECONDS, target = drunk_from, timed_action_flags = NONE, progress = FALSE)) + remove_drinking_overlay(drunk_from) + if(!(SEND_SIGNAL(drunk_from, COMSIG_MOB_VAMPIRE_SUCKED, drunk_from) & COMPONENT_RESIST_VAMPIRE_KISS)) + drunk_from.apply_status_effect(/datum/status_effect/kissed) return - mob.adjust_blood_pool(-1) - suckbar.icon_state = "[round(14*(mob.bloodpool/mob.maxbloodpool))]" + drunk_from.adjust_blood_pool(-1) + suckbar.icon_state = "[round(14*(drunk_from.bloodpool/drunk_from.maxbloodpool))]" - if(ishuman(mob)) - var/mob/living/carbon/human/H = mob + if(ishuman(drunk_from)) + var/mob/living/carbon/human/H = drunk_from drunked_of |= "[H.dna.real_name]" - if(!iskindred(mob)) + if(!iskindred(drunk_from)) H.blood_volume = max(H.blood_volume-50, 150) if(H.reagents) if(length(H.reagents.reagent_list)) if(prob(50)) - H.reagents.trans_to(src, min(10, H.reagents.total_volume), transferred_by = mob, methods = INGEST) + H.reagents.trans_to(src, min(10, H.reagents.total_volume), transferred_by = drunk_from, methods = INGEST) if(HAS_TRAIT(src, TRAIT_PAINFUL_VAMPIRE_KISS)) - mob.adjust_brute_loss(20, TRUE) + drunk_from.adjust_brute_loss(20, TRUE) //Ventrue can suck on normal people, but not homeless people and animals. //BLOOD_QUALITY_LOV - 1, BLOOD_QUALITY_NORMAL - 2, BLOOD_QUALITY_HIGH - 3. Blue blood gives +1 to suction - if(HAS_TRAIT(src, TRAIT_FEEDING_RESTRICTION) && mob.bloodquality < BLOOD_QUALITY_NORMAL) + if(HAS_TRAIT(src, TRAIT_FEEDING_RESTRICTION) && drunk_from.bloodquality < BLOOD_QUALITY_NORMAL) to_chat(src, span_warning("You are too privileged to drink that awful BLOOD. Go get something better.")) visible_message(span_danger("[src] throws up!"), span_userdanger("You throw up!")) playsound(get_turf(src), 'modular_darkpack/modules/deprecated/sounds/vomit.ogg', 75, TRUE) if(isturf(loc)) add_splatter_floor(loc) - remove_drinking_overlay(mob) + remove_drinking_overlay(drunk_from) return - if(iskindred(mob)) - to_chat(src, span_userdanger("[mob]'s blood tastes HEAVENLY...")) + if(iskindred(drunk_from)) + to_chat(src, span_userdanger("[drunk_from]'s blood tastes HEAVENLY...")) adjust_brute_loss(-25, TRUE) adjust_fire_loss(-25, TRUE) else to_chat(src, span_warning("You sip some BLOOD from your victim. It feels good.")) - var/drink_mod = calculate_drink_modifier(mob) + var/drink_mod = calculate_drink_modifier(drunk_from) if(drink_mod) - adjust_blood_pool(drink_mod*max(1, mob.bloodquality-1)) + adjust_blood_pool(drink_mod*max(1, drunk_from.bloodquality-1)) adjust_brute_loss(-10, TRUE) adjust_fire_loss(-10, TRUE) update_damage_overlays() update_health_hud() - if(mob.bloodpool <= 0) - handle_drink_dry(mob) - remove_drinking_overlay(mob) + if(drunk_from.bloodpool <= 0) + handle_drink_dry(drunk_from) + remove_drinking_overlay(drunk_from) return if(grab_state >= GRAB_PASSIVE) stop_sound_channel(CHANNEL_BLOOD) - drinksomeblood(mob) + drinksomeblood(drunk_from) diff --git a/modular_darkpack/modules/blood_drinking/code/movable_screens/blood_hud.dm b/modular_darkpack/modules/blood_drinking/code/movable_screens/blood_hud.dm index 5dab25e00803..c6fdab35ecb9 100644 --- a/modular_darkpack/modules/blood_drinking/code/movable_screens/blood_hud.dm +++ b/modular_darkpack/modules/blood_drinking/code/movable_screens/blood_hud.dm @@ -1,14 +1,27 @@ -#define ui_living_bloodpool "EAST-1:28,CENTER-4:14" +#define UI_LIVING_BLOODPOOL "EAST-1:28,CENTER-4:14" /atom/movable/screen/bloodpool name = "bloodpool" //icon = 'modular_darkpack/modules/blood_drinking/icons/bloodpool.dmi' //32x32 version icon = 'modular_darkpack/modules/blood_drinking/icons/old_bloodpool.dmi' icon_state = "blood0" - screen_loc = ui_living_bloodpool + screen_loc = UI_LIVING_BLOODPOOL mouse_over_pointer = MOUSE_HAND_POINTER -/atom/movable/screen/bloodpool/Click() +/atom/movable/screen/bloodpool/Initialize(mapload, datum/hud/hud_owner) + . = ..() + + update_icon() + register_context() + +/atom/movable/screen/bloodpool/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + + context[SCREENTIP_CONTEXT_LMB] = "Check blood points" + + return CONTEXTUAL_SCREENTIP_SET + +/atom/movable/screen/bloodpool/Click(location, control, params) if(isliving(usr)) var/mob/living/bloodbag = usr bloodbag.update_blood_hud() @@ -19,13 +32,19 @@ else to_chat(bloodbag, span_notice("You've got [bloodbag.bloodpool]/[bloodbag.maxbloodpool] blood points.")) - . = ..() + return ..() + +/atom/movable/screen/bloodpool/update_icon_state() + var/mob/living/owner = hud?.mymob + if(!istype(owner)) + return + var/bp_amount = clamp(round((owner.bloodpool/owner.maxbloodpool)*10), 0, 10) + icon_state = "blood[bp_amount]" + return ..() /mob/living/proc/update_blood_hud() - if(!client || !hud_used) + if(!hud_used) return - if(hud_used.bloodpool_icon) - var/emm = clamp(round((bloodpool/maxbloodpool)*10), 0, 10) - hud_used.bloodpool_icon.icon_state = "blood[emm]" + hud_used.bloodpool_icon?.update_icon() -#undef ui_living_bloodpool +#undef UI_LIVING_BLOODPOOL diff --git a/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/adjust_generation.dm b/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/adjust_generation.dm index 42a6c8697911..b8a2bde5ec3e 100644 --- a/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/adjust_generation.dm +++ b/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/adjust_generation.dm @@ -8,4 +8,4 @@ new_generation = max(generation - 1, MAX_TRUSTED_GENERATION) kindred.set_generation(new_generation) - client.prefs.write_preference_midround(GLOB.preference_entries[/datum/preference/numeric/generation], new_generation) + write_preference_midround(/datum/preference/numeric/generation, new_generation) diff --git a/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/make_diablerist.dm b/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/make_diablerist.dm index f10fcb5d7931..df28216398a2 100644 --- a/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/make_diablerist.dm +++ b/modular_darkpack/modules/blood_drinking/code/overfeeding/diablerie/make_diablerist.dm @@ -1,8 +1,5 @@ /mob/living/carbon/human/proc/make_diablerist() - if(!client?.prefs) - return - - client.prefs.write_preference_midround(GLOB.preference_entries[/datum/preference/toggle/diablerist], TRUE) + write_preference_midround(/datum/preference/toggle/diablerist, TRUE) ADD_TRAIT(src, TRAIT_DIABLERIE, TRAIT_DIABLERIE) SEND_SIGNAL(src, COMSIG_MOB_UPDATE_AURA) diff --git a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm index 49b9a03a1c5d..5317381c1521 100644 --- a/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm +++ b/modular_darkpack/modules/blood_drinking/code/vamp_bite.dm @@ -1,62 +1,51 @@ //this code is what should be called every time blood drinking is used on a character /mob/living/carbon/human/proc/vamp_bite() - update_blood_hud() if(!COOLDOWN_FINISHED(src, drinkblood_use_cd) || !COOLDOWN_FINISHED(src, drinkblood_click_cd)) return COOLDOWN_START(src, drinkblood_click_cd, 1 SECONDS) if(grab_state > GRAB_PASSIVE) - if(ishuman(pulling)) - var/mob/living/carbon/human/PB = pulling - if(isghoul(src)) - if(!iskindred(PB)) - SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) - to_chat(src, span_warning("You're not desperate enough to try that.")) - return - if(!isghoul(src) && !iskindred(src)) - SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) - to_chat(src, span_warning("You're not desperate enough to try that.")) - return - if(PB.stat == DEAD && !HAS_TRAIT(src, TRAIT_GULLET)) - SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) - to_chat(src, span_warning("Your Beast requires life, not the tepid swill of corpses.")) - return - if(PB.blood_volume <= 50 && (!iskindred(pulling) || !iskindred(src))) - SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) - to_chat(src, span_warning("This vessel is empty. You'll have to find another.")) - return - if(PB.bloodpool <= 0 && (!iskindred(pulling) || !iskindred(src))) - SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) - to_chat(src, span_warning("This vessel is empty. You'll have to find another.")) - return - if(iskindred(src)) - PB.emote("groan") - if(isghoul(src)) - PB.emote("scream") - PB.add_bite_animation() if(isliving(pulling)) - if(!iskindred(src)) + var/mob/living/bit_living = pulling + if(!isvampiresplat(src)) SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) to_chat(src, span_warning("You're not desperate enough to try that.")) return - var/mob/living/LV = pulling - if(LV.blood_volume <= 50 && (!iskindred(pulling) || !iskindred(src))) - SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) - to_chat(src, span_warning("This vessel is empty. You'll have to find another.")) - if(LV.bloodpool <= 0 && (!iskindred(pulling) || !iskindred(src))) - SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) - to_chat(src, span_warning("This vessel is empty. You'll have to find another.")) - return - if(LV.stat == DEAD && !HAS_TRAIT(src, TRAIT_GULLET)) + // Allow ghouls to steal viate? + if(isghoul(src)) + if(!iskindred(bit_living)) + SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) + to_chat(src, span_warning("You're not desperate enough to try that.")) + return + // Prevent drinking from corspes... Not V20 accurate as far as I can tell? + if(bit_living.stat == DEAD && !HAS_TRAIT(src, TRAIT_GULLET)) SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) to_chat(src,span_warning("Your Beast requires life, not the tepid swill of corpses.")) return + // Allow for diablor? + if(!iskindred(bit_living) || !iskindred(src)) + if(!CAN_HAVE_BLOOD(bit_living) || (bit_living.blood_volume <= 50) || (bit_living.bloodpool <= 0)) + SEND_SOUND(src, sound('modular_darkpack/modules/blood_drinking/sounds/need_blood.ogg', volume = 75)) + to_chat(src, span_warning("This vessel is empty. You'll have to find another.")) + return + + if(iskindred(src)) + bit_living.emote("groan") + else if(isghoul(src)) + bit_living.emote("scream") + + if(ishuman(bit_living)) + var/mob/living/carbon/human/bit_human = bit_living + bit_human.add_bite_animation() + var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) if(!skipface) if(iskindred(src) && HAS_TRAIT(src, TRAIT_NEEDS_BLOOD)) var/datum/splat/vampire/kindred/kindred_species = iskindred(src) var/stat_to_roll = kindred_species.enlightenment ? STAT_INSTINCT : STAT_SELF_CONTROL - var/frenzy_check = SSroll.storyteller_roll(st_get_stat(stat_to_roll), 6, src) - if(frenzy_check != ROLL_SUCCESS) + var/datum/storyteller_roll/frezy_roll = new() + frezy_roll.applicable_stats = list(stat_to_roll) + var/frenzy_result = frezy_roll.st_roll(src, bit_living) + if(frenzy_result != ROLL_SUCCESS) to_chat(src, span_userdanger("The taste of blood sends you into a frenzy as you feed!")) // DARKPACK TODO: frenzy, please put the call here else @@ -64,10 +53,10 @@ if(!HAS_TRAIT(src, TRAIT_BLOODY_LOVER)) playsound(src, 'modular_darkpack/modules/blood_drinking/sounds/drinkblood1.ogg', 50, TRUE) - LV.visible_message(span_warning(span_bold("[src] bites [LV]'s neck!")), span_warning(span_bold("[src] bites your neck!"))) + bit_living.visible_message(span_warning(span_bold("[src] bites [bit_living]'s neck!")), span_warning(span_bold("[src] bites your neck!"))) if(!HAS_TRAIT(src, TRAIT_BLOODY_LOVER)) SEND_SIGNAL(src, COMSIG_MASQUERADE_VIOLATION) else playsound(src, 'modular_darkpack/modules/blood_drinking/sounds/kiss.ogg', 50, TRUE) - LV.visible_message(span_italics(span_bold("[src] kisses [LV]!")), span_userlove(span_bold("[src] kisses you!"))) - drinksomeblood(LV, TRUE) + bit_living.visible_message(span_italics(span_bold("[src] kisses [bit_living]!")), span_userlove(span_bold("[src] kisses you!"))) + drinksomeblood(bit_living, TRUE) diff --git a/modular_darkpack/modules/cars/code/car.dm b/modular_darkpack/modules/cars/code/car.dm index 982599ec5639..f5a83940f720 100644 --- a/modular_darkpack/modules/cars/code/car.dm +++ b/modular_darkpack/modules/cars/code/car.dm @@ -244,11 +244,12 @@ var/total_lockpicking = user.st_get_stat(STAT_LARCENY) if(CONFIG_GET(flag/punishing_zero_dots) && total_lockpicking < 1) to_chat(user, span_warning("How do I do this...?")) - if(do_after(user, 10 SECONDS, src, interaction_key = DOAFTER_SOURCE_CAR)) + if(do_after(user, 1 TURNS, src, interaction_key = DOAFTER_SOURCE_CAR)) if(!locked) return - var/roll_result = SSroll.storyteller_roll(total_lockpicking + user.st_get_stat(STAT_DEXTERITY), lockpick_difficulty, list(user), user) - switch(roll_result) + var/datum/storyteller_roll/lockpick/our_roll = new() + our_roll.difficulty = lockpick_difficulty + switch(our_roll.st_roll(user, src)) if(ROLL_SUCCESS) to_chat(user, span_notice("You've managed to open [src]'s lock.")) playsound(src, 'modular_darkpack/modules/cars/sounds/open.ogg', 50, TRUE) @@ -671,6 +672,8 @@ return if(user.IsUnconscious() || HAS_TRAIT(user, TRAIT_INCAPACITATED) || HAS_TRAIT(user, TRAIT_RESTRAINED)) return + if(!ISADVANCEDTOOLUSER(user)) + return var/turn_speed = min(abs(speed_in_pixels) / 10, 3) switch(direction) if(NORTH) diff --git a/modular_darkpack/modules/cars/code/car_actions.dm b/modular_darkpack/modules/cars/code/car_actions.dm index 15c9c0771f7a..7d4ea543c544 100644 --- a/modular_darkpack/modules/cars/code/car_actions.dm +++ b/modular_darkpack/modules/cars/code/car_actions.dm @@ -88,6 +88,9 @@ to_chat(owner, span_danger("You don't know what you're doing!")) return FALSE + if(!ISADVANCEDTOOLUSER(clicker)) + return + var/obj/darkpack_car/owned_car = owner.loc if(!owned_car.on) if((owned_car.get_integrity() == owned_car.max_integrity) || (prob(100*(owned_car.get_integrity()/owned_car.max_integrity)))) diff --git a/modular_darkpack/modules/cars/code/gas.dm b/modular_darkpack/modules/cars/code/gas.dm index 2b553ed627ec..fac793c55c63 100644 --- a/modular_darkpack/modules/cars/code/gas.dm +++ b/modular_darkpack/modules/cars/code/gas.dm @@ -45,9 +45,9 @@ return NONE if(istype(get_turf(interacting_with), /turf/open/floor)) if(locate(/obj/effect/decal/cleanable/gasoline) in get_turf(interacting_with)) - return ITEM_INTERACT_FAILURE + return ITEM_INTERACT_BLOCKING if(stored_gasoline < 50) - return ITEM_INTERACT_FAILURE + return ITEM_INTERACT_BLOCKING stored_gasoline = max(0, stored_gasoline-50) new /obj/effect/decal/cleanable/gasoline(get_turf(interacting_with)) playsound(get_turf(src), 'modular_darkpack/modules/cars/sounds/gas_splat.ogg', 50, TRUE) @@ -125,11 +125,11 @@ continue oil.fire_act() -/obj/effect/decal/cleanable/gasoline/attackby(obj/item/I, mob/living/user) - var/attacked_by_hot_thing = I.get_temperature() +/obj/effect/decal/cleanable/gasoline/attackby(obj/item/tool, mob/living/user) + var/attacked_by_hot_thing = tool.get_temperature() if(attacked_by_hot_thing) - visible_message(span_warning("[user] tries to ignite [src] with [I]!"), span_warning("You try to ignite [src] with [I].")) - log_combat(user, src, (attacked_by_hot_thing < 480) ? "tried to ignite" : "ignited", I) + visible_message(span_warning("[user] tries to ignite [src] with [tool]!"), span_warning("You try to ignite [src] with [tool].")) + log_combat(user, src, (attacked_by_hot_thing < 480) ? "tried to ignite" : "ignited", tool) fire_act(attacked_by_hot_thing) return return ..() @@ -154,21 +154,25 @@ /obj/structure/fuelstation/examine(mob/user) . = ..() - . += "Balance: [stored_money] dollars" + . += "Balance: [stored_money] [MONEY_NAME]" -/obj/structure/fuelstation/attackby(obj/item/I, mob/living/user, params) - if(iscash(I)) - stored_money += I.get_item_credit_value() - to_chat(user, span_notice("You insert [I.get_item_credit_value()] dollars into [src].")) - qdel(I) +/obj/structure/fuelstation/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(iscash(tool)) + stored_money += tool.get_item_credit_value() + to_chat(user, span_notice("You insert [tool.get_item_credit_value()] [MONEY_NAME] into [src].")) + qdel(tool) say("Payment received.") - if(istype(I, /obj/item/gas_can)) - var/obj/item/gas_can/G = I + return ITEM_INTERACT_SUCCESS + if(istype(tool, /obj/item/gas_can)) + var/obj/item/gas_can/G = tool if(G.stored_gasoline < 1000 && stored_money) var/gas_to_dispense = min(stored_money*20, 1000-G.stored_gasoline) var/money_to_spend = round(gas_to_dispense/20) G.stored_gasoline = min(1000, G.stored_gasoline+gas_to_dispense) stored_money = max(0, stored_money-money_to_spend) playsound(loc, 'modular_darkpack/master_files/sounds/effects/gas_fill.ogg', 50, TRUE) - to_chat(user, span_notice("You fill [I].")) + to_chat(user, span_notice("You fill [tool].")) say("Gas filled.") + return ITEM_INTERACT_SUCCESS + return ITEM_INTERACT_BLOCKING + return NONE diff --git a/modular_darkpack/modules/city_time/code/status_effects.dm b/modular_darkpack/modules/city_time/code/status_effects.dm index a8e63e4c1e85..df63a9eac878 100644 --- a/modular_darkpack/modules/city_time/code/status_effects.dm +++ b/modular_darkpack/modules/city_time/code/status_effects.dm @@ -22,12 +22,17 @@ /datum/status_effect/sunlight_burning/on_apply() if(!SScity_time.daytime_started) return FALSE - if(!iskindred(owner)) - return FALSE var/area/my_area = get_area(owner) if(!istype(my_area) || !my_area.outdoors) return FALSE + var/datum/splat/vampire/kindred/kindred_owner = iskindred(owner) + if(!kindred_owner) + return FALSE + // Humanity 10 vamps are immume to the light. atleast for the amount of time our day lasts. + if(CONFIG_GET(flag/humanity_sunlight_resistance) && !kindred_owner.enlightenment && (owner.st_get_stat(STAT_MORALITY) >= 10)) + return FALSE + to_chat(owner, span_danger("THE SUN SEARS YOUR FLESH")) return TRUE @@ -45,3 +50,5 @@ desc = "Get inside!" icon = 'modular_darkpack/modules/deprecated/icons/hud/screen_alert.dmi' icon_state = "fire" + +/datum/config_entry/flag/humanity_sunlight_resistance diff --git a/modular_darkpack/modules/city_traits/code/positive_traits.dm b/modular_darkpack/modules/city_traits/code/positive_traits.dm index 4fa6ecac98cf..16406a2f10fc 100644 --- a/modular_darkpack/modules/city_traits/code/positive_traits.dm +++ b/modular_darkpack/modules/city_traits/code/positive_traits.dm @@ -17,5 +17,4 @@ /datum/station_trait/full_moon/on_round_start() . = ..() - GLOB.moon_state = "Full" set_starlight(null, GLOB.starlight_range*1.2, GLOB.starlight_power*1.2) diff --git a/modular_darkpack/modules/clothes/code/feet.dm b/modular_darkpack/modules/clothes/code/feet.dm index 8a77f453a42f..113c5f085184 100644 --- a/modular_darkpack/modules/clothes/code/feet.dm +++ b/modular_darkpack/modules/clothes/code/feet.dm @@ -52,6 +52,21 @@ /obj/item/clothing/shoes/vampire/sneakers/red icon_state = "sneakers_red" +/obj/item/clothing/shoes/vampire/blackfur + name = "black fur boots" + desc = "A furry pair of black and white boots" + icon_state = "furboots_black" + +/obj/item/clothing/shoes/vampire/brownfur + name = "brown fur boots" + desc = "A furry pair of brown boots" + icon_state = "furboots_brown" + +/obj/item/clothing/shoes/vampire/pumped + name = "knee-high sneakers" + desc = "Sneakers from the popular brand Converts" + icon_state = "pumped_up_kicks" + /obj/item/clothing/shoes/vampire/heels name = "heels" desc = "Rich-looking heels." diff --git a/modular_darkpack/modules/clothes/code/head.dm b/modular_darkpack/modules/clothes/code/head.dm index 734741c7fc10..594215ef8d7c 100644 --- a/modular_darkpack/modules/clothes/code/head.dm +++ b/modular_darkpack/modules/clothes/code/head.dm @@ -367,13 +367,11 @@ target.emote("scream") target.Stun(0.5 SECONDS) + H = target.get_item_by_slot(ITEM_SLOT_HEAD) // Refetch it if it changes between do_after target.dropItemToGround(H) target.equip_to_slot_if_possible(src, ITEM_SLOT_HEAD) /obj/item/clothing/head/beret/black name = "black beret" desc = "A black beret, perfect for war veterans and dark, brooding, anti-hero mimes." - icon_state = "beret" - greyscale_config = /datum/greyscale_config/beret - greyscale_config_worn = /datum/greyscale_config/beret/worn greyscale_colors = "#3f3c40" diff --git a/modular_darkpack/modules/clothes/code/suit.dm b/modular_darkpack/modules/clothes/code/suit.dm index ef4cbfc28583..87093cd3eeff 100644 --- a/modular_darkpack/modules/clothes/code/suit.dm +++ b/modular_darkpack/modules/clothes/code/suit.dm @@ -220,6 +220,49 @@ name = "brown fur coat" icon_state = "winter2" +/obj/item/clothing/suit/vampire/coat/leopard + name = "leopard coat" + desc = "A coat made from synthetic fur." + icon_state = "leopard_coat" + + +/obj/item/clothing/suit/hooded/hoodie + name = "hoodie" + desc = "A simple hoodie." + icon_state = "hoodie" + icon = 'modular_darkpack/modules/clothes/icons/clothing.dmi' + worn_icon = 'modular_darkpack/modules/clothes/icons/worn.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/clothes/icons/clothing_onfloor.dmi') + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + hoodtype = /obj/item/clothing/head/hooded/hood_hood + +/obj/item/clothing/head/hooded/hood_hood + name = "hoodie hood" + desc = "A hoodies hoodie hood." + icon_state = "hoodie_hood" + icon = 'modular_darkpack/modules/clothes/icons/clothing.dmi' + worn_icon = 'modular_darkpack/modules/clothes/icons/worn.dmi' + // You should not expect this to have an onfloor + body_parts_covered = HEAD + cold_protection = HEAD + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + flags_inv = HIDEEARS + hair_mask = /datum/hair_mask/winterhood + +/obj/item/clothing/suit/hooded/hoodie/hoodie_pim + name = "intruder zim hoodie" + desc = "A hoodie of a favorite Intruder Zim character, Ger." + icon_state = "hoodie_zim" + hoodtype = /obj/item/clothing/head/hooded/hood_hood/hood_pim + +/obj/item/clothing/head/hooded/hood_hood/hood_pim + name = "intruder zim hoodie hood" + desc = "A hood resembling a favorite Intruder Zim character, Ger." + icon_state = "hoodie_zim_hood" + + /obj/item/clothing/suit/vampire/slickbackcoat name = "opulent coat" desc = "Lavish, luxurious, and deeply purple. Slickback Clothing Co. It exudes immense energy." @@ -298,9 +341,14 @@ wound = 25 /obj/item/clothing/suit/vampire/trench/alt/armored - name = "armored trenchcoat" + name = "armored brown trenchcoat" icon_state = "trench2" - max_integrity = 1000; + max_integrity = 400 + armor_type = /datum/armor/armored_jackets + +/obj/item/clothing/suit/vampire/trench/armored + name = "armored black trenchcoat" + max_integrity = 400 armor_type = /datum/armor/armored_jackets /obj/item/clothing/suit/vampire/trench @@ -539,5 +587,3 @@ desc = "A crisp white labcoat. This one has a green trim and the " + MAIN_EVIL_COMPANY + " International logo stiched onto the breast!" icon_state = "pentex_labcoat_alt" armor_type = /datum/armor/labcoat - - diff --git a/modular_darkpack/modules/clothes/code/under.dm b/modular_darkpack/modules/clothes/code/under.dm index 58945a5784a3..878540cca562 100644 --- a/modular_darkpack/modules/clothes/code/under.dm +++ b/modular_darkpack/modules/clothes/code/under.dm @@ -98,6 +98,26 @@ desc = "A white, sweat stained shirt with a giant black skull on the front, it makes a statement. Maybe 'I don't use deoderant' but, a statement nontheless." icon_state = "dirty" +/obj/item/clothing/under/vampire/sceneleopard + name = "revealing outfit" + desc = "You never thought you needed spaghetti straps." + icon_state = "scenetop_leopard" + +/obj/item/clothing/under/vampire/scenemoody + name = "moody attire" + desc = "A classic My Chemistry Romance top." + icon_state = "scenetop_moody" + +/obj/item/clothing/under/vampire/scenezim + name = "intruder zim attire" + desc = "A top from your favorite show, Intruder Zim" + icon_state = "scenetop_zim" + +/obj/item/clothing/under/vampire/scenepink + name = "popular Outfit" + desc = "It almost makes you feel like a mean girl" + icon_state = "scenetop_pink" + /obj/item/clothing/under/vampire/turtleneck_white name = "white turtleneck" desc = "For me, it's always like this." @@ -489,4 +509,3 @@ desc = "A white designer suitskirt with a green dress shirt. This one has an Endron International tag on it!" icon_state = "pentex_executiveskirt" - diff --git a/modular_darkpack/modules/clothes/icons/clothing.dmi b/modular_darkpack/modules/clothes/icons/clothing.dmi index 69af6462be80..4a0c32ca2413 100644 Binary files a/modular_darkpack/modules/clothes/icons/clothing.dmi and b/modular_darkpack/modules/clothes/icons/clothing.dmi differ diff --git a/modular_darkpack/modules/clothes/icons/clothing_onfloor.dmi b/modular_darkpack/modules/clothes/icons/clothing_onfloor.dmi index 46cb2d37a0d7..c7f87b733003 100644 Binary files a/modular_darkpack/modules/clothes/icons/clothing_onfloor.dmi and b/modular_darkpack/modules/clothes/icons/clothing_onfloor.dmi differ diff --git a/modular_darkpack/modules/clothes/icons/head_onfloor.dmi b/modular_darkpack/modules/clothes/icons/head_onfloor.dmi new file mode 100644 index 000000000000..edcb059e7e98 Binary files /dev/null and b/modular_darkpack/modules/clothes/icons/head_onfloor.dmi differ diff --git a/modular_darkpack/modules/clothes/icons/worn.dmi b/modular_darkpack/modules/clothes/icons/worn.dmi index 164fa7f576b7..2f94c37b3afc 100644 Binary files a/modular_darkpack/modules/clothes/icons/worn.dmi and b/modular_darkpack/modules/clothes/icons/worn.dmi differ diff --git a/modular_darkpack/modules/computers/code/computer.dm b/modular_darkpack/modules/computers/code/computer.dm index 4fe138f09ffb..9fa5424129a6 100644 --- a/modular_darkpack/modules/computers/code/computer.dm +++ b/modular_darkpack/modules/computers/code/computer.dm @@ -51,6 +51,17 @@ GLOBAL_LIST_EMPTY(vampire_computers) /obj/vampire_computer/attack_hand(mob/user) . = ..() + /* I cant verify the lore accuracy of "rejection past your embrace age" and we dont have a invention date for tech to represent it either + var/bad_at_computers = FALSE + if(isliving(user)) + var/mob/living/living_user = user + bad_at_computers = (living_user.st_get_stat(STAT_COMPUTER) < 1) || HAS_TRAIT(user, TRAIT_REJECTED_BY_TECHNOLOGY) + if(bad_at_computers) + to_chat(user, span_warning("You start interacting with [src]. Confounded machine...")) + if(!do_after(user, 1 TURNS, src)) + to_chat(user, span_warning("Bah! You didn't need the machine anyways.")) + return + */ ui_interact(user) /obj/vampire_computer/Destroy() diff --git a/modular_darkpack/modules/decor/code/decor.dm b/modular_darkpack/modules/decor/code/decor.dm index 2f7a49a99f5c..9e2303d42538 100644 --- a/modular_darkpack/modules/decor/code/decor.dm +++ b/modular_darkpack/modules/decor/code/decor.dm @@ -437,18 +437,6 @@ /obj/underplate/stuff icon_state = "stuff" -/obj/structure/billiard_table - name = "billiard table" - desc = "Come here, play some BALLS. I know you want it so much..." - icon = 'modular_darkpack/modules/deprecated/icons/32x48.dmi' - icon_state = "billiard1" - anchored = TRUE - density = TRUE - -/obj/structure/billiard_table/Initialize(mapload) - . = ..() - icon_state = "billiard[rand(1, 3)]" - /obj/structure/pole name = "stripper pole" desc = "A pole fastened to the ceiling and floor, used to show of ones goods to company." @@ -652,21 +640,6 @@ icon = 'modular_darkpack/modules/deprecated/icons/64x64.dmi' icon_state = "kover" -/obj/were_ice - name = "ice block" - desc = "Stores some precious organs..." - icon = 'modular_darkpack/modules/deprecated/icons/werewolf_lupus.dmi' - icon_state = "ice_man" - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF - -/obj/were_ice/lupus - icon_state = "ice_wolf" - -/obj/were_ice/crinos - icon = 'modular_darkpack/modules/deprecated/icons/werewolf.dmi' - icon_state = "ice" - pixel_w = -8 - /obj/structure/bury_pit name = "bury pit" desc = "You can bury someone here." @@ -677,41 +650,43 @@ anchored = TRUE density = FALSE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - var/burying = FALSE - -// DARKPACK TODO - reimplement -/* -/obj/structure/bury_pit/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/shovel/vamp)) - if(!burying) - burying = TRUE - user.visible_message(span_warning("[user] starts to dig [src]"), span_warning("You start to dig [src].")) - if(do_mob(user, src, 10 SECONDS)) - burying = FALSE - if(icon_state == "pit0") - for(var/mob/living/L in get_turf(src)) - L.forceMove(src) - icon_state = "pit1" - user.visible_message(span_warning("[user] digs a hole in [src]."), span_warning("You dig a hole in [src].")) - else - for(var/mob/living/L in src) - L.forceMove(get_turf(src)) - icon_state = "pit0" - user.visible_message(span_warning("[user] digs a hole in [src]."), span_warning("You dig a hole in [src].")) - else - burying = FALSE - -/obj/structure/bury_pit/container_resist_act(mob/living/user) - if(!burying) - burying = TRUE - if(do_mob(user, src, 30 SECONDS)) + var/pit_busy = FALSE + +/obj/structure/bury_pit/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(tool.tool_behaviour == TOOL_SHOVEL) + if(pit_busy) + return ITEM_INTERACT_BLOCKING + + pit_busy = TRUE + user.visible_message(span_warning("[user] starts to dig [src]"), span_warning("You start to dig [src].")) + if(!do_after(user, 10 SECONDS, src)) + pit_busy = FALSE + + pit_busy = FALSE + if(icon_state == "pit0") + for(var/mob/living/L in get_turf(src)) + L.forceMove(src) + icon_state = "pit1" + user.visible_message(span_warning("[user] digs a hole in [src]."), span_warning("You dig a hole in [src].")) + else for(var/mob/living/L in src) L.forceMove(get_turf(src)) icon_state = "pit0" - burying = FALSE - else - burying = FALSE -*/ + user.visible_message(span_warning("[user] digs a hole in [src]."), span_warning("You dig a hole in [src].")) + +/obj/structure/bury_pit/container_resist_act(mob/living/user) + if(pit_busy) + return + + pit_busy = TRUE + if(!do_after(user, 30 SECONDS, src)) + pit_busy = FALSE + + for(var/mob/living/L in src) + L.forceMove(get_turf(src)) + icon_state = "pit0" + pit_busy = FALSE + /obj/structure/fluff/tv name = "\improper TV" diff --git a/modular_darkpack/modules/decor/code/stick.dm b/modular_darkpack/modules/decor/code/stick.dm index 7a0fb8cdaee2..e068f41a54ac 100644 --- a/modular_darkpack/modules/decor/code/stick.dm +++ b/modular_darkpack/modules/decor/code/stick.dm @@ -43,8 +43,10 @@ if(isliving(triggerer)) var/mob/living/stepper = triggerer if(stepper.mob_size >= MOB_SIZE_HUMAN) - var/roll = SSroll.storyteller_roll(stepper.st_get_stat(STAT_PERCEPTION) + stepper.st_get_stat(STAT_STEALTH), 6, stepper) - if(!roll == ROLL_SUCCESS) + var/datum/storyteller_roll/step_roll = new() + step_roll.applicable_stats = list(STAT_PERCEPTION, STAT_STEALTH) + var/roll_result = step_roll.st_roll(triggerer, src) + if(!roll_result == ROLL_SUCCESS) mineEffect(triggerer) if(isitem(triggerer)) diff --git a/modular_darkpack/modules/deprecated/code/runtime_town_types.dm b/modular_darkpack/modules/deprecated/code/runtime_town_types.dm index a8900d9b36a6..83d17765f5cf 100644 --- a/modular_darkpack/modules/deprecated/code/runtime_town_types.dm +++ b/modular_darkpack/modules/deprecated/code/runtime_town_types.dm @@ -11,6 +11,11 @@ desc = "For some reason its just stuck on the lock screen and all the buttons dont seem to do anything... (We have yet to reimplement vampire computers! Sorry!)" icon = 'modular_darkpack/modules/deprecated/icons/props.dmi' icon_state = "computer" + // APOC EDIT ADD START + var/owner + var/password + var/username + // APOC EDIT ADD END /obj/vampire_computer/prince icon_state = "computerprince" @@ -18,3 +23,14 @@ /obj/vampire_computer/box icon = 'icons/obj/machines/computer.dmi' icon_state = "oldcomp" + +#warn THIS IS 9/11 BUT THE PLAYTEST IS TODAY GRAAAAH. + +/obj/item/storage/box/baggie + name = "baggie box" + desc = "WIP! Sorry!" + +/obj/item/clothing/shoes/vampire/pumped + name = "knee-high sneakers" + desc = "these are the pumped up kicks you are looking for" + icon_state = "pumped_up_kicks" diff --git a/modular_darkpack/modules/deprecated/icons/32x48.dmi b/modular_darkpack/modules/deprecated/icons/32x48.dmi index f29a6a2c7af1..d3b06fc711f3 100644 Binary files a/modular_darkpack/modules/deprecated/icons/32x48.dmi and b/modular_darkpack/modules/deprecated/icons/32x48.dmi differ diff --git a/modular_darkpack/modules/deprecated/icons/48x32.dmi b/modular_darkpack/modules/deprecated/icons/48x32.dmi index 492b10ca9158..608b9520cbec 100644 Binary files a/modular_darkpack/modules/deprecated/icons/48x32.dmi and b/modular_darkpack/modules/deprecated/icons/48x32.dmi differ diff --git a/modular_darkpack/modules/deprecated/icons/48x48.dmi b/modular_darkpack/modules/deprecated/icons/48x48.dmi index 91e622fc89a1..b36897ceb1b9 100644 Binary files a/modular_darkpack/modules/deprecated/icons/48x48.dmi and b/modular_darkpack/modules/deprecated/icons/48x48.dmi differ diff --git a/modular_darkpack/modules/deprecated/icons/onfloor.dmi b/modular_darkpack/modules/deprecated/icons/onfloor.dmi index 551fbe5c75f6..617f3f077bc2 100644 Binary files a/modular_darkpack/modules/deprecated/icons/onfloor.dmi and b/modular_darkpack/modules/deprecated/icons/onfloor.dmi differ diff --git a/modular_darkpack/modules/deprecated/icons/radio.dmi b/modular_darkpack/modules/deprecated/icons/radio.dmi deleted file mode 100644 index 4b1cc0088ecf..000000000000 Binary files a/modular_darkpack/modules/deprecated/icons/radio.dmi and /dev/null differ diff --git a/modular_darkpack/modules/deprecated/icons/werewolf.dmi b/modular_darkpack/modules/deprecated/icons/werewolf.dmi deleted file mode 100644 index 036acf563686..000000000000 Binary files a/modular_darkpack/modules/deprecated/icons/werewolf.dmi and /dev/null differ diff --git a/modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi b/modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi deleted file mode 100644 index 76eb03fbdf60..000000000000 Binary files a/modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi and /dev/null differ diff --git a/modular_darkpack/modules/deprecated/icons/werewolf_ui.dmi b/modular_darkpack/modules/deprecated/icons/werewolf_ui.dmi deleted file mode 100644 index a24e95976b79..000000000000 Binary files a/modular_darkpack/modules/deprecated/icons/werewolf_ui.dmi and /dev/null differ diff --git a/modular_darkpack/modules/deprecated/sounds/werewolf_fall.ogg b/modular_darkpack/modules/deprecated/sounds/werewolf_fall.ogg deleted file mode 100644 index 6ea5225344aa..000000000000 Binary files a/modular_darkpack/modules/deprecated/sounds/werewolf_fall.ogg and /dev/null differ diff --git a/modular_darkpack/modules/doors/code/keys/keys.dm b/modular_darkpack/modules/doors/code/keys/keys.dm index 1cec601ec2e4..4a1976b572a8 100644 --- a/modular_darkpack/modules/doors/code/keys/keys.dm +++ b/modular_darkpack/modules/doors/code/keys/keys.dm @@ -368,7 +368,7 @@ LOCKACCESS_POLICE_CAPTAIN ) -//===========================GAROU KEYS=========================== +//===========================FERA KEYS=========================== /obj/item/vamp/keys/nps name = "\improper Park Service keys" diff --git a/modular_darkpack/modules/doors/code/vampdoor.dm b/modular_darkpack/modules/doors/code/vampdoor.dm index f39c07046b75..e326d7a8da04 100644 --- a/modular_darkpack/modules/doors/code/vampdoor.dm +++ b/modular_darkpack/modules/doors/code/vampdoor.dm @@ -25,17 +25,14 @@ var/door_broken = FALSE var/door_layer = CLOSED_DOOR_LAYER var/lock_id = null - var/lockpick_timer = LOCKTIMER_1 var/lockpick_difficulty = 6 var/open_sound = 'modular_darkpack/modules/doors/sounds/door_open.ogg' var/close_sound = 'modular_darkpack/modules/doors/sounds/door_close.ogg' var/lock_sound = 'modular_darkpack/modules/doors/sounds/door_locked.ogg' var/burnable = FALSE - /// Cooldown for bashing attempts - COOLDOWN_DECLARE(bash_cooldown) - /// Cooldown for lockpicking attempts - COOLDOWN_DECLARE(lockpick_cooldown) + var/datum/storyteller_roll/lockpick/lockpick_roll + var/datum/storyteller_roll/bash_door/bash_roll /// Difficulty for bashing this door down var/bash_difficulty = 6 /// Number of successes needed to bash down @@ -47,21 +44,6 @@ register_context() AddElement(/datum/element/contextual_screentip_bare_hands, rmb_text = "Try lock") - switch(lockpick_difficulty) //This is fine because any overlap gets intercepted before - if(LOCKDIFFICULTY_7 to INFINITY) - lockpick_timer = LOCKTIMER_7 - if(LOCKDIFFICULTY_6 to LOCKDIFFICULTY_7) - lockpick_timer = LOCKTIMER_6 - if(LOCKDIFFICULTY_5 to LOCKDIFFICULTY_6) - lockpick_timer = LOCKTIMER_5 - if(LOCKDIFFICULTY_4 to LOCKDIFFICULTY_5) - lockpick_timer = LOCKTIMER_4 - if(LOCKDIFFICULTY_3 to LOCKDIFFICULTY_4) - lockpick_timer = LOCKTIMER_3 - if(LOCKDIFFICULTY_2 to LOCKDIFFICULTY_3) - lockpick_timer = LOCKTIMER_2 - if(-INFINITY to LOCKDIFFICULTY_2) //LOCKDIFFICULTY_1 is basically the minimum so we can just do LOCKTIMER_1 from -INFINITY - lockpick_timer = LOCKTIMER_1 /obj/structure/vampdoor/CanAStarPass(to_dir, datum/can_pass_info/pass_info) return !density || !locked @@ -209,27 +191,27 @@ if(ishuman(user)) var/mob/living/carbon/human/human_user = user if(human_user.st_get_stat(STAT_STRENGTH) > 5) - if(!COOLDOWN_FINISHED(src, bash_cooldown)) - var/time_left = COOLDOWN_TIMELEFT(src, bash_cooldown) - to_chat(human_user, span_warning("You must wait [time_left / 10] seconds before attempting to rip the door off it's hinges again.")) - return - var/roll = SSroll.storyteller_roll(human_user.st_get_stat(STAT_STRENGTH), bash_difficulty, human_user, numerical = TRUE) - if(roll >= bash_successes_needed) - to_chat(human_user, span_danger("You wind up a big punch to break down the door...")) - if(do_after(human_user, 3 SECONDS, src)) - proc_unlock(50) - break_door(human_user) - else - to_chat(human_user, span_danger("You must be standing next to the door to break it down.")) - else - pixel_z = pixel_z+rand(-1, 1) - pixel_w = pixel_w+rand(-1, 1) - playsound(get_turf(src), 'modular_darkpack/master_files/sounds/effects/door/get_bent.ogg', 50, TRUE) - proc_unlock(5) - to_chat(user, span_warning("You aren't strong enough to break it down! You hurt your shoulder by punching the door!")) - human_user.adjust_brute_loss(30) - addtimer(CALLBACK(src, PROC_REF(reset_transform)), 2) - COOLDOWN_START(src, bash_cooldown, 1 SCENES) + if(!bash_roll) + bash_roll = new() + bash_roll.difficulty = bash_difficulty + bash_roll.successes_needed = bash_successes_needed + var/roll = bash_roll.st_roll(user, src) + switch(roll) + if(ROLL_SUCCESS) + to_chat(human_user, span_danger("You wind up a big punch to break down the door...")) + if(do_after(human_user, 3 SECONDS, src)) + proc_unlock(50) + break_door(human_user) + else + to_chat(human_user, span_danger("You must be standing next to the door to break it down.")) + if(ROLL_FAILURE, ROLL_BOTCH) + pixel_z = pixel_z+rand(-1, 1) + pixel_w = pixel_w+rand(-1, 1) + playsound(get_turf(src), 'modular_darkpack/master_files/sounds/effects/door/get_bent.ogg', 50, TRUE) + proc_unlock(5) + to_chat(user, span_warning("You aren't strong enough to break it down! You hurt your shoulder by punching the door!")) + human_user.adjust_brute_loss(1 LETHAL_TTRPG_DAMAGE) + addtimer(CALLBACK(src, PROC_REF(reset_transform)), 2) else pixel_z = pixel_z+rand(-1, 1) pixel_w = pixel_w+rand(-1, 1) @@ -249,7 +231,8 @@ var/has_keys = FALSE for(var/obj/item/vamp/keys/found_key in user) - if(!do_after(user, 1 SECONDS, src, interaction_key = DOAFTER_SOURCE_DOOR)) + // check if we already set has_keys so the first key you try and no do_after. + if(has_keys && !do_after(user, 1 SECONDS, src, interaction_key = DOAFTER_SOURCE_DOOR)) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN has_keys = TRUE if(try_keys(user, found_key)) @@ -301,31 +284,26 @@ if(CONFIG_GET(flag/punishing_zero_dots) && user.st_get_stat(STAT_LARCENY) < 1) to_chat(user, span_warning("How do I do this...?")) return - if(!COOLDOWN_FINISHED(src, lockpick_cooldown)) - var/time_left = COOLDOWN_TIMELEFT(src, lockpick_cooldown) - to_chat(user, span_warning("You must wait [time_left / 10] seconds before attempting another lockpick!")) - return if(locked) proc_unlock(5) playsound(src, 'modular_darkpack/modules/doors/sounds/hack.ogg', 100, TRUE) for(var/mob/living/carbon/human/npc/police/P in oviewers(DEFAULT_SIGHT_DISTANCE, src)) P.Aggro(user) - var/total_lockpicking = user.st_get_stat(STAT_LARCENY) - if(do_after(user, lockpick_timer, src, interaction_key = DOAFTER_SOURCE_DOOR)) + if(do_after(user, 1 TURNS, src, interaction_key = DOAFTER_SOURCE_DOOR)) if(!locked) return - var/roll_result = SSroll.storyteller_roll(total_lockpicking + (user.st_get_stat(STAT_DEXTERITY, FALSE)), lockpick_difficulty, list(user), user) - switch(roll_result) + if(!lockpick_roll) + lockpick_roll = new() + lockpick_roll.difficulty = lockpick_difficulty + switch(lockpick_roll.st_roll(user, src)) if(ROLL_SUCCESS) to_chat(user, span_notice("You pick the lock.")) locked = FALSE return TRUE if(ROLL_FAILURE) to_chat(user, span_warning("You failed to pick the lock.")) - COOLDOWN_START(src, lockpick_cooldown, 1 SCENES) if(ROLL_BOTCH) to_chat(user, span_warning("Your lockpick broke!")) - COOLDOWN_START(src, lockpick_cooldown, 1 SCENES) qdel(tool) else to_chat(user, span_warning("You failed to pick the lock.")) diff --git a/modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm b/modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm index e22b9dc6f5c0..7d1f1e03dfb6 100644 --- a/modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm +++ b/modular_darkpack/modules/drugs/code/bloodpacks/morphpack.dm @@ -40,7 +40,6 @@ M.update_damage_overlays() M.update_health_hud() if(iskindred(M)) - M.update_blood_hud() H.reagents.trans_to(M, min(10, H.reagents.total_volume), transfered_by = H, methods = INGEST) //calling the earlier variable to transfer to target, M playsound(M.loc,'sound/items/drink.ogg', 50, TRUE) return diff --git a/modular_darkpack/modules/drugs/code/weed/bong.dm b/modular_darkpack/modules/drugs/code/weed/bong.dm index 401cf1f0609f..0a523d9ce054 100644 --- a/modular_darkpack/modules/drugs/code/weed/bong.dm +++ b/modular_darkpack/modules/drugs/code/weed/bong.dm @@ -37,32 +37,34 @@ . = ..() create_reagents(chem_volume, INJECTABLE | NO_REACT) -/obj/item/bong/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers) - if((istype(attacking_item, /obj/item/food/grown) || istype(attacking_item, /obj/item/food/drug))) +/obj/item/bong/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if((istype(tool, /obj/item/food/grown) || istype(tool, /obj/item/food/drug))) if(packeditem) to_chat(user, span_warning("It is already packed!")) - return + return ITEM_INTERACT_BLOCKING - if(istype(attacking_item, /obj/item/food/grown) && !HAS_TRAIT(attacking_item, TRAIT_DRIED)) + if(istype(tool, /obj/item/food/grown) && !HAS_TRAIT(tool, TRAIT_DRIED)) to_chat(user, span_warning("It has to be dried first!")) - return + return ITEM_INTERACT_BLOCKING - to_chat(user, span_notice("You stuff [attacking_item] into [src].")) + to_chat(user, span_notice("You stuff [tool] into [src].")) bong_hits = max_hits - packeditem = attacking_item.name + packeditem = tool.name update_name() - if(attacking_item.reagents) - attacking_item.reagents.trans_to(src, attacking_item.reagents.total_volume, transferred_by = user) + if(tool.reagents) + tool.reagents.trans_to(src, tool.reagents.total_volume, transferred_by = user) reagent_transfer_per_use = reagents.total_volume / max_hits - qdel(attacking_item) + qdel(tool) + return ITEM_INTERACT_SUCCESS else - var/lighting_text = attacking_item.ignition_effect(src, user) + var/lighting_text = tool.ignition_effect(src, user) if(!lighting_text) - return ..() + return NONE if(bong_hits <= 0) to_chat(user, span_warning("Nothing to smoke!")) - return ..() + return ITEM_INTERACT_BLOCKING light(lighting_text) + return ITEM_INTERACT_SUCCESS /obj/item/bong/attack_self(mob/user) var/turf/location = get_turf(user) @@ -75,19 +77,22 @@ empty_out() return -/obj/item/bong/attack(mob/living/target_mob, mob/living/user, list/modifiers, list/attack_modifiers) +/obj/item/bong/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!isliving(interacting_with)) + return NONE + var/mob/living/interacting_living = interacting_with if(!packeditem || !lit) - return - target_mob.visible_message( - span_notice("[user] starts [target_mob == user ? "taking a hit from [src]." : "forcing [target_mob] to take a hit from [src]!"]"), - "[target_mob == user ? span_notice("You start taking a hit from [src].") : span_danger("[user] starts forcing you to take a hit from [src]!")]" + return ITEM_INTERACT_BLOCKING + interacting_with.visible_message( + span_notice("[user] starts [interacting_with == user ? "taking a hit from [src]." : "forcing [interacting_with] to take a hit from [src]!"]"), + "[interacting_with == user ? span_notice("You start taking a hit from [src].") : span_danger("[user] starts forcing you to take a hit from [src]!")]" ) playsound(src, 'modular_darkpack/modules/drugs/sounds/heatdam.ogg', 50, TRUE) if(!do_after(user, 4 SECONDS, src)) - return - to_chat(target_mob, span_notice("You finish taking a hit from [src].")) + return ITEM_INTERACT_BLOCKING + to_chat(interacting_with, span_notice("You finish taking a hit from [src].")) if(reagents.total_volume) - reagents.trans_to(target_mob, reagent_transfer_per_use, methods = INHALE, ignore_stomach = TRUE) + reagents.trans_to(interacting_with, reagent_transfer_per_use, methods = INHALE, ignore_stomach = TRUE) bong_hits-- var/turf/open/pos = get_turf(src) if(istype(pos)) @@ -95,15 +100,16 @@ spawn_cloud(pos, smoke_range) if(moan_chance > 0) if(prob(moan_chance)) - playsound(target_mob, pick('modular_darkpack/modules/drugs/sounds/lungbust_moan1.ogg','modular_darkpack/modules/drugs/sounds/lungbust_moan2.ogg', 'modular_darkpack/modules/drugs/sounds/lungbust_moan3.ogg'), 50, TRUE) - target_mob.emote("moan") + playsound(interacting_with, pick('modular_darkpack/modules/drugs/sounds/lungbust_moan1.ogg','modular_darkpack/modules/drugs/sounds/lungbust_moan2.ogg', 'modular_darkpack/modules/drugs/sounds/lungbust_moan3.ogg'), 50, TRUE) + interacting_living.emote("moan") else - playsound(target_mob, pick('modular_darkpack/modules/drugs/sounds/lungbust_cough1.ogg','modular_darkpack/modules/drugs/sounds/lungbust_cough2.ogg'), 50, TRUE) - target_mob.emote("cough") + playsound(interacting_with, pick('modular_darkpack/modules/drugs/sounds/lungbust_cough1.ogg','modular_darkpack/modules/drugs/sounds/lungbust_cough2.ogg'), 50, TRUE) + interacting_living.emote("cough") if(bong_hits <= 0) - to_chat(target_mob, span_warning("Out of uses!")) + to_chat(interacting_with, span_warning("Out of uses!")) put_out() empty_out() + return ITEM_INTERACT_SUCCESS /obj/item/bong/proc/light(flavor_text = null) if(lit) @@ -115,16 +121,8 @@ name = "lit [initial(name)]" set_light_on(TRUE) - if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire - var/datum/effect_system/reagents_explosion/explosion = new() - explosion.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/plasma) * 0.4, 1), get_turf(src), 0, 0) - explosion.start() - qdel(src) - return - if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently - var/datum/effect_system/reagents_explosion/explosion = new() - explosion.set_up(round(reagents.get_reagent_amount(/datum/reagent/fuel) * 0.2, 1), get_turf(src), 0, 0) - explosion.start() + if(reagents.spark_act(0, NONE, list()) & SPARK_ACT_DESTRUCTIVE) + usr?.log_message("lit a rigged bong", LOG_VICTIM) qdel(src) return diff --git a/modular_darkpack/modules/economy/code/atm.dm b/modular_darkpack/modules/economy/code/atm.dm index a5ec55400a22..6153f4d31a18 100644 --- a/modular_darkpack/modules/economy/code/atm.dm +++ b/modular_darkpack/modules/economy/code/atm.dm @@ -48,7 +48,7 @@ return ITEM_INTERACT_BLOCKING var/value = tool.get_item_credit_value() inserted_cash += value - to_chat(user, span_notice("You have deposited [value] dollars into [src]. [src] now holds [inserted_cash] dollars.")) + to_chat(user, span_notice("You have deposited [value] [MONEY_NAME] into [src]. [src] now holds [inserted_cash] [MONEY_NAME].")) qdel(tool) return ITEM_INTERACT_SUCCESS @@ -105,7 +105,7 @@ if("deposit") if(inserted_cash > 0) logged_account.adjust_money(inserted_cash, "ATM: Deposit") - to_chat(usr, span_notice("You have deposited [inserted_cash] dollars into your card. Your new balance is [logged_account.account_balance] dollars.")) + to_chat(usr, span_notice("You have deposited [inserted_cash] [MONEY_NAME] into your card. Your new balance is [logged_account.account_balance] [MONEY_NAME].")) total_stored_cash += inserted_cash inserted_cash = 0 return TRUE @@ -124,7 +124,7 @@ to_chat(user, span_notice("[src] has maxed out its withdraw limit")) break var/obj/item/stack/dollar/cash = new(loc, drop_amount) - to_chat(user, span_notice("You have withdrawn [drop_amount] dollars.")) + to_chat(user, span_notice("You have withdrawn [drop_amount] [MONEY_NAME].")) try_put_in_hand(cash, user) amount -= drop_amount total_stored_cash -= drop_amount diff --git a/modular_darkpack/modules/economy/code/dollar.dm b/modular_darkpack/modules/economy/code/dollar.dm index 35d5e93ff266..8dd28635a077 100644 --- a/modular_darkpack/modules/economy/code/dollar.dm +++ b/modular_darkpack/modules/economy/code/dollar.dm @@ -1,5 +1,5 @@ /obj/item/stack/dollar - name = "dollars" + name = MONEY_NAME // Prob overkill to use the define here. desc = "Wow! With enough of these, you could buy a lot! ...Pssh, yeah right." singular_name = "dollar" icon_state = "money1" diff --git a/modular_darkpack/modules/economy/code/selling/lombard.dm b/modular_darkpack/modules/economy/code/selling/lombard.dm index 1bc8f3d4d329..93415d2f9b71 100644 --- a/modular_darkpack/modules/economy/code/selling/lombard.dm +++ b/modular_darkpack/modules/economy/code/selling/lombard.dm @@ -2,6 +2,12 @@ #define SALE_DIFFICULTY 6 #define BOTCH_FAILURE_PENALTY 0.5 +/datum/storyteller_roll/fencing + bumper_text = "fencing" + applicable_stats = list(STAT_CHARISMA, STAT_FINANCE) + difficulty = SALE_DIFFICULTY + numerical = TRUE + /obj/lombard name = "pawnshop" desc = "Sell your stuff." @@ -10,17 +16,19 @@ icon = 'modular_darkpack/modules/retail/icons/vendors_shops.dmi' anchored = TRUE var/black_market = FALSE + var/datum/storyteller_roll/fencing/sell_roll -/obj/lombard/attackby(obj/item/W, mob/living/carbon/human/user, params) - var/datum/component/selling/selling_comp = W.GetComponent(/datum/component/selling) +/obj/lombard/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + var/datum/component/selling/selling_comp = tool.GetComponent(/datum/component/selling) if(!selling_comp) - return ..() + return NONE if(selling_comp.illegal != black_market) to_chat(user, span_warning("[black_market ? "This" : "The pawnshop"] doesn't accept [selling_comp.illegal ? "illegal" : "legal"] goods.")) - return + return ITEM_INTERACT_BLOCKING - sell_one_item(W, user) + sell_one_item(tool, user) + return ITEM_INTERACT_SUCCESS /// Sell a single item /obj/lombard/proc/sell_one_item(obj/item/sold, mob/living/user) @@ -56,13 +64,10 @@ var/list/sold_items = list() var/total_sale_price = 0 + if(!sell_roll) + sell_roll = new() // Make a single roll to sell all your items in bulk - var/negotiation_success_count = 0 - if(ishuman(user)) - var/mob/living/carbon/human/H = user - var/negotiation_dice = H.st_get_stat(STAT_CHARISMA) + H.st_get_stat(STAT_FINANCE) - if(negotiation_dice > 0) - negotiation_success_count = SSroll.storyteller_roll(negotiation_dice, SALE_DIFFICULTY, H, src, TRUE) + var/negotiation_success_count = sell_roll.st_roll(user, src) for(var/obj/item/sold in items_to_sell) var/datum/component/selling/selling_comp = sold.GetComponent(/datum/component/selling) @@ -105,20 +110,16 @@ return round(base_price * stack_multiplier * negotiation_success_count) return round(base_price * stack_multiplier * BOTCH_FAILURE_PENALTY) - // otherwise, roll for negotiation in a single item sale - if(ishuman(user)) - var/mob/living/carbon/human/H = user - var/negotiation_dice = H.st_get_stat(STAT_CHARISMA) + H.st_get_stat(STAT_FINANCE) - - if(negotiation_dice > 0) - var/success_count = SSroll.storyteller_roll(negotiation_dice, SALE_DIFFICULTY, H, src, TRUE) - if(success_count > 0) - return round(base_price * stack_multiplier * success_count) - return round(base_price * stack_multiplier * BOTCH_FAILURE_PENALTY) + // otherwise, roll for negotiation in a single item sale + if(!sell_roll) + sell_roll = new() + // Make a single roll to sell all your items in bulk + var/success_count = sell_roll.st_roll(user, src) - // No negotiation dice (which should rarely happen) = ZERO! Completely scammed at 0 finance 0 charisma - return 0 + if(success_count > 0) + return round(base_price * stack_multiplier * success_count) + return round(base_price * stack_multiplier * BOTCH_FAILURE_PENALTY) /obj/lombard/proc/spawn_money(amount, atom/spawn_location) if(amount <= 0) diff --git a/modular_darkpack/modules/economy/code/stocks_license.dm b/modular_darkpack/modules/economy/code/stocks_license.dm index df35dd249fa9..daac49ca3183 100644 --- a/modular_darkpack/modules/economy/code/stocks_license.dm +++ b/modular_darkpack/modules/economy/code/stocks_license.dm @@ -32,4 +32,4 @@ /obj/item/stocks_license/examine(mob/user) . = ..() - . += "Balance: [balance] dollars" + . += "Balance: [balance] [MONEY_NAME]" diff --git a/modular_darkpack/modules/electricity/code/fusebox.dm b/modular_darkpack/modules/electricity/code/fusebox.dm index ec09bb1e89df..a0bbd69e9226 100644 --- a/modular_darkpack/modules/electricity/code/fusebox.dm +++ b/modular_darkpack/modules/electricity/code/fusebox.dm @@ -42,8 +42,7 @@ power_area.power_environ = FALSE power_area.power_change() power_area.fire_controled = FALSE - var/datum/effect_system/spark_spread/local_spark = new /datum/effect_system/spark_spread - local_spark.set_up(5, 1, get_turf(src)) + var/datum/effect_system/basic/spark_spread/local_spark = new(get_turf(src), 5, 1) local_spark.start() for(var/obj/machinery/light/L in power_area) L.update(FALSE) @@ -52,32 +51,39 @@ update_icon() update_sound_state() -/obj/fusebox/attackby(obj/item/I, mob/living/user, params) - if(I.tool_behaviour == TOOL_WIRECUTTER) +/obj/fusebox/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(tool.tool_behaviour == TOOL_WIRECUTTER) if(!repairing) repairing = TRUE - if(do_after(user, 10 SECONDS, src)) - damaged = 0 - update_icon_state() - update_sound_state() - playsound(get_turf(src),'modular_darkpack/modules/electricity/sounds/fusebox_fix.ogg', 50, FALSE) - var/area/power_area = get_area(src) - power_area.power_light = TRUE - power_area.power_equip = TRUE - power_area.power_environ = TRUE - power_area.power_change() - if(initial(power_area.fire_controled)) - power_area.fire_controled = TRUE - for(var/obj/machinery/light/L in power_area) - L.update(FALSE) + if(!do_after(user, 10 SECONDS, src)) repairing = FALSE - else - repairing = FALSE - else - ..() - if(I.force) - damaged += I.force - check_damage(user) + return ITEM_INTERACT_BLOCKING + + damaged = 0 + update_icon_state() + update_sound_state() + playsound(get_turf(src),'modular_darkpack/modules/electricity/sounds/fusebox_fix.ogg', 50, FALSE) + var/area/power_area = get_area(src) + power_area.power_light = TRUE + power_area.power_equip = TRUE + power_area.power_environ = TRUE + power_area.power_change() + if(initial(power_area.fire_controled)) + power_area.fire_controled = TRUE + for(var/obj/machinery/light/L in power_area) + L.update(FALSE) + + repairing = FALSE + return ITEM_INTERACT_SUCCESS + + return NONE + +// This sucks. Snowflaking its own integrity system is always bad. +/obj/fusebox/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers) + . = ..() + if(attacking_item.force) + damaged += attacking_item.force + check_damage(user) // transformers (another type of fusebox) /obj/fusebox/transformer diff --git a/modular_darkpack/modules/electricity/code/generator.dm b/modular_darkpack/modules/electricity/code/generator.dm index ab33b51571f0..7d14464bf6f9 100644 --- a/modular_darkpack/modules/electricity/code/generator.dm +++ b/modular_darkpack/modules/electricity/code/generator.dm @@ -57,8 +57,7 @@ SEND_SOUND(M, 'modular_darkpack/modules/electricity/sounds/generator_shutdown.ogg') A.requires_power = TRUE A.fire_controled = FALSE - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(5, 1, get_turf(src)) + var/datum/effect_system/basic/spark_spread/s = new(get_turf(src), 5, 1) s.start() for(var/obj/machinery/light/L in A) L.on = FALSE diff --git a/modular_darkpack/modules/ert/code/items/first_team.dm b/modular_darkpack/modules/ert/code/items/first_team.dm new file mode 100644 index 000000000000..022ae62ddde9 --- /dev/null +++ b/modular_darkpack/modules/ert/code/items/first_team.dm @@ -0,0 +1,370 @@ +//------------EQUIPMENT------------ +/datum/armor/first_team + melee = 70 + bullet = 70 + laser = 70 + energy = 70 + fire = 70 + bomb = 70 + acid = 70 + wound = 70 + +//------------SHOES------------ +/obj/item/clothing/shoes/vampire/darkpack_ert + name = "shoes" + desc = "Comfortable-looking shoes." + icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' + worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' + icon_state = "ftboots" + inhand_icon_state = null + gender = PLURAL + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + + +/obj/item/clothing/shoes/vampire/darkpack_ert/firstteam + name = "\improper First team boots" + desc = "Pitch-black boots with hard, industrial laces." + icon_state = "ftboots" + armor_type = /datum/armor/shoes_jackboots + +//------------GLOVES------------ + +/obj/item/clothing/gloves/vampire/darkpack_ert + icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' + worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "ftgloves" + undyeable = TRUE + + +/obj/item/clothing/gloves/vampire/darkpack_ert/firstteam + name = "\improper First Team gloves" + desc = "Provides protection from the good, the bad and the ugly." + icon_state = "ftgloves" + body_parts_covered = HANDS + armor_type = /datum/armor/gloves_combat + +//------------HELMET------------ + +/obj/item/clothing/head/vampire/darkpack_ert + icon_state = "fthelmet" + icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' + inhand_icon_state = null + worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + +/obj/item/clothing/head/vampire/darkpack_ert/firstteam_helmet + name = "\improper First Team helmet" + desc = "A black helmet with two, green-glowing eye-pieces that seem to stare through your soul." + icon_state = "fthelmet" + armor_type = /datum/armor/first_team + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR + visor_flags_inv = HIDEFACE|HIDESNOUT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + +//------------ARMOR------------ + +/obj/item/clothing/suit/vampire/darkpack_ert + icon_state = "ftuni" + icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' + worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + inhand_icon_state = null + + body_parts_covered = CHEST + cold_protection = CHEST|GROIN + min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT + heat_protection = CHEST|GROIN + max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT + max_integrity = 250 + resistance_flags = NONE + +/obj/item/clothing/suit/vampire/darkpack_ert/Initialize() + . = ..() + AddComponent(/datum/component/selling, 200, "suit", FALSE) + + +/obj/item/clothing/suit/vampire/darkpack_ert/firstteam_armor + name = "\improper First Team Armoured Vest" + desc = "A strong looking, armoured-vest with a large '1' engraved onto the breast." + icon_state = "ftarmor" + inhand_icon_state = null + armor_type = /datum/armor/first_team + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + clothing_traits = list(TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) + +//------------SUIT------------ + +/obj/item/clothing/under/vampire/darkpack_ert + name = "\improper First Team uniform" + desc = "A completely blacked out uniform with a large '1' symbol sewn onto the shoulder-pad." + icon_state = "ftuni" + has_sensor = NO_SENSORS + random_sensor = FALSE + can_adjust = FALSE + icon = 'modular_darkpack/modules/ert/icons/clothing.dmi' + worn_icon = 'modular_darkpack/modules/ert/icons/worn.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + + +/obj/item/clothing/under/vampire/darkpack_ert/Initialize() + . = ..() + AddComponent(/datum/component/selling, 100, "undersuit", FALSE) + +/obj/item/clothing/under/vampire/darkpack_ert/firstteam_uniform + name = "First Team uniform" + desc = "A completely blacked out uniform with a large '1' symbol sewn onto the shoulder-pad." + icon_state = "ftuni" + armor_type = /datum/armor/clothing_under/security_head_of_security + +//------------Glasses------------ + +/obj/item/clothing/glasses/night/thermal + vision_flags = SEE_MOBS + +//------------Weapons------------/obj/item/ammo_casing/vampire/c12gvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +/obj/item/ammo_box/darkpack/c556/bale //DONT EVER PUT THIS IN A MAP + name = "balefire ammo box (5.56)" + icon = 'modular_darkpack/modules/ert/icons/ammo.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "556box-bale" + ammo_type = /obj/item/ammo_casing/vampire/c556mm/bale + +/obj/item/ammo_casing/vampire/c556mm/bale + name = "green 5.56mm bullet casing" + desc = "A modified 5.56mm bullet casing." + caliber = CALIBER_556NATO + projectile_type = /obj/projectile/bullet/darkpack/vamp556mm/bale + icon = 'modular_darkpack/modules/ert/icons/ammo.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "b556" + base_icon_state = "b556" + +/obj/projectile/bullet/darkpack/vamp556mm/bale + armour_penetration = 50 + damage = 45 + var/bloodloss = 1 + +/obj/projectile/bullet/darkpack/vamp556mm/bale/on_hit(atom/target, blocked = 0, pierce_hit) + . = ..() + if(iskindred(target) || isghoul(target)) + var/mob/living/carbon/human/H = target + if(H.bloodpool == 0) + to_chat(H, span_warning("Only ash remains in my veins!")) + H.apply_damage(20, BURN) + return + H.adjust_blood_pool(-bloodloss) + playsound(H, 'modular_darkpack/modules/ert/sounds/balefire.ogg', rand(10,15), TRUE) + to_chat(H, span_warning("Green flames errupt from the bullets impact, boiling your blood!")) +// DARKPACK TODO - GAROU +/* + if(iswerewolf(target) || isgarou(target)) + var/mob/living/carbon/M = target + if(M.auspice.gnosis) + if(prob(50)) + adjust_gnosis(-1, M) + M.apply_damage(20, CLONE) + playsound(M, 'modular_tfn/modules/first_team/audio/balefire.ogg', rand(10,15), TRUE) + M.apply_status_effect(STATUS_EFFECT_SILVER_SLOWDOWN) +*/ +/obj/item/ammo_casing/vampire/c12g/f12g + name = "Frag-12g shell casing" + desc = "A 12g explosive shell casing." + caliber = CALIBER_SHOTGUN + projectile_type = /obj/projectile/bullet/darkpack/f12g + icon = 'modular_darkpack/modules/ert/icons/ammo.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "f12" + base_icon_state = "f12" + +/obj/projectile/bullet/darkpack/f12g + name = "12g explosive slug" + damage = 60 + armour_penetration = 50 + exposed_wound_bonus = 10 + wound_bonus = 5 + +/obj/projectile/bullet/darkpack/f12g/on_hit(atom/target, blocked = 0, pierce_hit) + ..() + explosion(target, devastation_range = -1, light_impact_range = 2, explosion_cause = src) + return BULLET_ACT_HIT + +/obj/item/ammo_box/darkpack/f12g //DO NOT DISTRIBUTE NORMALLY + name = "ammo box (f12g)" + icon = 'modular_darkpack/modules/ert/icons/ammo.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "12box_frag" + ammo_type = /obj/item/ammo_casing/vampire/c12g/f12g + max_ammo = 40 + +/obj/item/ammo_box/magazine/darkpack/px66f + name = "\improper PX66F magazine (5.56mm)" + icon = 'modular_darkpack/modules/ert/icons/ammo.dmi' + lefthand_file = 'modular_darkpack/modules/ert/icons/righthand.dmi' + righthand_file = 'modular_darkpack/modules/ert/icons/lefthand.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "px66f" + inhand_icon_state = null + ammo_type = /obj/item/ammo_casing/vampire/c556mm/bale + caliber = CALIBER_556NATO + max_ammo = 30 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/darkpack/px249f + name = "\improper PX249F box magazine (5.56mm)" + icon = 'modular_darkpack/modules/ert/icons/ammo.dmi' + lefthand_file = 'modular_darkpack/modules/ert/icons/righthand.dmi' + righthand_file = 'modular_darkpack/modules/ert/icons/lefthand.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') + inhand_icon_state = null + icon_state = "px249f" + ammo_type = /obj/item/ammo_casing/vampire/c556mm/bale + caliber = CALIBER_556NATO + max_ammo = 200 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/internal/px12r + name = "shotgun internal magazine" + ammo_type = /obj/item/ammo_casing/vampire/c12g + caliber = CALIBER_SHOTGUN + max_ammo = 8 + masquerade_violating = FALSE + +/obj/item/ammo_box/magazine/darkpack/mk23 + name = "\improper automatic pistol magazine (.45 ACP)" + icon = 'modular_darkpack/modules/ert/icons/ammo.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + inhand_icon_state = null + icon_state = "mk23_mag" + ammo_type = /obj/item/ammo_casing/vampire/c45acp + caliber = CALIBER_45 + max_ammo = 12 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/darkpack/mk23/silver + name = "automatic pistol magazine (.45 ACP Silver)" + ammo_type = /obj/item/ammo_casing/vampire/c45acp/silver + +/obj/item/ammo_box/magazine/darkpack/mk23/hp + name = "automatic pistol magazine (.45 ACP HP)" + ammo_type = /obj/item/ammo_casing/vampire/c45acp/HP + +/obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom + name = "\improper Mark 23 SOCOM Pistol" + desc = "A specialized .45 ACP Pistol featuring an integrated supressor and laser sight" + icon = 'modular_darkpack/modules/ert/icons/48x32weapons.dmi' + lefthand_file = 'modular_darkpack/modules/ert/icons/righthand.dmi' + righthand_file = 'modular_darkpack/modules/ert/icons/lefthand.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "mk23" + //onflooricon_state = "mk23" + inhand_icon_state = "mk23" + w_class = WEIGHT_CLASS_SMALL + accepted_magazine_type = /obj/item/ammo_box/magazine/darkpack/mk23 + burst_size = 1 + recoil = 0 + projectile_damage_multiplier = 1.3 + actions_types = list() + bolt_type = BOLT_TYPE_LOCKING + suppressed = SUPPRESSED_QUIET + can_suppress = FALSE + can_unsuppress = FALSE + fire_sound = 'modular_darkpack/modules/weapons/sounds/glock.ogg' //Doesnt matter when it's always using the supressed SFX + +/obj/item/gun/ballistic/automatic/darkpack/px66f //DO NOT DISTRIBUTE IN MAPPING + name = "\improper PX66F Rifle" + desc = "A three-round burst 5.56 death machine, with a Spiral brand below the barrel." + icon = 'modular_darkpack/modules/ert/icons/48x32weapons.dmi' + lefthand_file = 'modular_darkpack/modules/ert/icons/righthand.dmi' + righthand_file = 'modular_darkpack/modules/ert/icons/lefthand.dmi' + worn_icon = 'modular_darkpack/modules/weapons/icons/worn_guns.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "px66f" + inhand_icon_state = "px66f" + worn_icon_state = "rifle" + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM //Bullpup makes it easy to fire with one hand, but we still don't want these dual-wielded + accepted_magazine_type = /obj/item/ammo_box/magazine/darkpack/px66f + burst_size = 3 + spread = 2 + recoil = 1.5 + bolt_type = BOLT_TYPE_LOCKING + show_bolt_icon = FALSE + mag_display = TRUE + can_suppress = FALSE + fire_sound = 'modular_darkpack/modules/ert/sounds/silenced_rifle.ogg' + masquerade_violating = TRUE + +/obj/item/gun/ballistic/automatic/darkpack/px66f/Initialize() + . = ..() + AddComponent(/datum/component/selling, 350, "aug", FALSE) + AddComponent(/datum/component/automatic_fire, 0.5 SECONDS) + +/obj/item/gun/ballistic/shotgun/darkpack/px12r //DONT DISTRIBUTE IN MAPPING + name = "\improper PX12R Breaching Shotgun" + desc = "A highly modified 12G Shotgun designed to fire Frag-12 explosive breaching rounds" + icon = 'modular_darkpack/modules/ert/icons/48x32weapons.dmi' + lefthand_file = 'modular_darkpack/modules/ert/icons/righthand.dmi' + righthand_file = 'modular_darkpack/modules/ert/icons/lefthand.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + worn_icon = 'modular_darkpack/modules/weapons/icons/worn_guns.dmi' + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM + worn_icon_state = "pomp" + icon_state = "px12r" + inhand_icon_state = "px12r" + recoil = 3 + fire_delay = 6 + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/px12r + can_be_sawn_off = FALSE + fire_sound = 'modular_darkpack/modules/ert/sounds/shotgun_firing.ogg' + load_sound = 'modular_darkpack/modules/ert/sounds/shell_load.ogg' + rack_sound = 'modular_darkpack/modules/ert/sounds/cycling.ogg' + inhand_x_dimension = 32 + inhand_y_dimension = 32 + + +/obj/item/gun/ballistic/automatic/l6_saw/darkpack + name = "\improper PX249F Light Machine Gun" + desc = "A modified M249 Machine Gun with an engraving of a Hydra on the grip" + icon = 'modular_darkpack/modules/ert/icons/48x32weapons.dmi' + lefthand_file = 'modular_darkpack/modules/ert/icons/righthand.dmi' + righthand_file = 'modular_darkpack/modules/ert/icons/lefthand.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/onfloor.dmi') + icon_state = "px249f" + inhand_icon_state = "px249f" + base_icon_state = "px249f" + w_class = WEIGHT_CLASS_HUGE + bolt_type = BOLT_TYPE_LOCKING + show_bolt_icon = FALSE + slot_flags = 0 + pin = /obj/item/firing_pin + accepted_magazine_type = /obj/item/ammo_box/magazine/darkpack/px249f + weapon_weight = WEAPON_HEAVY + burst_size = 1 + recoil = 6 //With good firearm skill it's not an issue + spread = 6 + fire_sound = 'modular_darkpack/modules/ert/sounds/m249fire.ogg' + rack_sound = 'modular_darkpack/modules/ert/sounds/m249rack.ogg' + +/obj/item/gun/ballistic/automatic/l6_saw/darkpack/update_icon_state() + . = ..() + if(item_flags & ACTIVE_WORLD_ICON) + return + inhand_icon_state = "[base_icon_state][magazine ? "mag":"nomag"]" + +/obj/item/gun/ballistic/automatic/l6_saw/darkpack/update_overlays() + . = ..() + if(item_flags & ACTIVE_WORLD_ICON) + return + . += "px249f_door_[cover_open ? "open" : "closed"]" + +/obj/item/gun/ballistic/automatic/l6_saw/darkpack/Initialize(mapload) + . = ..() + AddComponent(/datum/component/automatic_fire, 0.1 SECONDS) + +//------------Medical------------ +//To be done at a later date diff --git a/modular_darkpack/modules/ert/code/items/swat_items.dm b/modular_darkpack/modules/ert/code/items/swat_items.dm new file mode 100644 index 000000000000..8d3d906504ca --- /dev/null +++ b/modular_darkpack/modules/ert/code/items/swat_items.dm @@ -0,0 +1,43 @@ +/obj/item/storage/belt/police/swat + name = "swat belt" + desc = "Can hold SWAT gear like handcuffs." + icon_state = "security" + inhand_icon_state = "security" + worn_icon_state = "security" + content_overlays = TRUE + storage_type = /datum/storage/security_belt + +/obj/item/storage/belt/police/swat/full + +/obj/item/storage/belt/police/swat/full/PopulateContents() + new /obj/item/reagent_containers/spray/pepper(src) + new /obj/item/restraints/handcuffs(src) + new /obj/item/restraints/handcuffs(src) + new /obj/item/melee/baton/vamp(src) + +/obj/item/card/swat + name = "Dogtags" + desc = "The dogtags of an elite law enforcement officer. It prints the officer's name in case they're captured or killed." + icon = 'modular_darkpack/modules/ert/icons/badges.dmi' + icon_state = "dogtags" + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/badges_onfloor.dmi') + worn_icon = 'modular_darkpack/modules/jobs/icons/id_worn.dmi' + worn_icon_state = "police_badge" + +/obj/item/card/lieutenant + name = "Officer Badge" + desc = "The shiny badge of an elite law enforcement officer. It shines with golden authority." + icon = 'modular_darkpack/modules/ert/icons/badges.dmi' + icon_state = "leader" + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/badges_onfloor.dmi') + worn_icon = 'modular_darkpack/modules/jobs/icons/id_worn.dmi' + worn_icon_state = "police_badge" + +/obj/item/card/first_aid + name = "First Aid Officer Card" + desc = "The professional laminated card of a field medic. Did you know it's a war crime to specifically target field medics?" + icon = 'modular_darkpack/modules/ert/icons/badges.dmi' + icon_state = "first_aid" + ONFLOOR_ICON_HELPER('modular_darkpack/modules/ert/icons/badges_onfloor.dmi') + worn_icon = 'modular_darkpack/modules/jobs/icons/id_worn.dmi' + worn_icon_state = "grey_id" diff --git a/modular_darkpack/modules/ert/code/loadout.dm b/modular_darkpack/modules/ert/code/loadout.dm new file mode 100644 index 000000000000..802de83f7004 --- /dev/null +++ b/modular_darkpack/modules/ert/code/loadout.dm @@ -0,0 +1,125 @@ +/datum/outfit/job/vampire/ert/pentex + name = "First Team Leader" + ears = /obj/item/radio/headset/darkpack/pmc + uniform = /obj/item/clothing/under/vampire/darkpack_ert/firstteam_uniform + gloves = /obj/item/clothing/gloves/vampire/darkpack_ert/firstteam + mask = /obj/item/clothing/mask/vampire/balaclava + glasses = /obj/item/clothing/glasses/night/thermal + r_pocket = /obj/item/flashlight + l_pocket = /obj/item/ammo_box/magazine/darkpack/px66f + shoes = /obj/item/clothing/shoes/vampire/darkpack_ert/firstteam + belt = /obj/item/gun/ballistic/automatic/darkpack/px66f + suit = /obj/item/clothing/suit/vampire/darkpack_ert/firstteam_armor + head = /obj/item/clothing/head/vampire/darkpack_ert/firstteam_helmet + back = /obj/item/storage/backpack/satchel + implants = list(/obj/item/implant/explosive) + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack/px66f = 3, + /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom=1, + /obj/item/ammo_box/magazine/darkpack/mk23/silver = 2, + /obj/item/ammo_box/darkpack/c556/bale = 1, + /obj/item/vamp/keys/pentex = 1, + /obj/item/grenade/frag = 3, + /obj/item/storage/medkit/darkpack/ifak = 1, + ) + +/datum/outfit/job/vampire/ert/pentex/exterminator + name = "First Team Exterminator" + belt = /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom + l_pocket = /obj/item/ammo_box/magazine/darkpack/px249f + r_hand = /obj/item/gun/ballistic/automatic/l6_saw/darkpack + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack/mk23/silver = 2, + /obj/item/ammo_box/darkpack/c556/bale = 3, + /obj/item/vamp/keys/pentex = 1, + /obj/item/grenade/frag = 3, + /obj/item/storage/medkit/darkpack/ifak = 1, + ) + +/datum/outfit/job/vampire/ert/pentex/specialist + name = "First Team Specialist" + belt = /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom + r_hand = /obj/item/gun/ballistic/shotgun/darkpack/px12r + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack/px66f = 3, + /obj/item/ammo_box/magazine/darkpack/mk23/silver = 2, + /obj/item/ammo_box/darkpack/f12g = 2, + /obj/item/vamp/keys/pentex = 1, + /obj/item/grenade/frag = 3, + /obj/item/storage/medkit/darkpack/ifak = 1, + ) + +/datum/outfit/job/vampire/ert/pentex/medic + name = "First Team Medic" + back = /obj/item/storage/backpack/satchel + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack/px66f = 3, + /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom=1, + /obj/item/ammo_box/magazine/darkpack/mk23/silver = 2, + /obj/item/ammo_box/darkpack/c556/bale = 1, + /obj/item/vamp/keys/pentex = 1, + /obj/item/grenade/frag = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + /obj/item/storage/medkit/darkpack/combat = 1 + ) + +//=================BUDGET FIRST TEAM LOADOUTS================= + +/datum/outfit/job/vampire/ert/pentex_budget + name = "First Team Squad Leader" //the singular competent guy on the team + glasses = /obj/item/clothing/glasses/night/thermal + shoes = /obj/item/clothing/shoes/vampire/jackboots + uniform = /obj/item/clothing/under/vampire/pentex_suit + gloves = /obj/item/clothing/gloves/vampire/work + ears = /obj/item/radio/headset/darkpack/pmc + suit = /obj/item/clothing/suit/vampire/vest + head = /obj/item/clothing/head/vampire/pentex_beret + r_pocket = /obj/item/vamp/keys/pentex + mask = /obj/item/clothing/mask/gas/sechailer + belt = /obj/item/gun/ballistic/automatic/darkpack/mp7 + back = /obj/item/storage/backpack/satchel + backpack_contents = list( + /obj/item/storage/medkit/darkpack/ifak = 1, + /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom=1, + /obj/item/ammo_box/magazine/darkpack/mk23/silver = 2, + /obj/item/ammo_box/magazine/darkpack/c46pdw/ext = 4, + ) + +/datum/outfit/job/vampire/ert/pentex_budget/intern + name = "First Team Intern" //"I signed up to the cool add on TV and got thrown out to kill werewolves with a shotgun and silenced pistol" + uniform = /obj/item/clothing/under/vampire/pentex_longleeve + gloves = /obj/item/clothing/gloves/vampire/work + shoes = /obj/item/clothing/shoes/vampire + back = /obj/item/storage/backpack/satchel + glasses = /obj/item/clothing/glasses/sunglasses + head = /obj/item/clothing/head/vampire/pentex_yellowhardhat + r_hand = /obj/item/gun/ballistic/shotgun/vampire + back = /obj/item/storage/backpack/satchel + backpack_contents = list( + /obj/item/storage/medkit/darkpack/standard = 1, + /obj/item/ammo_box/darkpack/c12g = 1, + /obj/item/ammo_box/darkpack/c12g/buck = 1, + /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom=1, + /obj/item/ammo_box/magazine/darkpack/mk23/hp = 2, + /obj/item/clipboard = 1, + ) + + +/datum/outfit/job/vampire/ert/pentex_budget/medic + name = "First Team Intern Medic" //"How the fuck am I supposed to heal anyone with this" + uniform = /obj/item/clothing/under/vampire/pentex_shortsleeve + gloves = /obj/item/clothing/gloves/vampire/work + shoes = /obj/item/clothing/shoes/vampire + back = /obj/item/storage/backpack/satchel + glasses = /obj/item/clothing/glasses/sunglasses + head = /obj/item/clothing/head/vampire/pentex_whitehardhat + belt = /obj/item/gun/ballistic/automatic/darkpack/huntrifle + back = /obj/item/storage/backpack/satchel + backpack_contents = list( + /obj/item/storage/medkit/darkpack/advanced = 1, + /obj/item/ammo_box/magazine/darkpack556/hunt = 3, + /obj/item/gun/ballistic/automatic/pistol/darkpack/mk23_socom=1, + /obj/item/ammo_box/magazine/darkpack/mk23/hp = 2, + /obj/item/clipboard = 1, + ) + diff --git a/modular_darkpack/modules/ert/code/national_guard.dm b/modular_darkpack/modules/ert/code/national_guard.dm new file mode 100644 index 000000000000..496dde9cc1a2 --- /dev/null +++ b/modular_darkpack/modules/ert/code/national_guard.dm @@ -0,0 +1,24 @@ +/datum/antagonist/ert/darkpack/national_guard/leader + name = "National Guard Sergeant" + outfit = /datum/outfit/job/vampire/ert/national_guard/sergeant + role = "National Guard Sergeant" + +/datum/antagonist/ert/darkpack/national_guard/medic + name = "National Guard Medic" + outfit = /datum/outfit/job/vampire/ert/national_guard/medic + role = "National Guard Medic" + +/datum/antagonist/ert/darkpack/national_guard/rifleman + name = "National Guard Rifleman" + outfit = /datum/outfit/job/vampire/ert/national_guard/rifleman + role = "National Guard Rifleman" + +/datum/antagonist/ert/darkpack/national_guard/explosives + name = "National Guard Bomb Squad" + outfit = /datum/outfit/job/vampire/ert/national_guard/explosives + role = "National Guard Bomb Squad" + +/datum/antagonist/ert/darkpack/national_guard/marksman + name = "National Guard Marksman" + outfit = /datum/outfit/job/vampire/ert/national_guard/marksman + role = "National Guard Marksman" diff --git a/modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm b/modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm new file mode 100644 index 000000000000..b4b477b8e68f --- /dev/null +++ b/modular_darkpack/modules/ert/code/outfits/national_guard_outfits.dm @@ -0,0 +1,104 @@ +/datum/outfit/job/vampire/ert/national_guard/sergeant + name = "National Guard Sergeant" + ears = /obj/item/radio/headset/darkpack/military + glasses = /obj/item/clothing/glasses/vampire/sun + uniform = /obj/item/clothing/under/vampire/military_fatigues + gloves = /obj/item/clothing/gloves/vampire/work + r_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/vamp/keys/police/federal + shoes = /obj/item/clothing/shoes/vampire/jackboots + suit = /obj/item/clothing/suit/vampire/vest + id = /obj/item/card/lieutenant + r_hand = /obj/item/gun/ballistic/automatic/darkpack/autoshotgun + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpackautoshot = 1, + /obj/item/ammo_box/darkpack/c12g/buck = 1, + /obj/item/knife/vamp = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + /obj/item/megaphone = 1, + ) + +/datum/outfit/job/vampire/ert/national_guard/medic + name = "National Guard Medic" + ears = /obj/item/radio/headset/darkpack/military + glasses = /obj/item/clothing/glasses/vampire/perception + uniform = /obj/item/clothing/under/vampire/military_fatigues + gloves = /obj/item/clothing/gloves/vampire/latex + r_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/vamp/keys/police/federal + shoes = /obj/item/clothing/shoes/vampire/jackboots + belt = /obj/item/defibrillator/compact/loaded + suit = /obj/item/clothing/suit/vampire/labcoat/director + head = /obj/item/clothing/head/beret + id = /obj/item/card/first_aid + r_hand = /obj/item/gun/ballistic/automatic/darkpack/mp5 + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack9mp5 = 1, + /obj/item/storage/medkit/darkpack/doctor = 1, + /obj/item/storage/medkit/darkpack/combat = 1, + /obj/item/storage/medkit/darkpack/burn = 1, + /obj/item/storage/medkit/darkpack/brute = 1, + ) + +/datum/outfit/job/vampire/ert/national_guard/rifleman + name = "National Guard Rifleman" + ears = /obj/item/radio/headset/darkpack/military + uniform = /obj/item/clothing/under/vampire/military_fatigues + mask = /obj/item/clothing/mask/vampire/balaclava + gloves = /obj/item/clothing/gloves/vampire/work + r_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/ammo_box/magazine/darkpackaug + shoes = /obj/item/clothing/shoes/vampire/jackboots + belt = /obj/item/gun/ballistic/automatic/darkpack/aug + suit = /obj/item/clothing/suit/vampire/vest/army + head = /obj/item/clothing/head/vampire/army + id = /obj/item/card/swat + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpackaug = 1, + /obj/item/grenade/frag = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/grenade/smokebomb = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + ) + +/datum/outfit/job/vampire/ert/national_guard/explosives + name = "National Guard Explosives Expert" + ears = /obj/item/radio/headset/darkpack/military + uniform = /obj/item/clothing/under/vampire/military_fatigues + gloves = /obj/item/clothing/gloves/vampire/work + r_pocket = /obj/item/lighter + shoes = /obj/item/clothing/shoes/vampire/jackboots + suit = /obj/item/clothing/suit/vampire/eod + head = /obj/item/clothing/head/vampire/eod + id = /obj/item/card/swat + backpack_contents = list( + /obj/item/grenade/frag = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/grenade/smokebomb = 1, + /obj/item/molotov = 1, + /obj/item/gun/ballistic/revolver/grenadelauncher = 1, + /obj/item/gun/ballistic/automatic/darkpack/uzi = 1, + /obj/item/liquid_flamethrower = 1, + ) + +/datum/outfit/job/vampire/ert/national_guard/marksman + name = "National Guard Marksman" + ears = /obj/item/radio/headset/darkpack/military + glasses = /obj/item/clothing/glasses/vampire/sun + uniform = /obj/item/clothing/under/vampire/military_fatigues + gloves = /obj/item/clothing/gloves/vampire/work + r_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/ammo_box/magazine/m9mm + shoes = /obj/item/clothing/shoes/vampire/jackboots + suit = /obj/item/clothing/suit/vampire/vest/army + head = /obj/item/clothing/head/beret + id = /obj/item/card/swat + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack556 = 1, + /obj/item/ammo_box/magazine/m9mm = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + /obj/item/binoculars = 1, + /obj/item/gun/ballistic/automatic/darkpack/autosniper = 1, + /obj/item/gun/ballistic/automatic/pistol/darkpack/beretta = 1, + ) + diff --git a/modular_darkpack/modules/ert/code/outfits/swat_outfits.dm b/modular_darkpack/modules/ert/code/outfits/swat_outfits.dm new file mode 100644 index 000000000000..34ca0575474f --- /dev/null +++ b/modular_darkpack/modules/ert/code/outfits/swat_outfits.dm @@ -0,0 +1,84 @@ +/datum/outfit/job/vampire/swat_rifleman + name = "Swat Rifleman" + ears = /obj/item/radio/headset/darkpack/police + uniform = /obj/item/clothing/under/vampire/police/utility + gloves = /obj/item/clothing/gloves/fingerless + l_pocket = /obj/item/vamp/keys/police + suit_store = /obj/item/flashlight/seclite + shoes = /obj/item/clothing/shoes/vampire/jackboots + belt = /obj/item/storage/belt/police/swat/full + suit = /obj/item/clothing/suit/vampire/vest + head = /obj/item/clothing/head/vampire/helmet + id = /obj/item/card/swat + r_hand = /obj/item/gun/ballistic/automatic/darkpack/ar15 + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack556 = 2, + /obj/item/grenade/frag = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/grenade/smokebomb = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + /obj/item/restraints/handcuffs = 1, + ) + +/datum/outfit/job/vampire/swat_lieutenant + name = "Swat Lieutenant" + ears = /obj/item/radio/headset/darkpack/police + glasses = /obj/item/clothing/glasses/vampire/sun + uniform = /obj/item/clothing/under/vampire/police/utility + gloves = /obj/item/clothing/gloves/fingerless + l_pocket = /obj/item/vamp/keys/police/secure/captain + suit_store = /obj/item/flashlight/seclite + shoes = /obj/item/clothing/shoes/vampire/jackboots + belt = /obj/item/storage/belt/police/swat/full + suit = /obj/item/clothing/suit/vampire/trench/armored + head = /obj/item/clothing/head/hats/hos/beret + id = /obj/item/card/lieutenant + r_hand = /obj/item/gun/ballistic/automatic/pistol/darkpack/deagle/c50 + backpack_contents = list( + /obj/item/ammo_box/magazine/m50 = 2, + /obj/item/grenade/frag = 1, + /obj/item/grenade/flashbang = 1, + /obj/item/grenade/smokebomb = 1, + /obj/item/storage/medkit/darkpack/ifak = 1, + /obj/item/storage/box/handcuffs = 1, + ) + +/datum/outfit/job/vampire/swat_medic + name = "Swat Field Medic" + ears = /obj/item/radio/headset/darkpack/police + glasses = /obj/item/clothing/glasses/vampire/perception + uniform = /obj/item/clothing/under/vampire/police/utility + gloves = /obj/item/clothing/gloves/vampire/latex + l_pocket = /obj/item/vamp/keys/police + suit_store = /obj/item/flashlight/seclite + shoes = /obj/item/clothing/shoes/vampire/jackboots + belt = /obj/item/defibrillator/compact/loaded + suit = /obj/item/clothing/suit/vampire/labcoat + head = /obj/item/clothing/head/vampire/helmet + id = /obj/item/card/first_aid + r_hand = /obj/item/gun/ballistic/automatic/darkpack/mp5 + backpack_contents = list( + /obj/item/ammo_box/magazine/darkpack9mp5 = 2, + /obj/item/storage/medkit/darkpack/doctor = 1, + /obj/item/storage/medkit/darkpack/combat = 1, + /obj/item/storage/medkit/darkpack/burn = 1, + /obj/item/storage/medkit/darkpack/brute = 1, + ) + +/datum/outfit/job/vampire/swat_negotiator + name = "SWAT Negotiations Expert" + ears = /obj/item/radio/headset/darkpack/police + uniform = /obj/item/clothing/under/vampire/suit + l_pocket = /obj/item/vamp/keys/police + shoes = /obj/item/clothing/shoes/vampire + id = /obj/item/card/swat + r_hand = /obj/item/gun/ballistic/automatic/darkpack/sniper // for when negotiations go south. + backpack_contents = list( + /obj/item/clothing/under/vampire/suit/female = 1, + /obj/item/stack/dollar/thousand = 1, + /obj/item/ammo_box/darkpack/c50 = 1, + /obj/item/reagent_containers/cup/glass/coffee/vampire = 1, + /obj/item/food/cookie = 1, // cookies but no milk. these are gonna be some hard negotiations. + /obj/item/megaphone = 1, + /obj/item/flashlight/seclite = 1, + ) diff --git a/modular_darkpack/modules/ert/code/pentex_ert_roles.dm b/modular_darkpack/modules/ert/code/pentex_ert_roles.dm new file mode 100644 index 000000000000..02f7d972fb0d --- /dev/null +++ b/modular_darkpack/modules/ert/code/pentex_ert_roles.dm @@ -0,0 +1,34 @@ +/datum/antagonist/ert/darkpack/pentex/leader + name = "Squad Leader" + outfit = /datum/outfit/job/vampire/ert/pentex + role = "Sergeant" + +/datum/antagonist/ert/darkpack/pentex/medic + name = "Field Medic" + outfit = /datum/outfit/job/vampire/ert/pentex/medic + role = "Field Medic" + +/datum/antagonist/ert/darkpack/pentex/exterminator + name = "Exterminator" + outfit = /datum/outfit/job/vampire/ert/pentex/exterminator + role = "Exterminator" + +/datum/antagonist/ert/darkpack/pentex/specialist + name = "Breaching Specialist" + outfit = /datum/outfit/job/vampire/ert/pentex/specialist + role = "Specialist" + +/datum/antagonist/ert/darkpack/pentex/budget_leader + name = "Evaluation Officer" + outfit = /datum/outfit/job/vampire/ert/pentex_budget + role = "Evaluation Officer" + +/datum/antagonist/ert/darkpack/pentex/budget_intern + name = "Unpaid Intern" + outfit = /datum/outfit/job/vampire/ert/pentex_budget/intern + role = "Intern" + +/datum/antagonist/ert/darkpack/pentex/budget_medic + name = "Unpaid Intern Medic" + outfit = /datum/outfit/job/vampire/ert/pentex_budget/medic + role = "Medical Intern" diff --git a/modular_darkpack/modules/ert/code/swat.dm b/modular_darkpack/modules/ert/code/swat.dm new file mode 100644 index 000000000000..d48abfa10df5 --- /dev/null +++ b/modular_darkpack/modules/ert/code/swat.dm @@ -0,0 +1,19 @@ +/datum/antagonist/ert/darkpack/swat/leader + name = "SWAT Lieutenant" + outfit = /datum/outfit/job/vampire/swat_lieutenant + role = "SWAT Lieutenant" + +/datum/antagonist/ert/darkpack/swat/medic + name = "SWAT Field Medic" + outfit = /datum/outfit/job/vampire/swat_medic + role = "SWAT Field Medic" + +/datum/antagonist/ert/darkpack/swat/rifleman + name = "SWAT Rifleman" + outfit = /datum/outfit/job/vampire/swat_rifleman + role = "SWAT Rifleman" + +/datum/antagonist/ert/darkpack/swat/negotiations + name = "SWAT Negotiations Expert" + outfit = /datum/outfit/job/vampire/swat_negotiator + role = "SWAT Negotiations Expert" diff --git a/modular_darkpack/modules/ert/code/team.dm b/modular_darkpack/modules/ert/code/team.dm new file mode 100644 index 000000000000..97df12882279 --- /dev/null +++ b/modular_darkpack/modules/ert/code/team.dm @@ -0,0 +1,30 @@ +/datum/ert/darkpack + abstract_type = /datum/ert/darkpack + +/datum/ert/darkpack/swat + leader_role = /datum/antagonist/ert/darkpack/swat/leader + roles = list(/datum/antagonist/ert/darkpack/swat/medic, /datum/antagonist/ert/darkpack/swat/rifleman, /datum/antagonist/ert/darkpack/swat/negotiations) + rename_team = "SWAT Unit" + mission = "Assess the situation and assist the Police Department. Ensure that law and order is restored in the City." + polldesc = "the City's Special Weapons and Tactics Unit" + +/datum/ert/darkpack/national_guard + leader_role = /datum/antagonist/ert/darkpack/national_guard/leader + roles = list(/datum/antagonist/ert/darkpack/national_guard/medic, /datum/antagonist/ert/darkpack/national_guard/rifleman, /datum/antagonist/ert/darkpack/national_guard/explosives) + rename_team = "National Guard Platoon" + mission = "Stabilize the area. Establish a curfew. Disperse the riots. Ensure safety and restore order immediately - by any means." + polldesc = "the National Guard Emergency Response Unit" + +/datum/ert/darkpack/pentex + leader_role = /datum/antagonist/ert/darkpack/pentex/leader + roles = list(/datum/antagonist/ert/darkpack/pentex/medic, /datum/antagonist/ert/darkpack/pentex/exterminator, /datum/antagonist/ert/darkpack/pentex/specialist) + rename_team = "First Team" + mission = "Liquidate all hostile anomolous entities" + polldesc = "an elite FIRST Team" + +/datum/ert/darkpack/pentex/budget + leader_role = /datum/antagonist/ert/darkpack/pentex/budget_leader + roles = list(/datum/antagonist/ert/darkpack/pentex/budget_intern, /datum/antagonist/ert/darkpack/pentex/budget_medic) + rename_team = "First Team" //For when you need a death-squad on a budget + mission = "Remove all hostile anomolous entities" + polldesc = "an 'elite' FIRST Team" diff --git a/modular_darkpack/modules/ert/icons/48x32weapons.dmi b/modular_darkpack/modules/ert/icons/48x32weapons.dmi new file mode 100644 index 000000000000..e22880c27f1a Binary files /dev/null and b/modular_darkpack/modules/ert/icons/48x32weapons.dmi differ diff --git a/modular_darkpack/modules/ert/icons/ammo.dmi b/modular_darkpack/modules/ert/icons/ammo.dmi new file mode 100644 index 000000000000..f2bf90d8cdfc Binary files /dev/null and b/modular_darkpack/modules/ert/icons/ammo.dmi differ diff --git a/modular_darkpack/modules/ert/icons/badges.dmi b/modular_darkpack/modules/ert/icons/badges.dmi new file mode 100644 index 000000000000..dc6836811e5e Binary files /dev/null and b/modular_darkpack/modules/ert/icons/badges.dmi differ diff --git a/modular_darkpack/modules/ert/icons/badges_onfloor.dmi b/modular_darkpack/modules/ert/icons/badges_onfloor.dmi new file mode 100644 index 000000000000..f06fb56ec1f3 Binary files /dev/null and b/modular_darkpack/modules/ert/icons/badges_onfloor.dmi differ diff --git a/modular_darkpack/modules/ert/icons/clothing.dmi b/modular_darkpack/modules/ert/icons/clothing.dmi new file mode 100644 index 000000000000..13460812df4c Binary files /dev/null and b/modular_darkpack/modules/ert/icons/clothing.dmi differ diff --git a/modular_darkpack/modules/ert/icons/lefthand.dmi b/modular_darkpack/modules/ert/icons/lefthand.dmi new file mode 100644 index 000000000000..702f8a019b75 Binary files /dev/null and b/modular_darkpack/modules/ert/icons/lefthand.dmi differ diff --git a/modular_darkpack/modules/ert/icons/medical.dmi b/modular_darkpack/modules/ert/icons/medical.dmi new file mode 100644 index 000000000000..0451ab4a0e53 Binary files /dev/null and b/modular_darkpack/modules/ert/icons/medical.dmi differ diff --git a/modular_darkpack/modules/ert/icons/onfloor.dmi b/modular_darkpack/modules/ert/icons/onfloor.dmi new file mode 100644 index 000000000000..02f64283c486 Binary files /dev/null and b/modular_darkpack/modules/ert/icons/onfloor.dmi differ diff --git a/modular_darkpack/modules/ert/icons/righthand.dmi b/modular_darkpack/modules/ert/icons/righthand.dmi new file mode 100644 index 000000000000..8ba47e602e5e Binary files /dev/null and b/modular_darkpack/modules/ert/icons/righthand.dmi differ diff --git a/modular_darkpack/modules/ert/icons/worn.dmi b/modular_darkpack/modules/ert/icons/worn.dmi new file mode 100644 index 000000000000..fe186cde68a9 Binary files /dev/null and b/modular_darkpack/modules/ert/icons/worn.dmi differ diff --git a/modular_darkpack/modules/ert/sounds/balefire.ogg b/modular_darkpack/modules/ert/sounds/balefire.ogg new file mode 100644 index 000000000000..fc1611c22404 Binary files /dev/null and b/modular_darkpack/modules/ert/sounds/balefire.ogg differ diff --git a/modular_darkpack/modules/ert/sounds/cycling.ogg b/modular_darkpack/modules/ert/sounds/cycling.ogg new file mode 100644 index 000000000000..16431fbf5399 Binary files /dev/null and b/modular_darkpack/modules/ert/sounds/cycling.ogg differ diff --git a/modular_darkpack/modules/ert/sounds/m249fire.ogg b/modular_darkpack/modules/ert/sounds/m249fire.ogg new file mode 100644 index 000000000000..136ea4bdbc19 Binary files /dev/null and b/modular_darkpack/modules/ert/sounds/m249fire.ogg differ diff --git a/modular_darkpack/modules/ert/sounds/m249rack.ogg b/modular_darkpack/modules/ert/sounds/m249rack.ogg new file mode 100644 index 000000000000..a0fa47a40da8 Binary files /dev/null and b/modular_darkpack/modules/ert/sounds/m249rack.ogg differ diff --git a/modular_darkpack/modules/ert/sounds/shell_load.ogg b/modular_darkpack/modules/ert/sounds/shell_load.ogg new file mode 100644 index 000000000000..e157c90404f9 Binary files /dev/null and b/modular_darkpack/modules/ert/sounds/shell_load.ogg differ diff --git a/modular_darkpack/modules/ert/sounds/shotgun_firing.ogg b/modular_darkpack/modules/ert/sounds/shotgun_firing.ogg new file mode 100644 index 000000000000..5db94de7de13 Binary files /dev/null and b/modular_darkpack/modules/ert/sounds/shotgun_firing.ogg differ diff --git a/modular_darkpack/modules/ert/sounds/silenced_rifle.ogg b/modular_darkpack/modules/ert/sounds/silenced_rifle.ogg new file mode 100644 index 000000000000..473b22f78ded Binary files /dev/null and b/modular_darkpack/modules/ert/sounds/silenced_rifle.ogg differ diff --git a/modular_darkpack/modules/flavor_text/code/examine.dm b/modular_darkpack/modules/flavor_text/code/examine.dm index 73938bce8372..8cbcbb9ee47d 100644 --- a/modular_darkpack/modules/flavor_text/code/examine.dm +++ b/modular_darkpack/modules/flavor_text/code/examine.dm @@ -11,12 +11,6 @@ /datum/examine_panel/ui_state(mob/user) return GLOB.always_state -/datum/examine_panel/ui_close(mob/user) - // If this is an examine preview dummy, clean it up. - if(istype(holder, /mob/living/carbon/human/dummy)) - qdel(holder) - - /datum/examine_panel/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -77,15 +71,7 @@ return flavor_text_to_show -/mob/living/carbon/human/dummy/proc/setup_examine_preview(mob/living/carbon/user) - examine_panel_tgui.holder = user - /mob/living/carbon/Topic(href, href_list) if(href_list["view_flavortext"]) - // The examine preview dummy will be cleaned up once the user closes the TGUI window. - var/mob/living/carbon/human/dummy/mannequin = generate_or_wait_for_human_dummy() - if(!mannequin.examine_panel_tgui) - mannequin.examine_panel_tgui = new() - mannequin.setup_examine_preview(src) - mannequin.examine_panel_tgui.ui_interact(usr) - ..() + examine_panel_tgui.ui_interact(usr) + . = ..() diff --git a/modular_darkpack/modules/food/code/drinks.dm b/modular_darkpack/modules/food/code/drinks.dm index 91857b98641e..5990fb7c2667 100644 --- a/modular_darkpack/modules/food/code/drinks.dm +++ b/modular_darkpack/modules/food/code/drinks.dm @@ -30,7 +30,7 @@ icon_state = "beer_blue" list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 25, /datum/reagent/toxin/amatoxin = 5) -// DARKPACK TODO - Typhon's Beer +// DARKPACK TODO - (Typhon's Beer needs an audit of its handling. This looks ass.) /obj/item/reagent_containers/cup/glass/bottle/beer/vampire/typhon name = "Typhon's Beer" desc = "A sanguine drink to sate those of vampiric tastes" @@ -38,6 +38,10 @@ //foodtype = SANGUINE list_reagents = list(/datum/reagent/consumable/ethanol/beer/typhon = 30) +/obj/item/reagent_containers/cup/glass/bottle/beer/vampire/typhon/attack(mob/living/M, mob/user, def_zone) + . = ..() + reagents.trans_to(M, gulp_size, transferred_by = user) + /datum/reagent/consumable/ethanol/beer/typhon name = "Typhon's Beer" description = "An alcoholic beverage brewed with a sicekningly addictive sanguine taste" @@ -55,10 +59,6 @@ M.adjust_blood_pool(1) return ..() -/obj/item/reagent_containers/cup/glass/bottle/beer/vampire/typhon/attack(mob/living/M, mob/user, def_zone) - . = ..() - reagents.trans_to(M, gulp_size, transferred_by = user) - /obj/item/reagent_containers/cup/glass/vampirecola name = "two liter cola bottle" desc = "Coca cola espuma..." diff --git a/modular_darkpack/modules/food/code/recipes.dm b/modular_darkpack/modules/food/code/recipes.dm index 40134234447f..8e7c1df33edd 100644 --- a/modular_darkpack/modules/food/code/recipes.dm +++ b/modular_darkpack/modules/food/code/recipes.dm @@ -8,10 +8,9 @@ /datum/crafting_recipe/typhon_brew/is_recipe_available(mob/user) if(!ishuman(user)) return FALSE - //var/mob/living/carbon/human/H = user - /*for(var/datum/action/A in H.actions) DARKPACK TODO: Serpentis - if(istype(A, /datum/action/discipline/serpentis)) - return TRUE - */ - return FALSE + var/datum/splat/vampire/vampire = does_use_disciplines(user) + if(vampire?.get_discipline_power(/datum/discipline/serpentis)) + return TRUE + + return FALSE diff --git a/modular_darkpack/modules/forensics/code/forensic_gatherer.dm b/modular_darkpack/modules/forensics/code/forensic_gatherer.dm index 3420a7a4436d..a63b2e49357a 100644 --- a/modular_darkpack/modules/forensics/code/forensic_gatherer.dm +++ b/modular_darkpack/modules/forensics/code/forensic_gatherer.dm @@ -65,7 +65,7 @@ // Skill-check for scans var/mob/living/carbon/human/H = user - var/investigation_dice = H.st_get_stat(STAT_PERCEPTION) + H.st_get_stat(STAT_INVESTIGATION) + var/datum/storyteller_roll/investigation/investigate_roll = new() //Minium skill requirement to even use the thing if(H.st_get_stat(STAT_INVESTIGATION) <= 0) @@ -74,8 +74,9 @@ if(ishuman(scanned_atom)) var/mob/living/carbon/human/scanned_human = scanned_atom - var/investigation_roll = SSroll.storyteller_roll(investigation_dice, 3, H, src, TRUE) - if(!investigation_roll > 0) + investigate_roll.difficulty = 3 + var/investigation_roll = investigate_roll.st_roll(user, scanned_human) + if(investigation_roll != ROLL_SUCCESS) log_entry.add_data_entry(DETSCAN_CATEGORY_FINGERS, list("Improper fingerprints; try again.")) else if(!scanned_human.gloves) @@ -86,8 +87,9 @@ else if(!ismob(scanned_atom)) var/list/atom_fingerprints = GET_ATOM_FINGERPRINTS(scanned_atom) - var/investigation_roll = SSroll.storyteller_roll(investigation_dice, 5, H, src, TRUE) - if(!investigation_roll > 0) + investigate_roll.difficulty = 5 + var/investigation_roll = investigate_roll.st_roll(user, scanned_atom) + if(investigation_roll != ROLL_SUCCESS) log_entry.add_data_entry(DETSCAN_CATEGORY_FINGERS, list("Improper gathering; try again.")) else if(length(atom_fingerprints)) @@ -109,9 +111,10 @@ log_entry.add_data_entry(DETSCAN_CATEGORY_BLOOD, list(blood_DNA = blood_type)) if(istype(scanned_atom, /obj/item/ammo_casing)) - var/investigation_roll = SSroll.storyteller_roll(investigation_dice, 7, H, src, TRUE) + investigate_roll.difficulty = 7 + var/investigation_roll = investigate_roll.st_roll(user, scanned_atom) var/obj/item/ammo_casing/casing = scanned_atom - if(!investigation_roll > 0) + if(investigation_roll != ROLL_SUCCESS) log_entry.add_data_entry(DETSCAN_CATEGORY_MICROSTAMP, list("[casing.name] has an incomplete microstamp; you can't make it out.")) else if(casing.serial_type_index) @@ -121,8 +124,9 @@ if(istype(scanned_atom, /obj/item/card/id)) var/obj/item/card/id/user_id = scanned_atom - var/investigation_roll = SSroll.storyteller_roll(investigation_dice, 3, H, src, TRUE) - if(!investigation_roll > 0) + investigate_roll.difficulty = 3 + var/investigation_roll = investigate_roll.st_roll(user, scanned_atom) + if(investigation_roll != ROLL_SUCCESS) log_entry.add_data_entry(DETSCAN_CATEGORY_ACCESS, list("Improper gathering; try again.")) else for(var/region in DETSCAN_ACCESS_ORDER()) diff --git a/modular_darkpack/modules/frenzy/code/frenzy.dm b/modular_darkpack/modules/frenzy/code/frenzy.dm index 0c92e39d15a0..a40a5a9fcc7a 100644 --- a/modular_darkpack/modules/frenzy/code/frenzy.dm +++ b/modular_darkpack/modules/frenzy/code/frenzy.dm @@ -12,7 +12,7 @@ /mob/living/carbon/proc/rollfrenzy() if(client) - if(isgarou(src) || iswerewolf(src)) + if(isgarou(src)) to_chat(src, "I'm full of [span_danger("ANGER")], and I'm about to flare up in [span_danger("RAGE")]. Rolling...") else if(iskindred(src)) to_chat(src, "I need [span_danger("BLOOD")]. The [span_danger("BEAST")] is calling. Rolling...") diff --git a/modular_darkpack/modules/government/code/drivers_license.dm b/modular_darkpack/modules/government/code/drivers_license.dm index f25a6ab547ff..39bf001c543e 100644 --- a/modular_darkpack/modules/government/code/drivers_license.dm +++ b/modular_darkpack/modules/government/code/drivers_license.dm @@ -14,6 +14,7 @@ var/fake = FALSE /// If the NAME does not belong to the person. var/fake_identity = FALSE + var/datum/storyteller_roll/investigation/examine_roll /obj/item/card/drivers_license/Initialize(mapload) . = ..() @@ -43,8 +44,11 @@ /obj/item/card/drivers_license/examine(mob/user) . = ..() - //DARKPACK TODO - STATS - refer to passport.dm, this should be a statcheck to see if its an illegal ID/counterfeit + if(!examine_roll) + examine_roll = new() + examine_roll.reroll_cooldown = 1 SCENES + var/roll_result = examine_roll.st_roll(user, src) if(owner) . += span_notice("It reads as belonging to [owner], issued by the state of [issuing_state].") - if(fake) + if(fake && (roll_result == ROLL_SUCCESS)) . += span_notice("It looks like a crude counterfeit.") diff --git a/modular_darkpack/modules/government/code/passport.dm b/modular_darkpack/modules/government/code/passport.dm index dfac96c3be0f..37bcf6bf42b7 100644 --- a/modular_darkpack/modules/government/code/passport.dm +++ b/modular_darkpack/modules/government/code/passport.dm @@ -1,26 +1,3 @@ -/datum/quirk/illegal_identity - name = "Illegal Identity" - desc = "Illegal immigrant? Died legally? Born a wolf? The cops aren't happy." - value = 0 - quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_HIDE_FROM_SCAN - icon = FA_ICON_PERSON_CIRCLE_QUESTION - mob_trait = TRAIT_ILLEGAL_IDENTITY - gain_text = span_warning("You feel legally unprepared.") - lose_text = span_notice("You feel bureaucratically legitimate.") - medical_record_text = "Patient is not checked in with valid identification." - // excluded_clans = list(CLAN_RAVNOS) // DARKPACK TODO - RAVNOS - (They are forced to take this) - -/datum/quirk/illegal_identity/add() - . = ..() - if(!ishuman(quirk_holder)) - return - var/mob/living/carbon/human/criminal = quirk_holder - var/obj/item/passport/passport = locate() in criminal // In pockets - if(!passport && criminal.back) - passport = locate() in criminal.back // In backpack - if(passport && passport.owner == criminal.real_name) - passport.link_human(criminal) - /datum/loadout_item/pocket_items/passport name = "Identification" item_path = /obj/item/passport @@ -54,6 +31,7 @@ var/fake = FALSE /// If the NAME does not belong to the person. var/fake_identity = FALSE + var/datum/storyteller_roll/investigation/examine_roll /obj/item/passport/Initialize(mapload) . = ..() @@ -87,10 +65,13 @@ /obj/item/passport/examine(mob/user) . = ..() - // DARKPACK TODO - STATS - (Make this a perception+investigation roll when we have retrying check standeridization) + if(!examine_roll) + examine_roll = new() + examine_roll.reroll_cooldown = 1 SCENES + var/roll_result = examine_roll.st_roll(user, src) if(!closed && owner) . += span_notice("It reads as belonging to [owner] from [country_of_origin].") - if(fake) + if(fake && (roll_result == ROLL_SUCCESS)) . += span_notice("It looks like a crude counterfeit.") /obj/item/passport/attack_self(mob/user) diff --git a/modular_darkpack/modules/graveyard/code/graveyard.dm b/modular_darkpack/modules/graveyard/code/graveyard.dm index ceb8f8b997ec..3d28b8b02e32 100644 --- a/modular_darkpack/modules/graveyard/code/graveyard.dm +++ b/modular_darkpack/modules/graveyard/code/graveyard.dm @@ -84,7 +84,7 @@ // is there a nearby vampgate? for(var/obj/structure/vampgate/gate in oview(scan_range, zombie)) - if(!gate.gate_broken) + if(!gate.broken) // theres one, kill it controller.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, gate) controller.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION) @@ -123,6 +123,7 @@ /obj/vampgrave/Initialize(mapload) . = ..() randomize_appearance() + spawn_interval += rand(-10 SECONDS, 10 SECONDS) // Prevent them from all spawning at the same time. addtimer(CALLBACK(src, PROC_REF(try_spawn_zombie)), spawn_interval, TIMER_STOPPABLE | TIMER_LOOP) //they have the indestructible flag so this should never happen but just in case @@ -167,48 +168,51 @@ icon_state += "-snow" /obj/vampgrave/proc/is_outdoors() - if(!istype(get_area(src), /area/vtm)) - return FALSE - var/area/vtm/V = get_area(src) - return V.outdoors + var/area/my_area = get_area(src) + return my_area.outdoors + +// Adminbus or testing +/obj/vampgrave/rapid + name = "upturned grave" + spawn_interval = 30 SECONDS + max_zombies_per_grave = 1 /obj/structure/vampgate - name = "Graveyard Gate" + name = "graveyard gate" desc = "It opens and closes." icon = 'modular_darkpack/modules/graveyard/icons/gate.dmi' icon_state = "gate" - pixel_w = -32 + pixel_x = -32 + base_pixel_x = -32 anchored = TRUE density = TRUE - opacity = FALSE - resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF | INDESTRUCTIBLE max_integrity = 500 + prevent_destruction = TRUE var/repairing = FALSE - var/gate_broken = FALSE /obj/structure/vampgate/Initialize(mapload) . = ..() - atom_integrity = max_integrity + var/turf/right_turf = get_step(src, EAST) + var/turf/left_turf = get_step(src, WEST) + if(right_turf) + right_turf.set_density(TRUE) + if(left_turf) + left_turf.set_density(TRUE) /obj/structure/vampgate/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0) - // dont take more damage if its already broken - if(gate_broken) - return - - // manually reduce integrity, if we dont do this and rely only on parent functions, it will qdel at < 0 integrity - atom_integrity = max(0, atom_integrity - damage_amount) - - if(sound_effect) - playsound(get_turf(src), 'modular_darkpack/master_files/sounds/effects/door/get_bent.ogg', 100, FALSE) + . = ..() + if(!broken) + if(sound_effect) + playsound(get_turf(src), 'modular_darkpack/master_files/sounds/effects/door/get_bent.ogg', 100, FALSE) - shake_gate() + shake_gate() - if(atom_integrity <= 0) - break_open() + if(atom_integrity <= 0) + break_open() /obj/structure/vampgate/atom_destruction(damage_flag) - .=..() + . = ..() break_open() /obj/structure/vampgate/proc/shake_gate() @@ -221,41 +225,20 @@ pixel_w = initial(pixel_w) /obj/structure/vampgate/proc/break_open() - if(gate_broken) + if(broken) return - gate_broken = TRUE + broken = TRUE density = FALSE icon_state = "gate-open" - atom_integrity = 0 visible_message(span_boldwarning("[src] breaks open!")) -/obj/structure/vampgate/examine(mob/user) - . = ..() - - if(gate_broken) - . += span_boldwarning("The gate is broken open!") - return - - var/health_percent = round(get_integrity_percentage() * 100) - - switch(health_percent) - if(0 to 25) - . += span_boldwarning("Integrity: [atom_integrity]/[max_integrity] - Critically damaged!") - if(26 to 50) - . += span_warning("Integrity: [atom_integrity]/[max_integrity] - Heavily damaged") - if(51 to 75) - . += span_notice("Integrity: [atom_integrity]/[max_integrity] - Moderately damaged") - if(76 to INFINITY) - . += span_notice("Integrity: [atom_integrity]/[max_integrity] - Good condition") - /obj/structure/vampgate/item_interaction(mob/living/user, obj/item/tool, list/modifiers) - . = ..() if(istype(tool, /obj/item/melee/vamp/tire)) attempt_repair(user) - return TRUE + return ITEM_INTERACT_SUCCESS - return ..() + return NONE /obj/structure/vampgate/proc/attempt_repair(mob/living/user) if(repairing) @@ -271,8 +254,8 @@ if(do_after(user, 5 SECONDS, src)) repair_damage(50) - if(atom_integrity > 0 && gate_broken) - gate_broken = FALSE + if(atom_integrity > 0 && broken) + broken = FALSE density = TRUE icon_state = "gate" visible_message(span_notice("[src] is repaired and closed!")) diff --git a/modular_darkpack/modules/guestbook/code/adjective_preference.dm b/modular_darkpack/modules/guestbook/code/adjective_preference.dm index 183f81d93dbd..31fec0260dc4 100644 --- a/modular_darkpack/modules/guestbook/code/adjective_preference.dm +++ b/modular_darkpack/modules/guestbook/code/adjective_preference.dm @@ -1,5 +1,5 @@ /datum/preference/choiced/adjective_preference - category = PREFERENCE_CATEGORY_SECONDARY_FEATURES + category = PREFERENCE_CATEGORY_NON_CONTEXTUAL priority = PREFERENCE_PRIORITY_TABLETOP savefile_key = "adjective_preference" savefile_identifier = PREFERENCE_CHARACTER diff --git a/modular_darkpack/modules/guestbook/code/human_helpers.dm b/modular_darkpack/modules/guestbook/code/human_helpers.dm index da8d60536b37..193fd0198676 100644 --- a/modular_darkpack/modules/guestbook/code/human_helpers.dm +++ b/modular_darkpack/modules/guestbook/code/human_helpers.dm @@ -7,6 +7,9 @@ visible_gender = "Woman" else visible_gender = "Person" + if(dna?.species.visible_gender_override) + visible_gender = dna.species.visible_gender_override + return visible_gender /mob/living/carbon/human/proc/get_age() diff --git a/modular_darkpack/modules/jobs/code/clinic/doctor.dm b/modular_darkpack/modules/jobs/code/clinic/doctor.dm index ba3411275641..175e8f57871f 100644 --- a/modular_darkpack/modules/jobs/code/clinic/doctor.dm +++ b/modular_darkpack/modules/jobs/code/clinic/doctor.dm @@ -16,7 +16,7 @@ ) description = "Help your fellow kindred in all matters medicine related. Sell blood. Keep your human colleagues ignorant." - allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE) + allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE) allowed_clans = list(VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_SALUBRI, VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_KIASYD) known_contacts = list("Clinic Director") diff --git a/modular_darkpack/modules/jobs/code/event/national_guard.dm b/modular_darkpack/modules/jobs/code/event/national_guard.dm deleted file mode 100644 index 30e1a66fe572..000000000000 --- a/modular_darkpack/modules/jobs/code/event/national_guard.dm +++ /dev/null @@ -1,217 +0,0 @@ -/datum/outfit/job/vampire/national_guard - name = "National Guard Soldier" - ears = /obj/item/radio/headset/darkpack/military - uniform = /obj/item/clothing/under/vampire/military_fatigues - mask = /obj/item/clothing/mask/vampire/balaclava - r_pocket = /obj/item/flashlight - l_pocket = /obj/item/ammo_box/magazine/darkpackaug - shoes = /obj/item/clothing/shoes/vampire/jackboots - belt = /obj/item/gun/ballistic/automatic/darkpack/aug - suit = /obj/item/clothing/suit/vampire/vest/army - head = /obj/item/clothing/head/vampire/army - backpack_contents = list( - /obj/item/ammo_box/magazine/darkpackaug = 3, - /obj/item/gun/ballistic/automatic/pistol/darkpack/beretta = 1 - ) - -/datum/antagonist/national_guard/proc/equip_national_guard() - var/list/landmarkslist = list() - for(var/obj/effect/landmark/start/S in GLOB.start_landmarks_list) - if(S.name == name) - landmarkslist += S - var/mob/living/carbon/human/H = new(pick(landmarkslist)) - H.equipOutfit(national_guard_outfit) - H.st_set_stat(5, STAT_STAMINA) - H.st_set_stat(5, STAT_LARCENY) - H.st_set_stat(4, STAT_STRENGTH) - H.ignores_warrant = TRUE - -/datum/antagonist/national_guard/proc/offer_loadout() - var/list/loadouts = list( - "Flamethrower", - "EOD", - "Medic", - "Sniper", - "Ammo Carrier" - ) - var/loadout_type = input(owner.current, "Choose your loadout:", "Loadout Selection") in loadouts - switch(loadout_type) - if("Flamethrower") - owner.current.put_in_r_hand(new /obj/item/liquid_flamethrower(owner.current)) - owner.current.put_in_l_hand(new /obj/item/gas_can/full(owner.current)) - if("EOD") - owner.current.put_in_r_hand(new /obj/item/clothing/suit/vampire/eod(owner.current)) - owner.current.put_in_l_hand(new /obj/item/clothing/head/vampire/eod(owner.current)) - if("Medic") - owner.current.put_in_r_hand(new /obj/item/storage/medkit/darkpack/combat(owner.current)) - if("Sniper") - owner.current.put_in_r_hand(new /obj/item/gun/ballistic/automatic/darkpack/sniper(owner.current)) - owner.current.put_in_l_hand(new /obj/item/ammo_box/darkpack/c556(owner.current)) - if("Ammo Carrier") - owner.current.put_in_r_hand(new /obj/item/ammo_box/darkpack/c556/incendiary(owner.current)) - owner.current.put_in_l_hand(new /obj/item/ammo_box/darkpack/c556/incendiary(owner.current)) - -/datum/antagonist/national_guard - name = "National Guard" - roundend_category = "national guard" - antagpanel_category = "National Guard" - pref_flag = ROLE_NATIONAL_GUARD - antag_hud_name = "synd" - antag_moodlet = /datum/mood_event/focused - show_to_ghosts = TRUE - var/always_new_team = FALSE - var/datum/team/national_guard/national_guard_team - var/national_guard_outfit = /datum/outfit/job/vampire/national_guard - var/custom_objective - -/datum/antagonist/national_guard/sergeant - name = "National Guard Sergeant" - always_new_team = TRUE - var/title - -/datum/antagonist/national_guard/on_gain() - var/mob/living/carbon/human/guard_character = owner.current - guard_character.randomize_human_appearance() - forge_objectives() - equip_national_guard() - give_alias() - offer_loadout() - return ..() - -/datum/antagonist/national_guard/on_removal() - ..() - to_chat(owner.current, span_userdanger("You are no longer in the National Guard!")) - -/datum/antagonist/national_guard/greet() - to_chat(owner.current, span_alertsyndie("You're in the national guard.")) - to_chat(owner, span_notice("You are a [national_guard_team ? national_guard_team.national_guard_name : "national guard"] soldier!")) - owner.announce_objectives() - - -/datum/antagonist/national_guard/proc/give_alias() - var/my_name = "Tyler" - var/list/military_ranks = list("Private", "Private First Class", "Specialist", "Corporal") - var/selected_rank = pick(military_ranks) - if(owner.current.gender == MALE) - my_name = pick(GLOB.first_names_male) - else - my_name = pick(GLOB.first_names_female) - var/my_surname = pick(GLOB.last_names) - owner.current.fully_replace_character_name(null,"[selected_rank] [my_name] [my_surname]") - -/datum/antagonist/national_guard/forge_objectives() - spawn(2 SECONDS) - if(national_guard_team) - objectives |= national_guard_team.objectives - -/datum/antagonist/national_guard/sergeant/give_alias() - var/my_name = "Tyler" - if(owner.current.gender == MALE) - my_name = pick(GLOB.first_names_male) - else - my_name = pick(GLOB.first_names_female) - var/my_surname = pick(GLOB.last_names) - owner.current.fully_replace_character_name(null,"Sergeant [my_name] [my_surname]") - -/datum/team/national_guard/antag_listing_name() - if(national_guard_name) - return "[national_guard_name] Soldiers" - else - return "Soldiers" - - -/datum/antagonist/national_guard/sergeant/greet() - to_chat(owner, "You are the leading sergeant for this mission. You are responsible for guiding your team's operation.") - to_chat(owner, "If you feel you are not up to this task, give your command to another soldier.") - owner.announce_objectives() - addtimer(CALLBACK(src, PROC_REF(national_guardteam_name_assign)), 1) - -/datum/antagonist/national_guard/sergeant/proc/national_guardteam_name_assign() - if(!national_guard_team) - return - national_guard_team.rename_team(ask_name()) - -/datum/antagonist/national_guard/sergeant/proc/ask_name() - var/randomname = pick(GLOB.last_names) - var/newname = stripped_input(owner.current,"You are the sergeant. Please choose a name for your team.", "Name change",randomname) - if (!newname) - newname = randomname - else - newname = reject_bad_name(newname) - if(!newname) - newname = randomname - -/datum/antagonist/national_guard/create_team(datum/team/national_guard/new_team) - if(!new_team) - if(!always_new_team) - for(var/datum/antagonist/national_guard/N in GLOB.antagonists) - if(!N.owner) - stack_trace("Antagonist datum without owner in GLOB.antagonists: [N]") - continue - national_guard_team = new /datum/team/national_guard - national_guard_team.update_objectives() - return - if(!istype(national_guard_team)) - stack_trace("Wrong team type passed to [type] initialization.") - national_guard_team = new_team - -/datum/antagonist/national_guard/admin_add(datum/mind/new_owner,mob/admin) - new_owner.assigned_role = ROLE_NATIONAL_GUARD - new_owner.add_antag_datum(src) - message_admins("[key_name_admin(admin)] has national guard'd [key_name_admin(new_owner)].") - log_admin("[key_name(admin)] has national guard'd [key_name(new_owner)].") - -/datum/team/national_guard/proc/rename_team(new_name) - national_guard_name = new_name - name = "[national_guard_name] Team" - -/datum/objective/national_guard - name = "national_guard" - explanation_text = "Follow the orders of your sergeant." - martyr_compatible = TRUE - -/proc/national_guard_name() - var/name = "" - - // Prefix - name += pick("Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu") - - // Suffix - if (prob(80)) - name += " " - - // Full - if(prob(60)) - name += pick("Squad", "Team", "Unit", "Group", "Section", "Element", "Detachment") - // Broken - else - name += pick("-", "*", "") - name += "Ops" - -/datum/team/national_guard - var/national_guard_name - var/core_objective = /datum/objective/national_guard - member_name = "National Guard Operative" - var/memorized_code - var/list/team_discounts - var/obj/item/nuclear_challenge/war_button - -/datum/team/national_guard/New() - ..() - national_guard_name = national_guard_name() - -/datum/team/national_guard/proc/update_objectives() - if(core_objective) - var/datum/objective/O = new core_objective - O.team = src - objectives += O - -/datum/team/national_guard/roundend_report() - var/list/parts = list() - parts += span_header("[national_guard_name] Operatives:") - - var/text = "
[span_header("The national guard were:")]" - text += printplayerlist(members) - parts += text - - return "
[parts.Join("
")]
"
diff --git a/modular_darkpack/modules/jobs/code/event/swat.dm b/modular_darkpack/modules/jobs/code/event/swat.dm
deleted file mode 100644
index d5bc506a5abb..000000000000
--- a/modular_darkpack/modules/jobs/code/event/swat.dm
+++ /dev/null
@@ -1,196 +0,0 @@
-/datum/outfit/job/vampire/swat
- name = "Swat Officer"
- ears = /obj/item/radio/headset/darkpack/police
- uniform = /obj/item/clothing/under/vampire/police/utility
- mask = /obj/item/clothing/mask/vampire/balaclava
- r_pocket = /obj/item/flashlight
- l_pocket = /obj/item/vamp/keys/police
- shoes = /obj/item/clothing/shoes/vampire/jackboots
- belt = /obj/item/storage/belt/security/police/swat
- suit = /obj/item/clothing/suit/vampire/vest/police
- head = /obj/item/clothing/head/vampire/helmet
- id = /obj/item/card/police
- backpack_contents = list(
- /obj/item/ammo_box/magazine/darkpack556 = 4,
- /obj/item/storage/medkit/darkpack/ifak = 1,
- /obj/item/vamp/keys/hack=2
- )
- r_hand = /obj/item/gun/ballistic/automatic/darkpack/ar15
-
-/datum/antagonist/swat/proc/equip_swat()
- var/list/landmarkslist = list()
- for(var/obj/effect/landmark/start/S in GLOB.start_landmarks_list)
- if(S.name == name)
- landmarkslist += S
- var/mob/living/carbon/human/H = new(pick(landmarkslist))
- H.equipOutfit(swat_outfit)
- H.st_set_stat(5, STAT_LARCENY)
- H.st_set_stat(4, STAT_STRENGTH)
- H.ignores_warrant = TRUE
-
-/datum/antagonist/swat
- name = "Swat Officer"
- roundend_category = "Swat"
- antagpanel_category = "Swat"
- pref_flag = ROLE_SWAT
- antag_hud_name = "synd"
- antag_moodlet = /datum/mood_event/focused
- show_to_ghosts = TRUE
- var/always_new_team = FALSE
- var/datum/team/swat/swat_team
- var/swat_outfit = /datum/outfit/job/vampire/swat
- var/custom_objective
-
-/datum/antagonist/swat/team_leader
- name = "Swat Team Leader"
- always_new_team = TRUE
- var/title
-
-/datum/antagonist/swat/on_gain()
- var/mob/living/carbon/human/swat_character = owner.current
- swat_character.randomize_human_appearance()
- forge_objectives()
- equip_swat()
- give_alias()
- return ..()
-
-/datum/antagonist/swat/on_removal()
- ..()
- to_chat(owner.current,span_userdanger("You are no longer in the Special Weapons and Tactics squad!"))
-
-/datum/antagonist/swat/greet()
- to_chat(owner.current, span_alertsyndie("You're in the Special Weapons and Tactics squad."))
- to_chat(owner, span_notice("You are a [swat_team ? swat_team.swat_name : "swat"] officer!"))
- spawn(3 SECONDS)
- owner.announce_objectives()
-
-
-/datum/antagonist/swat/proc/give_alias()
- var/my_name = "Tyler"
- var/list/swat_ranks = list("Private", "Private First Class", "Lance Corporal", "Corporal")
- var/selected_rank = pick(swat_ranks)
- if(owner.current.gender == MALE)
- my_name = pick(GLOB.first_names_male)
- else
- my_name = pick(GLOB.first_names_female)
- var/my_surname = pick(GLOB.last_names)
- owner.current.fully_replace_character_name(null,"[selected_rank] [my_name] [my_surname]")
-
-/datum/antagonist/swat/forge_objectives()
- spawn(2 SECONDS)
- if(swat_team)
- objectives |= swat_team.objectives
-
-/datum/antagonist/swat/leader/give_alias()
- var/my_name = "Tyler"
- if(owner.current.gender == MALE)
- my_name = pick(GLOB.first_names_male)
- else
- my_name = pick(GLOB.first_names_female)
- var/my_surname = pick(GLOB.last_names)
- owner.current.fully_replace_character_name(null,"Squad Leader [my_name] [my_surname]")
-
-/datum/team/swat/antag_listing_name()
- if(swat_name)
- return "[swat_name] Officers"
- else
- return "Officers"
-
-
-/datum/antagonist/swat/leader/greet()
- to_chat(owner, "You are the SWAT Officer in charge of this mission. You are responsible for guiding your team's operation.")
- to_chat(owner, "If you feel you are not up to this task, give your command to another officer.")
- spawn(3 SECONDS)
- owner.announce_objectives()
- addtimer(CALLBACK(src, PROC_REF(swatteam_name_assign)), 1)
-
-/datum/antagonist/swat/leader/proc/swatteam_name_assign()
- if(!swat_team)
- return
- swat_team.rename_team(ask_name())
-
-/datum/antagonist/swat/leader/proc/ask_name()
- var/randomname = pick(GLOB.last_names)
- var/newname = stripped_input(owner.current,"You are the squa leader. Please choose a name for your team.", "Name change",randomname)
- if (!newname)
- newname = randomname
- else
- newname = reject_bad_name(newname)
- if(!newname)
- newname = randomname
-
-/datum/antagonist/swat/create_team(datum/team/swat/new_team)
- if(!new_team)
- if(!always_new_team)
- for(var/datum/antagonist/swat/N in GLOB.antagonists)
- if(!N.owner)
- stack_trace("Antagonist datum without owner in GLOB.antagonists: [N]")
- continue
- swat_team = new /datum/team/swat
- swat_team.update_objectives()
- return
- if(!istype(swat_team))
- stack_trace("Wrong team type passed to [type] initialization.")
- swat_team = new_team
-
-/datum/antagonist/swat/admin_add(datum/mind/new_owner,mob/admin)
- new_owner.assigned_role = ROLE_SWAT
- new_owner.add_antag_datum(src)
- message_admins("[key_name_admin(admin)] has swat'd [key_name_admin(new_owner)].")
- log_admin("[key_name(admin)] has swat'd [key_name(new_owner)].")
-
-/datum/team/swat/proc/rename_team(new_name)
- swat_name = new_name
- name = "[swat_name] Team"
-
-/proc/swat_name()
- var/name = ""
-
- // Prefix
- name += pick("Alpha", "Bravo", "Charlie", "Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet", "Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec", "Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray", "Yankee", "Zulu")
-
- // Suffix
- if (prob(80))
- name += " "
-
- // Full
- if(prob(60))
- name += pick("Squad", "Team", "Unit", "Group", "Section", "Element", "Detachment")
- // Broken
- else
- name += pick("-", "*", "")
- name += "Ops"
-
- return name
-
-/datum/objective/swat
- name = "swat"
- explanation_text = "Follow the orders of your commander."
- martyr_compatible = TRUE
-
-/datum/team/swat
- var/swat_name
- var/core_objective = /datum/objective/swat
- member_name = "Swat Officer"
-
-/datum/team/swat/New()
- ..()
- swat_name = swat_name()
-
-/datum/team/swat/proc/update_objectives()
- if(core_objective)
- var/datum/objective/O = new core_objective
- O.team = src
- objectives += O
-
-
-/datum/team/swat/roundend_report()
- var/list/parts = list()
- parts += span_header("[swat_name] Operatives:")
-
- var/text = "")]
[span_header("The SWAT were:")]" - text += printplayerlist(members) - parts += text - - return "
[parts.Join("
")]
"
-
diff --git a/modular_darkpack/modules/jobs/code/giovanni/capo.dm b/modular_darkpack/modules/jobs/code/giovanni/capo.dm
index 40ade8f21a6a..e70669df1218 100644
--- a/modular_darkpack/modules/jobs/code/giovanni/capo.dm
+++ b/modular_darkpack/modules/jobs/code/giovanni/capo.dm
@@ -29,4 +29,4 @@
shoes = /obj/item/clothing/shoes/vampire
l_pocket = /obj/item/smartphone/giovanni_capo
r_pocket = /obj/item/vamp/keys/capo
- backpack_contents = list(/obj/item/card/credit/giovanniboss=1)
+ backpack_contents = list(/obj/item/card/credit/giovanniboss=1, /obj/item/ritual_tome/necromancy=1)
diff --git a/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm b/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm
index 2ee63358a3c5..5cdf8adc54b0 100644
--- a/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm
+++ b/modular_darkpack/modules/jobs/code/giovanni/la_squadra.dm
@@ -29,4 +29,4 @@
shoes = /obj/item/clothing/shoes/vampire
l_pocket = /obj/item/smartphone/giovanni_squadra
r_pocket = /obj/item/vamp/keys/giovanni
- backpack_contents = list(/obj/item/card/credit/rich=1)
+ backpack_contents = list(/obj/item/card/credit/rich=1, /obj/item/ritual_tome/necromancy=1)
diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/citizen.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/citizen.dm
index 0f258c5a8cc8..cd42710a762d 100644
--- a/modular_darkpack/modules/jobs/code/miscelllaneous/citizen.dm
+++ b/modular_darkpack/modules/jobs/code/miscelllaneous/citizen.dm
@@ -10,7 +10,7 @@
display_order = JOB_DISPLAY_ORDER_CITIZEN
department_for_prefs = /datum/job_department/citizen
job_flags = CITY_JOB_FLAGS
- allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE)
+ allowed_splats = SPLAT_ALL
minimal_masquerade = 0
alt_titles = list(
"Citizen",
diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm
index 1f4bd2e2b0fb..8b164064836d 100644
--- a/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm
+++ b/modular_darkpack/modules/jobs/code/miscelllaneous/club_worker.dm
@@ -22,7 +22,7 @@
"Club Attendant"
)
- allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE)
+ allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE)
description = "Offer strip club services. Some of your clientele may be... Unusual, but you are either addicted to vampire bites, or bribed to listen little and say even less."
minimal_masquerade = 3
diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm
index b62c79369605..6a438be49119 100644
--- a/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm
+++ b/modular_darkpack/modules/jobs/code/miscelllaneous/janitor.dm
@@ -7,7 +7,7 @@
config_tag = "JANITOR"
outfit = /datum/outfit/job/vampire/janitor
job_flags = CITY_JOB_FLAGS
- allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE)
+ allowed_splats = SPLAT_ALL
department_for_prefs = /datum/job_department/city_services
departments_list = list(
/datum/job_department/city_services,
diff --git a/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm b/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm
index 1263de38b5c9..1c79a17dc28b 100644
--- a/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm
+++ b/modular_darkpack/modules/jobs/code/miscelllaneous/taxi.dm
@@ -13,7 +13,7 @@
departments_list = list(
/datum/job_department/city_services,
)
- allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE)
+ allowed_splats = SPLAT_ALL
description = "Drive people in the city."
minimal_masquerade = 0
diff --git a/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm b/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm
index f7a3b363d1a0..8866004027d0 100644
--- a/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm
+++ b/modular_darkpack/modules/jobs/code/pentex/branch_lead.dm
@@ -23,7 +23,7 @@
"Endron Operations Director"
)
- allowed_splats = list(SPLAT_GAROU, SPLAT_KINDRED, SPLAT_NONE)
+ allowed_splats = SPLAT_ALL
// allowed_tribes = list(TRIBE_WYRM, TRIBE_RONIN)
allowed_clans = VAMPIRE_CLAN_ALL
minimal_masquerade = 5
diff --git a/modular_darkpack/modules/jobs/code/pentex/employee.dm b/modular_darkpack/modules/jobs/code/pentex/employee.dm
index e4d2e9f84813..bbaa327790b3 100644
--- a/modular_darkpack/modules/jobs/code/pentex/employee.dm
+++ b/modular_darkpack/modules/jobs/code/pentex/employee.dm
@@ -24,7 +24,7 @@
"Endron Labourer"
)
- allowed_splats = list(SPLAT_GAROU, SPLAT_KINDRED, SPLAT_NONE)
+ allowed_splats = SPLAT_ALL
// allowed_tribes = list(TRIBE_WYRM, TRIBE_RONIN)
allowed_clans = VAMPIRE_CLAN_ALL
minimal_masquerade = 3
diff --git a/modular_darkpack/modules/jobs/code/pentex/sec.dm b/modular_darkpack/modules/jobs/code/pentex/sec.dm
index 1c47b7e99420..b4050511b35c 100644
--- a/modular_darkpack/modules/jobs/code/pentex/sec.dm
+++ b/modular_darkpack/modules/jobs/code/pentex/sec.dm
@@ -16,7 +16,7 @@
job_flags = CITY_JOB_FLAGS
outfit = /datum/outfit/job/vampire/pentex_sec
- allowed_splats = list(SPLAT_GAROU, SPLAT_KINDRED, SPLAT_NONE)
+ allowed_splats = SPLAT_ALL
// allowed_tribes = list(TRIBE_WYRM, TRIBE_RONIN)
allowed_clans = VAMPIRE_CLAN_ALL
minimal_masquerade = 3
diff --git a/modular_darkpack/modules/jobs/code/police/dispatcher.dm b/modular_darkpack/modules/jobs/code/police/dispatcher.dm
index f70beb09462a..acb7beffbd85 100644
--- a/modular_darkpack/modules/jobs/code/police/dispatcher.dm
+++ b/modular_darkpack/modules/jobs/code/police/dispatcher.dm
@@ -15,8 +15,8 @@
/datum/job_department/clinic,
)
- allowed_splats = list(SPLAT_GHOUL, SPLAT_NONE)
- splat_slots = list(SPLAT_GHOUL = 1)
+ allowed_splats = list(SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE)
+ splat_slots = list(SPLAT_GHOUL = 1, SPLAT_KINFOLK = 1)
description = "Report emergencies to the correct emergency service."
minimal_masquerade = 0
diff --git a/modular_darkpack/modules/jobs/code/police/police.dm b/modular_darkpack/modules/jobs/code/police/police.dm
index a4b46d3ed98a..83bf746e995a 100644
--- a/modular_darkpack/modules/jobs/code/police/police.dm
+++ b/modular_darkpack/modules/jobs/code/police/police.dm
@@ -20,8 +20,8 @@
"Senior Police Officer",
)
- allowed_splats = list(SPLAT_GHOUL, SPLAT_NONE)
- splat_slots = list(SPLAT_GHOUL = 2)
+ allowed_splats = list(SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_NONE)
+ splat_slots = list(SPLAT_GHOUL = 2, SPLAT_KINFOLK = 2)
description = "Enforce the Law."
minimal_masquerade = 0
diff --git a/modular_darkpack/modules/jobs/code/supply/supply_tech.dm b/modular_darkpack/modules/jobs/code/supply/supply_tech.dm
index c9a0618cb838..be165fdae7e1 100644
--- a/modular_darkpack/modules/jobs/code/supply/supply_tech.dm
+++ b/modular_darkpack/modules/jobs/code/supply/supply_tech.dm
@@ -15,7 +15,7 @@
/datum/job_department/supply,
)
- allowed_splats = list(SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_NONE)
+ allowed_splats = SPLAT_ALL
description = "You work at the warehouse, moving boxes and selling not-quite legal goods to anyone who has the money."
minimal_masquerade = 0
diff --git a/modular_darkpack/modules/loadout/code/categories/heads.dm b/modular_darkpack/modules/loadout/code/categories/heads.dm
index d299ef0353e4..b4070bf1806f 100644
--- a/modular_darkpack/modules/loadout/code/categories/heads.dm
+++ b/modular_darkpack/modules/loadout/code/categories/heads.dm
@@ -105,3 +105,6 @@
/datum/loadout_item/head/prayer_veil
name = "Prayer Veil"
item_path = /obj/item/clothing/head/vampire/prayer_veil
+
+/datum/loadout_item/head/beret
+ item_path = /obj/item/clothing/head/beret
diff --git a/modular_darkpack/modules/loadout/code/categories/shoes.dm b/modular_darkpack/modules/loadout/code/categories/shoes.dm
index c9b8777373c2..c857600e8dd3 100644
--- a/modular_darkpack/modules/loadout/code/categories/shoes.dm
+++ b/modular_darkpack/modules/loadout/code/categories/shoes.dm
@@ -53,3 +53,12 @@
/datum/loadout_item/shoes/metal_tipped_shoes
name = "Shoes (Metal Tipped)"
item_path = /obj/item/clothing/shoes/vampire/businesstip
+
+/datum/loadout_item/shoes/blackfur
+ item_path = /obj/item/clothing/shoes/vampire/blackfur
+
+/datum/loadout_item/shoes/brownfur
+ item_path = /obj/item/clothing/shoes/vampire/brownfur
+
+/datum/loadout_item/shoes/pumped
+ item_path = /obj/item/clothing/shoes/vampire/pumped
diff --git a/modular_darkpack/modules/loadout/code/categories/suit.dm b/modular_darkpack/modules/loadout/code/categories/suit.dm
index 2230f7af7601..b7e5f06cf70d 100644
--- a/modular_darkpack/modules/loadout/code/categories/suit.dm
+++ b/modular_darkpack/modules/loadout/code/categories/suit.dm
@@ -42,6 +42,9 @@
name = "Coat (Red)"
item_path = /obj/item/clothing/suit/vampire/coat/winter/alt
+/datum/loadout_item/suit/coat/leopardcoat
+ item_path = /obj/item/clothing/suit/vampire/coat/leopard
+
// Jackets
/datum/loadout_item/suit/jacket
abstract_type = /datum/loadout_item/suit/jacket
@@ -86,6 +89,13 @@
name = "Trenchcoat (Burgundy)"
item_path = /obj/item/clothing/suit/vampire/trench/archive
+// Hoodies
+/datum/loadout_item/suit/hoodie
+ item_path = /obj/item/clothing/suit/hooded/hoodie
+
+/datum/loadout_item/suit/hoodiezim
+ item_path = /obj/item/clothing/suit/hooded/hoodie/hoodie_pim
+
// Misc
/datum/loadout_item/suit/kasaya
name = "Kasaya"
diff --git a/modular_darkpack/modules/loadout/code/categories/uniform.dm b/modular_darkpack/modules/loadout/code/categories/uniform.dm
index 027d761190cd..df3ff9bea874 100644
--- a/modular_darkpack/modules/loadout/code/categories/uniform.dm
+++ b/modular_darkpack/modules/loadout/code/categories/uniform.dm
@@ -188,6 +188,19 @@
name = "Dress Shirt (Brown)"
item_path = /obj/item/clothing/under/vampire/biker
+//Scene
+/datum/loadout_item/uniform/scenepink
+ item_path = /obj/item/clothing/under/vampire/scenepink
+
+/datum/loadout_item/uniform/scenemoody
+ item_path = /obj/item/clothing/under/vampire/scenemoody
+
+/datum/loadout_item/uniform/sceneleopard
+ item_path = /obj/item/clothing/under/vampire/sceneleopard
+
+/datum/loadout_item/uniform/scenezim
+ item_path = /obj/item/clothing/under/vampire/scenezim
+
//Other
/datum/loadout_item/uniform/baron
name = "Bartender Outfit"
diff --git a/modular_darkpack/modules/mapping_helpers/code/splat_applicator.dm b/modular_darkpack/modules/mapping_helpers/code/splat_applicator.dm
new file mode 100644
index 000000000000..858e21b6f65d
--- /dev/null
+++ b/modular_darkpack/modules/mapping_helpers/code/splat_applicator.dm
@@ -0,0 +1,47 @@
+/obj/effect/mapping_helpers/splat_applicator
+ name = "abstract splat applicator"
+ desc = "Calls add_splat() on all /mob/living/carbon on our turf. Var-edit me!"
+ abstract_type = /obj/effect/mapping_helpers/splat_applicator
+ /// The splat we're adding as a string.
+ var/splat_to_apply
+ /// The range of the splatinator ray.
+ var/range
+
+ // Vampire vars
+ var/generation
+ var/datum/vampire_clan/clan
+ var/enlightenment
+
+ // Dog vars // TODO: add these when the fera rework is done
+ //var/rank
+ //var/tribe
+ //var/breed
+
+/obj/effect/mapping_helpers/splat_applicator/Initialize(mapload)
+ . = ..()
+ if(istype(src, abstract_type))
+ CRASH("[name] ([x],[y],[z]) says, \"We're using the abstract splat applicator! Use a subtype, darnit!\"")
+
+ for(var/mob/living/guy in range(range, src))
+ applicate_splat(splat_to_apply, guy)
+
+/obj/effect/mapping_helpers/splat_applicator/proc/applicate_splat(splat, mob/living/guy)
+ switch(splat)
+ if(SPLAT_KINDRED)
+ return guy.make_kindred(/datum/splat/vampire/kindred, generation, clan, enlightenment)
+ if(SPLAT_GHOUL)
+ return guy.make_ghoul()
+ if(SPLAT_GAROU)
+ return FALSE // TODO: Fera rework
+
+/obj/effect/mapping_helpers/splat_applicator/kindred
+ name = "kindred splat applicator"
+ splat_to_apply = SPLAT_KINDRED
+
+/obj/effect/mapping_helpers/splat_applicator/ghoul
+ name = "ghoul splat applicator"
+ splat_to_apply = SPLAT_GHOUL
+
+/obj/effect/mapping_helpers/splat_applicator/garou
+ name = "garou splat applicator"
+ splat_to_apply = SPLAT_GAROU
diff --git a/modular_darkpack/modules/masquerade/code/blood_hunt_skull.dm b/modular_darkpack/modules/masquerade/code/blood_hunt_skull.dm
index a5e1b9110b5f..3eb00551dedd 100644
--- a/modular_darkpack/modules/masquerade/code/blood_hunt_skull.dm
+++ b/modular_darkpack/modules/masquerade/code/blood_hunt_skull.dm
@@ -2,6 +2,7 @@
name = "ominous skull"
desc = "A stylized skull, made out of marble."
icon = 'modular_darkpack/modules/masquerade/icons/blood_hunt_skull.dmi'
+ ONFLOOR_ICON_HELPER('modular_darkpack/modules/masquerade/icons/onfloor.dmi')
icon_state = "skull"
item_flags = NOBLUDGEON
w_class = WEIGHT_CLASS_SMALL
@@ -70,17 +71,17 @@
target.clear_blood_hunt()
// This code is for reinforcing a player's masquerade.
-/obj/item/blood_hunt/pre_attack(atom/A, mob/living/user, params)
- if(!ishuman(A))
- return
- if(!iskindred(A))
- return
+/obj/item/blood_hunt/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!ishuman(interacting_with))
+ return NONE
+ if(!iskindred(interacting_with))
+ return ITEM_INTERACT_BLOCKING
- to_chat(user, span_notice("You hold the [src] up to [A]..."))
- if(!do_after(user, 10 SECONDS, A))
- return COMPONENT_CANCEL_ATTACK_CHAIN
- if(SSmasquerade.masquerade_reinforce(src, A, MASQUERADE_REASON_PREFERENCES))
- to_chat(user, span_notice("You pardon [A]'s masquerade breach!"))
- return COMPONENT_CANCEL_ATTACK_CHAIN
- to_chat(user, span_notice("[A]'s masquerade breach isn't worthy enough to be pardoned!"))
- return COMPONENT_CANCEL_ATTACK_CHAIN
+ to_chat(user, span_notice("You hold the [src] up to [interacting_with]..."))
+ if(!do_after(user, 10 SECONDS, interacting_with))
+ return ITEM_INTERACT_BLOCKING
+ if(SSmasquerade.masquerade_reinforce(src, interacting_with, MASQUERADE_REASON_PREFERENCES))
+ to_chat(user, span_notice("You pardon [interacting_with]'s masquerade breach!"))
+ return ITEM_INTERACT_SUCCESS
+ to_chat(user, span_notice("[interacting_with]'s masquerade breach isn't worthy enough to be pardoned!"))
+ return ITEM_INTERACT_BLOCKING
diff --git a/modular_darkpack/modules/masquerade/code/components/violation_observer.dm b/modular_darkpack/modules/masquerade/code/components/violation_observer.dm
index e131be0a0e52..f82593f8f98e 100644
--- a/modular_darkpack/modules/masquerade/code/components/violation_observer.dm
+++ b/modular_darkpack/modules/masquerade/code/components/violation_observer.dm
@@ -45,13 +45,18 @@
breached_players += player_breacher
SSmasquerade.masquerade_breach(source, player_breacher, (isliving(source) ? MASQUERADE_REASON_NPC : MASQUERADE_REASON_OBJECT))
+ return TRUE
+
/datum/component/violation_observer/proc/on_masquerade_violation_reinforced(atom/source, mob/living/player_breacher)
SIGNAL_HANDLER
- SEND_SIGNAL(source, COMSIG_MASQUERADE_HUD_DELETE, player_breacher)
- SSmasquerade.masquerade_reinforce(source, player_breacher)
- source.observe_masquerade_reinforce(player_breacher)
- breached_players -= player_breacher
+ if(player_breacher in breached_players)
+ SEND_SIGNAL(source, COMSIG_MASQUERADE_HUD_DELETE, player_breacher)
+ SSmasquerade.masquerade_reinforce(source, player_breacher)
+ source.observe_masquerade_reinforce(player_breacher)
+ breached_players -= player_breacher
+
+ return TRUE
/datum/component/violation_observer/proc/on_death(atom/source)
SIGNAL_HANDLER
@@ -63,21 +68,18 @@
breached_players -= player_breacher
/atom/proc/observe_masquerade_violation(player_breacher)
- /* // DARKPACK TODO - GAROU
- if(isgarou(player_breacher) || iswerewolf(player_breacher))
+ do_alert_animation()
+ if(iswerewolfsplat(player_breacher))
to_chat(player_breacher, span_userdanger(span_bold("VEIL VIOLATION")))
- SEND_SOUND(player_breacher, sound('code/modules/wod13/sounds/veil_violation.ogg', volume = 75))
+ playsound(player_breacher, 'modular_darkpack/modules/masquerade/sound/veil_violation.ogg', 50, FALSE, -5)
return
- */
playsound(player_breacher, 'modular_darkpack/modules/masquerade/sound/masquerade_violation.ogg', 50, FALSE, -5)
to_chat(player_breacher, span_userdanger(span_bold("MASQUERADE VIOLATION")))
/atom/proc/observe_masquerade_reinforce(player_breacher)
- /* // DARKPACK TODO - GAROU
- if(isgarou(player_breacher) || iswerewolf(player_breacher))
- SEND_SOUND(player_breacher, sound('code/modules/wod13/sounds/humanity_gain.ogg', volume = 75))
- to_chat(player_breacher, span_big(span_boldnicegreen("VEIL REINFORCEED")))
+ if(iswerewolfsplat(player_breacher))
+ to_chat(player_breacher, span_big(span_boldnicegreen("VEIL REINFORCED")))
+ playsound(player_breacher, 'modular_darkpack/modules/masquerade/sound/humanity_gain.ogg', 50, FALSE, -5)
return
- */
to_chat(player_breacher, span_big(span_boldnicegreen("MASQUERADE REINFORCED")))
playsound(player_breacher, 'modular_darkpack/modules/masquerade/sound/masquerade_reinforce.ogg', 50, FALSE, -5)
diff --git a/modular_darkpack/modules/masquerade/code/masquerade_contract.dm b/modular_darkpack/modules/masquerade/code/masquerade_contract.dm
index 9cc5010d2339..48c2106f68eb 100644
--- a/modular_darkpack/modules/masquerade/code/masquerade_contract.dm
+++ b/modular_darkpack/modules/masquerade/code/masquerade_contract.dm
@@ -13,9 +13,9 @@
fire = 100
acid = 100
-/obj/item/masquerade_contract/attack_self(mob/user)
+/obj/item/masquerade_contract/attack_self(mob/user, modifiers)
. = ..()
- if(!iskindred(user) && !isghoul(user))
+ if(!isvampiresplat(user))
return
var/turf/current_location = get_turf(user)
to_chat(user, "[span_bold("YOU")], [get_area_name(user)] X:[current_location.x] Y:[current_location.y] Z:[current_location.z]")
@@ -42,10 +42,9 @@
armor_type = /datum/armor/masquerade_contract
resistance_flags = FIRE_PROOF | ACID_PROOF
-/* // DARKPACK TODO - GAROU
-/obj/item/veil_contract/attack_self(mob/user)
+/obj/item/veil_contract/attack_self(mob/user, modifiers)
. = ..()
- if(!isgarou(user))
+ if(!iswerewolfsplat(user))
return
var/turf/current_location = get_turf(user)
to_chat(user, "[span_bold("YOU")], [get_area_name(user)] X:[current_location.x] Y:[current_location.y] Z:[current_location.z]")
@@ -60,4 +59,3 @@
if(!GLOB.veil_breakers_list)
to_chat(user, span_info("No available Veil breakers in city..."))
-*/
diff --git a/modular_darkpack/modules/masquerade/code/subsystem/masquerade.dm b/modular_darkpack/modules/masquerade/code/subsystem/masquerade.dm
index 57a0a15eb27a..962d799ef944 100644
--- a/modular_darkpack/modules/masquerade/code/subsystem/masquerade.dm
+++ b/modular_darkpack/modules/masquerade/code/subsystem/masquerade.dm
@@ -5,7 +5,10 @@ SUBSYSTEM_DEF(masquerade)
var/masquerade_level = MASQUERADE_MAX_LEVEL
var/list/masquerade_breachers
var/static/regex/masquerade_breaching_phrase_regex
+
+ // The round is soon to be declared ending. Scarey sounds during this.
var/ending = FALSE
+ var/roundend_started = FALSE
/datum/controller/subsystem/masquerade/Initialize()
masquerade_breachers = new()
@@ -67,21 +70,15 @@ SUBSYSTEM_DEF(masquerade)
. = TRUE
break
if(player_breacher.masquerade_score == 5) //Doesn't matter if they weren't in one of these lists.
- // DARKPACK TODO - GAROU
- //GLOB.veil_breakers_list -= player_breacher
+ GLOB.veil_breakers_list -= player_breacher
GLOB.masquerade_breakers_list -= player_breacher
- /* // DARKPACK TODO - GAROU
- if(isgarou(player_breacher) || iswerewolf(player_breacher))
- var/random_renown = pick("Honor","Wisdom","Glory")
- switch(random_renown)
- if("Honor")
- player_breacher.adjust_renown("honor", -1, vessel = player_breacher)
- if("Glory")
- player_breacher.adjust_renown("glory", -1, vessel = player_breacher)
- if("Wisdom")
- player_breacher.adjust_renown("wisdom", -1, vessel = player_breacher)
+ /*
+ var/datum/splat/werewolf/werewolf_splat = iswerewolfsplat(player_breacher)
+ if(istype(werewolf_splat))
+ werewolf_splat.adjust_renown(pick(RENOWN_HONOR, RENOWN_GLORY, RENOWN_WISDOM), 1)
*/
+
save_persistent_masquerade(player_breacher)
return .
@@ -99,14 +96,20 @@ SUBSYSTEM_DEF(masquerade)
return
player_breacher.masquerade_score = max(0, player_breacher.masquerade_score - 1)
masquerade_breachers += list(list(player_breacher, source, reason))
- // DARKPACK TODO - GAROU
- //if(isgarou(player_breacher) || iswerewolf(player_breacher))
- // GLOB.veil_breakers_list |= player_breacher
- //else
- GLOB.masquerade_breakers_list |= player_breacher
+ if(isvampiresplat(player_breacher))
+ GLOB.masquerade_breakers_list |= player_breacher
+ else if(iswerewolfsplat(player_breacher))
+ GLOB.veil_breakers_list |= player_breacher
//Only lower the global masq if the player's breach score is actually reduced by 1
if(pre_breach_score > player_breacher.masquerade_score)
masquerade_level = max(0, masquerade_level - 1)
+
+ /*
+ var/datum/splat/werewolf/werewolf_splat = iswerewolfsplat(player_breacher)
+ if(istype(werewolf_splat))
+ werewolf_splat.adjust_renown(pick(RENOWN_HONOR, RENOWN_GLORY, RENOWN_WISDOM), -1)
+ */
+
save_persistent_masquerade(player_breacher)
check_roundend_condition()
@@ -117,39 +120,32 @@ SUBSYSTEM_DEF(masquerade)
// Save the player's masquerade level to their character sheet.
/datum/controller/subsystem/masquerade/proc/save_persistent_masquerade(mob/living/player_breacher)
- var/datum/preferences/preferences = GLOB.preferences_datums[ckey(player_breacher.key)]
- if(preferences)
- preferences.write_preference_midround(GLOB.preference_entries[/datum/preference/numeric/masquerade], player_breacher.masquerade_score)
- preferences.save_character()
+ var/mob/living/carbon/human/human_breacher = player_breacher
+ if(!istype(human_breacher))
+ return
+ human_breacher.write_preference_midround(/datum/preference/numeric/masquerade, player_breacher.masquerade_score)
// This is for clearing the round's masquerade because a player matrix'd
-/datum/controller/subsystem/masquerade/proc/cryo_masquerade_breacher(mob/living/player_breacher, update_preferences)
+/datum/controller/subsystem/masquerade/proc/matrix_masquerade_breacher(mob/living/player_breacher, update_preferences)
for(var/masquerade_breach as anything in masquerade_breachers)
if((player_breacher in masquerade_breach))
masquerade_breachers -= list(masquerade_breach)
masquerade_level = min(MASQUERADE_MAX_LEVEL, masquerade_level + 1)
- // DARKPACK TODO - GAROU
- //if(isgarou(player_breacher) || iswerewolf(player_breacher))
- // GLOB.veil_breakers_list -= player_breacher
- //else
GLOB.masquerade_breakers_list -= player_breacher
+ GLOB.veil_breakers_list -= player_breacher
if(update_preferences)
save_persistent_masquerade(player_breacher)
// This is for checking if a joined player should be on the breachers list.
/datum/controller/subsystem/masquerade/proc/masquerade_breacher_check(mob/living/player_breacher)
if(player_breacher.masquerade_score < 5)
- // DARKPACK TODO - GAROU
- //if(isgarou(player_breacher) || iswerewolf(player_breacher))
- // GLOB.veil_breakers_list |= player_breacher
- //else
- GLOB.masquerade_breakers_list |= player_breacher
+ if(isvampiresplat(player_breacher))
+ GLOB.masquerade_breakers_list |= player_breacher
+ else if(iswerewolfsplat(player_breacher))
+ GLOB.veil_breakers_list |= player_breacher
else
- // DARKPACK TODO - GAROU
- //if(isgarou(player_breacher) || iswerewolf(player_breacher))
- // GLOB.veil_breakers_list -= player_breacher
- //else
GLOB.masquerade_breakers_list -= player_breacher
+ GLOB.veil_breakers_list -= player_breacher
/datum/controller/subsystem/masquerade/proc/player_masquerade_reinforce(datum/source, mob/living/player_breacher)
SIGNAL_HANDLER
@@ -184,10 +180,6 @@ SUBSYSTEM_DEF(masquerade)
else
var/atom/object = masquerade_breach_list[2]
SEND_SIGNAL(object, COMSIG_ALL_MASQUERADE_REINFORCE)
- SSticker.force_ending = 1
- SSticker.current_state = GAME_STATE_FINISHED
+
GLOB.canon_event = FALSE
- toggle_ooc(TRUE) // Turn it on
- toggle_dooc(TRUE)
- SSticker.declare_completion(SSticker.force_ending)
- Master.SetRunLevel(RUNLEVEL_POSTGAME)
+ roundend_started = TRUE
diff --git a/modular_darkpack/modules/masquerade/icons/onfloor.dmi b/modular_darkpack/modules/masquerade/icons/onfloor.dmi
index 569d6c68db66..18212b14a75a 100644
Binary files a/modular_darkpack/modules/masquerade/icons/onfloor.dmi and b/modular_darkpack/modules/masquerade/icons/onfloor.dmi differ
diff --git a/modular_darkpack/modules/masquerade/sound/humanity_gain.ogg b/modular_darkpack/modules/masquerade/sound/humanity_gain.ogg
new file mode 100644
index 000000000000..7e11eef24cd9
Binary files /dev/null and b/modular_darkpack/modules/masquerade/sound/humanity_gain.ogg differ
diff --git a/modular_darkpack/modules/masquerade/sound/veil_violation.ogg b/modular_darkpack/modules/masquerade/sound/veil_violation.ogg
new file mode 100644
index 000000000000..b859541f6df9
Binary files /dev/null and b/modular_darkpack/modules/masquerade/sound/veil_violation.ogg differ
diff --git a/modular_darkpack/modules/matrix/code/matrix.dm b/modular_darkpack/modules/matrix/code/matrix.dm
index 0107ffbe8746..fb5deb642aa8 100644
--- a/modular_darkpack/modules/matrix/code/matrix.dm
+++ b/modular_darkpack/modules/matrix/code/matrix.dm
@@ -50,11 +50,14 @@ ADMIN_VERB_AND_CONTEXT_MENU(matrix_mob_verb, R_ADMIN, "Matrix Mob", "Matrix (des
message_admins("[ADMIN_LOOKUP(despawning_mob)] has exited through the matrix.")
log_game("[despawning_mob] has exited through the matrix.")
+ GLOB.manifest.remove(despawning_mob.real_name)
+
SSjob.FreeRole(despawning_mob)
GLOB.joined_player_list -= despawning_mob.ckey
//handle_objectives()
+ SSmasquerade.matrix_masquerade_breacher(despawning_mob, TRUE)
despawning_mob.ghostize(FALSE)
QDEL_NULL(despawning_mob)
diff --git a/modular_darkpack/modules/merits_flaws/code/_darkpack_quirk.dm b/modular_darkpack/modules/merits_flaws/code/_darkpack_quirk.dm
new file mode 100644
index 000000000000..18680a0b25b2
--- /dev/null
+++ b/modular_darkpack/modules/merits_flaws/code/_darkpack_quirk.dm
@@ -0,0 +1,71 @@
+/datum/quirk/darkpack
+ abstract_type = /datum/quirk/darkpack
+ /// List of splats (vampire clans/types) this quirk is allowed for. Null = all allowed
+ var/list/allowed_splats
+ /// List of splats this quirk is explicitly forbidden for
+ var/list/forbidden_splats
+ /// Excluded clans from this quirk (exclusive to vampire)
+ var/list/excluded_clans
+ /// Minimum Generation
+ var/minimum_generation
+ /// Unique failure message on joining the round (should probably just mix the clan and generation blocking into the tgui...)
+ var/failure_message = "One of the quirks you've selected hasn't applied - your character is ineligible to use it!"
+
+/datum/quirk/darkpack/add_to_holder(mob/living/new_holder, quirk_transfer = FALSE, client/client_source, unique = TRUE, announce = TRUE)
+ if(forbidden_splats)
+ for(var/datum/splat/splat as anything in new_holder.splats)
+ if(splat.id in forbidden_splats)
+ return FALSE
+
+ if(allowed_splats)
+ var/has_allowed_splat = FALSE
+ for(var/datum/splat/splat as anything in new_holder.splats)
+ if(splat.id in allowed_splats)
+ has_allowed_splat = TRUE
+ break
+ if(!has_allowed_splat)
+ return FALSE
+
+ if(excluded_clans && iskindred(new_holder))
+ var/datum/splat/vampire/kindred/kindred_splat = iskindred(new_holder)
+ if(kindred_splat.clan && (kindred_splat.clan.id in excluded_clans))
+ to_chat(new_holder, span_warning("[failure_message]"))
+ return FALSE
+
+ if(minimum_generation)
+ var/datum/splat/vampire/kindred/kindred_splat = iskindred(new_holder)
+ if(kindred_splat.generation < minimum_generation)
+ to_chat(new_holder, span_warning("[failure_message]"))
+ return FALSE
+ return ..()
+
+/datum/quirk/darkpack/is_splat_appropriate(datum/splat/mob_splat)
+ if(!..())
+ return FALSE
+
+ if(!forbidden_splats && !allowed_splats && !excluded_clans)
+ return TRUE
+
+ var/datum/splat/splat_path = GLOB.splat_prototypes[mob_splat]
+ var/splat_id = splat_path?.id
+
+ if(forbidden_splats && (splat_id in forbidden_splats))
+ return FALSE
+
+ if(allowed_splats && !(splat_id in allowed_splats))
+ return FALSE
+
+ return TRUE
+
+/datum/quirk/darkpack/proc/is_clan_appropriate(datum/vampire_clan/clan)
+ if(!excluded_clans)
+ return TRUE
+
+ if(!clan)
+ return TRUE
+
+ if(clan.id in excluded_clans)
+ return FALSE
+
+ return TRUE
+
diff --git a/modular_darkpack/modules/merits_flaws/code/illegal_identity.dm b/modular_darkpack/modules/merits_flaws/code/illegal_identity.dm
new file mode 100644
index 000000000000..07688d52bdc5
--- /dev/null
+++ b/modular_darkpack/modules/merits_flaws/code/illegal_identity.dm
@@ -0,0 +1,29 @@
+/datum/quirk/darkpack/illegal_identity
+ name = "Illegal Identity"
+ desc = "Illegal immigrant? Died legally? Born a wolf? The cops aren't happy."
+ value = 0
+ quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_HIDE_FROM_SCAN
+ icon = FA_ICON_PERSON_CIRCLE_QUESTION
+ mob_trait = TRAIT_ILLEGAL_IDENTITY
+ gain_text = span_warning("You feel legally unprepared.")
+ lose_text = span_notice("You feel bureaucratically legitimate.")
+ medical_record_text = "Patient is not checked in with valid identification."
+ //excluded_clans = list(VAMPIRE_CLAN_RAVNOS) // They are forced to take this
+ failure_message = "Oh, there's my actual ID, looks like I misplaced it..."
+
+/datum/quirk/darkpack/illegal_identity/add()
+ . = ..()
+ if(!ishuman(quirk_holder))
+ return
+ var/mob/living/carbon/human/criminal = quirk_holder
+ var/obj/item/passport/passport = locate() in criminal // In pockets
+ if(!passport && criminal.back)
+ passport = locate() in criminal.back // In backpack
+ if(passport && passport.owner == criminal.real_name)
+ passport.link_human(criminal)
+ //drivers license too
+ var/obj/item/card/drivers_license/license = locate() in criminal // In pockets
+ if(!license && criminal.back)
+ license = locate() in criminal.back // In backpack
+ if(license)
+ license.link_human(criminal)
diff --git a/modular_darkpack/modules/merits_flaws/code/permanent_fangs.dm b/modular_darkpack/modules/merits_flaws/code/permanent_fangs.dm
new file mode 100644
index 000000000000..8ee8a3d81f9a
--- /dev/null
+++ b/modular_darkpack/modules/merits_flaws/code/permanent_fangs.dm
@@ -0,0 +1,10 @@
+/datum/quirk/darkpack/permafangs
+ name = "Permanent Fangs"
+ desc = "Your fangs do not retract, making it impossible for you to hide your true nature. While some mortals may think you've had your teeth filed or are wearing prosthetics, sooner or later you're going to run into someone who knows what you truly are."
+ value = -1
+ mob_trait = TRAIT_PERMAFANGS
+ gain_text = span_notice("Your fangs become stuck.")
+ lose_text = span_notice("You feel your fangs retract again.")
+ allowed_splats = list(SPLAT_KINDRED)
+ icon = FA_ICON_TEETH
+ failure_message = "You feel your fangs retract."
diff --git a/modular_darkpack/modules/merits_flaws/merits_flaws.md b/modular_darkpack/modules/merits_flaws/merits_flaws.md
new file mode 100644
index 000000000000..6b5a1d0100bf
--- /dev/null
+++ b/modular_darkpack/modules/merits_flaws/merits_flaws.md
@@ -0,0 +1,28 @@
+## ")]
"), "boxed_message") + for(var/mob/player_mob in get_mobs_to_show(roller)) + var/roll_important_to_me = FALSE + if(!spammy_roll && (player_mob == roller || target)) + roll_important_to_me = TRUE + + var/output_pref = player_mob.client?.prefs.read_preference(/datum/preference/choiced/dice_output) + + if(!spammy_roll && output_pref == DICE_OUTPUT_CHAT) + to_chat(player_mob, output_combined, MESSAGE_TYPE_INFO, trailing_newline = FALSE) + SEND_SOUND(player_mob, sound('sound/items/dice_roll.ogg', volume = roll_important_to_me ? 5 : 20)) + else if(spammy_roll || (output_pref == DICE_OUTPUT_BALLOON)) + if(last_sucess_amount > 0) + roller.balloon_alert(player_mob, "[last_sucess_amount]", TRUE) + else + roller.balloon_alert(player_mob, "[last_sucess_amount]", TRUE) + + LAZYADDASSOC(mobs_last_rolled, WEAKREF(roller), list(world.time, output)) + + return output + + +/datum/storyteller_roll/proc/get_mobs_to_show(mob/living/roller) + switch(roll_output_type) + if(ROLL_PUBLIC) + return viewers(DEFAULT_MESSAGE_RANGE, roller) + if(ROLL_PRIVATE) + return list(roller) + if(ROLL_PRIVATE_ADMIN) + return GLOB.admins + roller + if(ROLL_ADMIN) + return GLOB.admins + if(ROLL_NONE) + return // Not even important enough to be admin visable. + +/datum/storyteller_roll/proc/calculate_used_dice(mob/living/roller, bonus = 0) + var/dice_amount = 0 + for(var/stat_type in using_stats(roller)) + dice_amount += roller.st_get_stat(stat_type) + return dice_amount + bonus + +// Unused rn but can be used for overides of `using_stats()` +/datum/storyteller_roll/proc/return_higher_stat(mob/living/roller, list/stats) + var/stat_to_use + var/highest_stat + for(var/stat in stats) + var/stat_dots = roller.st_get_stat(stat) + if(isnull(highest_stat) || stat_dots > highest_stat) + stat_to_use = stat + highest_stat = stat_dots + return stat_to_use + +/datum/storyteller_roll/proc/using_stats(mob/living/roller) + return applicable_stats + +/datum/storyteller_roll/proc/show_rolling_with(mob/living/roller, bonus = 0) + var/output = "" + var/stuff = list() + for(var/datum/st_stat/stat_type as anything in using_stats(roller)) + stuff += "[LOWER_TEXT(stat_type::name)]:[roller.st_get_stat(stat_type)]" + output += jointext(stuff, "+") + if(bonus) + output += "+[bonus]" + return "Rolling [output]" + +/datum/storyteller_roll/proc/roll_dice(dice, sides = 10) + dice = max(dice, 1) + var/list/rolled_dice = list() + for(var/i in 1 to dice) + rolled_dice += rand(1, sides) + if(SSroll.on_crit_extra_die_enabled) + var/extra_dice = 0 + for(var/roll in rolled_dice) + if(roll == 10) + extra_dice++ + for(var/i in 1 to extra_dice) + rolled_dice += rand(1, sides) + return rolled_dice + +//Count the number of successes. +/datum/storyteller_roll/proc/count_success(list/rolled_dice, difficulty = 6, last_output_text) + var/sucess_amount = 0 + var/dice_text = "" + for(var/roll in rolled_dice) + if(roll >= difficulty) + dice_text += span_nicegreen("[get_dice_char(roll)]") + sucess_amount++ + if(SSroll.on_crit_extra_success_enabled && roll == 10) + sucess_amount++ + else if(roll == 1) + dice_text += span_bold(span_danger("[get_dice_char(roll)]")) + sucess_amount-- + else + dice_text += span_danger("[get_dice_char(roll)]") + last_output_text += "[roll_result_text(roll_result(sucess_amount))] [dice_text]" + return sucess_amount + +/datum/storyteller_roll/proc/roll_result(sucess_amount) + if(numerical) + return sucess_amount + else + if(sucess_amount < 0) + return ROLL_BOTCH + else if(sucess_amount < successes_needed) + return ROLL_FAILURE + else + return ROLL_SUCCESS + +/datum/storyteller_roll/proc/roll_result_text(success_result) + if(numerical) + return "[success_result] successes -" + else + switch(success_result) + if(ROLL_SUCCESS) + return span_nicegreen("Success -") + if(ROLL_FAILURE) + return span_danger("Failure -") + if(ROLL_BOTCH) + return span_bold(span_danger(("Botch -"))) + +/datum/storyteller_roll/proc/get_dice_char(input) + var/static/list/dice_output = list("❶", "❷", "❸", "❹", "❺", "❻", "❼", "❽", "❾", "❿") + return dice_output[input] + /* // This would require making it an assoc list and we dont every expect outside our given range. + // So if someone faces a runtime because of this just make it an actual assoc and deal with the micro preformace hit + var/static/alist/dice_output = alist(1 = "❶", 2 = "❷", 3 = "❸" ,4 = "❹", 5 = "❺", 6 = "❻", 7 = "❼", 8 = "❽", 9 = "❾", 10 = "❿") + if(!dice_output[input]) + return "⓿" + else + return dice_output[input] + */ + +/datum/storyteller_roll/proc/can_roll(mob/living/roller, feedback = TRUE) + if(reroll_cooldown && mobs_last_rolled) + for(var/datum/weakref/guy_ref, roll_info in mobs_last_rolled) + var/mob/living/guy = guy_ref.resolve() + if(!guy) + mobs_last_rolled.Remove(guy_ref) + continue + if(guy != roller) + continue + if(roll_info[1] + reroll_cooldown > world.time) + if(roll_info[2] > 0) + return TRUE + //return roll_info[2] // We really should support directly returning the output..? + if(feedback) + to_chat(roller, span_warning("You cannot reroll [bumper_text] yet. [round((roll_info[1] + reroll_cooldown - world.time)/10)]s left.")) + return FALSE + + return TRUE + diff --git a/modular_darkpack/modules/storyteller_dice/code/roll_subsystem.dm b/modular_darkpack/modules/storyteller_dice/code/roll_subsystem.dm index 01f80f17d3fb..9abca7539c78 100644 --- a/modular_darkpack/modules/storyteller_dice/code/roll_subsystem.dm +++ b/modular_darkpack/modules/storyteller_dice/code/roll_subsystem.dm @@ -23,150 +23,14 @@ SUBSYSTEM_DEF(roll) * Arguments: * * dice - number of 10-sided dice to roll. * * difficulty - the number that a dice must come up as to count as a success. - * * mobs_to_show_output - mobs shown the result - * * alert_atom - the atom over which balloon alerts should appear + * * roller - the mob who is making the role and owns the dice * * numerical - whether the proc returns number of successes or outcome (botch, failure, success) */ -/datum/controller/subsystem/roll/proc/storyteller_roll(dice = 1, difficulty = 6, list/mobs_to_show_output = list(), atom/alert_atom = null, numerical = FALSE) - var/list/rolled_dice = roll_dice(dice) - if(!islist(mobs_to_show_output)) - mobs_to_show_output = list(mobs_to_show_output) - var/list/output_text = list() - output_text += span_notice("Rolling [length(rolled_dice)] dice against difficulty [difficulty].\n") - var/success_count = count_success(rolled_dice, difficulty, output_text) - - var/output = roll_answer(success_count, numerical, output_text) - for(var/mob/player_mob as anything in mobs_to_show_output) - var/output_pref = player_mob.client?.prefs.read_preference(/datum/preference/choiced/dice_output) - - if(output_pref == DICE_OUTPUT_CHAT) - to_chat(player_mob, jointext(output_text, ""), trailing_newline = FALSE) - else if((output_pref == DICE_OUTPUT_BALLOON) && alert_atom) - if(success_count > 0) - alert_atom.balloon_alert(player_mob, "[success_count]", TRUE) - else - alert_atom.balloon_alert(player_mob, "[success_count]", TRUE) - - if(numerical) - return success_count - - return output - -/datum/controller/subsystem/roll/proc/opposed_roll(mob/player_a, mob/player_b, dice_a = 1, dice_b = 1, show_player_a=TRUE, show_player_b=TRUE, atom/alert_atom = null, draw_goes_to_b=TRUE, numerical=FALSE) - var/list/roll_a = roll_dice(dice_a) - var/list/roll_b = roll_dice(dice_b) - var/success_count_a = count_success_no_output(roll_a) - var/success_count_b = count_success_no_output(roll_b) - - var/player_a_succeeded = FALSE - if(success_count_a > success_count_b || (success_count_a == success_count_b && !draw_goes_to_b)) - player_a_succeeded = TRUE - - if(alert_atom) - var/is_zero = ((success_count_a - success_count_b) == 0) - if(show_player_a) - var/alert_text - if(player_a_succeeded) - alert_text = "[is_zero ?"":"+"][success_count_a - success_count_b]" - else - alert_text = "[success_count_a - success_count_b]" - alert_atom.balloon_alert(player_a, alert_text, TRUE) - if(show_player_b) - var/alert_text - if(!player_a_succeeded) - alert_text = "[is_zero ?"":"+"][success_count_b - success_count_a]" - else - alert_text = "[success_count_b - success_count_a]" - alert_atom.balloon_alert(player_b, alert_text, TRUE) - - if(numerical) - return success_count_a - success_count_b - else - return player_a_succeeded - -/datum/controller/subsystem/roll/proc/roll_dice(dice, sides = 10) - dice = max(dice, 1) - var/list/rolled_dice = list() - for(var/i in 1 to dice) - rolled_dice += rand(1, sides) - if(on_crit_extra_die_enabled) - var/extra_dice = 0 - for(var/roll in rolled_dice) - if(roll == 10) - extra_dice++ - for(var/i in 1 to extra_dice) - rolled_dice += rand(1, sides) - return rolled_dice - -//Count the number of successes. -/datum/controller/subsystem/roll/proc/count_success(list/rolled_dice, difficulty = 6, output_text) - var/success_count = 0 - for(var/roll in rolled_dice) - if(roll >= difficulty) - output_text += span_nicegreen("[get_dice_char(roll)]") - success_count++ - if(on_crit_extra_success_enabled) - if(roll == 10) - success_count++ - else if(roll == 1) - output_text += span_bold(span_danger("[get_dice_char(roll)]")) - success_count-- - else - output_text += span_danger("[get_dice_char(roll)]") - output_text += " " - return success_count - -//Count the number of successes. -/datum/controller/subsystem/roll/proc/count_success_no_output(list/rolled_dice, difficulty = 6) - var/success_count = 0 - for(var/roll in rolled_dice) - if(roll >= difficulty) - success_count++ - if(on_crit_extra_success_enabled) - if(roll == 10) - success_count++ - else if(roll == 1) - success_count-- - return success_count - -/datum/controller/subsystem/roll/proc/roll_answer(success_count, numerical, output_text) - if(numerical) - return success_count - else - if(success_count < 0) - output_text += span_bold(span_danger(("\n Botch!"))) - return ROLL_BOTCH - else if(success_count == 0) - output_text += span_danger("\n Failure!") - return ROLL_FAILURE - else - output_text += span_nicegreen("\n Success!") - return ROLL_SUCCESS - -/datum/controller/subsystem/roll/proc/get_dice_char(input) - switch(input) - if(1) - return "❶" - if(2) - return "❷" - if(3) - return "❸" - if(4) - return "❹" - if(5) - return "❺" - if(6) - return "❻" - if(7) - return "❼" - if(8) - return "❽" - if(9) - return "❾" - if(10) - return "❿" - else - return "⓿" +/datum/controller/subsystem/roll/proc/storyteller_roll(dice = 1, difficulty = 6, mob/living/roller = null, numerical = FALSE) + var/datum/storyteller_roll/dice_roll = new() + dice_roll.difficulty = difficulty + dice_roll.numerical = numerical + return dice_roll.st_roll(roller, roller, dice) //Config datums for exploding dice /datum/config_entry/flag/on_crit_additional_success diff --git a/modular_darkpack/modules/storyteller_dice/code/roll_subtypes.dm b/modular_darkpack/modules/storyteller_dice/code/roll_subtypes.dm new file mode 100644 index 000000000000..1bfa854c810d --- /dev/null +++ b/modular_darkpack/modules/storyteller_dice/code/roll_subtypes.dm @@ -0,0 +1,69 @@ +// Pretty generic ones for reuse if you dont really want/need a subtype +/datum/storyteller_roll/turn_cooldown + reroll_cooldown = 1 TURNS + +/datum/storyteller_roll/scene_cooldown + reroll_cooldown = 1 SCENES + +/datum/storyteller_roll/spammy + spammy_roll = TRUE + +// Mostly TTRPG accurate rolls + +// Physical Feats +/datum/storyteller_roll/lockpick + bumper_text = "lockpicking" + reroll_cooldown = 1 SCENES + applicable_stats = list(STAT_DEXTERITY, STAT_LARCENY) + +/datum/storyteller_roll/bash_door + bumper_text = "bash door" + reroll_cooldown = 1 SCENES + applicable_stats = list(STAT_STRENGTH) + numerical = TRUE + +/datum/storyteller_roll/grappling + bumper_text = "grappling" + applicable_stats = list(STAT_STRENGTH, STAT_BRAWL) + numerical = TRUE + spammy_roll = TRUE + +/datum/storyteller_roll/grappled + bumper_text = "resisting" + applicable_stats = list(STAT_STRENGTH, STAT_BRAWL) + numerical = TRUE + spammy_roll = TRUE + +/datum/storyteller_roll/climbing + bumper_text = "climbing" + applicable_stats = list(STAT_DEXTERITY, STAT_ATHLETICS) + +/datum/storyteller_roll/shooting + bumper_text = "shooting" + applicable_stats = list(STAT_DEXTERITY, STAT_FIREARMS) + reroll_cooldown = 1 TURNS + numerical = TRUE + +// DARKPACK TODO - (Attacks need a rework on how they calcuate landing a hit.) +/datum/storyteller_roll/punch + bumper_text = "punch" + applicable_stats = list(STAT_DEXTERITY, STAT_BRAWL) + spammy_roll = TRUE + +/datum/storyteller_roll/damage + bumper_text = "damage" + applicable_stats = list(STAT_STRENGTH) + numerical = TRUE + spammy_roll = TRUE + +// Mental Feats +/datum/storyteller_roll/investigation + bumper_text = "investigation" + applicable_stats = list(STAT_PERCEPTION, STAT_INVESTIGATION) + + +// Made up shittttt +/datum/storyteller_roll/identify_occult + bumper_text = "identify" + applicable_stats = list(STAT_INTELLIGENCE, STAT_OCCULT) + reroll_cooldown = 1 SCENES diff --git a/modular_darkpack/modules/storyteller_dice/code/verbs.dm b/modular_darkpack/modules/storyteller_dice/code/verbs.dm index c2cbcccf6600..bba04c26d80d 100644 --- a/modular_darkpack/modules/storyteller_dice/code/verbs.dm +++ b/modular_darkpack/modules/storyteller_dice/code/verbs.dm @@ -1,6 +1,50 @@ -ADMIN_VERB(roll_storyteller_dice, R_NONE, "Roll storyteller dice", "Roll storyteller dice at yourself.", ADMIN_CATEGORY_FUN) - var/dice_count = tgui_input_number(usr, "Input amount of dice to roll:", "Dice", 5, 100, 1) - var/difficulty = tgui_input_number(usr, "Input roll difficulty:", "Difficulty", 6, 10, 1) - - SSroll.storyteller_roll(dice_count, difficulty, usr, usr) +ADMIN_VERB_ONLY_CONTEXT_MENU(roll_storyteller_dice, R_FUN, "Roll storyteller dice", mob/living/M in world) + M.roll_dice_custom() BLACKBOX_LOG_ADMIN_VERB("Storyteller dice") + +/mob/living/verb/roll_dice_custom() + set name = "Roll custom dice" + set category = "IC" + set desc = "Roll dice!" + + var/list/allowed_stats = list() + // Blame Xeon im pretty sure for the mobs storing this as a string. + for(var/stat_path_as_a_fucked_up_evil_string, dots_in in storyteller_stats) + var/datum/st_stat/stat = text2path(stat_path_as_a_fucked_up_evil_string) + if(!ispath(stat)) + continue + if(stat == stat::abstract_type) + continue + allowed_stats += stat + //allowed_stats[stat] = "[stat::name]: [dots_in]" + var/list/stats_to_use = tgui_input_checkboxes(usr, "Select stats to use for the roll.", "Choose Stats", allowed_stats, min_checked = 0, max_checked = 5) + var/list/output_stats = list() + if(length(stats_to_use)) + for(var/list/stat as anything in stats_to_use) + output_stats += text2path(stat[1]) + + var/bonus_dice = tgui_input_number(usr, "Input amount of bonus dice to roll.", "Dice", 0, 20, -20) + if(isnull(bonus_dice)) + return + + var/difficulty = tgui_input_number(usr, "Input roll difficulty.", "Difficulty", 6, 10, 1) + if(isnull(difficulty)) + return + + var/successes_needed = tgui_input_number(usr, "Input successes required to pass.", "Successes Needed", 1, 20, 1) + if(isnull(successes_needed)) + return + + var/roll_type = tgui_input_list(usr, "Who do you want to roll to.", "Roll Type", list(ROLL_PUBLIC, ROLL_PRIVATE, ROLL_PRIVATE_ADMIN, ROLL_ADMIN), ROLL_PUBLIC) + if(isnull(roll_type)) + return + + var/datum/storyteller_roll/custom_roll/custom_roll = new() + custom_roll.applicable_stats = output_stats + custom_roll.difficulty = difficulty + custom_roll.successes_needed = successes_needed + custom_roll.roll_output_type = roll_type + return custom_roll.st_roll(src, src, bonus_dice) + +/datum/storyteller_roll/custom_roll + bumper_text = "custom roll" diff --git a/modular_darkpack/modules/storyteller_stats/code/logging.dm b/modular_darkpack/modules/storyteller_stats/code/logging.dm index cbb0f8b63597..6022c693cd5b 100644 --- a/modular_darkpack/modules/storyteller_stats/code/logging.dm +++ b/modular_darkpack/modules/storyteller_stats/code/logging.dm @@ -1,2 +1,8 @@ /proc/log_stats(text, list/data) logger.Log(LOG_CATEGORY_STATS, text, data) + +/datum/log_category/stats + category = LOG_CATEGORY_STATS + config_flag = /datum/config_entry/flag/log_stats + +/datum/config_entry/flag/log_stats diff --git a/modular_darkpack/modules/storyteller_stats/code/mob_affecting_adjustments/mob_procs.dm b/modular_darkpack/modules/storyteller_stats/code/mob_affecting_adjustments/mob_procs.dm index 1c0ea38d3bd1..4bf56f68f8b8 100644 --- a/modular_darkpack/modules/storyteller_stats/code/mob_affecting_adjustments/mob_procs.dm +++ b/modular_darkpack/modules/storyteller_stats/code/mob_affecting_adjustments/mob_procs.dm @@ -1,9 +1,17 @@ -// Get a specific mob's stat from its stats list. +/// Get a specific mob's stat from its stats list. /mob/living/proc/st_get_stat(stat_path, include_bonus) var/datum/st_stat/given_stat = storyteller_stats["[stat_path]"] return given_stat?.get_score(include_bonus) -// Set a specific mob's stat from its stats list. +/// Wrapper for st_get_stat to reduce copypaste. Get a specific mob's stat from its stats list. +/mob/living/proc/st_get_stats(list/stat_list, include_bonus) + var/total_score = 0 + for(var/stat_path in stat_list) + var/datum/st_stat/given_stat = storyteller_stats["[stat_path]"] + total_score += given_stat?.get_score(include_bonus) + return total_score + +/// Set a specific mob's stat from its stats list. /mob/living/proc/st_set_stat(stat_path, amount) var/datum/st_stat/given_stat = storyteller_stats["[stat_path]"] return given_stat?.set_score(amount) diff --git a/modular_darkpack/modules/storyteller_stats/code/st_stats/default_abilities.dm b/modular_darkpack/modules/storyteller_stats/code/st_stats/default_abilities.dm index 501fca922bc3..458393434c59 100644 --- a/modular_darkpack/modules/storyteller_stats/code/st_stats/default_abilities.dm +++ b/modular_darkpack/modules/storyteller_stats/code/st_stats/default_abilities.dm @@ -109,7 +109,17 @@ /datum/st_stat/ability/computer subcategory = "Knowledges" name = "Computer" - description = "Affects your ability to use and interact with computerized devices. At 0 points, you won't be able to use a phone. At 1 point, you can use a phone, but not a computer." + /* V20 p. 108 + This Knowledge represents the ability to operate and program computers, including mobile devices. + Most Computer use also imparts a degree of Internet awareness (if not savvy). + */ + description = "Affects your ability to use and interact with computerized devices." + +// This kinda sucks dick to do for every stat. +/datum/st_stat/ability/computer/New() + . = ..() + if(CONFIG_GET(flag/punishing_zero_dots)) + description += " At 0 points, you won't be able to use a computer." /datum/st_stat/ability/finance subcategory = "Knowledges" @@ -149,4 +159,10 @@ /datum/st_stat/ability/technology subcategory = "Knowledges" name = "Technology" + /* V20 p. 110 + The Technology Knowledge represents a broad acumen with electronics, computer hardware, and devices more elaborate than “machines,” which fall under the Crafts Skill. + If it has a processor, a transistor, or an integrated circuit — if it’s electronic rather than electrical manipulating it uses the Technology Knowledge. + This is the wide-ranging Ability used to build one’s own computer, install (or subvert) a security system, repair a mobile phone, or kitbash a shortwave radio. + You must always choose a specialization in Technology, even though you possess some skill in multiple fields. + */ description = "Affects your character's familiarity with machines, devices, and electrical systems." diff --git a/modular_darkpack/modules/storyteller_stats/code/stat_pref_middleware.dm b/modular_darkpack/modules/storyteller_stats/code/stat_pref_middleware.dm index 135a2ae9c299..94421f8635bf 100644 --- a/modular_darkpack/modules/storyteller_stats/code/stat_pref_middleware.dm +++ b/modular_darkpack/modules/storyteller_stats/code/stat_pref_middleware.dm @@ -58,8 +58,8 @@ var/new_value = stat_path.get_score(include_bonus = FALSE) - var/log_text = "[key_name(user, TRUE, TRUE)] increased stat '[stat_path.name]' from [old_value] to [new_value]" - log_stats(log_text) + var/real_name = user.client.prefs.read_preference(/datum/preference/name/real_name) + user.log_message("increased stat '[stat_path.name]' from [old_value] to [new_value] on [real_name]", LOG_STATS) return TRUE /datum/preference_middleware/stats/proc/decrease_stat(list/params, mob/user) @@ -89,8 +89,8 @@ update_middleware_stats(preferences.preference_storyteller_stats) var/new_value = stat_path.get_score(include_bonus = FALSE) - var/log_text = "[key_name(user, TRUE, TRUE)] decreased stat '[stat_path.name]' from [old_value] to [new_value]" - log_stats(log_text) + var/real_name = user.client.prefs.read_preference(/datum/preference/name/real_name) + user.log_message("decreased stat '[stat_path.name]' from [old_value] to [new_value] on '[real_name]'", LOG_STATS) return TRUE /datum/preference_middleware/stats/proc/reset_stats(list/params, mob/user) @@ -100,8 +100,9 @@ to_chat(user, span_warning("You have to be in the main menu to adjust your stats.")) return FALSE - var/log_text = "[key_name(user, TRUE, TRUE)] reset all stats to default values" - log_stats(log_text) + var/real_name = user.client.prefs.read_preference(/datum/preference/name/real_name) + user.log_message("reset all stats to default values on '[real_name]'", LOG_STATS) + preferences.preference_storyteller_stats = null preferences.preference_storyteller_stats = create_new_stat_prefs(preferences.preference_storyteller_stats) return TRUE diff --git a/modular_darkpack/modules/umbra/code/minesweeper.dm b/modular_darkpack/modules/umbra/code/minesweeper.dm index d8b2102efa1a..4a6934c81698 100644 --- a/modular_darkpack/modules/umbra/code/minesweeper.dm +++ b/modular_darkpack/modules/umbra/code/minesweeper.dm @@ -1,3 +1,6 @@ +/datum/storyteller_roll/mindsweeper + applicable_stats = list(STAT_PERCEPTION, STAT_OCCULT) + /obj/minespot name = "safe umbral tether" desc = "Connects the parts of Penumbra together." @@ -35,7 +38,8 @@ icon_state = "boom" if(!dangerous) return - var/roll_result = SSroll.storyteller_roll(user.st_get_stat(STAT_PERCEPTION) + user.st_get_stat(STAT_OCCULT), 6, list(user), user) + var/datum/storyteller_roll/mindsweeper/perc_roll = new() + var/roll_result = perc_roll.st_roll(user, src) switch(roll_result) if(ROLL_SUCCESS) to_chat(user, span_revenwarning("Close... but the spirits do not punish you for this one.")) diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/blood_power.dm b/modular_darkpack/modules/vampire_the_masquerade/code/blood_power.dm index eccf09a22f21..b49b8a0ad234 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/blood_power.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/blood_power.dm @@ -6,9 +6,15 @@ background_icon = 'modular_darkpack/master_files/icons/mob/actions/backgrounds.dmi' background_icon_state = "bg_discipline" check_flags = AB_CHECK_HANDS_BLOCKED | AB_CHECK_IMMOBILE | AB_CHECK_LYING | AB_CHECK_CONSCIOUS - cooldown_time = 10 SECONDS + cooldown_time = 1 TURNS vampiric = TRUE + /// How much the ability costs to activate per "turn" + var/bp_per_turns = 1 + var/stat_buff_amount = 1 + // Activated for two "turns" as 5 seconds is acctually pretty short. Opens to door to let players set how long they are declaring it active for. + /// How many "turns" its activated for. Multiplies the blood cost. + var/turns_activated = 2 var/datum/armor/old_armor var/list/obj/item/bodypart/strengthened_limbs @@ -26,42 +32,45 @@ return FALSE var/mob/living/carbon/human/human_owner = owner - var/cost = HAS_TRAIT(human_owner, TRAIT_HUNGRY) ? 3 : 2 - if (human_owner.bloodpool < cost) + if (human_owner.bloodpool < current_bp_cost(human_owner)) if (feedback) SEND_SOUND(human_owner, sound('modular_darkpack/modules/deprecated/sounds/need_blood.ogg', volume = 75)) owner.balloon_alert(owner, "not enough BLOOD!") return FALSE /datum/action/cooldown/blood_power/Activate(mob/living/target) - cooldown_time = 10 SECONDS + target.discipline_time_plus + target.bloodpower_time_plus + cooldown_time = turns_activated TURNS . = ..() + if(!ishuman(owner)) + return var/mob/living/carbon/human/human_owner = owner - playsound(usr, 'modular_darkpack/modules/deprecated/sounds/bloodhealing.ogg', 50, FALSE) + playsound(usr, 'modular_darkpack/modules/vampire_the_masquerade/sounds/bloodhealing.ogg', 50, FALSE) to_chat(human_owner, span_notice("You use blood to become more powerful.")) - for (var/obj/item/bodypart/limb in human_owner.bodyparts) - limb.unarmed_damage_low += 5 - limb.unarmed_damage_high += 5 - LAZYADD(strengthened_limbs, limb) - + // DARKPACK TODO - This can be represented by having stam do anything old_armor = human_owner.physiology.armor human_owner.physiology.armor = old_armor.generate_new_with_modifiers(list(MELEE = 15, BULLET = 15)) - human_owner.st_add_stat_mod(STAT_STRENGTH, 2, "blood_power") - human_owner.st_add_stat_mod(STAT_DEXTERITY, 2, "blood_power") - human_owner.st_add_stat_mod(STAT_STAMINA, 2, "blood_power") + human_owner.st_add_stat_mod(STAT_STRENGTH, stat_buff_amount, "blood_power") + human_owner.st_add_stat_mod(STAT_DEXTERITY, stat_buff_amount, "blood_power") + human_owner.st_add_stat_mod(STAT_STAMINA, stat_buff_amount, "blood_power") - var/cost = HAS_TRAIT(owner, TRAIT_HUNGRY) ? 3 : 2 - human_owner.adjust_blood_pool(-cost) + human_owner.adjust_blood_pool(-current_bp_cost(human_owner)) ADD_TRAIT(human_owner, TRAIT_IGNORESLOWDOWN, MAGIC_TRAIT) addtimer(CALLBACK(src, PROC_REF(end_bloodpower)), cooldown_time) +/datum/action/cooldown/blood_power/proc/current_bp_cost(mob/living/carbon/human/human_owner) + var/cost = bp_per_turns * turns_activated * stat_buff_amount + if(HAS_TRAIT(human_owner, TRAIT_HUNGRY)) + cost = round(cost * 1.5) + cost = round(cost * human_owner.blood_efficiency) + return cost + /datum/action/cooldown/blood_power/proc/end_bloodpower() if (!owner || !ishuman(owner)) return @@ -69,11 +78,6 @@ var/mob/living/carbon/human/human_owner = owner to_chat(human_owner, span_warning("You feel like your BLOOD power slowly decreases.")) - for (var/obj/item/bodypart/limb in strengthened_limbs) - limb.unarmed_damage_low -= 5 - limb.unarmed_damage_high -= 5 - strengthened_limbs = null - human_owner.physiology.armor = old_armor human_owner.st_remove_stat_mod(STAT_STRENGTH, "blood_power") @@ -81,3 +85,32 @@ human_owner.st_remove_stat_mod(STAT_STAMINA, "blood_power") REMOVE_TRAIT(human_owner, TRAIT_IGNORESLOWDOWN, MAGIC_TRAIT) + +/datum/action/cooldown/blood_power/proc/set_usage() + var/turns = tgui_input_number(owner, "Set turns ([1 TURNS / 10] seconds per turn) to use blood for.", "Set Bloodpower Turns", turns_activated, TURNS_PER_SCENE, 1) + if(turns) + turns_activated = turns + var/datum/splat/vampire/kindred/kindred_splat = iskindred(owner) + if(!kindred_splat) + return + // Realising this is reimplenting very similar behavior to discs and could possibly just be typed under it. + var/max_buff_amount = kindred_splat.vitae_spending_rate + if(max_buff_amount <= 1) // No reason to prompt them if they only have one option + return + stat_buff_amount = clamp(stat_buff_amount, 0, max_buff_amount) + var/stat_buff_input = tgui_input_number(owner, "Set amount of dice to add for usage. (Max based on your generation)", "Set Buff Bonus", stat_buff_amount, max_buff_amount, 1) + if(stat_buff_input) + stat_buff_amount = stat_buff_input + +// DARKPACK TODO - (Refactor. Both this and discs should prob just have a subtype for /action_button) +/atom/movable/screen/movable/action_button/Click(location, control, params) + if(istype(linked_action, /datum/action/cooldown/blood_power)) + var/list/modifiers = params2list(params) + + //increase on right click, decrease on shift right click + if(LAZYACCESS(modifiers, RIGHT_CLICK)) + var/datum/action/cooldown/blood_power/bp_action = linked_action + bp_action.set_usage() + return + //TODO: middle click to swap loadout + . = ..() diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm index 3671ab7f0951..2adee483e833 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/humanity.dm @@ -34,9 +34,12 @@ //before going any further, roll either conscience or conviction to determine if we actually lose path/humanity if(humanity_change < 0) var/stat_to_roll = is_enlightenment ? STAT_CONVICTION : STAT_CONSCIENCE - var/degeneration_roll = SSroll.storyteller_roll(owner.st_get_stat(stat_to_roll), difficulty, owner, numerical = FALSE) + var/datum/storyteller_roll/degeneration_roll = new() + degeneration_roll.applicable_stats = list(stat_to_roll) + degeneration_roll.difficulty = difficulty + var/roll_result = degeneration_roll.st_roll(owner) - if(degeneration_roll == ROLL_SUCCESS) + if(roll_result == ROLL_SUCCESS) to_chat(owner, span_green("Your [is_enlightenment ? "conviction" : "conscience"] prevents you from losing [path] as you successfully justify your actions!")) return else diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/torpor.dm b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/torpor.dm index 64ba868c0fa3..861299439d40 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/kindred/torpor.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/kindred/torpor.dm @@ -14,6 +14,7 @@ var/torpor_time = (14 - morality_score) MINUTES COOLDOWN_START(vampirism, torpor_timer, torpor_time) // RegisterSignal(new_kindred, COMSIG_PATH_HIT, PROC_REF(adjust_morality)) + /mob/living/proc/cure_torpor(source, force) if(!HAS_TRAIT_FROM(src, TRAIT_TORPOR, source)) return diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/preferences/immortal_age.dm b/modular_darkpack/modules/vampire_the_masquerade/code/preferences/immortal_age.dm index 5d2a78d29029..c4f944b3be1d 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/preferences/immortal_age.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/preferences/immortal_age.dm @@ -1,5 +1,5 @@ /datum/preference/numeric/immortal_age - category = PREFERENCE_CATEGORY_SECONDARY_FEATURES + category = PREFERENCE_CATEGORY_NON_CONTEXTUAL savefile_key = "immortal_age" savefile_identifier = PREFERENCE_CHARACTER priority = PREFERENCE_PRIORITY_TABLETOP diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm b/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm index 52aa8d79da7a..9569e1c51c06 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/splats/kindred_splat/kindred_splat.dm @@ -78,6 +78,8 @@ // Morality loss RegisterSignal(owner, COMSIG_PATH_HIT, PROC_REF(adjust_morality)) + RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_kindred_death)) + // Make all food except raw meat repulsive var/obj/item/organ/tongue/tongue = owner.get_organ_by_type(/obj/item/organ/tongue) tongue?.liked_foodtypes = NONE @@ -94,11 +96,14 @@ /datum/splat/vampire/kindred/on_lose() owner.set_clan(null) - UnregisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN) - UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION)) - UnregisterSignal(owner, COMSIG_MOB_VAMPIRE_SUCKED) - UnregisterSignal(owner, COMSIG_MOB_APPLY_DAMAGE_MODIFIERS) - UnregisterSignal(owner, COMSIG_HUMAN_ON_HANDLE_BLOOD) + UnregisterSignal(owner, list( + COMSIG_CARBON_LOSE_ORGAN, + SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION), + COMSIG_MOB_VAMPIRE_SUCKED, + COMSIG_MOB_APPLY_DAMAGE_MODIFIERS, + COMSIG_HUMAN_ON_HANDLE_BLOOD, + COMSIG_LIVING_DEATH + )) // Reset tongue var/obj/item/organ/tongue/tongue = owner.get_organ_by_type(/obj/item/organ/tongue) @@ -185,6 +190,40 @@ return HANDLE_BLOOD_NO_NUTRITION_DRAIN|HANDLE_BLOOD_NO_OXYLOSS +/datum/splat/vampire/kindred/proc/on_kindred_death(mob/living/carbon/human/kindred, gibbed) + if(gibbed) + return + + kindred.can_be_embraced = FALSE + var/obj/item/organ/brain/brain = kindred.get_organ_slot(ORGAN_SLOT_BRAIN) //NO REVIVAL EVER + if(brain) + brain.organ_flags |= ORGAN_FAILING + + /* + if(HAS_TRAIT(src, TRAIT_IN_FRENZY)) + exit_frenzymod() + */ + SEND_SOUND(kindred, sound('modular_darkpack/modules/vampire_the_masquerade/sounds/final_death.ogg', volume = 50)) + + switch(kindred.chronological_age) + if(-INFINITY to 10) //normal corpse + return + if(10 to 50) + kindred.rot_body(1) //skin takes on a weird colouration + kindred.visible_message(span_notice("[kindred]'s skin loses some of its colour.")) + if(50 to 100) + kindred.rot_body(2) //looks slightly decayed + kindred.visible_message(span_notice("[kindred]'s skin rapidly decays.")) + if(100 to 150) + kindred.rot_body(3) //looks very decayed + kindred.visible_message(span_warning("[kindred]'s body rapidly decomposes!")) + if(150 to 200) + kindred.rot_body(4) //mummified skeletonised corpse + kindred.visible_message(span_warning("[kindred]'s body rapidly skeletonises!")) + if(200 to INFINITY) //turn to ash + playsound(kindred, 'modular_darkpack/modules/vampire_the_masquerade/sounds/burning_death.ogg', 80, TRUE) + kindred.dust(just_ash = TRUE, drop_items = TRUE, force = TRUE) + /datum/splat/vampire/kindred/vv_edit_var(var_name, var_value) switch (var_name) if (NAMEOF(src, generation)) diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_globals.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_globals.dm index 864a5eb1dbbb..220d9e72d5f4 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_globals.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_globals.dm @@ -4,19 +4,12 @@ GLOBAL_LIST_INIT(vampire_clan_list, init_vampire_clan_list()) /proc/init_vampire_clan_list() var/list/clan_list = list() for (var/datum/vampire_clan/clan_type as anything in valid_subtypesof(/datum/vampire_clan)) - clan_list[initial(clan_type.name)] = clan_type + clan_list[clan_type::name] = clan_type clan_list = sort_list(clan_list) return clan_list /// Associative list of Clan typepaths to singletons -GLOBAL_LIST_INIT_TYPED(vampire_clans, /datum/vampire_clan, init_vampire_clans()) - -/proc/init_vampire_clans() - var/list/clan_list = list() - for (var/datum/vampire_clan/clan_type as anything in valid_subtypesof(/datum/vampire_clan)) - clan_list[clan_type] = new clan_type - clan_list = sort_list(clan_list) - return clan_list +GLOBAL_LIST_INIT_TYPED(vampire_clans, /datum/vampire_clan, init_subtypes_w_path_keys(/datum/vampire_clan, list())) /// All frenzied players GLOBAL_LIST_EMPTY(frenzy_list) diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_mark_pref.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_mark_pref.dm index d18dbcf2eb41..90b12e5b1ca9 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_mark_pref.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clan_mark_pref.dm @@ -1,7 +1,7 @@ /datum/preference/external_choiced/clan_mark savefile_key = "clan_mark" savefile_identifier = PREFERENCE_CHARACTER - priority = PREFERENCE_PRIORITY_REQUIRES_CLAN + priority = PREFERENCE_PRIORITY_REQUIRES_SUBSPLAT category = PREFERENCE_CATEGORY_SECONDARY_FEATURES relevant_inherent_trait = TRAIT_VTM_CLANS diff --git a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm index b454fddcf9bf..4a4465184637 100644 --- a/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm +++ b/modular_darkpack/modules/vampire_the_masquerade/code/vampire_clan/clans/lasombra/lasombra.dm @@ -23,3 +23,27 @@ H.vis_flags |= VIS_HIDE H.add_faction(VAMPIRE_CLAN_LASOMBRA) + +// Not TTRPG accurate and is pending a rework to use real rolls after #633 +/proc/scramble_lasombra_message(message, mob/living/lasombra) + var/static/list/zalgo_letters = list( + "̨a", "̡b", "̢c", "̷d", "̶e", "̸f", "̹g", "̺h", "̻i", + "̼j", "̽k", "̾l", "̿m", "͈n", "͍o", "͎p", "q", "͕r", + "͓s", "͒t", "̱u", "̲v", "̳w", "͡x", "̨y", "̨z", "̨A", + "̨B", "̨C", "̨D", "̨E", "̨F", "̨G", "̨H", "̨I", "̨J", + "̨K", "̨L", "̨M", "̨N", "̨O", "̨P", "̨Q", "̨R", "̨S", + "̨T", "̨U", "̨V", "̨W", "̨X", "̨Y", "̨Z" + ) + var/gibberish_message = "" + var/total_stats = 0 + if(istype(lasombra)) + total_stats = lasombra.st_get_stat(STAT_TECHNOLOGY) * 3 // +3% chance per tech. 15 max, 18 avg, 24 beauty.9 + for(var/i = 1 to length(message)) + var/char = message[i] + // Randomize or replace characters with gibberish + var/chance = 70 + total_stats // 70% + total_stats chance per point of social to keep intact. + if(prob(chance)) + gibberish_message += char + else + gibberish_message += pick(zalgo_letters) // Replace with random gibberish letters + return gibberish_message diff --git a/modular_darkpack/modules/deprecated/sounds/bloodhealing.ogg b/modular_darkpack/modules/vampire_the_masquerade/sounds/bloodhealing.ogg similarity index 100% rename from modular_darkpack/modules/deprecated/sounds/bloodhealing.ogg rename to modular_darkpack/modules/vampire_the_masquerade/sounds/bloodhealing.ogg diff --git a/modular_darkpack/modules/vip_areas/code/vip_barrier_perm.dm b/modular_darkpack/modules/vip_areas/code/vip_barrier_perm.dm index 90e82b337528..f69962123032 100644 --- a/modular_darkpack/modules/vip_areas/code/vip_barrier_perm.dm +++ b/modular_darkpack/modules/vip_areas/code/vip_barrier_perm.dm @@ -88,11 +88,11 @@ var/mob/living/carbon/human/npc/bouncer/target_bouncer = pick(linked_bouncers) target_bouncer.speak_seldom(pick(target_bouncer.block_phrases), target_mob) -/datum/vip_barrier_perm/proc/notify_barrier_social_bypass(mob/user, mob/bouncer, used_badge) - if(!linked_barriers.len) +/datum/vip_barrier_perm/proc/notify_barrier_social_bypass(mob/user, mob/bouncer, used_badge, used_stat) + if(!length(linked_barriers) || !isliving(user)) return var/obj/effect/vip_barrier/target_barrier = linked_barriers[1] - target_barrier.handle_social_bypass(user, bouncer, used_badge) + target_barrier.handle_social_bypass(user, bouncer, used_badge, used_stat) //============================================================================= diff --git a/modular_darkpack/modules/vip_areas/code/vip_barriers/__vip_barrier.dm b/modular_darkpack/modules/vip_areas/code/vip_barriers/__vip_barrier.dm index d43c01dce6b8..dedecb303cea 100644 --- a/modular_darkpack/modules/vip_areas/code/vip_barriers/__vip_barrier.dm +++ b/modular_darkpack/modules/vip_areas/code/vip_barriers/__vip_barrier.dm @@ -3,11 +3,13 @@ desc = "Not a real checkpoint." icon = 'modular_darkpack/modules/vip_areas/icons/barrier.dmi' icon_state = "camarilla_blocking" + + anchored = TRUE + var/block_sound = "modular_darkpack/modules/deprecated/sounds/bouncer_blocked.ogg" //Social bypass numbers var/social_bypass_allowed = TRUE - var/social_bypass_time = 20 SECONDS var/can_use_badge = TRUE var/mean_to_cops = TRUE var/social_roll_difficulty = 7 @@ -15,9 +17,7 @@ //Display settings var/always_invisible = FALSE - density = FALSE - anchored = TRUE - + var/datum/storyteller_roll/scene_cooldown/bypass_roll //Assigns an ID to NPCs that guard certain doors, must match a barrier's ID @@ -101,7 +101,7 @@ /obj/effect/vip_barrier/proc/check_entry_permission_custom(mob/living/carbon/human/entering_mob) return TRUE -/obj/effect/vip_barrier/proc/handle_social_bypass(mob/living/carbon/human/user, mob/bouncer, used_badge = FALSE) +/obj/effect/vip_barrier/proc/handle_social_bypass(mob/living/carbon/human/user, mob/bouncer, used_badge = FALSE, used_stat = STAT_EMPATHY) if(user.get_face_name() == "Unknown") to_chat(user, span_notice("They won't talk to someone they can't look in the eye.")) @@ -119,18 +119,29 @@ linked_perm.notify_guard_blocked_denial(user) return - - if(!do_after(user, max(5 SECONDS, social_bypass_time - (user.st_get_stat(STAT_CHARISMA) * 2 SECONDS)), bouncer)) + if(!do_after(user, 1 TURNS, bouncer)) return - - var/involved_social_roll = social_roll_difficulty if(used_badge) involved_social_roll -= 1 - if(SSroll.storyteller_roll(user.st_get_stat(STAT_CHARISMA), involved_social_roll, mobs_to_show_output = user) == ROLL_SUCCESS) - to_chat(user, span_notice("You manage to persuade your way past the guards.")) + if(!bypass_roll) + bypass_roll = new() + bypass_roll.bumper_text = "persuade guard" + + var/verbage + bypass_roll.difficulty = involved_social_roll + bypass_roll.applicable_stats = list(STAT_CHARISMA) + if(used_stat == STAT_INTIMIDATION) + verbage = "intimidate" + bypass_roll.applicable_stats += used_stat + else + verbage = "persuade" + bypass_roll.applicable_stats += used_stat + + if(bypass_roll.st_roll(user, src) == ROLL_SUCCESS) + to_chat(user, span_notice("You manage to [verbage] your way past the guards.")) linked_perm.allow_list += user.get_face_name() return diff --git a/modular_darkpack/modules/vitae/code/blood_pack.dm b/modular_darkpack/modules/vitae/code/blood_pack.dm index f82f58723bba..f53ece7db5fc 100644 --- a/modular_darkpack/modules/vitae/code/blood_pack.dm +++ b/modular_darkpack/modules/vitae/code/blood_pack.dm @@ -31,16 +31,18 @@ inhand_icon_state = icon_state onflooricon_state = icon_state -/obj/item/reagent_containers/blood/attack(mob/living/M, mob/living/user) - . = ..() - if(!canconsume(M, user)) - return - if(!do_after(user, 3 SECONDS, M)) - return - reagents.trans_to(M, reagents.total_volume, transferred_by = user, methods = INGEST, show_message = FALSE) - playsound(M.loc, 'sound/items/drink.ogg', 50, TRUE) +/obj/item/reagent_containers/blood/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!ismob(interacting_with)) + return NONE + if(!canconsume(interacting_with, user)) + return ITEM_INTERACT_BLOCKING + if(!do_after(user, 3 SECONDS, interacting_with)) + return ITEM_INTERACT_BLOCKING + reagents.trans_to(interacting_with, reagents.total_volume, transferred_by = user, methods = INGEST, show_message = FALSE) + playsound(interacting_with.loc, 'sound/items/drink.ogg', 50, TRUE) update_appearance() - //SEND_SIGNAL(M, COMSIG_MASQUERADE_VIOLATION) + // SEND_SIGNAL(interacting_with, COMSIG_MASQUERADE_VIOLATION) - warning, interacting_with is the person who will be breaching, griefing potential here if a player walks up and feeds someone a bloodbag in public causing them to breach. resolve this prior to uncommenting + return ITEM_INTERACT_SUCCESS /obj/item/reagent_containers/blood/empty blood_type = null diff --git a/modular_darkpack/modules/vitae/code/embracing.dm b/modular_darkpack/modules/vitae/code/embracing.dm index 742487125462..28452f65ff07 100644 --- a/modular_darkpack/modules/vitae/code/embracing.dm +++ b/modular_darkpack/modules/vitae/code/embracing.dm @@ -37,7 +37,7 @@ //addtimer(CALLBACK(childe, PROC_REF(embrace_persistence_confirmation)), 1 SECONDS) -/* // DARKPACK TODO - GAROU +/* // DARKPACK TODO - WEREWOLF /mob/living/carbon/human/proc/attempt_abomination_embrace(mob/living/carbon/human/childe, second_party_embrace) if(!(childe.auspice?.level)) //here be Abominations return diff --git a/modular_darkpack/modules/vitae/code/vitae.dm b/modular_darkpack/modules/vitae/code/vitae.dm index a89949c17021..6dbfc41182d8 100644 --- a/modular_darkpack/modules/vitae/code/vitae.dm +++ b/modular_darkpack/modules/vitae/code/vitae.dm @@ -14,7 +14,7 @@ var/datum/weakref/embracer_weakref = data["donor"] var/mob/living/carbon/human/embracer = embracer_weakref?.resolve() - //if(isgarou(victim)) //Are we a garou species? DARKPACK TODO - GAROU + //if(isgarou(victim)) //Are we a garou species? DARKPACK TODO - WEREWOLF // attempt_abomination_embrace(childe) // victim.rollfrenzy() // return diff --git a/modular_darkpack/modules/walls/code/walls.dm b/modular_darkpack/modules/walls/code/walls.dm index 4aa641980faf..7a2513495fe0 100644 --- a/modular_darkpack/modules/walls/code/walls.dm +++ b/modular_darkpack/modules/walls/code/walls.dm @@ -76,18 +76,18 @@ if(user.body_position != STANDING_UP) return if(above_turf && istype(above_turf, /turf/open/openspace)) - var/total_dexterity = user.st_get_stat(STAT_DEXTERITY) - var/total_athletics = user.st_get_stat(STAT_ATHLETICS) to_chat(user, span_notice("You start climbing up...")) add_fingerprint(user) - var/result = do_after(user, (11 - total_dexterity - total_athletics) SECONDS, src) + var/result = do_after(user, 1 TURNS, src) if(!result || HAS_TRAIT(user, LEANING_TRAIT)) to_chat(user, span_notice("You were interrupted and failed to climb up.")) return //(Botch, slip and take damage), (Fail, fail to climb), (Success, climb up successfully) - var/roll = SSroll.storyteller_roll(total_dexterity+total_athletics, 6, user) + + var/datum/storyteller_roll/climbing/climb_roll = new() + var/roll = climb_roll.st_roll(user, src) switch(roll) if(ROLL_BOTCH) user.ZImpactDamage(loc, 1) diff --git a/modular_darkpack/modules/weapons/code/melee.dm b/modular_darkpack/modules/weapons/code/melee.dm index 3c2d839afd22..d4e078f62808 100644 --- a/modular_darkpack/modules/weapons/code/melee.dm +++ b/modular_darkpack/modules/weapons/code/melee.dm @@ -20,6 +20,7 @@ righthand_file = 'modular_darkpack/modules/deprecated/icons/righthand.dmi' worn_icon = 'modular_darkpack/modules/weapons/icons/worn_melee.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT // Should really be suit storage pixel_w = -8 custom_price = 1800 @@ -32,6 +33,7 @@ worn_icon = 'modular_darkpack/modules/weapons/icons/worn_melee.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') pixel_w = -8 + custom_price = 1300 /obj/item/katana/vamp/Initialize(mapload) . = ..() @@ -148,6 +150,7 @@ . = ..() AddComponent(/datum/component/selling, 600, "longsword", FALSE) +// "Keepers" derived from "my brother's keeper" are an epithet for Lasombra but this seems to be a wholly unqiue item not found in any book. /obj/item/claymore/longsword/keeper name = "The Brother's Keeper" desc = "The ancient yet classic weapon of times gone, this is a longsword. This exemplar is surprisingly well taken care of, despite its age, to the point that whatever blood or vitae it may have drawn in the past is not visible at all, while still functioning as well as it first did however long ago. Upon the flat side of this blade, a simple well-worn inscription is engraved in Latin. 'In Death, I Rise.'" @@ -156,27 +159,15 @@ force = 50 block_chance = 45 armour_penetration = 40 - sharpness = SHARP_EDGED attack_verb_continuous = list("slashes", "cuts") attack_verb_simple = list("slash", "cut") hitsound = 'sound/items/weapons/rapierhit.ogg' wound_bonus = 5 - resistance_flags = FIRE_PROOF - masquerade_violating = FALSE //is_iron = FALSE DARKPACK TODO - Kiasyd -/obj/item/claymore/longsword/keeper/afterattack(atom/target, mob/living/carbon/user, proximity) +/obj/item/claymore/longsword/keeper/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers) . = ..() - /* DARKPACK TODO - WEREWOLF - (this is a silver longsword) - if(iswerewolf(target) || isgarou(target) && proximity) - var/mob/living/carbon/M = target - if(M.auspice.gnosis) - if(prob(50)) - adjust_gnosis(-1, M) - - M.apply_damage(25, CLONE) - M.apply_status_effect(STATUS_EFFECT_SILVER_SLOWDOWN) - */ + fera_silver_damage(target, 5, 1) /obj/item/melee/baseball_bat/vamp name = "baseball bat" @@ -188,6 +179,7 @@ ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') icon_state = "baseball" inhand_icon_state = "baseball" + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT // Should really be suit storage custom_price = 50 /obj/item/melee/baseball_bat/vamp/Initialize(mapload) @@ -328,6 +320,7 @@ righthand_file = 'modular_darkpack/modules/deprecated/icons/righthand.dmi' worn_icon = 'modular_darkpack/modules/weapons/icons/worn_melee.dmi' ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_BELT icon_state = "rock0" inhand_icon_state = "rock0" diff --git a/modular_darkpack/modules/weapons/code/pliers.dm b/modular_darkpack/modules/weapons/code/pliers.dm index d31ad116ecf3..2d07bb87fc3a 100644 --- a/modular_darkpack/modules/weapons/code/pliers.dm +++ b/modular_darkpack/modules/weapons/code/pliers.dm @@ -5,25 +5,15 @@ icon_state = "neat_ripper" lefthand_file = 'modular_darkpack/modules/weapons/icons/melee_lefthand.dmi' righthand_file = 'modular_darkpack/modules/weapons/icons/melee_righthand.dmi' - onflooricon_state = "neat_ripper" inhand_icon_state = "neat_ripper" toolspeed = 2 //isn't meant for cutting wires + slot_flags = NONE /// If pulling fangs lasts for the entire ROUND or not. var/permanent = TRUE - slot_flags = NONE - -/obj/item/wirecutters/pliers/bad_pliers - name = "pliers" - desc = "Meant for pulling wires but you could definetly crush something with these." - icon_state = "ripper" - onflooricon_state = "ripper" - inhand_icon_state = "ripper" - toolspeed = 1.2 //is an actual tool but can't actually cut - permanent = FALSE +/* DARKPACK TODO - MERITS/FLAWS related to feeding /obj/item/wirecutters/pliers/attack(mob/living/target, mob/living/user) . = ..() - /* DARKPACK TODO - Merits/Flaws related to feeding if(HAS_TRAIT(user, TRAIT_PACIFISM)) return if(HAS_TRAIT(target, TRAIT_BABY_TEETH)) @@ -42,4 +32,12 @@ visible_message(span_warning("[user] stuff's in Bone putty into [target] to stop their canines from regrowing!")) else target.apply_status_effect(STATUS_EFFECT_BABY_TEETH) - */ +*/ + +/obj/item/wirecutters/pliers/bad_pliers + name = "pliers" + desc = "Meant for pulling wires but you could definetly crush something with these." + icon_state = "ripper" + inhand_icon_state = "ripper" + toolspeed = 1.2 //is an actual tool but can't actually cut + permanent = FALSE diff --git a/modular_darkpack/modules/weapons/code/projectiles.dm b/modular_darkpack/modules/weapons/code/projectiles.dm index 49761bffd098..a80e7527a32f 100644 --- a/modular_darkpack/modules/weapons/code/projectiles.dm +++ b/modular_darkpack/modules/weapons/code/projectiles.dm @@ -15,18 +15,10 @@ /obj/projectile/bullet/darkpack/vamp9mm/silver name = "9mm silver bullet" -/* /obj/projectile/bullet/darkpack/vamp9mm/silver/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() - if(iswerewolf(target) || isgarou(target)) - var/mob/living/carbon/M = target - if(M.auspice.gnosis) - if(prob(50)) - adjust_gnosis(-1, M) + fera_silver_damage(target, 2) - M.apply_damage(10, AGGRAVATED) - M.apply_status_effect(STATUS_EFFECT_SILVER_SLOWDOWN) -*/ // .45 ACP /obj/projectile/bullet/darkpack/vamp45acp name = ".45 ACP bullet" @@ -43,18 +35,10 @@ /obj/projectile/bullet/darkpack/vamp45acp/silver name = ".45 ACP silver bullet" -/* /obj/projectile/bullet/darkpack/vamp45acp/silver/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() - if(iswerewolf(target) || isgarou(target)) - var/mob/living/carbon/M = target - if(M.auspice.gnosis) - if(prob(50)) - adjust_gnosis(-1, M) + fera_silver_damage(target, 3) - M.apply_damage(15, AGGRAVATED) - M.apply_status_effect(STATUS_EFFECT_SILVER_SLOWDOWN) -*/ // .44 Magnum /obj/projectile/bullet/darkpack/vamp44 name = ".44 bullet" @@ -67,18 +51,10 @@ name = ".44 silver bullet" //icon_state = "s44" -/* /obj/projectile/bullet/darkpack/vamp44/silver/on_hit(atom/target, blocked = 0, pierce_hit) . = ..() - if(iswerewolf(target) || isgarou(target)) - var/mob/living/carbon/M = target - if(M.auspice.gnosis) - if(prob(50)) - adjust_gnosis(-1, M) + fera_silver_damage(target, 4) - M.apply_damage(20, AGGRAVATED) - M.apply_status_effect(STATUS_EFFECT_SILVER_SLOWDOWN) -*/ // .50 BMG/AE /obj/projectile/bullet/darkpack/vamp50 name = ".50 BMG bullet" @@ -168,11 +144,10 @@ . = ..() if(iscarbon(target)) var/mob/living/carbon/hit_person = target - if(SSroll.storyteller_roll( - dice = hit_person.st_get_stat(STAT_STRENGTH) + min(hit_person.st_get_stat(STAT_DEXTERITY) + hit_person.st_get_stat(STAT_ATHLETICS)), - difficulty = 3 + (!isnull(firer) ? rand(1,2) : 0), - mobs_to_show_output = target - ) == ROLL_FAILURE) + var/datum/storyteller_roll/knockdown_roll = new() + knockdown_roll.applicable_stats = list(STAT_STRENGTH, STAT_DEXTERITY, STAT_ATHLETICS) + knockdown_roll.difficulty = 3 + (!isnull(firer) ? rand(1,2) : 0) + if(knockdown_roll.st_roll(target, firer ? firer : src) == ROLL_FAILURE) hit_person.Knockdown(20) to_chat(hit_person, span_danger("The force of a projectile sends you sprawling!")) diff --git a/modular_darkpack/modules/weapons/icons/worn_guns.dmi b/modular_darkpack/modules/weapons/icons/worn_guns.dmi index 7aee5d789094..911da95ca2bf 100644 Binary files a/modular_darkpack/modules/weapons/icons/worn_guns.dmi and b/modular_darkpack/modules/weapons/icons/worn_guns.dmi differ diff --git a/modular_darkpack/modules/weapons/icons/worn_melee.dmi b/modular_darkpack/modules/weapons/icons/worn_melee.dmi index 12c8f1edb932..feadb9fe5d05 100644 Binary files a/modular_darkpack/modules/weapons/icons/worn_melee.dmi and b/modular_darkpack/modules/weapons/icons/worn_melee.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/emotes.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/emotes.dm new file mode 100644 index 000000000000..24795cf5a1fa --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/emotes.dm @@ -0,0 +1,70 @@ +/datum/emote/living/growl + key = "growl" + key_third_person = "growls" + message = "growls!" + emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE + +/datum/emote/living/growl/get_sound(mob/living/carbon/human/user) + if(!istype(user)) + return + return user.dna.species.get_growl_sound(user) + +/// Returns the species' growl sound +/datum/species/proc/get_growl_sound(mob/living/carbon/human/human) + if(human.physique == FEMALE) + return 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/female_growl.ogg' + return 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/male_growl.ogg' + +/datum/species/human/shifter/war/get_growl_sound(mob/living/carbon/human/human) + return 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/crinos_growl.ogg' +/datum/species/human/shifter/dire/get_growl_sound(mob/living/carbon/human/human) + return 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/crinos_growl.ogg' +/datum/species/human/shifter/feral/get_growl_sound(mob/living/carbon/human/human) + return 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/lupus_growl.ogg' + +/* // DARKPACK TODO - CORAX +/datum/emote/living/caw + key = "caw" + key_third_person = "caws" +message = "caws!" + emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE + +/datum/emote/living/caw/get_sound(mob/living/carbon/human/user) + if(!istype(user)) + return + return user.dna.species.get_caw_sound(user) +*/ + +/datum/emote/living/howl + key = "howl" + key_third_person = "howls" + message = "howls!" + message_param = "howls for %t!" + emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE + +/datum/emote/living/howl/get_sound(mob/living/user) + var/static/list/howl_sounds = list( + 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/awo1.ogg', + 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/emotes/awo2.ogg', + ) + if(isdog(user) || istype(user, /mob/living/basic/mining/wolf)) + return pick(howl_sounds) + + if(isgarou(user)) + return pick(howl_sounds) + + if(user.is_clan(/datum/vampire_clan/gangrel)) + return pick(howl_sounds) + +/datum/emote/living/howl/get_range(mob/living/user) + if(HAS_TRAIT(user, TRAIT_LOUD_HOWLER)) + return 60 + + if(isdog(user) || istype(user, /mob/living/basic/mining/wolf)) + return 7 + + if(isgarou(user)) + return 15 + + if(user.is_clan(/datum/vampire_clan/gangrel)) + return 7 diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/auspice.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/auspice.dm deleted file mode 100644 index 87462dda2a03..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/auspice.dm +++ /dev/null @@ -1,105 +0,0 @@ -/datum/auspice - var/name = "Loh" - var/desc = "Furry ebaka" - var/level = 1 - var/start_rage = 1 - var/rage = 1 - var/start_gnosis = 1 - var/gnosis = 1 - var/base_breed = "Homid" - var/tribe = "Wendigo" - var/list/gifts = list() - var/force_abomination = FALSE - - var/list/wendigo = list( - /datum/action/gift/stoic_pose = 1, - /datum/action/gift/freezing_wind = 2, - /datum/action/gift/bloody_feast = 3 - ) - - var/list/glasswalker = list( - /datum/action/gift/smooth_move = 1, - /datum/action/gift/digital_feelings = 2, - /datum/action/gift/elemental_improvement = 3 - ) - - var/list/spiral = list( - /datum/action/gift/stinky_fur = 1, - /datum/action/gift/venom_claws = 2, - /datum/action/gift/burning_scars = 3 - ) - -/datum/auspice/proc/on_gain(mob/living/carbon/C) - C.update_rage_hud() - C.transformator.lupus_form.auspice = src - C.transformator.lupus_form.dna = C.dna - C.transformator.crinos_form.auspice = src - C.transformator.crinos_form.dna = C.dna - rage = start_rage - if(length(gifts)) - for(var/i in gifts) - var/datum/action/A1 = new i() - A1.Grant(C) - var/datum/action/A2 = new i() - A2.Grant(C.transformator.lupus_form) - var/datum/action/A3 = new i() - A3.Grant(C.transformator.crinos_form) - - switch(tribe) - if("Glasswalkers") - for(var/i in 1 to level) - var/zalupa = glasswalker[i] - var/datum/action/A = new zalupa() - A.Grant(C) - var/datum/action/A1 = new zalupa() - A1.Grant(C.transformator.lupus_form) - var/datum/action/A2 = new zalupa() - A2.Grant(C.transformator.crinos_form) - if("Wendigo") - for(var/i in 1 to level) - var/zalupa = wendigo[i] - var/datum/action/A = new zalupa() - A.Grant(C) - var/datum/action/A1 = new zalupa() - A1.Grant(C.transformator.lupus_form) - var/datum/action/A2 = new zalupa() - A2.Grant(C.transformator.crinos_form) - if("Black Spiral Dancers") - for(var/i in 1 to level) - var/zalupa = spiral[i] - var/datum/action/A = new zalupa() - A.Grant(C) - var/datum/action/A1 = new zalupa() - A1.Grant(C.transformator.lupus_form) - var/datum/action/A2 = new zalupa() - A2.Grant(C.transformator.crinos_form) - -/datum/auspice/ahroun - name = "Ahroun" - desc = "The Ahroun is the archetype of the werewolf as murderous beast, though they range from unapologetic berserkers to hardened veterans tempering their Rage with discipline. Their high levels of Rage put them on the edge at all times - the Full Moon's blessing is a hair trigger, among other things. Those closer to the waxing moon tend to exult in the glory of the war, while those closer to the waning moon are more viciously pragmatic, ruthless in their bloodthirst. Every Ahroun is a dangerous individual to be around, but when the forces of the Wyrm attack, their packmates are glad to have a Full Moon warrior at the front of the charge." - start_rage = 5 - gifts = list(/datum/action/gift/falling_touch, /datum/action/gift/inspiration, /datum/action/gift/razor_claws) - -/datum/auspice/galliard - name = "Galliard" - desc = "Where the Philodox is stoic, the Galliard is a creature of unbridled passion. The Gibbous Moon is a fiery muse, and stirs its children into great heights and depths of emotion. While all Galliards are prone to immense mirth and immense melancholy, those born under a waning moon fall more readily into dark, consuming passions; they are the tragedians of the Garou, mastering tales of doom, ruin, sacrifice and loss. Conversely, their waxing-moon cousins sing of triumph and conquest, of the pounding heart and the love of life. They tend to be the soul of their pack's morale - when the Galliard is willing to go on, so too are all the others." - start_rage = 4 - gifts = list(/datum/action/gift/beast_speech, /datum/action/gift/call_of_the_wyld, /datum/action/gift/mindspeak) - -/datum/auspice/philodox - name = "Philodox" - desc = "Buried so heavily in his role as impartial judge and jury, the Philodox may seem aloof, even surprisingly cold-blooded for a werewolf. Those born under the waxing Half Moon may seem unusually serene and disaffected, their emotions only emerging when their Rage comes to a boil. The waning-moon Philodox is more incisive and judgmental, his all-seeing eye always carefully watching his packmates and colleagues for any departure from the expected. The Half Moons' opinions are somewhat feared, yet highly respected - a word of praise or condemnation means much coming from those born to see both sides of every struggle." - start_rage = 3 - gifts = list(/datum/action/gift/resist_pain, /datum/action/gift/scent_of_the_true_form, /datum/action/gift/truth_of_gaia) - -/datum/auspice/theurge - name = "Theurge" - desc = "The Crescent Moons can be strange and enigmatic, prone to falling into the convoluted symbolic logic of the spirits they truck with rather than the more familiar logic of humanity. Those Theurges born under the waning moon frequently have a harsher, more adversarial relationship with the spirit world - they tend to excel at binding and forcing spirits to their will, and are more vicious when battling spirits. Theurges born under the waxing moon tend to be more generous and open with the spirits, charming and cajoling rather than intimidating and threatening." - start_rage = 2 - gifts = list(/datum/action/gift/mothers_touch, /datum/action/gift/sense_wyrm, /datum/action/gift/spirit_speech) - -/datum/auspice/ragabash - name = "Ragabash" - desc = "The Ragabash born under the waxing new moon is usually light-hearted and capricious, while one born under the waning new moon has a slightly more wicked and ruthless streak. It's a rare Ragabash indeed that lacks a keen wit and the capacity to find some humor in any situation, no matter how bleak. Many other werewolves are slow to take the Ragabash seriously, though, as it's difficult to tell the difference between a New Moon's mockery that points out a grievous flaw in a plan and similar mockery that simply amuses him. Sometimes a Ragabash points out that the emperor has no clothes - but sometimes they're the first to cry wolf, so to speak." - start_rage = 1 - gifts = list(/datum/action/gift/blur_of_the_milky_eye, /datum/action/gift/open_seal, /datum/action/gift/infectious_laughter) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/garou_species.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/garou_species.dm deleted file mode 100644 index d4f498a15e00..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/garou_species.dm +++ /dev/null @@ -1,87 +0,0 @@ -/datum/species/garou - name = "Werewolf" - id = "garou" - default_color = "FFFFFF" - toxic_food = PINEAPPLE - species_traits = list(EYECOLOR, HAIR, FACEHAIR, LIPS, HAS_FLESH, HAS_BONE) - inherent_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_VIRUSIMMUNE, TRAIT_PERFECT_ATTACKER) - use_skintones = TRUE - limbs_id = "human" - wings_icon = "Dragon" - mutant_bodyparts = list("tail_human" = "None", "ears" = "None", "wings" = "None") - brutemod = 0.75 - heatmod = 1 - burnmod = 1 - dust_anim = "dust-h" - whitelisted = TRUE - selectable = TRUE - var/glabro = FALSE - -/datum/species/garou/on_species_gain(mob/living/carbon/human/C) - . = ..() -// ADD_TRAIT(C, TRAIT_NOBLEED, HIGHLANDER) - C.update_body(0) - C.last_experience = world.time+3000 - var/datum/action/gift/glabro/glabro = new() - glabro.Grant(C) - var/datum/action/gift/rage_heal/GH = new() - GH.Grant(C) - C.transformator = new(C) - C.transformator.human_form = C - - //garou resist vampire bites better than mortals - RegisterSignal(C, COMSIG_MOB_VAMPIRE_SUCKED, PROC_REF(on_garou_bitten)) - RegisterSignal(C.transformator.lupus_form, COMSIG_MOB_VAMPIRE_SUCKED, PROC_REF(on_garou_bitten)) - RegisterSignal(C.transformator.crinos_form, COMSIG_MOB_VAMPIRE_SUCKED, PROC_REF(on_garou_bitten)) - -/datum/species/garou/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) - . = ..() - UnregisterSignal(C, COMSIG_MOB_VAMPIRE_SUCKED) - UnregisterSignal(C.transformator.lupus_form, COMSIG_MOB_VAMPIRE_SUCKED) - UnregisterSignal(C.transformator.crinos_form, COMSIG_MOB_VAMPIRE_SUCKED) - for(var/datum/action/gift/G in C.actions) - G.Remove(C) - -/datum/species/garou/check_roundstart_eligible() - return FALSE - -/proc/adjust_rage(amount, mob/living/carbon/C, sound = TRUE) - if(amount > 0) - if(C.auspice.rage < 10) - if(sound) - SEND_SOUND(C, sound('modular_darkpack/modules/deprecated/sounds/rage_increase.ogg', volume = 75)) - to_chat(C, span_userdanger("RAGE INCREASES")) - C.auspice.rage = min(10, C.auspice.rage+amount) - if(amount < 0) - if(C.auspice.rage > 0) - C.auspice.rage = max(0, C.auspice.rage+amount) - if(sound) - SEND_SOUND(C, sound('modular_darkpack/modules/deprecated/sounds/rage_decrease.ogg', volume = 75)) - to_chat(C, span_userdanger("RAGE DECREASES")) - C.update_rage_hud() - -/proc/adjust_gnosis(amount, mob/living/carbon/C, sound = TRUE) - if(amount > 0) - if(C.auspice.gnosis < C.auspice.start_gnosis) - if(sound) - SEND_SOUND(C, sound('modular_darkpack/modules/deprecated/sounds/humanity_gain.ogg', volume = 75)) - to_chat(C, span_boldnotice("GNOSIS INCREASES")) - C.auspice.gnosis = min(C.auspice.start_gnosis, C.auspice.gnosis+amount) - if(amount < 0) - if(C.auspice.gnosis > 0) - C.auspice.gnosis = max(0, C.auspice.gnosis+amount) - if(sound) - SEND_SOUND(C, sound('modular_darkpack/modules/deprecated/sounds/rage_decrease.ogg', volume = 75)) - to_chat(C, span_boldnotice("GNOSIS DECREASES")) - C.update_rage_hud() - -/** - * On being bit by a vampire - * - * This handles vampire bite sleep immunity and any future special interactions. - */ -/datum/species/garou/proc/on_garou_bitten(datum/source, mob/living/carbon/being_bitten) - SIGNAL_HANDLER - - if(isgarou(being_bitten) || iswerewolf(being_bitten)) - return COMPONENT_RESIST_VAMPIRE_KISS diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/silver_slowdown.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/silver_slowdown.dm deleted file mode 100644 index 1d9f41e91a34..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/silver_slowdown.dm +++ /dev/null @@ -1,14 +0,0 @@ -/datum/status_effect/silver_slowdown - id = "slowdown" - status_type = STATUS_EFFECT_REPLACE - duration = 5 SECONDS - -/datum/status_effect/silver_slowdown/on_apply() - . = ..() - var/mob/living/carbon/user = owner - user.add_movespeed_modifier(/datum/movespeed_modifier/silver_slowdown) - -/datum/status_effect/silver_slowdown/on_remove() - . = ..() - var/mob/living/carbon/user = owner - user.remove_movespeed_modifier(/datum/movespeed_modifier/silver_slowdown) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/transformation.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/transformation.dm deleted file mode 100644 index 3d6a546356d9..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/transformation.dm +++ /dev/null @@ -1,176 +0,0 @@ -/obj/werewolf_holder/transformation - var/mob/living/carbon/human/human_form - var/mob/living/carbon/werewolf/crinos/crinos_form - var/mob/living/carbon/werewolf/lupus/lupus_form - - var/transformating = FALSE - var/given_quirks = FALSE - -/obj/werewolf_holder/transformation/Initialize(mapload) - . = ..() - crinos_form = new() - crinos_form.transformator = src - lupus_form = new() - lupus_form.transformator = src - -/obj/werewolf_holder/transformation/proc/transfer_damage(mob/living/carbon/first, mob/living/carbon/second) - second.masquerade = first.masquerade - var/percentage = (100/first.maxHealth)*second.maxHealth - second.adjust_brute_loss(round((first.get_brute_loss()/100)*percentage)-second.get_brute_loss()) - second.adjust_fire_loss(round((first.get_fire_loss()/100)*percentage)-second.get_fire_loss()) - second.adjustToxLoss(round((first.get_tox_loss()/100)*percentage)-second.get_tox_loss()) - second.adjust_agg_loss(round((first.get_agg_loss()/100)*percentage)-second.get_agg_loss()) - -/obj/werewolf_holder/transformation/proc/trans_gender(mob/living/carbon/trans, form) - if(!given_quirks) - given_quirks = TRUE - if(trans.has_quirk(/datum/quirk/dancer)) - var/datum/action/dance/DA = new() - DA.Grant(lupus_form) - var/datum/action/dance/NE = new() - NE.Grant(crinos_form) - var/matrix/ntransform = matrix(transform) //aka transform.Copy() - if(trans.auspice.rage == 0 && form != trans.auspice.base_breed) - to_chat(trans, "Not enough rage to transform into anything but [trans.auspice.base_breed].") - return - if(trans.in_frenzy) - to_chat(trans, "You can't transform while in frenzy.") - return - trans.inspired = FALSE - if(ishuman(trans)) - var/datum/species/garou/G = trans.dna.species - var/mob/living/carbon/human/H = trans - if(G.glabro) - H.remove_overlay(PROTEAN_LAYER) - G.punchdamagelow = G.punchdamagelow-15 - G.punchdamagehigh = G.punchdamagehigh-15 - H.st_remove_stat_mod(STAT_STRENGTH, "glabro_form") - H.physiology.armor.melee = H.physiology.armor.melee-15 - H.physiology.armor.bullet = H.physiology.armor.bullet-15 - var/matrix/M = matrix() - M.Scale(1) - H.transform = M - G.glabro = FALSE - H.update_icons() - switch(form) - if("Lupus") - if(iscrinos(trans)) - ntransform.Scale(0.75, 0.75) - if(ishuman(trans)) - ntransform.Scale(1, 0.75) - if("Crinos") - if(islupus(trans)) - ntransform.Scale(1.75, 1.75) - if(ishuman(trans)) - ntransform.Scale(1.25, 1.5) - if("Homid") - if(iscrinos(trans)) - ntransform.Scale(0.75, 0.5) - if(islupus(trans)) - ntransform.Scale(1, 1.5) - if(!transformating) - transformating = TRUE - switch(form) - if("Lupus") - if(trans == lupus_form) - transformating = FALSE - return - animate(trans, transform = ntransform, color = "#000000", time = 30) - playsound(get_turf(trans), 'modular_darkpack/modules/deprecated/sounds/transform.ogg', 50, FALSE) - for(var/mob/living/simple_animal/hostile/beastmaster/B in trans.beastmaster) - qdel(B) - spawn(30) - if(trans.stat == DEAD || !trans.client) // [ChillRaccoon] - preventing non-player transform issues - animate(trans, transform = null, color = "#FFFFFF") - return - var/items = trans.get_contents() - for(var/obj/item/item_worn in items) - if(!ismob(item_worn.loc)) - continue - trans.dropItemToGround(item_worn, TRUE) - var/current_loc = get_turf(trans) - lupus_form.color = "#000000" - lupus_form.forceMove(current_loc) - animate(lupus_form, color = "#FFFFFF", time = 10) - lupus_form.key = trans.key - forceMove(lupus_form) - lupus_form.bloodpool = trans.bloodpool - lupus_form.masquerade = trans.masquerade - lupus_form.nutrition = trans.nutrition - lupus_form.mind = trans.mind - lupus_form.update_blood_hud() - transfer_damage(trans, lupus_form) - lupus_form.add_movespeed_modifier(/datum/movespeed_modifier/lupusform) - trans.forceMove(src) - transformating = FALSE - animate(trans, transform = null, color = "#FFFFFF", time = 1) - lupus_form.update_icons() - if("Crinos") - if(trans == crinos_form) - transformating = FALSE - return - animate(trans, transform = ntransform, color = "#000000", time = 30) - playsound(get_turf(trans), 'modular_darkpack/modules/deprecated/sounds/transform.ogg', 50, FALSE) - for(var/mob/living/simple_animal/hostile/beastmaster/B in trans.beastmaster) - qdel(B) - spawn(30) - if(trans.stat == DEAD || !trans.client) // [ChillRaccoon] - preventing non-player transform issues - animate(trans, transform = null, color = "#FFFFFF") - return - var/items = trans.get_contents() - for(var/obj/item/item_worn in items) - if(!ismob(item_worn.loc)) - continue - trans.dropItemToGround(item_worn, TRUE) - var/current_loc = get_turf(trans) - crinos_form.color = "#000000" - crinos_form.forceMove(current_loc) - animate(crinos_form, color = "#FFFFFF", time = 10) - crinos_form.key = trans.key - forceMove(crinos_form) - crinos_form.bloodpool = trans.bloodpool - crinos_form.masquerade = trans.masquerade - crinos_form.nutrition = trans.nutrition - crinos_form.mind = trans.mind - crinos_form.update_blood_hud() - crinos_form.st_add_stat_mod(STAT_STRENGTH, 3, "crinos_form") - transfer_damage(trans, crinos_form) - crinos_form.add_movespeed_modifier(/datum/movespeed_modifier/crinosform) - trans.forceMove(src) - transformating = FALSE - animate(trans, transform = null, color = "#FFFFFF", time = 1) - crinos_form.update_icons() - if("Homid") - if(trans == human_form) - transformating = FALSE - return - animate(trans, transform = ntransform, color = "#000000", time = 30) - playsound(get_turf(trans), 'modular_darkpack/modules/deprecated/sounds/transform.ogg', 50, FALSE) - for(var/mob/living/simple_animal/hostile/beastmaster/B in trans.beastmaster) - qdel(B) - spawn(30) - if(trans.stat == DEAD || !trans.client) // [ChillRaccoon] - preventing non-player transform issues - animate(trans, transform = null, color = "#FFFFFF") - return - var/items = trans.get_contents() - for(var/obj/item/item_worn in items) - if(!ismob(item_worn.loc)) - continue - trans.dropItemToGround(item_worn, TRUE) - var/current_loc = get_turf(trans) - human_form.color = "#000000" - human_form.forceMove(current_loc) - animate(human_form, color = "#FFFFFF", time = 10) - human_form.key = trans.key - forceMove(human_form) - human_form.bloodpool = trans.bloodpool - human_form.masquerade = trans.masquerade - human_form.nutrition = trans.nutrition - human_form.mind = trans.mind - human_form.update_blood_hud() - transfer_damage(trans, human_form) - human_form.remove_movespeed_modifier(/datum/movespeed_modifier/crinosform) - human_form.remove_movespeed_modifier(/datum/movespeed_modifier/lupusform) - trans.forceMove(src) - transformating = FALSE - animate(trans, transform = null, color = "#FFFFFF", time = 1) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/life.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/life.dm deleted file mode 100644 index d50b76298918..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/life.dm +++ /dev/null @@ -1,131 +0,0 @@ -/mob/living/carbon/werewolf/Life() - update_icons() - update_rage_hud() - return..() - -/mob/living/carbon/Life() - . = ..() - if(isgarou(src) || iswerewolf(src)) - if(key && stat <= HARD_CRIT) - var/datum/preferences/P = GLOB.preferences_datums[ckey(key)] - if(P) - if(P.masquerade != masquerade) - P.masquerade = masquerade - P.save_preferences() - P.save_character() - - - if(stat != DEAD) - var/gaining_rage = TRUE - for(var/obj/structure/werewolf_totem/W in GLOB.totems) - if(W.totem_health) - if(W.tribe == auspice.tribe) - if(get_area(W) == get_area(src) && client) - gaining_rage = FALSE - if(last_gnosis_buff+300 < world.time) - last_gnosis_buff = world.time - adjust_gnosis(1, src, TRUE) - if(iscrinos(src)) - if(auspice.base_breed == "Crinos") - gaining_rage = FALSE - //else if(auspice.rage == 0) //! [ChillRaccoon] - FIXME - // transformator.trans_gender(src, auspice.base_breed) - if(islupus(src)) - if(auspice.base_breed == "Lupus") - gaining_rage = FALSE - //else if(auspice.rage == 0) - // transformator.trans_gender(src, auspice.base_breed) - if(ishuman(src)) - if(auspice.base_breed == "Homid") - gaining_rage = FALSE - //else if(auspice.rage == 0) - // transformator.trans_gender(src, auspice.base_breed) - - if(gaining_rage && client) - if((last_rage_gain + 1 MINUTES) < world.time) - last_rage_gain = world.time - adjust_rage(1, src, TRUE) - - if(masquerade == 0) - if(!is_special_character(src)) - if(auspice.gnosis) - to_chat(src, span_warning("My Veil is too low to connect with the spirits of Umbra!")) - adjust_gnosis(-1, src, FALSE) - - if(auspice.rage >= 9) - if(!in_frenzy) - if((last_frenzy_check + 40 SECONDS) <= world.time) - last_frenzy_check = world.time - rollfrenzy() - - if(istype(get_area(src), /area/vtm/outside/penumbra)) - if((last_veil_restore + 40 SECONDS) < world.time) - adjust_veil(1, src, TRUE) - last_veil_restore = world.time - - switch(auspice.tribe) - if("Wendigo") - if(istype(get_area(src), /area/vtm/forest)) - if((last_veil_restore + 50 SECONDS) <= world.time) - adjust_veil(1, src, TRUE) - last_veil_restore = world.time - - if("Glasswalkers") - if(istype(get_area(src), /area/vtm/interior/glasswalker)) - if((last_veil_restore + 50 SECONDS) <= world.time) - adjust_veil(1, src, TRUE) - last_veil_restore = world.time - - if("Black Spiral Dancers") - if(istype(get_area(src), /area/vtm/interior/endron_facility)) - if((last_veil_restore + 50 SECONDS) <= world.time) - adjust_veil(1, src, TRUE) - last_veil_restore = world.time - - -/mob/living/carbon/werewolf/crinos/Life() - . = ..() - if(CheckEyewitness(src, src, 5, FALSE)) - adjust_veil(-1) - -/mob/living/carbon/werewolf/check_breath(datum/gas_mixture/breath) - return - -/mob/living/carbon/werewolf/handle_status_effects() - . = ..() - //natural reduction of movement delay due to stun. - if(move_delay_add > 0) - move_delay_add = max(0, move_delay_add - rand(1, 2)) - -/mob/living/carbon/werewolf/handle_changeling() - return - -/mob/living/carbon/werewolf/handle_fire()//Aliens on fire code - . = ..() - if(.) //if the mob isn't on fire anymore - return - adjust_bodytemperature(BODYTEMP_HEATING_MAX) //If you're on fire, you heat up! - -/mob/living/carbon/proc/adjust_veil(var/amount) - if(last_veil_adjusting+200 >= world.time) - return - if(amount > 0) - if(HAS_TRAIT(src, TRAIT_VIOLATOR)) - return - if(amount < 0) - if(istype(get_area(src), /area/vtm)) - var/area/vtm/V = get_area(src) - if(V.zone_type != "masquerade") - return - last_veil_adjusting = world.time - if(!is_special_character(src)) - if(amount < 0) - if(masquerade > 0) - SEND_SOUND(src, sound('modular_darkpack/modules/deprecated/sounds/veil_violation.ogg', volume = 75)) - to_chat(src, span_boldnotice("VEIL VIOLATION")) - masquerade = max(0, masquerade+amount) - if(amount > 0) - if(masquerade < 5) - SEND_SOUND(src, sound('modular_darkpack/modules/deprecated/sounds/humanity_gain.ogg', volume = 75)) - to_chat(src, span_boldnotice("VEIL REINFORCEMENT")) - masquerade = min(5, masquerade+amount) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/lupus.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/lupus.dm deleted file mode 100644 index 47bd2fc3a811..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/lupus.dm +++ /dev/null @@ -1,73 +0,0 @@ -/mob/living/carbon/werewolf/lupus - name = "wolf" - icon_state = "black" - icon = 'code/modules/wod13/werewolf_lupus.dmi' - pass_flags = PASSTABLE - mob_size = MOB_SIZE_SMALL - butcher_results = list(/obj/item/food/meat/slab = 5) - possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) - hud_type = /datum/hud/werewolf - limb_destroyer = 1 - has_limbs = 0 -// dextrous = FALSE -// speed = -1.5 doesn't work on carbons -// var/move_delay_add = -1.5 // movement delay to add also didn't work - melee_damage_lower = 15 - melee_damage_upper = 35 - health = 150 - maxHealth = 150 - werewolf_armor = 10 -// bodyparts = list( -// /obj/item/bodypart/chest, -// /obj/item/bodypart/head, -// /obj/item/bodypart/r_arm, -// /obj/item/bodypart/l_arm, -// /obj/item/bodypart/r_leg, -// /obj/item/bodypart/l_leg, -// ) - var/hispo = FALSE - -/datum/movespeed_modifier/lupusform - multiplicative_slowdown = -0.80 - -/mob/living/carbon/werewolf/lupus/update_icons() - cut_overlays() - - var/laid_down = FALSE - - if(stat == UNCONSCIOUS || IsSleeping() || stat == HARD_CRIT || stat == SOFT_CRIT || IsParalyzed() || stat == DEAD || body_position == LYING_DOWN) - icon_state = "[sprite_color]_rest" - laid_down = TRUE - else - icon_state = "[sprite_color]" - - switch(get_fire_loss()+get_brute_loss()) - if(25 to 75) - var/mutable_appearance/damage_overlay = mutable_appearance(icon, "damage1[laid_down ? "_rest" : ""]") - add_overlay(damage_overlay) - if(75 to 150) - var/mutable_appearance/damage_overlay = mutable_appearance(icon, "damage2[laid_down ? "_rest" : ""]") - add_overlay(damage_overlay) - if(150 to INFINITY) - var/mutable_appearance/damage_overlay = mutable_appearance(icon, "damage3[laid_down ? "_rest" : ""]") - add_overlay(damage_overlay) - - var/mutable_appearance/eye_overlay = mutable_appearance(icon, "eyes[laid_down ? "_rest" : ""]") - eye_overlay.color = sprite_eye_color - eye_overlay.plane = ABOVE_LIGHTING_PLANE - eye_overlay.layer = ABOVE_LIGHTING_LAYER - add_overlay(eye_overlay) - -/mob/living/carbon/werewolf/lupus/regenerate_icons() - if(!..()) - // update_icons() //Handled in update_transform(), leaving this here as a reminder - update_transform() - -/mob/living/carbon/werewolf/lupus/update_transform() //The old method of updating lying/standing was update_icons(). Aliens still expect that. - . = ..() - update_icons() - -/mob/living/carbon/werewolf/lupus/Life() - if(hispo) - CheckEyewitness(src, src, 7, FALSE) - . = ..() diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/werewolf.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/werewolf.dm deleted file mode 100644 index 147c3341e3ce..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/garou/werewolf_mobs/werewolf.dm +++ /dev/null @@ -1,272 +0,0 @@ -/mob/living/carbon/werewolf - name = "werewolf" - icon = 'code/modules/wod13/werewolf.dmi' - gender = MALE - dna = null - faction = list(FACTION_GAIA) - ventcrawler = VENTCRAWLER_NONE - pass_flags = 0 -// sight = SEE_MOBS - see_in_dark = 2 - verb_say = "woofs" - rotate_on_lying = 0 - - movement_type = GROUND // [ChillRaccoon] - fucking flying werewolfes is a meme - - bloodpool = 20 - maxbloodpool = 20 - - var/move_delay_add = 0 // movement delay to add - - status_flags = CANUNCONSCIOUS|CANPUSH - - heat_protection = 0.5 // minor heat insulation - - var/leaping = FALSE - gib_type = /obj/effect/decal/cleanable/blood/gibs - unique_name = FALSE - var/environment_smash = ENVIRONMENT_SMASH_STRUCTURES - melee_damage_lower = 20 - melee_damage_upper = 20 - butcher_results = list(/obj/item/food/meat/slab = 5) - layer = LARGE_MOB_LAYER - var/obj_damage = 30 - var/wound_bonus = 20 - var/bare_wound_bonus = 25 - var/sharpness = 50 - var/armour_penetration = 100 - var/melee_damage_type = BRUTE - var/list/damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, AGGRAVATED = 1, STAMINA = 0, OXY = 1) - var/attack_verb_continuous = "attacks" - var/attack_verb_simple = "attack" - var/friendly_verb_continuous = "nuzzles" - var/friendly_verb_simple = "nuzzle" - var/attack_sound = 'modular_darkpack/modules/deprecated/sounds/werewolf_bite.ogg' - - var/sprite_color = "black" - var/sprite_scar = 0 - var/sprite_hair = 0 - var/sprite_hair_color = "#000000" - var/sprite_eye_color = "#FFFFFF" - var/sprite_apparel = 0 - - var/step_variable = 0 - - var/werewolf_armor = 0 - - var/assigned_quirks = FALSE - -/mob/living/carbon/werewolf/update_resting() - if(resting) - ADD_TRAIT(src, TRAIT_IMMOBILIZED, RESTING_TRAIT) - else - REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, RESTING_TRAIT) - return ..() - -/mob/living/carbon/werewolf/crinos/Move(NewLoc, direct) - if(isturf(loc)) - step_variable = step_variable+1 - if(step_variable == 2) - step_variable = 0 - playsound(get_turf(src), 'modular_darkpack/modules/deprecated/sounds/werewolf_step.ogg', 50, FALSE) - . = ..() - -/mob/living/carbon/proc/epic_fall(var/apply_stun_self = TRUE, var/apply_stun_others = TRUE) - playsound(get_turf(src), 'modular_darkpack/modules/deprecated/sounds/werewolf_fall.ogg', 100, FALSE) - new /obj/effect/temp_visual/dir_setting/crack_effect(get_turf(src)) - new /obj/effect/temp_visual/dir_setting/fall_effect(get_turf(src)) - for(var/mob/living/carbon/C in range(5, src)) - if(apply_stun_others) - C.Stun(30) - shake_camera(C, (6-get_dist(C, src))+1, (6-get_dist(C, src))) - if(apply_stun_self) - Stun(20) - shake_camera(src, 5, 4) - -/mob/living/carbon/werewolf/Initialize(mapload) - var/datum/action/gift/rage_heal/GH = new() - GH.Grant(src) - add_verb(src, /mob/living/proc/mob_sleep) - add_verb(src, /mob/living/proc/toggle_resting) - - create_bodyparts() //initialize bodyparts - - create_internal_organs() - - ADD_TRAIT(src, TRAIT_NEVER_WOUNDED, ROUNDSTART_TRAIT) - - . = ..() - -/mob/living/carbon/werewolf/create_internal_organs() - internal_organs += new /obj/item/organ/brain - internal_organs += new /obj/item/organ/tongue - // DARKPACK TODO - Base type for night_vison eyes dont work. Make a subtype and fiddle with the values - internal_organs += new /obj/item/organ/eyes/night_vision - internal_organs += new /obj/item/organ/liver - internal_organs += new /obj/item/organ/stomach - internal_organs += new /obj/item/organ/heart - internal_organs += new /obj/item/organ/lungs - internal_organs += new /obj/item/organ/ears - ..() - -/mob/living/carbon/werewolf/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) // beepsky won't hunt aliums - return -10 - -/mob/living/carbon/werewolf/handle_environment(datum/gas_mixture/environment) - // Run base mob body temperature proc before taking damage - // this balances body temp to the environment and natural stabilization - . = ..() - - if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT) - //Body temperature is too hot. - throw_alert("alien_fire", /atom/movable/screen/alert/alien_fire) - switch(bodytemperature) - if(360 to 400) - apply_damage(HEAT_DAMAGE_LEVEL_1, BURN) - if(400 to 460) - apply_damage(HEAT_DAMAGE_LEVEL_2, BURN) - if(460 to INFINITY) - if(on_fire) - apply_damage(HEAT_DAMAGE_LEVEL_3, BURN) - else - apply_damage(HEAT_DAMAGE_LEVEL_2, BURN) - else - clear_alert("alien_fire") - -/mob/living/carbon/werewolf/reagent_check(datum/reagent/R) //can metabolize all reagents - return 0 - -/mob/living/carbon/werewolf/get_status_tab_items() - . = ..() - . += "Intent: [a_intent]" - -/mob/living/carbon/werewolf/getTrail() - return pick (list("trails_1", "trails2")) - -/mob/living/carbon/werewolf/canBeHandcuffed() - return FALSE - -/mob/living/carbon/werewolf/can_hold_items(obj/item/I) - return (I && (I.item_flags & WEREWOLF_HOLDABLE || ISADVANCEDTOOLUSER(src)) && ..()) - -/mob/living/carbon/werewolf/on_lying_down(new_lying_angle) - . = ..() - update_icons() - -/mob/living/carbon/werewolf/on_standing_up() - . = ..() - update_icons() - -///aliens are immune to stamina damage. -/mob/living/carbon/werewolf/adjust_stamina_loss(amount, updating_health = 1, forced = FALSE) - return FALSE - -///aliens are immune to stamina damage. -/mob/living/carbon/werewolf/setStaminaLoss(amount, updating_health = 1) - return FALSE - -/mob/living/carbon/werewolf/Stun(amount, ignore_canstun = FALSE) - . = ..() - if(!.) - move_delay_add = min(move_delay_add + round(amount / 2), 10) //a maximum delay of 10 - -/mob/living/carbon/werewolf/SetStun(amount, ignore_canstun = FALSE) - . = ..() - if(!.) - move_delay_add = min(move_delay_add + round(amount / 2), 10) - -/mob/living/carbon/werewolf/AdjustStun(amount, ignore_canstun = FALSE) - . = ..() - if(!.) - move_delay_add = clamp(move_delay_add + round(amount/2), 0, 10) - -/mob/living/carbon/werewolf/crinos - name = "werewolf" - icon_state = "black" - mob_size = MOB_SIZE_HUGE - butcher_results = list(/obj/item/food/meat/slab = 5) - possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM) - limb_destroyer = 1 - hud_type = /datum/hud/werewolf - melee_damage_lower = 35 - melee_damage_upper = 65 - health = 250 - maxHealth = 250 -// speed = -1 doesn't work on carbons - var/obj/item/r_store = null - var/obj/item/l_store = null - var/pounce_cooldown = 0 - var/pounce_cooldown_time = 30 - pixel_w = -8 -// deathsound = 'sound/voice/hiss6.ogg' - bodyparts = list( - /obj/item/bodypart/chest, - /obj/item/bodypart/head, - /obj/item/bodypart/l_arm, - /obj/item/bodypart/r_arm, - /obj/item/bodypart/r_leg, - /obj/item/bodypart/l_leg, - ) - - werewolf_armor = 30 - -/datum/movespeed_modifier/crinosform - multiplicative_slowdown = -0.2 - -/datum/movespeed_modifier/silver_slowdown - multiplicative_slowdown = 0.3 - -/mob/living/carbon/werewolf/crinos/Initialize(mapload) - . = ..() - var/datum/action/change_apparel/A = new() - A.Grant(src) -// AddComponent(/datum/component/footstep, FOOTSTEP_MOB_CLAW, 0.5, -11) - -/mob/living/carbon/werewolf/lupus/Initialize(mapload) - . = ..() - AddComponent(/datum/component/footstep, FOOTSTEP_MOB_CLAW, 0.5, -11) - var/datum/action/gift/hispo/hispo = new() - hispo.Grant(src) - -/mob/living/carbon/werewolf/crinos/show_inv(mob/user) - user.set_machine(src) - var/list/dat = list() - dat += "
| [get_held_index_name(i)]: | [(I && !(I.item_flags & ABSTRACT)) ? I : "Empty"] |
| Empty Pouches |
...and of [secondary_descriptor]." : "."]")) + else + var/successes = SSroll.storyteller_roll(caster.st_get_stat(STAT_PERCEPTION) + PRIMAL_URGE_PLACEHOLDER, 6, owner, numerical = TRUE) + switch(successes) + if(0) + to_chat(owner, span_purple("You can't exactly tell what [victim] smells like.")) + if(1) + to_chat(owner, span_purple("[victim] smells mundane.")) + if(2 to 3) + if(iskindred(victim)) + to_chat(owner, span_purple("[victim] smells of [pick(wyrm_descriptors)]")) + if(isshifter(victim) && !isgarou(victim)) + to_chat(owner, span_purple("They smell of kin, but not Garou.")) +// if(ishungrydead(victim)) +// to_chat(owner, span_purple("[victim] smells of [pick(wyrm_descriptors)]")) +// if(ischangeling(victim)) +// to_chat(owner, span_purple("[victim] smells of [pick(wyld_descriptors)]")) +// if(isdemon(victim)) +// to_chat(owner, span_purple("[victim] smells of brimstone.")) +// if(ismummy(victim)) +// to_chat(owner, span_purple("[victim] smells of [pick(wyld_descriptors)]")) + if(4) + if(iskindred(victim)) + to_chat(owner, span_purple("[victim] smells of [pick(wyrm_descriptors)]")) + if(isghoul(victim)) + to_chat(owner, span_purple("[victim] smells of [pick(wyrm_descriptors)]")) + if(isshifter(victim) && !isgarou(victim)) + to_chat(owner, span_purple("They smell of kin, but not Garou.")) +// if(isfomor(victim)) +// to_chat(owner, span_purple("[victim] smells of [pick(wyrm_descriptors)]")) +// if(ischangeling(victim)) +// to_chat(owner, span_purple("[victim] smells of [pick(wyld_descriptors)]")) +// if(isdemon(victim)) +// to_chat(owner, span_purple("[victim] smells of brimstone.")) +// if(ismummy(victim)) +// to_chat(owner, span_purple("[victim] smells of [pick(wyld_descriptors)]")) +// if(ismage(victim)) +// to_chat(owner, span_purple("[victim] smells of pure energy.")) + + caster.emote("sniff") + + StartCooldown() + return TRUE diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/ragabash.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/ragabash.dm new file mode 100644 index 000000000000..5455734ebfa7 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/ragabash.dm @@ -0,0 +1,95 @@ +/* +/datum/action/cooldown/power/gift/blur_of_the_milky_eye + name = "Blur Of The Milky Eye" + desc = "The Garou's form becomes a shimmering blur, allowing him to pass unnoticed among others." + button_icon_state = "blur_of_the_milky_eye" + rage_req = 2 + //gnosis_req = 1 + +/datum/action/cooldown/power/gift/blur_of_the_milky_eye/Activate(atom/target) + . = ..() + if(allowed_to_proceed) + var/mob/living/carbon/C = owner + C.alpha = 36 + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/milky_blur.ogg', 75, FALSE) + spawn(20 SECONDS) + C.alpha = 255 +*/ + +/datum/action/cooldown/power/gift/infectious_laughter + name = "Infectious Laughter" + desc = "When the Ragabash laughs, those around her are compelled to follow along, forgetting their grievances. Uses the last message you spoke for the ability" + button_icon_state = "infectious_laughter" + // I dont acctually see anything in the book that is causes rage. + // rage_req = 1 + var/last_spoken_message + var/when_spoken = 0 + +/datum/action/cooldown/power/gift/infectious_laughter/Grant(mob/granted_to) + . = ..() + + RegisterSignal(granted_to, COMSIG_MOB_SAY, PROC_REF(on_mob_say)) + +/datum/action/cooldown/power/gift/infectious_laughter/Remove(mob/removed_from) + . = ..() + + UnregisterSignal(removed_from, COMSIG_MOB_SAY) + +/datum/action/cooldown/power/gift/infectious_laughter/proc/on_mob_say(datum/source, list/speech_args) + SIGNAL_HANDLER + + last_spoken_message = speech_args[SPEECH_MESSAGE] + when_spoken = world.time + +/datum/action/cooldown/power/gift/infectious_laughter/IsAvailable(feedback) + . = ..() + if(!last_spoken_message || (when_spoken + 3 TURNS < world.time)) + if(feedback) + to_chat(owner, span_warning("You haven't said anything making a joke of the current scene in the past few moments!")) + return FALSE + +/datum/action/cooldown/power/gift/infectious_laughter/Activate(atom/target) + . = ..() + + if(!ishuman(owner)) + return + if(!last_spoken_message || (when_spoken + 3 TURNS < world.time)) + return + var/mob/living/carbon/human/human_owner = owner + + owner.emote("laugh") + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/gifts/infectious_laughter.ogg', 50, FALSE) + var/list/hearers = oviewers(DEFAULT_MESSAGE_RANGE, owner) + var/highest_diff = 0 + for(var/mob/living/dice_guy in hearers) + var/datum/splat/werewolf/rage_haver = iswerewolfsplat(dice_guy) + if(!rage_haver) + continue + highest_diff = max(highest_diff, rage_haver.rage) + var/roll = SSroll.storyteller_roll(human_owner.st_get_stat(STAT_MANIPULATION) + human_owner.st_get_stat(STAT_EMPATHY), highest_diff, owner) + if(roll == ROLL_SUCCESS) + for(var/mob/living/hearer in hearers) + to_chat(hearer, span_hypnophrase("The message bounces around in your head, \"[last_spoken_message]\". You struggle to recall why you might have been mad.")) + hearer.emote("laugh") + + last_spoken_message = null + when_spoken = 0 + + + // laughers.emote("laugh") + +/* +/datum/action/cooldown/power/gift/open_seal + name = "Open Seal" + desc = "With this Gift, the Garou can open nearly any sort of closed or locked physical device." + button_icon_state = "open_seal" +// gnosis_req = 1 + +/datum/action/cooldown/power/gift/open_seal/Activate(atom/target) + . = ..() + if(allowed_to_proceed) + for(var/obj/structure/vampdoor/V in range(5, owner)) + if(V.closed) + if(V.lockpick_difficulty < 10) + V.open_door(owner, TRUE) +*/ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/theurge.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/theurge.dm new file mode 100644 index 000000000000..eb26fdefe41c --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/theurge.dm @@ -0,0 +1,40 @@ +/* +From W20 p. 164 +Mother's Touch +System: The player spends one Gnosis point and rolls +Intelligence + Empathy (difficulty is the target’s current +Rage, or 5 for those with no Rage). Each success heals one +level of lethal, bashing, or aggravated damage. The healer +may even heal fresh Battle Scars (see p. 259) in this man- +ner, if the Gift is applied during the same scene in which +the scar is received and an extra Gnosis point is spent. +*/ +/datum/action/cooldown/power/gift/mothers_touch + name = "Mother's Touch" + desc = "The Garou is able to heal the wounds of any living creature, aggravated or otherwise, simply by laying hands over the afflicted area." + button_icon_state = "mothers_touch" + click_to_activate = TRUE + + //rage_req = 1 + gnosis_req = 1 + + +/datum/action/cooldown/power/gift/mothers_touch/Activate(atom/target) + if(!isliving(target)) + return + if(!(target in range(1, owner))) + return + + . = ..() + + var/mob/living/living_owner = owner + var/datum/splat/werewolf/werewolf_splat = iswerewolfsplat(owner) + var/difficulty = werewolf_splat.uses_rage ? werewolf_splat.rage : 5 + var/successes = SSroll.storyteller_roll(living_owner.st_get_stat(STAT_INTELLIGENCE) + living_owner.st_get_stat(STAT_EMPATHY), difficulty, owner, TRUE) + + var/mob/living/living_target = target + living_target.heal_storyteller_health(successes, TRUE, TRUE, TRUE) + + SEND_SIGNAL(owner, COMSIG_MASQUERADE_VIOLATION) + StartCooldown() + return TRUE diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/innate/howling.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/innate/howling.dm new file mode 100644 index 000000000000..2432605cc06b --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/innate/howling.dm @@ -0,0 +1,119 @@ +/datum/action/cooldown/power/gift/howling + name = "Howl" + desc = "The werewolf may send her howl far beyond the normal range of hearing and communicate a single word or concept to all other Garou across the city." + button_icon_state = "call_of_the_wyld" + rage_req = 1 + check_flags = null + innate_ability = TRUE + var/static/list/howls = list( + "attack" = list( + "menu" = "Attack", + SPLAT_GAROU = "A wolf howls a fierce call to attack", + SPLAT_CORAX = "A raven hisses a fierce call to attack" + ), + "retreat" = list( + "menu" = "Retreat", + SPLAT_GAROU = "A wolf howls a warning to retreat", + SPLAT_CORAX = "A raven squawks a warning to retreat" + ), + "help" = list( + "menu" = "Help", + SPLAT_GAROU = "A wolf howls a desperate plea for help", + SPLAT_CORAX = "A raven shrieks a a desperate plea for help" + ), + "gather" = list( + "menu" = "Gather", + SPLAT_GAROU = "A wolf howls to gather the pack", + SPLAT_CORAX = "A raven beckons the conspiracy" + ), + "victory" = list( + "menu" = "Victory", + SPLAT_GAROU = "A wolf howls in celebration of victory", + SPLAT_CORAX = "A raven croaks in celebration of victory" + ), + "dying" = list( + "menu" = "Dying", + SPLAT_GAROU = "A wolf howls in pain and despair", + SPLAT_CORAX = "A raven shrieks in pain and despair" + ), + "mourning" = list( + "menu" = "Mourning", + SPLAT_GAROU = "A wolf howls in deep mourning for the fallen", + SPLAT_CORAX = "A raven mourns the loss of the fallen" + ) + ) + +/datum/action/cooldown/power/gift/howling/IsAvailable(feedback) + . = ..() + if(istype(get_area(owner), /area/vtm/interior/penumbra)) + if(feedback) + to_chat(owner, span_warning("Your howl echoes and dissipates into the Umbra, it's sound blanketed by the spiritual energy of the Velvet Shadow.")) + return + +/datum/action/cooldown/power/gift/howling/Activate(atom/target) + . = ..() + + var/mob/living/living_mob = owner + var/datum/splat/werewolf/shifter = isshifter(owner) + var/list/menu_options = list() + for(var/howl_key in howls) + menu_options += howls[howl_key]["menu"] + + var/choice = tgui_input_list(owner, "Select a howl to use!", "Howl Selection", menu_options) + if(!choice) + return + + var/howl + for(var/howl_key in howls) + if(howls[howl_key]["menu"] == choice) + howl = howls[howl_key] + break + + var/garou_message = howl[shifter.id] + /* + var/tribe = living_mob.auspice.tribe.name + if (tribe) + garou_message = replacetext(garou_message, "tribe", tribe) + */ + var/origin_turf = get_turf(living_mob) + ADD_TRAIT(living_mob, TRAIT_LOUD_HOWLER, type) + living_mob.emote("howl") + REMOVE_TRAIT(living_mob, TRAIT_LOUD_HOWLER, type) + + var/howl_details + var/final_message + for(var/mob/living/howled_at in GLOB.player_list - owner) + if(isshifter(howled_at)) + howl_details = get_message(howled_at, origin_turf) + final_message = garou_message + howl_details + to_chat(howled_at, span_boldnotice(final_message)) + + +/datum/action/cooldown/power/gift/howling/proc/get_message(mob/living/howled_at, turf/origin_turf) + var/distance = get_dist(howled_at, origin_turf) + var/dirtext = " to the " + var/direction = get_dir(howled_at, origin_turf) + + if(dir2text(direction)) + dirtext += dir2text(direction) + else + dirtext = " although I cannot make out an exact direction" + + var/disttext + switch(distance) + if(0 to 20) + disttext = " within 20 feet" + if(20 to 40) + disttext = " 20 to 40 feet away" + if(40 to 80) + disttext = " 40 to 80 feet away" + if(80 to 160) + disttext = " far" + else + disttext = " very far" + + var/place = get_area_name(origin_turf) + + var/returntext = "[disttext],[dirtext], at [place]." + + return returntext diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/tribes.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/tribes.dm similarity index 72% rename from modular_darkpack/modules/werewolf_the_apocalypse/code/tribes.dm rename to modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/tribes.dm index 3c9c78421165..4ecee4e784c0 100644 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/tribes.dm +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/tribes.dm @@ -1,14 +1,14 @@ -/datum/action/gift/stoic_pose +/datum/action/cooldown/power/gift/stoic_pose name = "Stoic Pose" desc = "With this gift garou sends theirself into cryo-state, ignoring all incoming damage but also covering themself in a block of ice." button_icon_state = "stoic_pose" rage_req = 2 gnosis_req = 1 -/datum/action/gift/stoic_pose/Trigger() +/datum/action/cooldown/power/gift/stoic_pose/Trigger() . = ..() if(allowed_to_proceed) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/ice_blocking.ogg', 100, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/ice_blocking.ogg', 100, FALSE) var/mob/living/carbon/C = owner if(isgarou(C)) var/obj/were_ice/W = new (get_turf(owner)) @@ -32,17 +32,32 @@ C.forceMove(get_turf(W)) qdel(W) -/datum/action/gift/freezing_wind +/obj/were_ice + name = "ice block" + desc = "Stores some precious organs..." + icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_lupus.dmi' + icon_state = "ice_man" + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF + +/obj/were_ice/lupus + icon_state = "ice_wolf" + +/obj/were_ice/crinos + icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf.dmi' + icon_state = "ice" + pixel_w = -8 + +/datum/action/cooldown/power/gift/freezing_wind name = "Freezing Wind" desc = "Garou of Wendigo Tribe can create a stream of cold, freezing wind, and strike her foes with it." button_icon_state = "freezing_wind" rage_req = 1 //gnosis_req = 1 -/datum/action/gift/freezing_wind/Trigger() +/datum/action/cooldown/power/gift/freezing_wind/Trigger() . = ..() if(allowed_to_proceed) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/wind_cast.ogg', 100, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/wind_cast.ogg', 100, FALSE) for(var/turf/T in range(3, get_step(get_step(owner, owner.dir), owner.dir))) if(owner.loc != T) var/obj/effect/wind/W = new(T) @@ -52,14 +67,14 @@ qdel(W) // if(allowed_to_proceed) -/datum/action/gift/bloody_feast +/datum/action/cooldown/power/gift/bloody_feast name = "Bloody Feast" desc = "By eating a grabbed corpse, garou can redeem their lost health and heal the injuries." button_icon_state = "bloody_feast" rage_req = 2 gnosis_req = 1 -/datum/action/gift/bloody_feast/Trigger() +/datum/action/cooldown/power/gift/bloody_feast/Trigger() . = ..() if(allowed_to_proceed) var/mob/living/carbon/C = owner @@ -67,36 +82,36 @@ if(isliving(C.pulling)) var/mob/living/L = C.pulling if(L.stat == DEAD) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/bloody_feast.ogg', 50, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/bloody_feast.ogg', 50, FALSE) qdel(L) C.revive(full_heal = TRUE, admin_revive = TRUE) -/datum/action/gift/stinky_fur +/datum/action/cooldown/power/gift/stinky_fur name = "Stinky Fur" desc = "Garou creates an aura of very toxic smell, which disorientates everyone around." button_icon_state = "stinky_fur" -/datum/action/gift/stinky_fur/Trigger() +/datum/action/cooldown/power/gift/stinky_fur/Trigger() . = ..() if(allowed_to_proceed) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/necromancy.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/necromancy.ogg', 75, FALSE) for(var/mob/living/carbon/C in orange(5, owner)) if(prob(25)) C.vomit() C.dizziness += 10 C.add_confusion(10) -/datum/action/gift/venom_claws +/datum/action/cooldown/power/gift/venom_claws name = "Venom Claws" desc = "While this ability is active, strikes with claws poison foes of garou." button_icon_state = "venom_claws" rage_req = 1 -/datum/action/gift/venom_claws/Trigger() +/datum/action/cooldown/power/gift/venom_claws/Trigger() . = ..() if(allowed_to_proceed) if(ishuman(owner)) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/venom_claws.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/venom_claws.ogg', 75, FALSE) var/mob/living/carbon/human/H = owner H.melee_damage_lower = initial(H.melee_damage_lower)+15 H.melee_damage_upper = initial(H.melee_damage_upper)+15 @@ -108,7 +123,7 @@ H.melee_damage_upper = initial(H.melee_damage_upper) to_chat(owner, span_warning("Your claws are not poison anymore...")) else - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/venom_claws.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/venom_claws.ogg', 75, FALSE) var/mob/living/carbon/H = owner H.melee_damage_lower = initial(H.melee_damage_lower)+10 H.melee_damage_upper = initial(H.melee_damage_upper)+10 @@ -120,14 +135,14 @@ H.melee_damage_upper = initial(H.melee_damage_upper) to_chat(owner, span_warning("Your claws are not poison anymore...")) -/datum/action/gift/burning_scars +/datum/action/cooldown/power/gift/burning_scars name = "Burning Scars" desc = "Garou creates an aura of very hot air, which burns everyone around." button_icon_state = "burning_scars" rage_req = 2 gnosis_req = 1 -/datum/action/gift/burning_scars/Trigger() +/datum/action/cooldown/power/gift/burning_scars/Trigger() . = ..() if(allowed_to_proceed) owner.visible_message(span_danger("[owner.name] crackles with heat!"), span_danger("You crackle with heat, charging up your Gift!")) @@ -139,13 +154,13 @@ spawn(5) qdel(F) -/datum/action/gift/smooth_move +/datum/action/cooldown/power/gift/smooth_move name = "Smooth Move" desc = "Garou jumps forward, avoiding every damage for a moment." button_icon_state = "smooth_move" //rage_req = 1 somewhat useless gift with MMB pounce -/datum/action/gift/smooth_move/Trigger() +/datum/action/cooldown/power/gift/smooth_move/Trigger() . = ..() if(allowed_to_proceed) var/turf/T = get_turf(get_step(get_step(get_step(owner, owner.dir), owner.dir), owner.dir)) @@ -158,14 +173,14 @@ spawn(3) owner.throw_at(T, get_dist(owner, T), 1, owner, 0) -/datum/action/gift/digital_feelings +/datum/action/cooldown/power/gift/digital_feelings name = "Digital Feelings" desc = "Every technology creates an electrical strike, which hits garou's enemies." button_icon_state = "digital_feelings" rage_req = 2 gnosis_req = 1 -/datum/action/gift/digital_feelings/Trigger() +/datum/action/cooldown/power/gift/digital_feelings/Trigger() . = ..() if(allowed_to_proceed) owner.visible_message(span_danger("[owner.name] crackles with static electricity!"), span_danger("You crackle with static electricity, charging up your Gift!")) @@ -175,19 +190,19 @@ for(var/mob/living/L in orange(6, owner)) L.electrocute_act(30, owner, siemens_coeff = 1, flags = NONE) -/datum/action/gift/elemental_improvement +/datum/action/cooldown/power/gift/elemental_improvement name = "Elemental Improvement" desc = "Garou flesh replaces itself with prothesis, making it less vulnerable to brute damage, but more for burn damage." button_icon_state = "elemental_improvement" rage_req = 2 gnosis_req = 1 -/datum/action/gift/elemental_improvement/Trigger() +/datum/action/cooldown/power/gift/elemental_improvement/Trigger() . = ..() if(allowed_to_proceed) animate(owner, color = "#6a839a", time = 10) if(ishuman(owner)) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/electro_cast.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/electro_cast.ogg', 75, FALSE) var/mob/living/carbon/human/H = owner H.physiology.armor.melee = 25 H.physiology.armor.bullet = 45 @@ -198,7 +213,7 @@ to_chat(owner, span_warning("Your skin is natural again...")) owner.color = "#FFFFFF" else - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/electro_cast.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/electro_cast.ogg', 75, FALSE) var/mob/living/carbon/werewolf/H = owner H.werewolf_armor = 45 to_chat(owner, span_notice("You feel your skin replaced with the machine...")) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/glyphs.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/glyphs.dm index 96afd70ec212..f7c779af409c 100644 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/glyphs.dm +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/glyphs.dm @@ -1,32 +1,22 @@ /// Inits GLOB.glyph_list /proc/init_glyphs() var/glyph_list = list() - for(var/path in subtypesof(/obj/effect/decal/garou_glyph)) + for(var/path in valid_subtypesof(/obj/effect/decal/garou_glyph)) var/obj/effect/decal/garou_glyph/S = path glyph_list[S.garou_name] = S sort_list(glyph_list, GLOBAL_PROC_REF(cmp_typepaths_asc)) return glyph_list -/obj/item/charcoal_stick - name = "charcoal stick" - desc = "A piece of burnt charcoal." - icon = 'icons/obj/art/crayons.dmi' - icon_state = "crayonblack" - w_class = WEIGHT_CLASS_SMALL - // TODO: Needs a ear icon state - // slot_flags = ITEM_SLOT_EARS +/obj/item/pen/charcoal/interact_with_atom(atom/target, mob/user, list/modifiers, list/attack_modifiers) + if(!isopenturf(target) || isgroundlessturf(target)) + return NONE -/obj/item/charcoal_stick/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers) - // DARKPACK TODO - GAROU - //if(!isgarou(user)) - // return + if(!user.has_language(/datum/language/garou_tongue, UNDERSTOOD_LANGUAGE)) + return NONE if(!GLOB.glyph_list.len) to_chat(user, span_notice("There are no glyphs available.")) - return - - if(!isopenturf(target) || isgroundlessturf(target)) - return + return NONE var/list/glyph_names = list() @@ -34,41 +24,42 @@ glyph_names += glyph var/choice = tgui_input_list(user, "Select a glyph to draw.", "Glyph Selection", glyph_names) - if(choice) - var/obj/effect/decal/garou_glyph/drawn_glyph = GLOB.glyph_list[choice] - if(drawn_glyph) - user.visible_message(span_notice("[user] starts to scrape a glyph into the ground..."), \ - span_notice("You begin to etch the spirals and lines of your chosen glyph...")) - - if(do_after(user, 5 SECONDS, target)) - new drawn_glyph.type(target) - user.visible_message(span_notice("[user] finishes up their rune."), \ - span_notice("You put the finishing touches on your rune, as it marks the ground before you.")) - else - user.visible_message(span_notice("[user] slips, smduges and ruins their glyph."), \ - span_notice("You mess it up, the glyph turning into nothing more than a smear upon the ground.")) - . = ..() + if(!choice) + return ITEM_INTERACT_BLOCKING + + var/obj/effect/decal/garou_glyph/drawn_glyph = GLOB.glyph_list[choice] + if(drawn_glyph) + user.visible_message(span_notice("[user] starts to scrape a glyph into the ground..."), \ + span_notice("You begin to etch the spirals and lines of your chosen glyph...")) + + if(do_after(user, 5 SECONDS, target)) + new drawn_glyph.type(target) + user.visible_message(span_notice("[user] finishes up their rune."), \ + span_notice("You put the finishing touches on your rune, as it marks the ground before you.")) + return ITEM_INTERACT_SUCCESS + else + user.visible_message(span_notice("[user] slips, smduges and ruins their glyph."), \ + span_notice("You mess it up, the glyph turning into nothing more than a smear upon the ground.")) + return ITEM_INTERACT_FAILURE /obj/effect/decal/garou_glyph + abstract_type = /obj/effect/decal/garou_glyph name = "odd glyph" desc = "An odd collection of symbols drawn in what seems to be charcoal." - var/garou_name = "basic glyph" - var/garou_desc = "a basic glyph with no meaning." // This is shown to werewolves who examine the glyph in order to determine its true meaning. anchored = TRUE icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/glyphs.dmi' icon_state = "garou" resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF // Very likely not needed // layer = SIGIL_LAYER + var/garou_name = "basic glyph" + var/garou_desc = "a basic glyph with no meaning." // This is shown to werewolves who examine the glyph in order to determine its true meaning. /obj/effect/decal/garou_glyph/examine(mob/user) . = ..() - // DARKPACK TODO - GAROU - /* - if(isgarou(user) || iswerewolf(user)) // If they're a werewolf, show them the true meaning of the glyph. - . += "Name: [garou_name]\n" + \ - "Description: [garou_desc]\n" - */ + if(user.has_language(/datum/language/garou_tongue, UNDERSTOOD_LANGUAGE)) + . += "Name: [garou_name]\n" + . += "Description: [garou_desc]\n" /obj/effect/decal/garou_glyph/wyrm name = "creepy glyph" diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/hud.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/hud.dm new file mode 100644 index 000000000000..235ff019a939 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/hud.dm @@ -0,0 +1,217 @@ +#define UI_LIVING_AUSPICE "EAST-2:16,CENTER:40" +#define UI_LIVING_RAGE_AND_GNOSIS "EAST-2:20,CENTER-1:40" +#define UI_LIVING_TRANSFORM_HOMID "EAST-2,CENTER+1:40" +#define UI_LIVING_TRANSFORM_WAR "EAST-1,CENTER+1:40" +#define UI_LIVING_TRANSFORM_FERAL "EAST,CENTER+1:40" + +/datum/hud/proc/add_werewolf_elements() + // transform_werewolf = new(null, src) + // infodisplay += transform_werewolf + + if(!auspice_icon) + auspice_icon = new(null, src) + infodisplay += auspice_icon + + if(!rage_and_gnosis_icon) + rage_and_gnosis_icon = new(null, src) + infodisplay += rage_and_gnosis_icon + + if(!homid_trans_icon) + homid_trans_icon = new(null, src) + infodisplay += homid_trans_icon + if(!war_trans_icon) + war_trans_icon = new(null, src) + infodisplay += war_trans_icon + if(!feral_trans_icon) + feral_trans_icon = new(null, src) + infodisplay += feral_trans_icon + + +/datum/splat/werewolf/add_relevent_huds(datum/hud/hud_used) + hud_used.add_werewolf_elements() + +/atom/movable/screen/auspice + name = "auspice" + icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_ui.dmi' + icon_state = "auspice_bar" + screen_loc = UI_LIVING_AUSPICE + mouse_over_pointer = MOUSE_HAND_POINTER + var/looked_at_moon = FALSE + COOLDOWN_DECLARE(force_rage_cd) + +/atom/movable/screen/auspice/Initialize(mapload, datum/hud/hud_owner) + . = ..() + + update_icon() + register_context() + +/atom/movable/screen/auspice/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + + context[SCREENTIP_CONTEXT_LMB] = "Check Moon" + if(COOLDOWN_FINISHED(src, force_rage_cd)) + context[SCREENTIP_CONTEXT_RMB] = "Gain Rage" + + return CONTEXTUAL_SCREENTIP_SET + +/atom/movable/screen/auspice/Click(location, control, params) + . = ..() + var/mob/living/carbon/human/clicker = usr + if(!istype(clicker)) + return + var/datum/splat/werewolf/clicker_splat = iswerewolfsplat(clicker) + if(!istype(clicker_splat)) + return + + var/list/modifiers = params2list(params) + if(LAZYACCESS(modifiers, RIGHT_CLICK) && clicker_splat.uses_rage) + if(!COOLDOWN_FINISHED(src, force_rage_cd)) + return + + clicker_splat.adjust_rage(1) + message_admins("[ADMIN_LOOKUPFLW(clicker)] manually gained rage.") + clicker.log_message("manually gained rage.", LOG_GAME, color="red") + COOLDOWN_START(src, force_rage_cd, 1 SCENES) + return TRUE + + var/area/my_area = get_area(clicker) + if(!my_area || !my_area.outdoors) + to_chat(clicker, span_warning("You need to be outside to look at the moon!")) + return + + to_chat(clicker, span_notice("The phase of the Moon is a [GLOB.moon_state].")) + + if(looked_at_moon) + return + looked_at_moon = TRUE + + update_icon() + + if(!clicker_splat.uses_rage) + return + + var/rage_amount = 1 + // W20 p. 145 + switch(GLOB.moon_state) + if(MOON_NEW) + rage_amount = 1 + if(MOON_WANING_GIBBOUS, MOON_WANING_CRESCENT) + rage_amount = 2 + if(MOON_WAXING_CRESENT, MOON_FIRST_QUARTER, MOON_WAXING_GIBBOUS, MOON_LAST_QUARTER) + rage_amount = 3 + if(MOON_FULL) + rage_amount = 4 + + if(clicker_splat?.auspice && (GLOB.moon_state in clicker_splat.auspice.moons_born_under)) + rage_amount = MAX_RAGE + + clicker_splat.adjust_rage(rage_amount, TRUE) + return TRUE + +/atom/movable/screen/auspice/update_icon_state() + if(looked_at_moon) + icon_state = "[GLOB.moon_state]" + return ..() + + +/mob/living/proc/update_werewolf_hud() + if(!hud_used) + return + hud_used.rage_and_gnosis_icon?.update_icon() + +/atom/movable/screen/rage_and_gnosis + name = "rage and gnosis" + icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_meters.dmi' + icon_state = "rage0" + screen_loc = UI_LIVING_RAGE_AND_GNOSIS + +/atom/movable/screen/rage_and_gnosis/Initialize(mapload, datum/hud/hud_owner) + . = ..() + + update_icon() + +/atom/movable/screen/rage_and_gnosis/update_icon_state() + var/mob/living/owner = hud?.mymob + if(!istype(owner)) + return + + var/datum/splat/werewolf/our_splat = iswerewolfsplat(owner) + if(!istype(our_splat)) + return + + icon_state = "rage[our_splat.rage]" + + // Should really be in update_overlays but i wanted to keep it to one iswerewolfsplat fetch + cut_overlays() + add_overlay("gnosis[our_splat.gnosis]") + + return ..() + +/atom/movable/screen/fera_transform + abstract_type = /atom/movable/screen/fera_transform + icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_transforms.dmi' + mouse_over_pointer = MOUSE_HAND_POINTER + var/datum/species/left_click_transform + var/datum/species/right_click_transform + +/atom/movable/screen/fera_transform/Initialize(mapload, datum/hud/hud_owner) + . = ..() + + update_icon() + register_context() + +/atom/movable/screen/fera_transform/Click(location, control, params) + . = ..() + var/mob/living/carbon/human/clicker = usr + if(!istype(clicker)) + return + if(clicker.stat >= UNCONSCIOUS) + return + + var/datum/splat/werewolf/shifter/shifting = isshifter(clicker) + var/list/modifiers = params2list(params) + // Right click for alt forms like glabro and hispo. Ctrl click to use rage to do it instantly (doesnt matter if its breed form tho) + shifting.transform_fera(LAZYACCESS(modifiers, RIGHT_CLICK) ? right_click_transform : left_click_transform, LAZYACCESS(modifiers, CTRL_CLICK)) + + +/atom/movable/screen/fera_transform/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + + var/datum/splat/werewolf/shifter/shifting = isshifter(user) + + if(left_click_transform) + context[SCREENTIP_CONTEXT_LMB] = "Shift to [left_click_transform::name]" + if(left_click_transform != shifting.get_breed_form_species()) + context[SCREENTIP_CONTEXT_CTRL_LMB] = "Shift using rage" + if(right_click_transform) + context[SCREENTIP_CONTEXT_RMB] = "Shift to [right_click_transform::name]" + if(right_click_transform != shifting.get_breed_form_species()) + context[SCREENTIP_CONTEXT_CTRL_RMB] = "Shift using rage" + + return CONTEXTUAL_SCREENTIP_SET + +/atom/movable/screen/fera_transform/homid + name = "homid form" + icon_state = "homid" + screen_loc = UI_LIVING_TRANSFORM_HOMID + left_click_transform = /datum/species/human/shifter/homid + right_click_transform = /datum/species/human/shifter/bestial + +/atom/movable/screen/fera_transform/war + name = "war form" + icon_state = "war" + screen_loc = UI_LIVING_TRANSFORM_WAR + left_click_transform = /datum/species/human/shifter/war + +/atom/movable/screen/fera_transform/feral + name = "feral form" + icon_state = "feral" + screen_loc = UI_LIVING_TRANSFORM_FERAL + left_click_transform = /datum/species/human/shifter/feral + right_click_transform = /datum/species/human/shifter/dire + +#undef UI_LIVING_TRANSFORM_HOMID +#undef UI_LIVING_TRANSFORM_WAR +#undef UI_LIVING_TRANSFORM_FERAL +#undef UI_LIVING_AUSPICE +#undef UI_LIVING_RAGE_AND_GNOSIS diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/old/gifts.dm similarity index 50% rename from modular_darkpack/modules/werewolf_the_apocalypse/code/gifts.dm rename to modular_darkpack/modules/werewolf_the_apocalypse/code/old/gifts.dm index a572395bb31a..86fec51a85d5 100644 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts.dm +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/old/gifts.dm @@ -1,61 +1,17 @@ -/datum/action/gift - icon_icon = 'modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi' - button_icon = 'modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi' - check_flags = AB_CHECK_IMMOBILE|AB_CHECK_CONSCIOUS - var/rage_req = 0 - var/gnosis_req = 0 - var/cool_down = 0 - - var/allowed_to_proceed = FALSE - -/datum/action/gift/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force = FALSE) - icon_icon = 'modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi' - button_icon = 'modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi' - . = ..() - -/datum/action/gift/Trigger() - . = ..() - if(istype(owner, /mob/living/carbon)) - var/mob/living/carbon/H = owner - if(H.stat == DEAD) - allowed_to_proceed = FALSE - return - if(rage_req) - if(H.auspice.rage < rage_req) - to_chat(owner, span_warning("You don't have enough RAGE to do that!")) - SEND_SOUND(owner, sound('modular_darkpack/modules/deprecated/sounds/werewolf_cast_failed.ogg', volume = 75)) - allowed_to_proceed = FALSE - return - if(H.auspice.gnosis < gnosis_req) - to_chat(owner, span_warning("You don't have enough GNOSIS to do that!")) - SEND_SOUND(owner, sound('modular_darkpack/modules/deprecated/sounds/werewolf_cast_failed.ogg', volume = 75)) - allowed_to_proceed = FALSE - return - if(cool_down+150 >= world.time) - allowed_to_proceed = FALSE - return - cool_down = world.time - allowed_to_proceed = TRUE - if(rage_req) - adjust_rage(-rage_req, owner, FALSE) - if(gnosis_req) - adjust_gnosis(-gnosis_req, owner, FALSE) - to_chat(owner, span_notice("You activate the [name]...")) - -/datum/action/gift/falling_touch +/datum/action/cooldown/power/gift/falling_touch name = "Falling Touch" desc = "This Gift allows the Garou to send her foe sprawling with but a touch." button_icon_state = "falling_touch" rage_req = 1 -/datum/action/gift/falling_touch/Trigger() +/datum/action/cooldown/power/gift/falling_touch/Activate(atom/target) . = ..() if(allowed_to_proceed) var/mob/living/carbon/H = owner - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/falling_touch.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/falling_touch.ogg', 75, FALSE) H.put_in_active_hand(new /obj/item/melee/touch_attack/werewolf(H)) -/datum/action/gift/inspiration +/datum/action/cooldown/power/gift/inspiration name = "Inspiration" desc = "The Garou with this Gift lends new resolve and righteous anger to his brethren." button_icon_state = "inspiration" @@ -80,28 +36,28 @@ to_chat(src, span_warning("You no longer feel inspired...")) inspired = FALSE -/datum/action/gift/inspiration/Trigger() +/datum/action/cooldown/power/gift/inspiration/Activate(atom/target) . = ..() if(allowed_to_proceed) var/mob/living/carbon/H = owner - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/inspiration.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/inspiration.ogg', 75, FALSE) H.emote("scream") for(var/mob/living/carbon/C in range(5, owner)) if(iswerewolf(C) || isgarou(C)) if(C.auspice.tribe == H.auspice.tribe) C.inspired() -/datum/action/gift/razor_claws +/datum/action/cooldown/power/gift/razor_claws name = "Razor Claws" desc = "By raking his claws over stone, steel, or another hard surface, the Ahroun hones them to razor sharpness." button_icon_state = "razor_claws" rage_req = 1 -/datum/action/gift/razor_claws/Trigger() +/datum/action/cooldown/power/gift/razor_claws/Activate(atom/target) . = ..() if(allowed_to_proceed) if(ishuman(owner)) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/razor_claws.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/razor_claws.ogg', 75, FALSE) var/mob/living/carbon/human/H = owner H.dna.species.attack_verb = "slash" H.dna.species.attack_sound = 'sound/items/weapons/slash.ogg' @@ -119,7 +75,7 @@ H.agg_damage_plus = 0 to_chat(owner, span_warning("Your claws are not sharp anymore...")) else - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/razor_claws.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/razor_claws.ogg', 75, FALSE) var/mob/living/carbon/H = owner H.melee_damage_lower = H.melee_damage_lower+15 H.melee_damage_upper = H.melee_damage_upper+15 @@ -131,80 +87,17 @@ H.agg_damage_plus = 0 to_chat(owner, span_warning("Your claws are not sharp anymore...")) -/datum/action/gift/beast_speech - name = "Beast Speech" - desc = "The werewolf with this Gift may communicate with any animals from fish to mammals." - button_icon_state = "beast_speech" - rage_req = 1 - //gnosis_req = 1 - -/datum/action/gift/beast_speech/Trigger() - . = ..() - if(allowed_to_proceed) - var/mob/living/carbon/C = owner - if(length(C.beastmaster) > 3) - var/mob/living/simple_animal/hostile/beastmaster/B = pick(C.beastmaster) - qdel(B) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/wolves.ogg', 75, FALSE) - if(!length(C.beastmaster)) - var/datum/action/beastmaster_stay/E1 = new() - E1.Grant(C) - var/datum/action/beastmaster_deaggro/E2 = new() - E2.Grant(C) - var/mob/living/simple_animal/hostile/beastmaster/D = new(get_turf(C)) - D.my_creator = C - C.beastmaster |= D - D.beastmaster = C - -/datum/action/gift/call_of_the_wyld - name = "Call Of The Wyld" - desc = "The werewolf may send her howl far beyond the normal range of hearing and imbue it with great emotion, stirring the hearts of fellow Garou and chilling the bones of all others." - button_icon_state = "call_of_the_wyld" - rage_req = 1 - -/datum/action/gift/call_of_the_wyld/Trigger() - . = ..() - if(allowed_to_proceed) - var/mob/living/carbon/C = owner - C.emote("howl") - playsound(get_turf(C), pick('modular_darkpack/modules/deprecated/sounds/awo1.ogg', 'modular_darkpack/modules/deprecated/sounds/awo2.ogg'), 100, FALSE) - for(var/mob/living/carbon/A in orange(6, owner)) - if(isgarou(A) || iswerewolf(A)) - A.emote("howl") - playsound(get_turf(A), pick('modular_darkpack/modules/deprecated/sounds/awo1.ogg', 'modular_darkpack/modules/deprecated/sounds/awo2.ogg'), 100, FALSE) - spawn(10) - adjust_gnosis(1, A, TRUE) -// awo1 - -/datum/action/gift/mindspeak - name = "Mindspeak" - desc = "By invoking the power of waking dreams, the Garou can place any chosen characters into silent communion." - button_icon_state = "mindspeak" -// gnosis_req = 1 - -/datum/action/gift/mindspeak/Trigger() - . = ..() - if(allowed_to_proceed) - var/new_thought = input(owner, "What do you want to tell to your Tribe?") as text|null - if(new_thought) - var/mob/living/carbon/C = owner - to_chat(C, "You transfer this message to your tribe members nearby: [sanitize_text(new_thought)]") - for(var/mob/living/carbon/A in orange(9, owner)) - if(isgarou(A) || iswerewolf(A)) - if(A.auspice.tribe == C.auspice.tribe) - to_chat(A, "You hear a message in your head... [sanitize_text(new_thought)]") - -/datum/action/gift/resist_pain +/datum/action/cooldown/power/gift/resist_pain name = "Resist Pain" desc = "Through force of will, the Philodox is able to ignore the pain of his wounds and continue acting normally." button_icon_state = "resist_pain" rage_req = 2 -/datum/action/gift/resist_pain/Trigger() +/datum/action/cooldown/power/gift/resist_pain/Activate(atom/target) . = ..() if(allowed_to_proceed) if(ishuman(owner)) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/resist_pain.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/resist_pain.ogg', 75, FALSE) var/mob/living/carbon/human/H = owner H.physiology.armor.melee = 40 H.physiology.armor.bullet = 25 @@ -214,7 +107,7 @@ H.physiology.armor.bullet = initial(H.physiology.armor.bullet) to_chat(owner, span_warning("Your skin is thin again...")) else - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/resist_pain.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/resist_pain.ogg', 75, FALSE) var/mob/living/carbon/werewolf/H = owner H.werewolf_armor = 40 to_chat(owner, span_notice("You feel your skin thickering...")) @@ -222,14 +115,14 @@ H.werewolf_armor = initial(H.werewolf_armor) to_chat(owner, span_warning("Your skin is thin again...")) -/datum/action/gift/scent_of_the_true_form +/datum/action/cooldown/power/gift/scent_of_the_true_form name = "Scent Of The True Form" desc = "This Gift allows the Garou to determine the true nature of a person." button_icon_state = "scent_of_the_true_form" rage_req = 1 //gnosis_req = 1 -/datum/action/gift/scent_of_the_true_form/Trigger() +/datum/action/cooldown/power/gift/scent_of_the_true_form/Activate(atom/target) . = ..() if(allowed_to_proceed) var/datum/atom_hud/abductor_hud = GLOB.huds[DATA_HUD_ABDUCTOR] @@ -237,49 +130,36 @@ spawn(200) abductor_hud.remove_hud_from(owner) -/datum/action/gift/truth_of_gaia +/datum/action/cooldown/power/gift/truth_of_gaia name = "Truth Of Gaia" desc = "As judges of the Litany, Philodox have the ability to sense whether others have spoken truth or falsehood." button_icon_state = "truth_of_gaia" // rage_req = 1 -/datum/action/gift/mothers_touch - name = "Mother's Touch" - desc = "The Garou is able to heal the wounds of any living creature, aggravated or otherwise, simply by laying hands over the afflicted area." - button_icon_state = "mothers_touch" - rage_req = 2 - //gnosis_req = 1 - -/datum/action/gift/mothers_touch/Trigger() - . = ..() - if(allowed_to_proceed) - var/mob/living/carbon/H = owner - H.put_in_active_hand(new /obj/item/melee/touch_attack/mothers_touch(H)) - -/datum/action/gift/sense_wyrm +/datum/action/cooldown/power/gift/sense_wyrm name = "Sense Wyrm" desc = "This Gift allows the werewolf to sense the presence of Wyrm." button_icon_state = "sense_wyrm" rage_req = 1 -/datum/action/gift/sense_wyrm/Trigger() +/datum/action/cooldown/power/gift/sense_wyrm/Activate(atom/target) . = ..() if(allowed_to_proceed) var/mob/living/carbon/C = owner C.sight = SEE_MOBS|SEE_OBJS - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/sense_wyrm.ogg', 75, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/sense_wyrm.ogg', 75, FALSE) to_chat(owner, span_notice("You feel your sense sharpening...")) spawn(200) C.sight = initial(C.sight) to_chat(owner, span_warning("You no longer sense anything more than normal...")) -/datum/action/gift/spirit_speech +/datum/action/cooldown/power/gift/spirit_speech name = "Spirit Speech" desc = "This Gift allows the Garou to communicate with encountered spirits." button_icon_state = "spirit_speech" //gnosis_req = 1 -/datum/action/gift/spirit_speech/Trigger() +/datum/action/cooldown/power/gift/spirit_speech/Activate(atom/target) . = ..() if(allowed_to_proceed) var/mob/living/carbon/C = owner @@ -287,66 +167,19 @@ spawn(200) C.see_invisible = initial(C.see_invisible) -/datum/action/gift/blur_of_the_milky_eye - name = "Blur Of The Milky Eye" - desc = "The Garou's form becomes a shimmering blur, allowing him to pass unnoticed among others." - button_icon_state = "blur_of_the_milky_eye" - rage_req = 2 - //gnosis_req = 1 - -/datum/action/gift/blur_of_the_milky_eye/Trigger() - . = ..() - if(allowed_to_proceed) - var/mob/living/carbon/C = owner - C.alpha = 36 - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/milky_blur.ogg', 75, FALSE) - spawn(20 SECONDS) - C.alpha = 255 - -/datum/action/gift/open_seal - name = "Open Seal" - desc = "With this Gift, the Garou can open nearly any sort of closed or locked physical device." - button_icon_state = "open_seal" -// gnosis_req = 1 - -/datum/action/gift/open_seal/Trigger() - . = ..() - if(allowed_to_proceed) - for(var/obj/structure/vampdoor/V in range(5, owner)) - if(V.closed) - if(V.lockpick_difficulty < 10) - V.open_door(owner, TRUE) - -/datum/action/gift/infectious_laughter - name = "Infectious Laughter" - desc = "When the Ragabash laughs, those around her are compelled to follow along, forgetting their grievances." - button_icon_state = "infectious_laughter" - rage_req = 1 - -/datum/action/gift/infectious_laughter/Trigger() - . = ..() - if(allowed_to_proceed) - var/mob/living/carbon/C = owner - C.emote("laugh") - C.Stun(10) - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/infectious_laughter.ogg', 100, FALSE) - for(var/mob/living/L in oviewers(4, owner)) - L.emote("laugh") - L.Stun(20) - -/datum/action/gift/rage_heal +/datum/action/cooldown/power/gift/rage_heal name = "Rage Heal" desc = "This Gift allows the Garou to heal severe injuries with rage." button_icon_state = "rage_heal" rage_req = 1 check_flags = null -/datum/action/gift/rage_heal/Trigger() +/datum/action/cooldown/power/gift/rage_heal/Activate(atom/target) . = ..() if(allowed_to_proceed) var/mob/living/carbon/C = owner if(C.stat != DEAD) - SEND_SOUND(owner, sound('modular_darkpack/modules/deprecated/sounds/rage_heal.ogg', volume = 75)) + SEND_SOUND(owner, sound('modular_darkpack/modules/werewolf_the_apocalypse/sounds/rage_heal.ogg', volume = 50)) C.adjust_brute_loss(-40*C.auspice.level, TRUE) C.adjust_fire_loss(-30*C.auspice.level, TRUE) C.adjust_agg_loss(-10*C.auspice.level, TRUE) @@ -376,10 +209,10 @@ name = "Change Apparel" desc = "Choose the clothes of your Crinos form." button_icon_state = "choose_apparel" - icon_icon = 'modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi' + icon_icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_abilities.dmi' check_flags = AB_CHECK_IMMOBILE|AB_CHECK_CONSCIOUS -/datum/action/change_apparel/Trigger() +/datum/action/change_apparel/Activate(atom/target) . = ..() var/mob/living/carbon/werewolf/crinos/C = owner if(C.stat == CONSCIOUS) @@ -388,18 +221,18 @@ else C.sprite_apparel = min(4, C.sprite_apparel+1) -/datum/action/gift/hispo +/datum/action/cooldown/power/gift/hispo name = "Hispo Form" desc = "Change your Lupus form into Hispo and backwards." button_icon_state = "hispo" -/datum/action/gift/hispo/Trigger() +/datum/action/cooldown/power/gift/hispo/Activate(atom/target) . = ..() if(allowed_to_proceed) var/mob/living/carbon/werewolf/lupus/H = owner - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/transform.ogg', 50, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/transform.ogg', 50, FALSE) if(H.hispo) - H.icon = 'modular_darkpack/modules/deprecated/icons/werewolf_lupus.dmi' + H.icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_lupus.dmi' H.pixel_w = 0 H.pixel_z = 0 H.melee_damage_lower = initial(H.melee_damage_lower) @@ -409,7 +242,7 @@ H.remove_movespeed_modifier(/datum/movespeed_modifier/crinosform) H.add_movespeed_modifier(/datum/movespeed_modifier/lupusform) else - H.icon = 'modular_darkpack/modules/deprecated/icons/hispo.dmi' + H.icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/hispo.dmi' H.pixel_w = -16 H.pixel_z = -16 H.melee_damage_lower = 35 @@ -419,17 +252,17 @@ H.remove_movespeed_modifier(/datum/movespeed_modifier/lupusform) H.add_movespeed_modifier(/datum/movespeed_modifier/crinosform) -/datum/action/gift/glabro +/datum/action/cooldown/power/gift/glabro name = "Glabro Form" desc = "Change your Homid form into Glabro and backwards." button_icon_state = "glabro" -/datum/action/gift/glabro/Trigger() +/datum/action/cooldown/power/gift/glabro/Activate(atom/target) . = ..() if(allowed_to_proceed) var/mob/living/carbon/human/H = owner var/datum/species/garou/G = H.dna.species - playsound(get_turf(owner), 'modular_darkpack/modules/deprecated/sounds/transform.ogg', 50, FALSE) + playsound(get_turf(owner), 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/transform.ogg', 50, FALSE) if(G.glabro) H.remove_overlay(PROTEAN_LAYER) G.punchdamagelow -= 15 @@ -444,7 +277,7 @@ H.update_icons() else H.remove_overlay(PROTEAN_LAYER) - var/mutable_appearance/glabro_overlay = mutable_appearance('modular_darkpack/modules/deprecated/icons/werewolf_abilities.dmi', H.transformator.crinos_form?.sprite_color, -PROTEAN_LAYER) + var/mutable_appearance/glabro_overlay = mutable_appearance('modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/werewolf_abilities.dmi', H.transformator.crinos_form?.sprite_color, -PROTEAN_LAYER) H.overlays_standing[PROTEAN_LAYER] = glabro_overlay H.apply_overlay(PROTEAN_LAYER) G.punchdamagelow += 15 diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/auspice.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/auspice.dm new file mode 100644 index 000000000000..7c767bd00f21 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/auspice.dm @@ -0,0 +1,20 @@ +/datum/preference/choiced/garou_auspice + savefile_key = "garou_auspice" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_FEATURES + priority = PREFERENCE_PRIORITY_WORLD_OF_DARKNESS + main_feature_name = "Auspice" + relevant_inherent_trait = TRAIT_WTA_GAROU_AUSPICE + must_have_relevant_trait = TRUE + should_generate_icons = TRUE + +/datum/preference/choiced/garou_auspice/init_possible_values() + return assoc_to_keys(GLOB.auspices_list) // This would be inclusive of ALL auspices so many need to be reworked when adding other fera + +/datum/preference/choiced/garou_auspice/icon_for(value) + var/datum/universal_icon/auspice_icon = uni_icon('icons/effects/effects.dmi', "nothing") + auspice_icon.blend_icon(uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/auspices.dmi', replacetext(LOWER_TEXT(value), " ", "_")), ICON_OVERLAY) + return auspice_icon + +/datum/preference/choiced/garou_auspice/apply_to_human(mob/living/carbon/human/target, value) + target.set_auspice(value, TRUE) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/breed.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/breed.dm new file mode 100644 index 000000000000..f07ab142ad4e --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/breed.dm @@ -0,0 +1,40 @@ +/datum/preference/choiced/garou_breed + savefile_key = "garou_breed" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_FEATURES + priority = PREFERENCE_PRIORITY_WORLD_OF_DARKNESS + main_feature_name = "Breed" + relevant_inherent_trait = TRAIT_WTA_GAROU_BREED + must_have_relevant_trait = TRUE + should_generate_icons = TRUE + +/datum/preference/choiced/garou_breed/init_possible_values() + return assoc_to_keys(GLOB.breed_forms_list) + +/datum/preference/choiced/garou_breed/icon_for(value) + var/datum/universal_icon/garou_icon = uni_icon('icons/effects/effects.dmi', "nothing") + switch(value) + if(BREED_HOMID) + var/datum/universal_icon/breed_homid = uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_head_m") + breed_homid.blend_icon(uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_chest_m"), ICON_OVERLAY) + breed_homid.blend_icon(uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_arm"), ICON_OVERLAY) + breed_homid.blend_icon(uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_arm"), ICON_OVERLAY) + breed_homid.blend_icon(uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_leg"), ICON_OVERLAY) + breed_homid.blend_icon(uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_leg"), ICON_OVERLAY) + breed_homid.blend_icon(uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_r_hand"), ICON_OVERLAY) + breed_homid.blend_icon(uni_icon('icons/mob/human/bodyparts_greyscale.dmi', "human_l_hand"), ICON_OVERLAY) + breed_homid.blend_color(skintone2hex("caucasian1"), ICON_MULTIPLY) + breed_homid.scale(32, 32) + garou_icon.blend_icon(breed_homid, ICON_OVERLAY) + if(BREED_LUPUS) + var/datum/universal_icon/breed_lupus = uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi', "black") + breed_lupus.scale(32, 32) + garou_icon.blend_icon(breed_lupus, ICON_OVERLAY) + if(BREED_CRINOS) + var/datum/universal_icon/breed_crinos = uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi', "black") + breed_crinos.scale(32, 32) + garou_icon.blend_icon(breed_crinos, ICON_OVERLAY) + return garou_icon + +/datum/preference/choiced/garou_breed/apply_to_human(mob/living/carbon/human/target, value) + target.set_breed_form(value, TRUE) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/fur.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/fur.dm new file mode 100644 index 000000000000..5ffe5a8988fd --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/fur.dm @@ -0,0 +1,15 @@ +/datum/preference/choiced/garou_fur_color + savefile_key = "garou_fur_color" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_SECONDARY_FEATURES + priority = PREFERENCE_PRIORITY_WORLD_OF_DARKNESS + main_feature_name = "Fera Fur Color" + relevant_inherent_trait = TRAIT_FERA_FUR + must_have_relevant_trait = TRUE + +/datum/preference/choiced/garou_fur_color/init_possible_values() + return assoc_to_keys(GLOB.garou_fur_colors) + + +/datum/preference/choiced/garou_fur_color/apply_to_human(mob/living/carbon/human/target, value) + target.dna.features[FEATURE_FUR_COLOR] = value diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/renown.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/renown.dm new file mode 100644 index 000000000000..d166f2f8a39b --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/renown.dm @@ -0,0 +1,47 @@ +/datum/preference/numeric/renown + abstract_type = /datum/preference/numeric/renown + category = PREFERENCE_CATEGORY_MANUALLY_RENDERED // DARKPACK TODO - Render this somewhere + priority = PREFERENCE_PRIORITY_REQUIRES_SUBSPLAT + savefile_identifier = PREFERENCE_CHARACTER + + minimum = 1 + maximum = 10 + +/datum/preference/numeric/renown/create_default_value() + return 1 + +/datum/preference/numeric/renown/apply_to_human(mob/living/carbon/human/target, value) + var/datum/splat/werewolf/splat = iswerewolfsplat(target) + if(!splat) + return + + splat.renown[savefile_key] = value + +/datum/preference/numeric/renown/honor + savefile_key = RENOWN_HONOR + +/datum/preference/numeric/renown/glory + savefile_key = RENOWN_GLORY + +/datum/preference/numeric/renown/wisdom + savefile_key = RENOWN_WISDOM + + +/datum/preference/numeric/fera_rank + category = PREFERENCE_CATEGORY_MANUALLY_RENDERED // DARKPACK TODO - Render this somewhere + priority = PREFERENCE_PRIORITY_REQUIRES_SUBSPLAT + savefile_identifier = PREFERENCE_CHARACTER + savefile_key = "fera_rank" + + minimum = 0 + maximum = 5 + +/datum/preference/numeric/fera_rank/create_default_value() + return 0 + +/datum/preference/numeric/fera_rank/apply_to_human(mob/living/carbon/human/target, value) + var/datum/splat/werewolf/splat = iswerewolfsplat(target) + if(!splat) + return + + splat.renown_rank = value diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/tribe.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/tribe.dm new file mode 100644 index 000000000000..e5fe60606149 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/preferences/tribe.dm @@ -0,0 +1,20 @@ +/datum/preference/choiced/garou_tribe + savefile_key = "garou_tribe" + savefile_identifier = PREFERENCE_CHARACTER + category = PREFERENCE_CATEGORY_FEATURES + priority = PREFERENCE_PRIORITY_WORLD_OF_DARKNESS + main_feature_name = "Tribe" + relevant_inherent_trait = TRAIT_WTA_GAROU_TRIBE + must_have_relevant_trait = TRUE + should_generate_icons = TRUE + +/datum/preference/choiced/garou_tribe/init_possible_values() + return assoc_to_keys(GLOB.tribes_list) // This would be inclusive of ALL tribes so many need to be reworked when adding other fera + +/datum/preference/choiced/garou_tribe/icon_for(value) + var/datum/universal_icon/tribe_icon = uni_icon('icons/effects/effects.dmi', "nothing") + tribe_icon.blend_icon(uni_icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/tribes.dmi', replacetext(LOWER_TEXT(value), " ", "_")), ICON_OVERLAY) + return tribe_icon + +/datum/preference/choiced/garou_tribe/apply_to_human(mob/living/carbon/human/target, value) + target.set_fera_tribe(value, TRUE) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/silver_damage.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/silver_damage.dm new file mode 100644 index 000000000000..3932efaa0f8f --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/silver_damage.dm @@ -0,0 +1,41 @@ +// W20 p. 259 +/datum/status_effect/stacking/silver_bullets + id = "silver_bullet_stacks" + tick_interval = 1 TURNS + delay_before_decay = 1 SCENES + stacks = 1 + stack_threshold = 5 + max_stacks = 5 + // This renders ONTOP of the mob. Not as a status effect. Which is prob what we need to do. + // overlay_file = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/silver_dam_status.dmi' + // overlay_state = "silver" + +/datum/status_effect/stacking/silver_bullets/threshold_cross_effect() + var/datum/splat/werewolf/shifter/splat = isshifter(owner) + if(splat) + splat.adjust_gnosis(-1, TRUE) + + +/obj/projectile/bullet/proc/fera_silver_damage(mob/living/carbon/human/target, dice = 0) + if(!istype(target)) + return + var/datum/splat/werewolf/shifter/shot_pup_splat = isshifter(target) + if(shot_pup_splat) + var/mob/living/carbon/human/shot_pup = target + shot_pup.apply_status_effect(STATUS_EFFECT_SILVER_BULLLET_STACKS) + + if(!shot_pup_splat.is_breed_form()) + // IDK. This is might TTRPG inaccurate RN because i think it should acctaully convert ALL the damage to agg not just add some agg to it. + shot_pup.apply_damage(dice TTRPG_DAMAGE, AGGRAVATED) + +/obj/item/proc/fera_silver_damage(mob/living/carbon/human/target, dice = 0, gnosis_damage = 0) + if(!istype(target)) + return + var/datum/splat/werewolf/shifter/shot_pup_splat = isshifter(target) + if(shot_pup_splat) + var/mob/living/carbon/human/shot_pup = target + shot_pup_splat.adjust_gnosis(-gnosis_damage, TRUE) + + // W20 p. 290 - Werewolves dont take silver damage in breed form because they arent spirits + if(!shot_pup_splat.is_breed_form()) + shot_pup.apply_damage(dice TTRPG_DAMAGE, AGGRAVATED) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/species/garou_organs.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/species/garou_organs.dm new file mode 100644 index 000000000000..d956c2c45b63 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/species/garou_organs.dm @@ -0,0 +1,53 @@ +// Organs and limbs are applied where it makes sense to limited behavoir. +// e.g only the proper dogs on all 4s get the brain as that is to restrict there use of tools and force biting. + +/obj/item/bodypart/head/fera + // limb_id = SPECIES_FERA + head_flags = NONE + unarmed_attack_sound = 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/werewolf_bite.ogg' + +/obj/item/bodypart/chest/fera + // limb_id = SPECIES_FERA + +/obj/item/bodypart/arm/left/fera + // limb_id = SPECIES_FERA + unarmed_attack_verbs = list("claw") + unarmed_attack_verbs_continuous = list("claws") + appendage_noun = "paw" + unarmed_attack_effect = ATTACK_EFFECT_CLAW + unarmed_attack_sound = 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/werewolf_bite.ogg' + unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' + +/obj/item/bodypart/arm/right/fera + // limb_id = SPECIES_FERA + unarmed_attack_verbs = list("claw") + unarmed_attack_verbs_continuous = list("claws") + appendage_noun = "paw" + unarmed_attack_effect = ATTACK_EFFECT_CLAW + unarmed_attack_sound = 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/werewolf_bite.ogg' + unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' + +/obj/item/bodypart/leg/left/fera + // limb_id = SPECIES_FERA + +/obj/item/bodypart/leg/right/fera + // limb_id = SPECIES_FERA + + +// Specificly to restrict use of tools... because that was moved to the brain.. +/obj/item/organ/brain/fera + name = "exotic brain" + organ_traits = list(TRAIT_LITERATE, TRAIT_CAN_STRIP) + +/obj/item/organ/brain/fera/get_attacking_limb(mob/living/carbon/human/target) + if(!HAS_TRAIT(owner, TRAIT_ADVANCEDTOOLUSER) || HAS_TRAIT(owner, TRAIT_FERAL_BITER)) + return owner.get_bodypart(BODY_ZONE_HEAD) + return ..() + +/obj/item/organ/tongue/fera + name = "exotic tongue" + languages_native = list(/datum/language/garou_tongue) + +// Garou tongues can speak all default + garou tongue +/obj/item/organ/tongue/fera/get_possible_languages() + return ..() + /datum/language/garou_tongue diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/examine_text.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/examine_text.dm new file mode 100644 index 000000000000..94f123df8a6d --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/examine_text.dm @@ -0,0 +1,46 @@ +/datum/splat/werewolf/proc/examine_other_human(mob/living/carbon/examined) + var/datum/splat/werewolf/wolp_splat = iswerewolfsplat(examined) + if(wolp_splat) + var/list/honor_flavor = list("claim to good conduct", "claim to honor", "claim to chivalry") + var/list/wisdom_flavor = list("claim to insight", "claim to wisdom", "claim to sagacity") + var/list/glory_flavor = list("claim to bravery", "claim to valor", "claim to glory") + + var/same_tribe = FALSE + var/is_known = FALSE + + if(!wolp_splat.tribe || !wolp_splat.auspice) + return + if(tribe.name == wolp_splat.tribe.name) + same_tribe = TRUE + + switch(wolp_splat.renown_rank) + if(RANK_CUB to RANK_FOSTERN) + if(same_tribe) + . += "You know [examined.p_them()] as \a [fera_rank_name(wolp_splat.renown_rank)] of the [wolp_splat.tribe.name]." + is_known = TRUE + if(RANK_ADREN to RANK_LEGEND) + . += "You know [examined.p_them()] as \a [fera_rank_name(wolp_splat.renown_rank)] [wolp_splat.auspice.name] of the [wolp_splat.tribe.name]." + is_known = TRUE + + if(is_known) + switch(wolp_splat.renown[RENOWN_HONOR]) + if(4,5,6) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [honor_flavor[1]]." + if(7,8,9) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [honor_flavor[2]]." + if(10) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [honor_flavor[3]]." + switch(wolp_splat.renown[RENOWN_WISDOM]) + if(4,5,6) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [wisdom_flavor[1]]." + if(7,8,9) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [wisdom_flavor[2]]." + if(10) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [wisdom_flavor[3]]." + switch(wolp_splat.renown[RENOWN_GLORY]) + if(4,5,6) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [glory_flavor[1]]." + if(7,8,9) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [glory_flavor[2]]." + if(10) + . += "In the local Garou, you have heard of [examined.p_their(TRUE)] [glory_flavor[3]]." diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/fera_species.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/fera_species.dm new file mode 100644 index 000000000000..384cfec4311f --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/fera_species.dm @@ -0,0 +1,302 @@ +//Required so werewolves can almost entirely override body rendering +/mob/living/carbon/human/update_body_parts(update_limb_data) + if(dna?.species?.update_body_parts(src)) + return + return ..() + +/datum/species/proc/update_body_parts(mob/living/carbon/human/human) + return + +/mob/living/carbon/human/update_damage_overlays() + if(dna?.species?.update_damage_overlays(src)) + return + return ..() + +/datum/species/proc/update_damage_overlays(mob/living/carbon/human/human) + return + + +/datum/species/human/shifter + abstract_type = /datum/species/human/shifter + name = "Fera" + plural_form = "Fera" + id = SPECIES_FERA + species_language_holder = /datum/language_holder/garou + var/mob_pixel_w + var/mob_pixel_z + /// Stats added and removed upon gaining the species + var/list/form_bonus_stats = list() + /// Dice roll difficulty required to shift into this form + var/shift_difficulty = 6 + /// If update_body_parts is allowed to override the body render + var/custom_body_render = FALSE + /// If update_damage_parts is allowed to override the damage render + var/custom_damage_render = FALSE + /// Fallback dmi to refrence if we fail to get one from our splat + var/fallback_icon + /// Speed mod applied and removed upon gaining this species + var/speed_mod + /// Causes delerium, which if the user is affected by, does not cause breaches + var/causes_delerium + /// IF this form can be witnessed, causes masqurade breaches + var/veil_breaching_form = FALSE + +/datum/species/human/shifter/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons) + . = ..() + if(speed_mod) + human_who_gained_species.add_movespeed_modifier(speed_mod) + + human_who_gained_species.add_offsets(type, w_add = mob_pixel_w, z_add = mob_pixel_z) + + for(var/key, value in form_bonus_stats) + human_who_gained_species.st_add_stat_mod(key, value, type) + +/datum/species/human/shifter/on_species_loss(mob/living/carbon/human/human, datum/species/new_species, pref_load) + . = ..() + if(speed_mod) + human.remove_movespeed_modifier(speed_mod) + + human.remove_offsets(type) + + for(var/key, value in form_bonus_stats) + human.st_remove_stat_mod(key, type) + + +/// Fetch the mobs fur color from their features. +/datum/species/human/shifter/proc/get_fur_color(mob/living/carbon/human/human) + return human.dna.features[FEATURE_FUR_COLOR] ? human.dna.features[FEATURE_FUR_COLOR] : "black" + + +/// Fetch the mob dmi from our splat +/datum/species/human/shifter/proc/get_mob_icon(mob/living/carbon/human/human) + var/datum/splat/werewolf/shifter/shifter_splat = isshifter(human) + var/icon_to_use + if(shifter_splat) + icon_to_use = shifter_splat.mob_icons[id] + + return icon_to_use ? icon_to_use : fallback_icon + +/datum/species/human/shifter/update_body_parts(mob/living/carbon/human/human) + if(!custom_body_render) + return FALSE + + human.remove_overlay(BODYPARTS_LAYER) + + var/fur_color = get_fur_color(human) + var/mob_icon = get_mob_icon(human) + + var/main_iconstate = "" + if(HAS_TRAIT(human, TRAIT_WYRMTAINTED)) + main_iconstate += "spiral" + main_iconstate += fur_color + if(human.body_position == LYING_DOWN) + main_iconstate += "_rest" + + human.overlays_standing[BODYPARTS_LAYER] = list(image(mob_icon, main_iconstate)) + + human.apply_overlay(BODYPARTS_LAYER) + + return TRUE + +/datum/species/human/shifter/update_damage_overlays(mob/living/carbon/human/human) + if(!custom_damage_render) + return FALSE + + human.remove_overlay(DAMAGE_LAYER) + + var/dam_amount + switch(human.get_brute_loss() + human.get_fire_loss() + human.get_agg_loss()) + if(25 to 100) + dam_amount = 1 + if(100 to 250) + dam_amount = 2 + if(250 to INFINITY) + dam_amount = 3 + if(dam_amount) + human.overlays_standing[DAMAGE_LAYER] = mutable_appearance(get_mob_icon(human), "damage[dam_amount][human.body_position == LYING_DOWN ? "_rest" : ""]") + + human.apply_overlay(DAMAGE_LAYER) + + return TRUE + +/datum/species/human/shifter/homid + name = "homid form" + id = SPECIES_FERA_HOMID + + +/datum/species/human/shifter/bestial + name = "bestial form" + id = SPECIES_FERA_BESTIAL + form_bonus_stats = list( + STAT_STRENGTH = 2, + STAT_STAMINA = 2, + STAT_MANIPULATION = -2, + STAT_APPEARANCE = -1 + ) + shift_difficulty = 7 + fallback_icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/glabro.dmi' + veil_breaching_form = TRUE + +/datum/species/human/shifter/bestial/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load, regenerate_icons) + . = ..() + human_who_gained_species.update_mob_height() + human_who_gained_species.update_transform(1.25) + + + human_who_gained_species.remove_overlay(BODY_ADJ_LAYER) + + var/fur_color = get_fur_color(human_who_gained_species) + var/mob_icon = get_mob_icon(human_who_gained_species) + + human_who_gained_species.overlays_standing[BODY_ADJ_LAYER] = list(image(mob_icon, fur_color)) + + human_who_gained_species.apply_overlay(BODY_ADJ_LAYER) + +/datum/species/human/shifter/bestial/on_species_loss(mob/living/carbon/human/human, datum/species/new_species, pref_load) + . = ..() + human.update_mob_height() + human.update_transform() + human.remove_overlay(BODY_ADJ_LAYER) + +/datum/species/human/shifter/bestial/update_species_heights(mob/living/carbon/human/holder) + if(HAS_TRAIT(holder, TRAIT_DWARF)) + return HUMAN_HEIGHT_MEDIUM + + if(HAS_TRAIT(holder, TRAIT_TOO_TALL)) + return HUMAN_HEIGHT_TALLEST + + return HUMAN_HEIGHT_TALL + + +/datum/species/human/shifter/war + name = "war form" + id = SPECIES_FERA_WAR + inherent_traits = list( + TRAIT_NO_UNDERWEAR, + TRAIT_NO_BLOOD_OVERLAY, + TRAIT_NO_LYING_ANGLE, + TRAIT_TRANSFORM_UPDATES_ICON, + ) + causes_delerium = TRUE + veil_breaching_form = TRUE + + mutanttongue = /obj/item/organ/tongue/fera + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/fera, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/fera, + BODY_ZONE_HEAD = /obj/item/bodypart/head/fera, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/fera, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/fera, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/fera, + ) + + no_equip_flags = ITEM_SLOT_ON_BODY + + visible_gender_override = "beast" + + form_bonus_stats = list( + STAT_STRENGTH = 4, + STAT_STAMINA = 3, + STAT_DEXTERITY = 1, + STAT_MANIPULATION = -3, + // STAT_APPEARANCE = 0 // NOT YET SUPPORTED + ) + mob_pixel_w = -8 + custom_body_render = TRUE + custom_damage_render = TRUE + fallback_icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi' + speed_mod = /datum/movespeed_modifier/shifter/war + +/datum/species/human/shifter/dire + name = "dire form" + id = SPECIES_FERA_DIRE + inherent_traits = list( + TRAIT_NO_UNDERWEAR, + TRAIT_NO_BLOOD_OVERLAY, + TRAIT_NO_LYING_ANGLE, + TRAIT_TRANSFORM_UPDATES_ICON, + TRAIT_FERAL_BITER, + TRAIT_SMALL_HANDS, + ) + veil_breaching_form = TRUE + + mutantbrain = /obj/item/organ/brain/fera + mutanttongue = /obj/item/organ/tongue/fera + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/fera, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/fera, + BODY_ZONE_HEAD = /obj/item/bodypart/head/fera, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/fera, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/fera, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/fera, + ) + + no_equip_flags = ITEM_SLOT_ON_BODY + + visible_gender_override = "beast" + + form_bonus_stats = list( + STAT_STRENGTH = 3, + STAT_STAMINA = 3, + STAT_DEXTERITY = 2, + STAT_MANIPULATION = -3, + ) + shift_difficulty = 7 + mob_pixel_w = -16 + mob_pixel_z = -8 + custom_body_render = TRUE + custom_damage_render = TRUE + fallback_icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/hispo.dmi' + speed_mod = /datum/movespeed_modifier/shifter/dire + +/datum/species/human/shifter/feral + name = "feral form" + id = SPECIES_FERA_FERAL + inherent_traits = list( + TRAIT_NO_UNDERWEAR, + TRAIT_NO_BLOOD_OVERLAY, + TRAIT_NO_LYING_ANGLE, + TRAIT_TRANSFORM_UPDATES_ICON, + TRAIT_FERAL_BITER, + TRAIT_SMALL_HANDS, + ) + + mutantbrain = /obj/item/organ/brain/fera + mutanttongue = /obj/item/organ/tongue/fera + bodypart_overrides = list( + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/fera, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/fera, + BODY_ZONE_HEAD = /obj/item/bodypart/head/fera, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/fera, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/fera, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/fera, + ) + + no_equip_flags = ITEM_SLOT_ON_BODY + + visible_gender_override = "wolf" + + form_bonus_stats = list( + STAT_STRENGTH = 1, + STAT_STAMINA = 2, + STAT_DEXTERITY = 2, + STAT_MANIPULATION = -3, + ) + custom_body_render = TRUE + custom_damage_render = TRUE + fallback_icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi' + speed_mod = /datum/movespeed_modifier/shifter/feral + +/datum/movespeed_modifier/shifter + abstract_type = /datum/movespeed_modifier/shifter + movetypes = GROUND + +// Verify these nums are ttrpg accurate. +/datum/movespeed_modifier/shifter/war + multiplicative_slowdown = -0.1 + +/datum/movespeed_modifier/shifter/dire + multiplicative_slowdown = -0.3 + +/datum/movespeed_modifier/shifter/feral + multiplicative_slowdown = -0.5 diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/fera_splat.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/fera_splat.dm new file mode 100644 index 000000000000..1b5e676b5e10 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/fera_splat.dm @@ -0,0 +1,175 @@ +// Represents the system not that they are a werewolf/fera +/datum/splat/werewolf + abstract_type = /datum/splat/werewolf + + power_type = /datum/action/cooldown/power/gift + + var/uses_rage = FALSE + var/rage = 0 + // without a merit kinfolk cannot use gnosis + var/uses_gnosis = FALSE + var/gnosis = 0 + + var/list/renown = list() + var/renown_rank = RANK_CUB + + var/datum/subsplat/werewolf/breed_form/breed_form + var/datum/subsplat/werewolf/auspice/auspice + var/datum/subsplat/werewolf/tribe/tribe + +/datum/splat/werewolf/proc/adjust_rage(amount, sound = TRUE) + if(!uses_rage) + return FALSE + + if(amount > 0) + if(rage < MAX_RAGE) + rage = min(MAX_RAGE, rage+amount) + if(sound) + SEND_SOUND(owner, sound('modular_darkpack/modules/werewolf_the_apocalypse/sounds/rage_increase.ogg', volume = 50)) + to_chat(owner, span_userdanger("RAGE INCREASES")) + else + return FALSE + if(amount < 0) + if(rage > 0) + rage = max(0, rage+amount) + if(sound) + SEND_SOUND(owner, sound('modular_darkpack/modules/werewolf_the_apocalypse/sounds/rage_decrease.ogg', volume = 50)) + to_chat(owner, span_userdanger("RAGE DECREASES")) + else + return FALSE + + owner.update_werewolf_hud() + return TRUE + +/datum/splat/werewolf/proc/adjust_gnosis(amount, sound = TRUE) + if(!uses_gnosis) + return FALSE + + if(amount > 0) + if(gnosis < MAX_GNOSIS) + gnosis = clamp(gnosis + amount, 0, MAX_GNOSIS) + if(sound) + SEND_SOUND(owner, sound('modular_darkpack/modules/deprecated/sounds/humanity_gain.ogg', volume = 50)) + to_chat(owner, span_boldnotice("GNOSIS INCREASES")) + else + return FALSE + if(amount < 0) + if(gnosis > 0) + gnosis = clamp(gnosis + amount, 0, MAX_GNOSIS) + if(sound) + SEND_SOUND(owner, sound('modular_darkpack/modules/werewolf_the_apocalypse/sounds/rage_decrease.ogg', volume = 50)) + to_chat(owner, span_boldnotice("GNOSIS DECREASES")) + else + return FALSE + + owner.update_werewolf_hud() + return TRUE + + +/datum/splat/werewolf/kinfolk + name = "Kinfolk" + id = SPLAT_KINFOLK + // incompatible_splats = list(/datum/splat/werewolf/shifter) // TODO: Becoming a shifter should get rid of your kinfolk splat + +/datum/splat/werewolf/shifter + abstract_type = /datum/splat/werewolf/shifter + splat_traits = list( + TRAIT_WTA_GAROU_BREED, + TRAIT_WTA_GAROU_AUSPICE, + TRAIT_WTA_GAROU_TRIBE, + TRAIT_FERA_FUR, + TRAIT_FRENETIC_AURA + ) + // id = SPLAT_FERA + incompatible_splats = list( + /datum/splat/werewolf + ) // We dont support being multiple fera or gaining kinfolk as a fera + uses_rage = TRUE + uses_gnosis = TRUE + + var/list/transformation_list = list() + var/transform_sound = 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/transform.ogg' + COOLDOWN_DECLARE(transform_cd) + /** + * [SPECIES_ID -> dmi path] assoc list + * + * Only required for forms that you can into (corax lack dire and bestial) + * and acctually have custom sprite behavoir (homid are exempt, bestial are fluff added to homid) + */ + var/list/mob_icons = list( + SPECIES_FERA_BESTIAL = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/glabro.dmi', + SPECIES_FERA_WAR = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi', + SPECIES_FERA_DIRE = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/hispo.dmi', + SPECIES_FERA_FERAL = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi' + ) + COOLDOWN_DECLARE(passive_healing_cd) + COOLDOWN_DECLARE(gnosis_regain_cd) + +/datum/splat/werewolf/shifter/on_gain() + . = ..() + owner.set_species(/datum/species/human/shifter/homid) + add_power(/datum/action/cooldown/power/gift/howling) + + RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(revert_to_breed_form)) + +/datum/splat/werewolf/shifter/on_lose_or_destroy() + . = ..() + if(!QDELETED(owner)) + owner.set_species(/datum/species/human) + + UnregisterSignal(owner, COMSIG_LIVING_DEATH) + +/datum/splat/werewolf/shifter/splat_life(seconds_per_tick) + regain_gnosis_process(seconds_per_tick) + if(COOLDOWN_FINISHED(src, passive_healing_cd)) + // Metis heal in all forms. Lupus and homid born dont heal FAST FAST in their breed form + // their fast healing is represented in day/days in breed-form so we just dont. + if(is_breed_form() && (get_breed_form_species() != /datum/species/human/shifter/war)) + return + owner.heal_storyteller_health(1, heal_scars = TRUE, heal_blood = TRUE) + COOLDOWN_START(src, passive_healing_cd, 1 TURNS) + var/datum/species/human/shifter/shifter_species = owner.dna.species + if(istype(shifter_species)) + if(shifter_species.veil_breaching_form && !shifter_species.causes_delerium) + SEND_SIGNAL(owner, COMSIG_MASQUERADE_VIOLATION) + +// Being used to represent meditating in your caern +/datum/splat/werewolf/shifter/proc/regain_gnosis_process(seconds_per_tick) + if(!COOLDOWN_FINISHED(src, gnosis_regain_cd)) + return + for(var/obj/structure/werewolf_totem/totem in GLOB.totems) + if(totem.broken) + continue + if(!(tribe.name in totem.tribes)) + continue + if(get_area(totem) != get_area(owner)) + continue + adjust_gnosis(1, TRUE) + COOLDOWN_START(src, gnosis_regain_cd, 1 SCENES) + +/datum/splat/werewolf/shifter/garou + name = "Garou" + id = SPLAT_GAROU + transformation_list = list( + /datum/species/human/shifter/homid, + /datum/species/human/shifter/bestial, + /datum/species/human/shifter/war, + /datum/species/human/shifter/dire, + /datum/species/human/shifter/feral + ) + +/* // DARKPACK TODO - CORAX +/datum/splat/werewolf/shifter/corax + name = "Corax" + id = SPLAT_CORAX + transformation_list = list( + /datum/species/human/shifter/homid, + /datum/species/human/shifter/war, + /datum/species/human/shifter/feral + ) + mob_icons = list( + SPECIES_FERA_WAR = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/crinos.dmi', + SPECIES_FERA_FERAL = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/corvid.dmi' + ) + transform_sound = 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/corax_transform.ogg' +*/ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/is_werewolf_helpers.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/is_werewolf_helpers.dm new file mode 100644 index 000000000000..427b1be1b8ca --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/is_werewolf_helpers.dm @@ -0,0 +1,30 @@ +/** + * If the character is any kind of fera or kinfolk creature, named after the game line + */ +/proc/iswerewolfsplat(mob/character) + RETURN_TYPE(/datum/splat/werewolf) + + return character.get_splat(/datum/splat/werewolf) + +/proc/isshifter(mob/character) + RETURN_TYPE(/datum/splat/werewolf/shifter) + + return character.get_splat(/datum/splat/werewolf/shifter) + +/proc/isgarou(mob/character) + RETURN_TYPE(/datum/splat/werewolf/shifter/garou) + + return character.get_splat(/datum/splat/werewolf/shifter/garou) + +/* // DARKPACK TODO - CORAX +/proc/iscorax(mob/character) + RETURN_TYPE(/datum/splat/werewolf/shifter/cora + + return character.get_splat(/datum/splat/werewolf/shifter/corax) +*/ + +/proc/iskinfolk(mob/character) + RETURN_TYPE(/datum/splat/werewolf/kinfolk) + + return character.get_splat(/datum/splat/werewolf/kinfolk) + diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/pref_lore.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/pref_lore.dm new file mode 100644 index 000000000000..a37c33482a3e --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/pref_lore.dm @@ -0,0 +1,52 @@ +/datum/splat/werewolf/kinfolk/prepare_human_for_preview(mob/living/carbon/human/human) + human.set_haircolor("#C3BA88", update = FALSE) + human.set_eye_color("B2B2B2", "B2B2B2") + human.set_hairstyle("Bangs (Diagonal Alt)", update = TRUE) + human.undershirt = "Shirt (Ian)" + human.update_body() + +// DARKPACK TODO - WEREWOLF - (len lore) +/datum/splat/werewolf/kinfolk/get_splat_description() + return "Lorem Ipsum" + +// DARKPACK TODO - WEREWOLF - (len lore) +/datum/splat/werewolf/kinfolk/get_splat_lore() + return list( + "Lorem Ipsum", + ) + +/datum/splat/werewolf/shifter/garou/prepare_human_for_preview(mob/living/carbon/human/human) + human.set_haircolor("#502D15", update = FALSE) + human.set_hairstyle("Long Hair 3", update = TRUE) + human.undershirt = "Shirt (Alien)" + human.update_body() + +// DARKPACK TODO - WEREWOLF - (len lore) +/datum/splat/werewolf/shifter/garou/get_splat_description() + return "Lorem Ipsum" + +// DARKPACK TODO - WEREWOLF - (len lore) +/datum/splat/werewolf/shifter/garou/get_splat_lore() + return list( + "Lorem Ipsum", + ) + +/datum/splat/werewolf/shifter/garou/create_pref_unique_perks() + var/list/to_add = list() + + to_add += list( + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = FA_ICON_DOG, + SPECIES_PERK_NAME = "Shapeshifting", + SPECIES_PERK_DESC = "Garou can shift between 5 diffrent forms that grant them bonus.", + ), + list( + SPECIES_PERK_TYPE = SPECIES_POSITIVE_PERK, + SPECIES_PERK_ICON = FA_ICON_BAND_AID, + SPECIES_PERK_NAME = "Passive healing", + SPECIES_PERK_DESC = "Garou have a strong passive healing while outside of their breed form.", + ) + ) + + return to_add diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/renown.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/renown.dm new file mode 100644 index 000000000000..2ae22c6d2604 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/renown.dm @@ -0,0 +1,100 @@ +#define MAX_RENOWN 10 + +/datum/splat/werewolf/proc/adjust_renown(attribute, amount) + if(!renown[attribute]) + renown[attribute] = 0 + + + var/old_rank = renown_rank + var/new_amount = clamp(renown[attribute] + amount, 0, MAX_RENOWN) + + renown[attribute] = new_amount + if(amount < 0) + to_chat(owner, span_userdanger("You feel [get_negative_emotion(attribute)]!")) + else if(amount > 0) + to_chat(owner, span_bold("You feel [get_positive_emotion(attribute)]!")) + + switch(attribute) + if(RENOWN_HONOR) + owner.write_preference_midround(/datum/preference/numeric/renown/honor, new_amount) + if(RENOWN_GLORY) + owner.write_preference_midround(/datum/preference/numeric/renown/glory, new_amount) + if(RENOWN_WISDOM) + owner.write_preference_midround(/datum/preference/numeric/renown/wisdom, new_amount) + + renown_rank = auspice_rank_check() + if(old_rank != renown_rank) + to_chat(owner, span_boldnotice("You are now a [fera_rank_name(renown_rank)].")) + + owner.write_preference_midround(/datum/preference/numeric/fera_rank, renown_rank) + + +/datum/splat/werewolf/proc/get_negative_emotion(attribute) + switch(attribute) + if(RENOWN_HONOR) + return "ashamed" + + if(RENOWN_GLORY) + return "humiliated" + + if(RENOWN_WISDOM) + return "foolish" + + return "unsure" + +/datum/splat/werewolf/proc/get_positive_emotion(attribute) + switch(attribute) + + if(RENOWN_HONOR) + return "vindicated" + + if(RENOWN_GLORY) + return "brave" + + if(RENOWN_WISDOM) + return "clever" + + return "confident" + + +/datum/splat/werewolf/proc/auspice_rank_check() + return auspice.rank_requirments(renown) + +// Pretty iffy on this. This could likely just be moved onto the splat itself so corax and other breeds can override it. +/proc/fera_rank_name(rank, breed) + + // if(breed != "Corax") DARKPACK TODO - CORAX + switch(rank) + if(RANK_CUB) + return "cub" // in lowercase so that \a might function during the character examine + if(RANK_CLIATH) + return "cliath" + if(RANK_FOSTERN) + return "fostern" + if(RANK_ADREN) + return "adren" + if(RANK_ATHRO) + return "athro" + if(RANK_ELDER) + return "elder" + if(RANK_LEGEND) + return "legend" +/* DARKPACK TODO - CORAX + switch(rank) + if(0) + return "fledgling" + if(1) + return "oviculum" + if(2) + return "neocornix" + if(3) + return "ales" + if(4) + return "volucris" + if(5) + return "corvus" + if(6) + return "grey eminence" +*/ + +#undef MAX_RENOWN diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/transformation.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/transformation.dm new file mode 100644 index 000000000000..5988945b512a --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/transformation.dm @@ -0,0 +1,79 @@ +#define DOGGY_ANIMATION_TIME 1 TURNS + +/datum/storyteller_roll/fera_trans + bumper_text = "transformation" + applicable_stats = list(STAT_STAMINA) + + +// Remeber if you remove homid being species that this will break. +/datum/splat/werewolf/shifter/proc/transform_fera(datum/species/human/shifter/form_to_transform, costs_rage = FALSE, requires_roll = TRUE, force = FALSE) + if(!form_to_transform) + return + if(!istype(owner)) + return + if(!(form_to_transform in transformation_list)) + return + if(owner?.dna?.species?.type == form_to_transform) + return + if(!force && !COOLDOWN_FINISHED(src, transform_cd)) + to_chat(owner, span_warning("Your shifting is on cooldown for one turn.")) + return + + if(ispath(get_breed_form_species(), form_to_transform)) + requires_roll = FALSE + else if(costs_rage) + if(adjust_rage(-1, TRUE)) + requires_roll = FALSE + else + to_chat(owner, span_warning("You don't have enough RAGE to do that!")) + SEND_SOUND(owner, sound('modular_darkpack/modules/werewolf_the_apocalypse/sounds/werewolf_cast_failed.ogg', volume = 50)) + return + + COOLDOWN_START(src, transform_cd, 1 TURNS) + var/time_to_transform = DOGGY_ANIMATION_TIME + + // TODO: should accctually require an amount of successes equal to the forms your shifting through + if(requires_roll) + var/datum/storyteller_roll/fera_trans/transform_roll = new() + transform_roll.difficulty = form_to_transform::shift_difficulty + switch(transform_roll.st_roll(owner, owner, PRIMAL_URGE_PLACEHOLDER)) + if(ROLL_SUCCESS) + EMPTY_BLOCK_GUARD + if(ROLL_FAILURE, ROLL_BOTCH) + return + + // If it doesnt require a roll it must be instant/free action + if(requires_roll) + playsound(owner, transform_sound, 50, FALSE) + else + playsound(owner, 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/speedtrans.ogg', 50, FALSE) + time_to_transform *= 0.1 + + // owner.Stun(time_to_transform, ignore_canstun = TRUE) + + var/matrix/ntransform = matrix(owner.transform) + ntransform.Scale(1.1, 1.1) + animate(owner, transform = ntransform, color = "#000000", time = time_to_transform * 0.9) + + SEND_SIGNAL(owner, COMSIG_MASQUERADE_VIOLATION) + + addtimer(CALLBACK(src, PROC_REF(transform_finish), form_to_transform, time_to_transform), time_to_transform * 0.9) + +/datum/splat/werewolf/shifter/proc/revert_to_breed_form() + transform_fera(get_breed_form_species(), force = TRUE) + +/datum/splat/werewolf/shifter/proc/transform_finish(form_to_transform, time_taken = DOGGY_ANIMATION_TIME) + animate(owner, transform = null, color = "#FFFFFF", time = time_taken * 0.1) + owner.set_species(form_to_transform) + +/datum/splat/werewolf/shifter/proc/is_breed_form() + if(!owner?.dna) + return FALSE + if(owner.dna.species?.type != get_breed_form_species()) + return FALSE + return TRUE + +/datum/splat/werewolf/shifter/proc/get_breed_form_species() + return breed_form?.breed_species + +#undef DOGGY_ANIMATION_TIME diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/varediting.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/varediting.dm new file mode 100644 index 000000000000..0e490eefd889 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/varediting.dm @@ -0,0 +1,37 @@ +#define VV_HK_EDIT_RENOWN "edit_renown" + +/datum/splat/werewolf/vv_get_dropdown() + . = ..() + VV_DROPDOWN_OPTION("", "---------") + VV_DROPDOWN_OPTION(VV_HK_EDIT_RENOWN, "Edit Renown") + +/datum/splat/werewolf/vv_do_topic(list/href_list) + . = ..() + + if(!.) + return + + if(href_list[VV_HK_EDIT_RENOWN]) + if(!check_rights(R_SPAWN)) + return + var/list/options = ALL_RENOWNS + var/result = tgui_input_list(usr, "Please choose a renown to adjust", "Renown", options) + if(!result) + return + var/amount = tgui_input_number(usr, "Enter to renown add/remove.", "Renown", 1, 10, -10) + if(isnull(amount)) + return + adjust_renown(result, amount) + + +/datum/splat/werewolf/vv_edit_var(var_name, var_value) + . = ..() + if(!.) + return + switch(var_name) + if(NAMEOF(src, rage)) + owner.update_werewolf_hud() + if(NAMEOF(src, gnosis)) + owner.update_werewolf_hud() + +#undef VV_HK_EDIT_RENOWN diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/werewolf_gift_management.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/werewolf_gift_management.dm new file mode 100644 index 000000000000..587d1f8c2f36 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/splats/werewolf_gift_management.dm @@ -0,0 +1,31 @@ +/datum/splat/werewolf/get_power(power_type) + RETURN_TYPE(/datum/action/cooldown/power/gift) + + for(var/datum/action/cooldown/power/gift/found_action as anything in powers) + if(!istype(found_action, power_type)) + continue + + return found_action + +/datum/splat/werewolf/add_power(power_type, level) + // Prevent duplicates + if(get_power(power_type)) + return FALSE + var/datum/action/cooldown/power/gift/adding_action = new power_type() + adding_action.Grant(owner) + LAZYADD(powers, adding_action) + return TRUE + +/datum/splat/werewolf/remove_power(power_type) + var/datum/action/cooldown/power/gift/found_action = get_power(power_type) + if(!found_action) + return FALSE + + LAZYREMOVE(powers, found_action) + qdel(found_action) + return TRUE + +/datum/splat/werewolf/change_power_level(power_type, new_level) + return // We dont really have discs in the same way, and we dont have diffrent power levels for an individual power? + + diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/status_effects/delirium.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/status_effects/delirium.dm new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/status_effects/rage_heal.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/status_effects/rage_heal.dm new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/_subsplat.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/_subsplat.dm new file mode 100644 index 000000000000..c4f78ab568cc --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/_subsplat.dm @@ -0,0 +1,16 @@ +/datum/subsplat/werewolf + abstract_type = /datum/subsplat/werewolf + // Currently un-implemented + /// Fera required to have this subsplat. If null its takeable by any splat. + var/fera_restriction + + // At present it grants all of them but this is a mechanical limitation while i wait for the disc rework. + // /datum/action/cooldown/power/gift + /// All gifts avalible via this subsplat. + var/list/gifts_provided = list() + +/datum/subsplat/werewolf/on_gain(datum/splat/gaining, joining_round) + . = ..() + // Placeholder! + for(var/gift in gifts_provided) + gaining.add_power(gift) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/auspices/_auspice.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/auspices/_auspice.dm new file mode 100644 index 000000000000..4564a2b57334 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/auspices/_auspice.dm @@ -0,0 +1,77 @@ + + +/datum/subsplat/werewolf/auspice + abstract_type = /datum/subsplat/werewolf/auspice + + var/start_rage + + var/moons_born_under = list() + +/datum/subsplat/werewolf/auspice/on_gain(datum/splat/gaining, joining_round) + . = ..() + if(istype(gaining, /datum/splat/werewolf)) + var/datum/splat/werewolf/werewolf_splat = gaining + werewolf_splat.adjust_rage(start_rage) + +/datum/subsplat/werewolf/auspice/proc/rank_requirments(list/renown) + return 0 + +/** + * Gets the singleton of an Auspice + * from its name, typepath, or returns the + * argument if given a Auspice singleton. + * + * Arguments: + * * auspice_identifier - Name, typepath, or singleton of the Auspice being retrieved + */ +/proc/get_fera_auspice(auspice_identifier) + RETURN_TYPE(/datum/subsplat/werewolf/auspice) + + if (ispath(auspice_identifier)) + return GLOB.auspices[auspice_identifier] + else if (istext(auspice_identifier)) + return GLOB.auspices[GLOB.auspices_list[auspice_identifier]] + else + return auspice_identifier + +/** + * Gives the human a Auspice, applying + * on_gain effects and post_gain effects if the + * parameter is true. Can also remove Auspices + * with or without a replacement, and apply + * on_lose effects. Will have no effect the human + * is being given the Auspice it already has. + * + * Arguments: + * * setting_auspice - Typepath or Auspice singleton to give to the human + * * joining_round - If this Auspice is being given at roundstart and should call on_join_round + */ +/mob/living/carbon/human/proc/set_auspice(setting_auspice, joining_round) + var/datum/subsplat/werewolf/auspice/previous_auspice = get_our_auspice() + + // Convert IDs and typepaths to singletons, or just directly assign if already singleton + var/datum/subsplat/werewolf/auspice/new_auspice = get_fera_auspice(setting_auspice) + + // Handle losing Auspice + previous_auspice?.on_lose(src) + + var/datum/splat/werewolf/shifter/shifter = isshifter(src) + if (!shifter) + return + + shifter.auspice = new_auspice + + // Auspice's been cleared, don't apply effects + if (!new_auspice) + return + + // Gaining Auspice effects + new_auspice.on_gain(shifter, joining_round) + +/mob/living/proc/get_our_auspice() + RETURN_TYPE(/datum/subsplat/werewolf/auspice) + + return isshifter(src)?.auspice + +/mob/living/proc/is_auspice(auspice_type) + return istype(get_our_auspice(), auspice_type) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/auspices/garou.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/auspices/garou.dm new file mode 100644 index 000000000000..c045c1e49215 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/auspices/garou.dm @@ -0,0 +1,142 @@ +/datum/subsplat/werewolf/auspice/garou + abstract_type = /datum/subsplat/werewolf/auspice/garou + fera_restriction = SPLAT_GAROU + + +/datum/subsplat/werewolf/auspice/garou/ahroun + name = AUSPICE_AHROUN + desc = "The Ahroun is the archetype of the werewolf as murderous beast, though they range from unapologetic berserkers to hardened veterans tempering their Rage with discipline. Their high levels of Rage put them on the edge at all times - the Full Moon's blessing is a hair trigger, among other things. Those closer to the waxing moon tend to exult in the glory of the war, while those closer to the waning moon are more viciously pragmatic, ruthless in their bloodthirst. Every Ahroun is a dangerous individual to be around, but when the forces of the Wyrm attack, their packmates are glad to have a Full Moon warrior at the front of the charge." + start_rage = 5 + gifts_provided= list(/datum/action/cooldown/power/gift/falling_touch)//, /datum/action/cooldown/power/gift/inspiration, /datum/action/cooldown/power/gift/razor_claws) + moons_born_under = list(MOON_FULL) + +/datum/subsplat/werewolf/auspice/garou/ahroun/rank_requirments(list/renown) + var/glory = renown[RENOWN_GLORY] + var/honor = renown[RENOWN_HONOR] + var/wisdom = renown[RENOWN_WISDOM] + + if(glory >= 10 && honor >= 9 && wisdom >= 4) + return RANK_ELDER + if(glory >= 9 && honor >= 4 && wisdom >= 2) + return RANK_ATHRO + if(glory >= 6 && honor >= 3 && wisdom >= 1) + return RANK_ADREN + if(glory >= 4 && honor >= 1 && wisdom >= 1) + return RANK_FOSTERN + if(glory >= 2 || honor >= 1) + return RANK_CLIATH + return RANK_CUB + +/datum/subsplat/werewolf/auspice/garou/galliard + name = AUSPICE_GALLIARD + desc = "Where the Philodox is stoic, the Galliard is a creature of unbridled passion. The Gibbous Moon is a fiery muse, and stirs its children into great heights and depths of emotion. While all Galliards are prone to immense mirth and immense melancholy, those born under a waning moon fall more readily into dark, consuming passions; they are the tragedians of the Garou, mastering tales of doom, ruin, sacrifice and loss. Conversely, their waxing-moon cousins sing of triumph and conquest, of the pounding heart and the love of life. They tend to be the soul of their pack's morale - when the Galliard is willing to go on, so too are all the others." + start_rage = 4 + gifts_provided = list( + // /datum/action/cooldown/power/gift/beast_speech, + // /datum/action/cooldown/power/gift/call_of_the_wyld, + /datum/action/cooldown/power/gift/mindspeak + ) + moons_born_under = list(MOON_WAXING_GIBBOUS, MOON_WANING_GIBBOUS) + +/datum/subsplat/werewolf/auspice/garou/galliard/rank_requirments(list/renown) + var/glory = renown[RENOWN_GLORY] + var/honor = renown[RENOWN_HONOR] + var/wisdom = renown[RENOWN_WISDOM] + + if(glory >= 9 && honor >= 5 && wisdom >= 9) + return RANK_ELDER + if(glory >= 7 && honor >= 2 && wisdom >= 6) + return RANK_ATHRO + if(glory >= 4 && honor >= 2 && wisdom >= 4) + return RANK_ADREN + if(glory >= 4 && wisdom >= 2) + return RANK_FOSTERN + if(glory >= 2 && wisdom >= 1) + return RANK_CLIATH + return RANK_CUB + +/datum/subsplat/werewolf/auspice/garou/philodox + name = AUSPICE_PHILODOX + desc = "Buried so heavily in his role as impartial judge and jury, the Philodox may seem aloof, even surprisingly cold-blooded for a werewolf. Those born under the waxing Half Moon may seem unusually serene and disaffected, their emotions only emerging when their Rage comes to a boil. The waning-moon Philodox is more incisive and judgmental, his all-seeing eye always carefully watching his packmates and colleagues for any departure from the expected. The Half Moons' opinions are somewhat feared, yet highly respected - a word of praise or condemnation means much coming from those born to see both sides of every struggle." + start_rage = 3 + gifts_provided= list(/datum/action/cooldown/power/gift/scent_of_the_true_form)//,/datum/action/cooldown/power/gift/resist_pain, /datum/action/cooldown/power/gift/truth_of_gaia) + moons_born_under = list(MOON_FIRST_QUARTER, MOON_LAST_QUARTER) + +/datum/subsplat/werewolf/auspice/garou/philodox/rank_requirments(list/renown) + var/glory = renown[RENOWN_GLORY] + var/honor = renown[RENOWN_HONOR] + var/wisdom = renown[RENOWN_WISDOM] + + if(glory >= 4 && honor >= 10 && wisdom >= 9) + return RANK_ELDER + if(glory >= 3 && honor >= 8 && wisdom >= 4) + return RANK_ATHRO + if(glory >= 2 && honor >= 6 && wisdom >= 2) + return RANK_ADREN + if(glory >= 1 && honor >= 4 && wisdom >= 1) + return RANK_FOSTERN + if(honor >= 3) + return RANK_CLIATH + return RANK_CUB + + +/datum/subsplat/werewolf/auspice/garou/theurge + name = AUSPICE_THEURGE + desc = "The Crescent Moons can be strange and enigmatic, prone to falling into the convoluted symbolic logic of the spirits they truck with rather than the more familiar logic of humanity. Those Theurges born under the waning moon frequently have a harsher, more adversarial relationship with the spirit world - they tend to excel at binding and forcing spirits to their will, and are more vicious when battling spirits. Theurges born under the waxing moon tend to be more generous and open with the spirits, charming and cajoling rather than intimidating and threatening." + start_rage = 2 + gifts_provided = list( + /datum/action/cooldown/power/gift/mothers_touch, + // /datum/action/cooldown/power/gift/sense_wyrm, + // /datum/action/cooldown/power/gift/spirit_speech + ) + moons_born_under = list(MOON_WANING_CRESCENT, MOON_WAXING_CRESENT) + +/datum/subsplat/werewolf/auspice/garou/theurge/rank_requirments(list/renown) + var/glory = renown[RENOWN_GLORY] + var/honor = renown[RENOWN_HONOR] + var/wisdom = renown[RENOWN_WISDOM] + + if(glory >= 4 && honor >= 9 && wisdom >= 10) + return RANK_ELDER + if(glory >= 4 && honor >= 2 && wisdom >= 9) + return RANK_ATHRO + if(glory >= 2 && honor >= 1 && wisdom >= 7) + return RANK_ADREN + if(glory >= 1 && wisdom >= 5) + return RANK_FOSTERN + if(wisdom >= 3) + return RANK_CLIATH + return RANK_CUB + + +/datum/subsplat/werewolf/auspice/garou/ragabash + name = AUSPICE_RAGABASH + desc = "The Ragabash born under the waxing new moon is usually light-hearted and capricious, while one born under the waning new moon has a slightly more wicked and ruthless streak. It's a rare Ragabash indeed that lacks a keen wit and the capacity to find some humor in any situation, no matter how bleak. Many other werewolves are slow to take the Ragabash seriously, though, as it's difficult to tell the difference between a New Moon's mockery that points out a grievous flaw in a plan and similar mockery that simply amuses him. Sometimes a Ragabash points out that the emperor has no clothes - but sometimes they're the first to cry wolf, so to speak." + start_rage = 1 + gifts_provided= list( + // /datum/action/cooldown/power/gift/blur_of_the_milky_eye, + /datum/action/cooldown/power/gift/infectious_laughter + // /datum/action/cooldown/power/gift/open_seal, + ) + moons_born_under = list(MOON_NEW) + +/datum/subsplat/werewolf/auspice/garou/ragabash/rank_requirments(list/renown) + var/total_score = renown[RENOWN_GLORY] + renown[RENOWN_HONOR] + renown[RENOWN_WISDOM] + + if(total_score >= 25) + return RANK_ELDER + if(total_score >= 19) + return RANK_ATHRO + if(total_score >= 13) + return RANK_ADREN + if(total_score >= 7) + return RANK_FOSTERN + if(total_score >= 3) + return RANK_CLIATH + return RANK_CUB + +/datum/subsplat/werewolf/auspice/garou/stolen_moon + name = AUSPICE_NONE + // DARKPACK TODO - WEREWOLF - (len lore) + desc = "Your not a dog are you." + // Stolen moon get no gifts diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/breeds/_breed.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/breeds/_breed.dm new file mode 100644 index 000000000000..aeaee128398c --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/breeds/_breed.dm @@ -0,0 +1,73 @@ +// Not a splat in the TTRPG but functions like one in terms of code. +/datum/subsplat/werewolf/breed_form + abstract_type = /datum/subsplat/werewolf/breed_form + + var/start_gnosis + + var/breed_species + +/datum/subsplat/werewolf/breed_form/on_gain(datum/splat/gaining, joining_round) + . = ..() + if(istype(gaining, /datum/splat/werewolf)) + var/datum/splat/werewolf/werewolf_splat = gaining + werewolf_splat.adjust_gnosis(start_gnosis) + +/** + * Gets the singleton of an breed_form + * from its name, typepath, or returns the + * argument if given a breed_form singleton. + * + * Arguments: + * * breed_form_identifier - Name, typepath, or singleton of the breed_form being retrieved + */ +/proc/get_fera_breed_form(breed_form_identifier) + RETURN_TYPE(/datum/subsplat/werewolf/breed_form) + + if (ispath(breed_form_identifier)) + return GLOB.breed_forms[breed_form_identifier] + else if (istext(breed_form_identifier)) + return GLOB.breed_forms[GLOB.breed_forms_list[breed_form_identifier]] + else + return breed_form_identifier + +/** + * Gives the human a breed_form, applying + * on_gain effects and post_gain effects if the + * parameter is true. Can also remove breed_forms + * with or without a replacement, and apply + * on_lose effects. Will have no effect the human + * is being given the breed_form it already has. + * + * Arguments: + * * setting_breed_form - Typepath or breed_form singleton to give to the human + * * joining_round - If this breed_form is being given at roundstart and should call on_join_round + */ +/mob/living/carbon/human/proc/set_breed_form(setting_breed_form, joining_round) + var/datum/subsplat/werewolf/breed_form/previous_breed_form = get_our_breed_form() + + // Convert IDs and typepaths to singletons, or just directly assign if already singleton + var/datum/subsplat/werewolf/breed_form/new_breed_form = get_fera_breed_form(setting_breed_form) + + // Handle losing breed_form + previous_breed_form?.on_lose(src) + + var/datum/splat/werewolf/shifter/shifter = isshifter(src) + if (!shifter) + return + + shifter.breed_form = new_breed_form + + // breed_form's been cleared, don't apply effects + if (!new_breed_form) + return + + // Gaining breed_form effects + new_breed_form.on_gain(shifter, joining_round) + +/mob/living/proc/get_our_breed_form() + RETURN_TYPE(/datum/subsplat/werewolf/breed_form) + + return isshifter(src)?.breed_form + +/mob/living/proc/is_breed_form(breed_form_type) + return istype(get_our_breed_form(), breed_form_type) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/breeds/garou.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/breeds/garou.dm new file mode 100644 index 000000000000..89a797ef5237 --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/breeds/garou.dm @@ -0,0 +1,18 @@ +/datum/subsplat/werewolf/breed_form/garou + abstract_type = /datum/subsplat/werewolf/breed_form/garou + fera_restriction = SPLAT_GAROU + +/datum/subsplat/werewolf/breed_form/garou/homid + name = BREED_HOMID + start_gnosis = 1 + breed_species = /datum/species/human/shifter/homid + +/datum/subsplat/werewolf/breed_form/garou/metis + name = BREED_CRINOS + start_gnosis = 3 + breed_species = /datum/species/human/shifter/war + +/datum/subsplat/werewolf/breed_form/garou/lupus + name = BREED_LUPUS + start_gnosis = 5 + breed_species = /datum/species/human/shifter/feral diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/_tribe.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/_tribe.dm new file mode 100644 index 000000000000..07ca1d1efc9f --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/_tribe.dm @@ -0,0 +1,65 @@ +/datum/subsplat/werewolf/tribe + abstract_type = /datum/subsplat/werewolf/tribe + + var/tribe_keys + //var/tribe_trait + +/** + * Gets the singleton of an tribe + * from its name, typepath, or returns the + * argument if given a tribe singleton. + * + * Arguments: + * * tribe_identifier - Name, typepath, or singleton of the tribe being retrieved + */ +/proc/get_fera_tribe(tribe_identifier) + RETURN_TYPE(/datum/subsplat/werewolf/tribe) + + if (ispath(tribe_identifier)) + return GLOB.fera_tribes[tribe_identifier] + else if (istext(tribe_identifier)) + return GLOB.fera_tribes[GLOB.tribes_list[tribe_identifier]] + else + return tribe_identifier + +/** + * Gives the human a tribe, applying + * on_gain effects and post_gain effects if the + * parameter is true. Can also remove tribes + * with or without a replacement, and apply + * on_lose effects. Will have no effect the human + * is being given the tribe it already has. + * + * Arguments: + * * setting_tribe - Typepath or tribe singleton to give to the human + * * joining_round - If this tribe is being given at roundstart and should call on_join_round + */ +/mob/living/carbon/human/proc/set_fera_tribe(setting_tribe, joining_round) + var/datum/subsplat/werewolf/tribe/previous_tribe = get_our_tribe() + + // Convert IDs and typepaths to singletons, or just directly assign if already singleton + var/datum/subsplat/werewolf/tribe/new_tribe = get_fera_tribe(setting_tribe) + + // Handle losing tribe + previous_tribe?.on_lose(src) + + var/datum/splat/werewolf/shifter/shifter = isshifter(src) + if (!shifter) + return + + shifter.tribe = new_tribe + + // tribe's been cleared, don't apply effects + if (!new_tribe) + return + + // Gaining tribe effects + new_tribe.on_gain(shifter, joining_round) + +/mob/living/proc/get_our_tribe() + RETURN_TYPE(/datum/subsplat/werewolf/tribe) + + return isshifter(src)?.tribe + +/mob/living/proc/is_tribe(tribe_type) + return istype(get_our_tribe(), tribe_type) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/garou.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/garou.dm new file mode 100644 index 000000000000..fcf46b013c7f --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/garou.dm @@ -0,0 +1,164 @@ + +/datum/subsplat/werewolf/tribe/garou + abstract_type = /datum/subsplat/werewolf/tribe/garou + fera_restriction = SPLAT_GAROU + +/datum/subsplat/werewolf/tribe/garou/galestalkers + name = TRIBE_GALESTALKERS + desc = "Tireless trackers and peerless hunters, the galestalkers carry the namesake of the wind that crosses the tundra." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/ghostcouncil + name = TRIBE_UKTENA + desc = "Seekers of mystery and highly secretive, the Uktena is one of the most misunderstood tribes. Their ranks include guides, academics and the religious." + // gifts_provided = list( + // /datum/action/gift/shroud = 1, + // /datum/action/gift/coils_of_the_serpent = 2, + // /datum/action/gift/banish_totem = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/hartwardens + name = TRIBE_FIANNA + desc = "Growing, creating, cultivating and maintaining the most natural of Gaia's creations, the Wardens are some of the closest to nature. Wherever they are, they coax Gaia's blessing out of whatever they can." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/glasswalkers + name = TRIBE_GLASS_WALKERS + desc = "The closest to the Weaver, they find themselves deeply entrenched in modern human society, religion, technology and cities. Every new invention and every new discovery is one that aids the Glass Walkers, instead of impeding them." + // gifts_provided = list( + // /datum/action/gift/smooth_move = 1, + // /datum/action/gift/digital_feelings = 2, + // /datum/action/gift/elemental_improvement = 3 + // ) + tribe_keys = /obj/item/vamp/keys/techstore + +/datum/subsplat/werewolf/tribe/garou/bonegnawers + name = TRIBE_BONE_GNAWERS + desc = "Survivors and scavengers, often destitute and homeless. The Gnawers are seen as mongrels who live off scraps, but they know better. They're the true survivors, patiently waiting for their moment to strike against overconfident foes." + // gifts_provided = list( + // /datum/action/gift/guise_of_the_hound = 1, + // /datum/action/gift/infest = 2, + // /datum/action/gift/gift_of_the_termite = 3 + // ) + tribe_keys = /obj/item/vamp/keys/children_of_gaia + +/datum/subsplat/werewolf/tribe/garou/childrenofgaia + name = TRIBE_CHILDREN_OF_GAIA + desc = "Peacekeepers, negotiators, treaty-makers and philosophers. The Children of Gaia strive as hard as they can create an understanding and unity between the disparate tribes that will allow them to form a united front against their foes." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/children_of_gaia + +/datum/subsplat/werewolf/tribe/garou/getoffenris + name = TRIBE_GET_OF_FENRIS + desc = "Warriors, compassionate and fierce. They view themselves are Gaia's strongest heroes, but the rest of the tribes view them with caution, their violence more famous than their courage." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/blackfuries + name = TRIBE_BLACK_FURIES + desc = "An all-female tribe, and the matriarchs of the Garou. The Black Furies are known fondly for their honor, wisdom, pride and impressive prowess in battle." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/silentstriders + name = TRIBE_SILENT_STRIDERS + desc = "Highly spiritual nomads, the Silent Striders have headed deeper and longer into the depths of the Umbra than any other tribe." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/shadowlords + name = TRIBE_SHADOW_LORDS + desc = "The closest one could consider a Garou to being a 'politician'. They manipulate the tribes, and their enemies, and rely on cunning and wits more than physical strength. Not to say there aren't adept warriors in their ranks, but the tribe tends towards brains than brawn." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/techstore + +/datum/subsplat/werewolf/tribe/garou/redtalons + name = TRIBE_RED_TALONS + desc = "Exclusively consisting of lupus, the Red Talons shun humanity and think of them as a blight on Gaia." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + +/datum/subsplat/werewolf/tribe/garou/silverfangs + name = TRIBE_SILVER_FANGS + desc = "Commonly known as the 'Alphas' of the Garou Nation, their ranks consist of traditional rulers and wartime leaders. Known for being honorable and having courage, odd mental quirks have begun plaguing their young members, and the tribe is beginning to suffer from diseases of the spirit and mind." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/stargazers + name = TRIBE_STARGAZERS + desc = "The calmest of the Garou, they are well known for their introversion. They are the smallest of the remaining tribes, many of their kind wiped out by the Wyrm." + // gifts_provided = list( + // /datum/action/gift/stoic_pose = 1, + // /datum/action/gift/freezing_wind = 2, + // /datum/action/gift/bloody_feast = 3 + // ) + tribe_keys = /obj/item/vamp/keys/nps + +/datum/subsplat/werewolf/tribe/garou/blackspiraldancers + name = TRIBE_BLACK_SPIRAL_DANCERS + desc = "The lost tribe. The dreadwolves. Those who dance lockstep with the Wyrm. They who have entered the labyrinth and come back, changed.\n{THIS IS AN ADVANCED TRIBE AND NOT RECOMMENDED FOR BEGINNERS. LORE KNOWLEDGE IS REQUIRED TO PLAY THIS TRIBE}" + // gifts_provided = list( + // /datum/action/gift/stinky_fur = 1, + // /datum/action/gift/venom_claws = 2, + // /datum/action/gift/burning_scars = 3 + // ) + +/datum/subsplat/werewolf/tribe/garou/ronin + name = TRIBE_RONIN + desc = "Garou who, for one reason or another, find themselves as outcasts of the Nation." + // gifts_provided = list( + // /datum/action/gift/guise_of_the_hound = 1, + // /datum/action/gift/stoic_pose = 2, + // /datum/action/gift/smooth_move = 3, + // /datum/action/gift/shroud = 4 + // ) + +/* // DARKPACK TODO - CORAX +/datum/subsplat/werewolf/tribe/garou/corax + name = TRIBE_CORAX + desc = "{CONSIDER : THIS IS A PLACEHOLDER, FEATURES WILL BE MISSING.} \nMessengers of Gaia, children of Raven, and scions of Helios; the wereravens travel accross the globe, guided by their innate curiosity and insatiable thirst for gossip. \nThey are renowned for their ability to gather useful intelligence, and the difficulty of making them stop talking." + gifts_provided = list( + /datum/action/gift/eye_drink = 1, + /datum/action/gift/smooth_move = 2, + /datum/action/gift/suns_guard = 3 + ) + tribe_trait = TRAIT_CORAX +*/ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/totems.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/totems.dm index 67c5c06971de..5566401817ef 100644 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/totems.dm +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/totems.dm @@ -1,172 +1,242 @@ /obj/structure/werewolf_totem + abstract_type = /obj/structure/werewolf_totem name = "tribe totem" - desc = "Gives power to all Garou of that tribe and steals it from others." + desc = "Gives power to all Garou of that tribe." icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/totems.dmi' - icon_state = "glassw" - plane = GAME_PLANE - layer = SPACEVINE_LAYER + icon_state = "wendigo" + base_icon_state = "wendigo" anchored = TRUE density = TRUE - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF - var/tribe - var/totem_health = 500 - var/obj/overlay/totem_light_overlay - var/totem_overlay_color = "#FFFFFF" - var/last_rage = 0 + resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF + max_integrity = 500 // Fuck you flav for having this orginally be snowflaked health + + // light_color = "#FFFFFF" + light_range = 3 + light_power = 0.5 + damage_deflection = 5 + + var/tribes = list() + + COOLDOWN_DECLARE(rage_notify_cd) var/turf/teleport_turf var/opening = FALSE -// DARKPACK TODO - GAROU - Fuck this not respecting normal integrity -/* -/obj/structure/werewolf_totem/attackby(obj/item/I, mob/living/user, params) - . = ..() - if(I.force) - adjust_totem_health(round(I.force/2)) - -/obj/structure/werewolf_totem/bullet_act(obj/projectile/P, def_zone, piercing_hit = FALSE) - . = ..() - adjust_totem_health(round(P.damage/2)) /obj/structure/werewolf_totem/Initialize(mapload) . = ..() + var/list/candidates = list() for(var/obj/effect/landmark/teleport_mark/T in GLOB.landmarks_list) - if(T.tribe == tribe) - teleport_turf = get_turf(T) - set_light(3, 0.5, totem_overlay_color) + for(var/entry in T.tribes) + if(entry in tribes) + candidates += T + break + + if(!length(candidates)) + if(mapload) + log_mapping("[src] failed to find a candidate for an exit point.") + else + var/candidate = pick(candidates) + teleport_turf = get_turf(candidate) + qdel(candidate) GLOB.totems += src - totem_light_overlay = new(src) - totem_light_overlay.icon = icon - totem_light_overlay.icon_state = "[icon_state]_overlay" - totem_light_overlay.plane = ABOVE_LIGHTING_PLANE - totem_light_overlay.layer = ABOVE_LIGHTING_LAYER - totem_light_overlay.color = totem_overlay_color - overlays |= totem_light_overlay - -/obj/structure/werewolf_totem/proc/adjust_totem_health(amount) - if(amount > 0) - if(totem_health == 0) + + update_icon(UPDATE_ICON) + +/obj/structure/werewolf_totem/update_icon_state() + . = ..() + + if(broken) + icon_state = "[base_icon_state]_broken" + else + icon_state = base_icon_state + +/obj/structure/werewolf_totem/update_overlays() + . = ..() + + var/mutable_appearance/totem_light_overlay = mutable_appearance(icon, "[icon_state]_overlay") + SET_PLANE(totem_light_overlay, ABOVE_LIGHTING_PLANE, src) + totem_light_overlay.color = light_color + // totem_light_overlay.layer = ABOVE_LIGHTING_LAYER + . += totem_light_overlay + +/obj/structure/werewolf_totem/Destroy(force) + . = ..() + GLOB.totems -= src + +/obj/structure/werewolf_totem/take_damage(damage_amount, damage_type = BRUTE, damage_flag = "", sound_effect = TRUE, attack_dir, armour_penetration = 0) + . = ..() + if(. && !broken) + if(!COOLDOWN_FINISHED(src, rage_notify_cd)) + return . + notify_fera(-damage_amount) + COOLDOWN_START(src, rage_notify_cd, 5 SECONDS) + +/obj/structure/werewolf_totem/atom_break(damage_flag) + . = ..() + break_totem() + +/obj/structure/werewolf_totem/atom_destruction(damage_flag) + SHOULD_CALL_PARENT(FALSE) + break_totem() + +/obj/structure/werewolf_totem/atom_fix() + . = ..() + set_light(initial(light_range)) + update_icon(UPDATE_ICON) + notify_fera(1) + +/obj/structure/werewolf_totem/proc/break_totem() + if(broken) + return + broken = TRUE + set_light(0) + update_icon(UPDATE_ICON) + var/obj/umbra_portal/prev = locate() in get_step(src, SOUTH) + if(prev) + collapse_portal(prev) + notify_fera(-1) + +/obj/structure/werewolf_totem/proc/notify_fera(damage_change) + for(var/mob/living/carbon/human/human in GLOB.player_list) + var/datum/splat/werewolf/shifter/shifter_splat = isshifter(human) + if(!istype(shifter_splat)) + continue + if(human.stat == DEAD) + continue + if(!(shifter_splat.tribe.name in tribes)) + continue + + if(damage_change < 0) + if(broken) + to_chat(human, span_userdanger("YOUR TOTEM IS DESTROYED")) + SEND_SOUND(human, sound('sound/effects/tendril_destroyed.ogg', volume = 50)) + shifter_splat.adjust_gnosis(-5, FALSE) + else + to_chat(human, span_userdanger("YOUR TOTEM IS BREAKING DOWN")) + SEND_SOUND(human, sound('modular_darkpack/modules/werewolf_the_apocalypse/sounds/bumps.ogg', volume = 50)) + shifter_splat.adjust_rage(1, FALSE) + else + to_chat(human, span_boldnotice("YOUR TOTEM IS RESTORED")) + SEND_SOUND(human, sound('modular_darkpack/modules/werewolf_the_apocalypse/sounds/inspire.ogg', volume = 50)) + shifter_splat.adjust_gnosis(1, FALSE) + +/obj/structure/werewolf_totem/attack_hand(mob/living/user, list/modifiers) + . = ..() + if(user.combat_mode) + attack_generic(user, rand(user.melee_damage_lower, user.melee_damage_upper)) + else + var/datum/splat/werewolf/shifter/shifter_splat = isshifter(user) + if(!istype(shifter_splat)) + return . + if(broken) + to_chat(user, span_warning("[src] is broken!")) return - totem_health = max(0, totem_health-amount) - if(totem_health == 0) - icon_state = "[initial(icon_state)]_broken" - overlays -= totem_light_overlay - totem_light_overlay.icon_state = "[icon_state]_overlay" - overlays |= totem_light_overlay - for(var/mob/living/carbon/C in GLOB.player_list) - if(iswerewolf(C) || isgarou(C)) - if(C.stat != DEAD) - if(C.auspice.tribe == tribe) - set_light(0) - to_chat(C, span_userdanger("YOUR TOTEM IS DESTROYED")) - SEND_SOUND(C, sound('sound/effects/tendril_destroyed.ogg', volume = 75)) - adjust_gnosis(-5, C, FALSE) - var/obj/umbra_portal/prev = locate() in get_step(src, SOUTH) - if(prev) - qdel(prev.exit) - qdel(prev) + var/obj/umbra_portal/prev = locate() in get_step(src, SOUTH) + if(!prev) + if(shifter_splat.auspice.name == AUSPICE_THEURGE) + if(!opening) + opening = TRUE + if(do_after(user, 10 SECONDS, src)) + spawn_portal() + opening = FALSE + else + to_chat(user, span_warning("You need a Theurge to open the Moon Gates!")) else - for(var/mob/living/carbon/C in GLOB.player_list) - if(iswerewolf(C) || isgarou(C)) - if(C.stat != DEAD) - if(C.auspice.tribe == tribe) - if(last_rage+50 < world.time) - last_rage = world.time - to_chat(C, span_userdanger("YOUR TOTEM IS BREAKING DOWN")) - SEND_SOUND(C, sound('modular_darkpack/modules/deprecated/sounds/bumps.ogg', volume = 75)) - adjust_rage(1, C, FALSE) - if(amount < 0) - totem_health = min(initial(totem_health), totem_health-amount) - if(totem_health > 0) - if(icon_state != initial(icon_state)) - for(var/mob/living/carbon/C in GLOB.player_list) - if(iswerewolf(C) || isgarou(C)) - if(C.stat != DEAD) - if(C.auspice.tribe == tribe) - to_chat(C, span_userhelp("YOUR TOTEM IS RESTORED")) - SEND_SOUND(C, sound('modular_darkpack/modules/deprecated/sounds/inspire.ogg', volume = 75)) - adjust_gnosis(1, C, FALSE) - icon_state = "[initial(icon_state)]" - overlays -= totem_light_overlay - totem_light_overlay.icon_state = "[icon_state]_overlay" - overlays |= totem_light_overlay -*/ + if(shifter_splat.auspice.name == AUSPICE_THEURGE) + collapse_portal(prev) + +/obj/structure/werewolf_totem/proc/spawn_portal() + var/obj/umbra_portal/prev = locate() in get_step(src, SOUTH) + if(prev) + collapse_portal(prev) + playsound(src, 'modular_darkpack/modules/deprecated/sounds/portal.ogg', 50, FALSE) + var/obj/umbra_portal/U = new (get_step(src, SOUTH)) + // New code doesnt relay on ID for these two's connections buy why not. + U.id = "[pick(tribes)][rand(1, 999)]" + var/obj/umbra_portal/P = new (teleport_turf) + P.id = U.id + U.link_portal(P) + +/obj/structure/werewolf_totem/proc/collapse_portal(obj/umbra_portal/old_portal) + playsound(src, 'modular_darkpack/modules/deprecated/sounds/portal.ogg', 50, FALSE) + qdel(old_portal.exit) + qdel(old_portal) /obj/structure/werewolf_totem/wendigo - name = "\improper Wendigo totem" - desc = "Gives power to all Garou of that tribe and steals it from others." - icon_state = "wendigo" - tribe = "Wendigo" - totem_overlay_color = "#81ff4f" + name = "\improper " + TRIBE_GALESTALKERS + " totem" + tribes = list(TRIBE_GALESTALKERS) + light_color = "#81ff4f" /obj/structure/werewolf_totem/children_of_gaia - name = "Children of Gaia Totem" - desc = "Gives power to all Garou of that tribe and steals it from others." - icon_state = "wendigo" - tribe = "Children of Gaia" - totem_overlay_color = "#00CEC8" + name = "\improper " + TRIBE_CHILDREN_OF_GAIA + " totem" + tribes = list(TRIBE_CHILDREN_OF_GAIA) + light_color = "#00CEC8" /obj/structure/werewolf_totem/bone_gnawer - name = "Bone Gnawer Totem" - desc = "Gives power to all Garou of that tribe and steals it from others." - icon_state = "wendigo" - tribe = "Bone Gnawers" - totem_overlay_color = "#FFA500" + name = "\improper " + TRIBE_BONE_GNAWERS + " totem" + light_color = "#FFA500" + tribes = list(TRIBE_BONE_GNAWERS) /obj/structure/werewolf_totem/glasswalker - name = "\improper Glasswalker totem" - desc = "Gives power to all Garou of that tribe and steals it from others." + name = "\improper " + TRIBE_GLASS_WALKERS + " totem" icon_state = "glassw" - tribe = "Glasswalkers" - totem_overlay_color = "#35b0ff" + base_icon_state = "glassw" + light_color = "#35b0ff" + tribes = list(TRIBE_GLASS_WALKERS) /obj/structure/werewolf_totem/spiral name = "spiral totem" - desc = "Gives power to all Garou of that tribe and steals it from others." icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/spiral_totem.dmi' icon_state = "spiral" - tribe = "Black Spiral Dancers" - totem_overlay_color = "#ff5235" + base_icon_state = "spiral" + light_color = "#ff5235" + tribes = list(TRIBE_BLACK_SPIRAL_DANCERS) + +/obj/structure/werewolf_totem/generic + light_color = "#81ff4f" + tribes = TRIBE_GAIA + +/obj/structure/werewolf_totem/generic/wyld + light_color = "#81ff4f" + tribes = TRIBE_WYLD + +/obj/structure/werewolf_totem/generic/weaver + icon_state = "glassw" + base_icon_state = "glassw" + light_color = "#35b0ff" + tribes = TRIBE_WEAVER + +/obj/structure/werewolf_totem/generic/wyrm + icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/spiral_totem.dmi' + icon_state = "spiral" + base_icon_state = "spiral" + light_color = "#ff5235" + tribes = TRIBE_WYRM + +/obj/structure/werewolf_totem/generic/alltribes + tribes = TRIBE_ALL + + +// This things type path sucks /obj/effect/landmark/teleport_mark - name = "Teleport" - icon_state = "x" - var/tribe + name = "totem Exit Mark" + icon_state = "portal_exit" + var/tribes = list() -// DARKPACK TODO - GAROU -/* -/obj/structure/werewolf_totem/attack_hand(mob/user) - . = ..() - if(iswerewolf(user) || isgarou(user)) - var/mob/living/carbon/C = user - if(C.a_intent != INTENT_HARM) - if(totem_health <= 0) - to_chat(C, span_warning("[src] is broken!")) - return - var/obj/umbra_portal/prev = locate() in get_step(src, SOUTH) - if(!prev) - if(C.auspice.name == "Theurge") - if(!opening) - opening = TRUE - if(do_mob(user, src, 10 SECONDS)) - playsound(loc, 'modular_darkpack/modules/deprecated/sounds/portal.ogg', 75, FALSE) - var/obj/umbra_portal/U = new (get_step(src, SOUTH)) - // New code doesnt relay on ID for these two's connections buy why not. - U.id = "[tribe][rand(1, 999)]" - var/obj/umbra_portal/P = new (teleport_turf) - P.id = U.id - U.link_portal(P) - opening = FALSE - else - opening = FALSE - else - to_chat(C, span_warning("You need a Theurge to open the Moon Gates!")) - else - if(C.auspice.name == "Theurge") - playsound(loc, 'modular_darkpack/modules/deprecated/sounds/portal.ogg', 75, FALSE) - qdel(prev.exit) - qdel(prev) - else - adjust_totem_health(round(C.melee_damage_lower/2)) -*/ +/obj/effect/landmark/teleport_mark/gaia + tribes = TRIBE_GAIA + +/obj/effect/landmark/teleport_mark/wyld + tribes = TRIBE_WYLD + +/obj/effect/landmark/teleport_mark/weaver + tribes = TRIBE_WEAVER + +/obj/effect/landmark/teleport_mark/wyrm + tribes = TRIBE_WYRM + +/obj/effect/landmark/teleport_mark/alltribes + tribes = TRIBE_ALL diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/werewolf_globals.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/werewolf_globals.dm index 5fedbf24d242..e112a527852d 100644 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/werewolf_globals.dm +++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/werewolf_globals.dm @@ -1,7 +1,65 @@ /// Current phase of the moon, randomly chosen -GLOBAL_VAR_INIT(moon_state, pick("New", "Crescent", "Half", "Gibbous", "Full")) +GLOBAL_VAR_INIT(moon_state, get_moon_phase()) + +#define LUNAR_CYCLE 29.530588 +/proc/get_moon_phase() + // First known fullmoon since the BYOND EPOCH. + var/ref_year = 2000 + var/ref_month = 1 + var/ref_day = 20 + + var/year = text2num(station_time_timestamp("YYYY")) + var/month = text2num(station_time_timestamp("MM")) + var/day = text2num(station_time_timestamp("DD")) + + var/ref_days = ref_year * 365 + ref_month * 30 + ref_day + var/current_days = year * 365 + month * 30 + day + + var/days_since_full = current_days - ref_days + + var/phase_day = days_since_full % LUNAR_CYCLE + if(phase_day < 0) + phase_day += LUNAR_CYCLE + + return moon_phase_name(phase_day) +#undef LUNAR_CYCLE + +/proc/moon_phase_name(phase_day) + if(phase_day < 1.84566) + return MOON_NEW + if(phase_day < 5.53699) + return MOON_WAXING_CRESENT + if(phase_day < 9.22831) + return MOON_FIRST_QUARTER + if(phase_day < 12.91963) + return MOON_WAXING_GIBBOUS + if(phase_day < 16.61096) + return MOON_FULL + if(phase_day < 20.30228) + return MOON_WANING_GIBBOUS + if(phase_day < 23.99361) + return MOON_LAST_QUARTER + if(phase_day < 27.68493) + return MOON_WANING_CRESCENT + return MOON_FULL /// List of all Tribe totems GLOBAL_LIST_EMPTY(totems) + +/// Associative list of auspice names to typepaths +GLOBAL_LIST_INIT(auspices_list, init_subsplat_list(/datum/subsplat/werewolf/auspice)) +/// Associative list of auspice typepaths to singletons +GLOBAL_LIST_INIT_TYPED(auspices, /datum/subsplat/werewolf/auspice, init_subtypes_w_path_keys(/datum/subsplat/werewolf/auspice, list())) + +/// Associative list of tribe names to typepaths +GLOBAL_LIST_INIT(tribes_list, init_subsplat_list(/datum/subsplat/werewolf/tribe)) +/// Associative list of tribe typepaths to singletons +GLOBAL_LIST_INIT_TYPED(fera_tribes, /datum/subsplat/werewolf/tribe, init_subtypes_w_path_keys(/datum/subsplat/werewolf/tribe, list())) + +/// Associative list of breed form names to typepaths +GLOBAL_LIST_INIT(breed_forms_list, init_subsplat_list(/datum/subsplat/werewolf/breed_form)) +/// Associative list of breed_form typepaths to singletons +GLOBAL_LIST_INIT_TYPED(breed_forms, /datum/subsplat/werewolf/breed_form, init_subtypes_w_path_keys(/datum/subsplat/werewolf/breed_form, list())) + GLOBAL_LIST_INIT(glyph_list, init_glyphs()) diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/werewolf_hud.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/werewolf_hud.dm deleted file mode 100644 index 652ee0e5d886..000000000000 --- a/modular_darkpack/modules/werewolf_the_apocalypse/code/werewolf_hud.dm +++ /dev/null @@ -1,249 +0,0 @@ -/atom/movable/screen/werewolf - icon = 'icons/hud/screen_midnight.dmi' - -/datum/hud/werewolf - ui_style = 'icons/hud/screen_midnight.dmi' - -/atom/movable/screen/rage - name = "Rage" - icon = 'code/modules/wod13/48x48.dmi' - icon_state = "rage0" - layer = HUD_LAYER - plane = HUD_PLANE - -/atom/movable/screen/transform_homid - name = "Homid" - icon = 'code/modules/wod13/32x48.dmi' - icon_state = "homid" - layer = HUD_LAYER - plane = HUD_PLANE - -/atom/movable/screen/transform_homid/Click() - var/mob/living/carbon/C = usr - if(C.stat >= SOFT_CRIT || C.IsSleeping() || C.IsUnconscious() || C.IsParalyzed() || C.IsKnockdown() || C.IsStun()) - return - if(C.transformator) - C.transformator.trans_gender(C, "Homid") - -/atom/movable/screen/transform_crinos - name = "Crinos" - icon = 'code/modules/wod13/32x48.dmi' - icon_state = "crinos" - layer = HUD_LAYER - plane = HUD_PLANE - -/atom/movable/screen/transform_crinos/Click() - var/mob/living/carbon/C = usr - if(C.stat >= SOFT_CRIT || C.IsSleeping() || C.IsUnconscious() || C.IsParalyzed() || C.IsKnockdown() || C.IsStun()) - return - if(C.transformator) - C.transformator.trans_gender(C, "Crinos") - -/atom/movable/screen/transform_lupus - name = "Lupus" - icon = 'code/modules/wod13/32x48.dmi' - icon_state = "lupus" - layer = HUD_LAYER - plane = HUD_PLANE - -/atom/movable/screen/transform_lupus/Click() - var/mob/living/carbon/C = usr - if(C.stat >= SOFT_CRIT || C.IsSleeping() || C.IsUnconscious() || C.IsParalyzed() || C.IsKnockdown() || C.IsStun()) - return - if(C.transformator) - C.transformator.trans_gender(C, "Lupus") - -/atom/movable/screen/auspice - name = "Auspice" - icon = 'code/modules/wod13/werewolf_ui.dmi' - icon_state = "auspice_bar" - layer = HUD_LAYER - plane = HUD_PLANE - -/atom/movable/screen/auspice/Click() - if(!GLOB.moon_state) - GLOB.moon_state = pick("Full", "Gibbous", "Half", "Crescent", "New") - var/mob/living/carbon/C = usr - if(C.stat >= SOFT_CRIT || C.IsSleeping() || C.IsUnconscious() || C.IsParalyzed() || C.IsKnockdown() || C.IsStun()) - return - var/area/vtm/V = get_area(C) - if(!V.outdoors) - to_chat(C, span_warning("You need to be outside to look at the moon!")) - return - if(C.last_moon_look == 0 || C.last_moon_look+600 < world.time) -// last_moon_look = world.time - C.transformator.lupus_form.last_moon_look = world.time - C.transformator.crinos_form.last_moon_look = world.time - C.transformator.human_form.last_moon_look = world.time - to_chat(C, span_notice("The Moon is [GLOB.moon_state].")) -// icon_state = "[GLOB.moon_state]" - C.emote("howl") - playsound(get_turf(C), pick('modular_darkpack/modules/deprecated/sounds/awo1.ogg', 'modular_darkpack/modules/deprecated/sounds/awo2.ogg'), 100, FALSE) - icon_state = "[GLOB.moon_state]" - spawn(10) - adjust_rage(1, C, TRUE) - -/datum/hud - var/atom/movable/screen/auspice_icon - -/datum/hud/werewolf/New(mob/living/carbon/werewolf/owner) - ..() - - var/atom/movable/screen/using - var/atom/movable/screen/transform_werewolf - -//equippable shit - -//hands - if(iscrinos(owner)) - build_hand_slots() - -//begin buttons - - using = new /atom/movable/screen/fullscreen_hud() - using.screen_loc = ui_full_inventory - using.hud = src - static_inventory += using - - transform_werewolf = new /atom/movable/screen/transform_lupus() - transform_werewolf.screen_loc = ui_werewolf_lupus - transform_werewolf.hud = src - static_inventory += transform_werewolf - - transform_werewolf = new /atom/movable/screen/transform_crinos() - transform_werewolf.screen_loc = ui_werewolf_crinos - transform_werewolf.hud = src - static_inventory += transform_werewolf - - transform_werewolf = new /atom/movable/screen/transform_homid() - transform_werewolf.screen_loc = ui_werewolf_homid - transform_werewolf.hud = src - static_inventory += transform_werewolf - - auspice_icon = new /atom/movable/screen/auspice() - auspice_icon.screen_loc = ui_werewolf_auspice - auspice_icon.hud = src - static_inventory += auspice_icon - - rage_icon = new /atom/movable/screen/rage() - rage_icon.screen_loc = ui_werewolf_rage - rage_icon.hud = src - infodisplay += rage_icon - - if(iscrinos(owner)) - using = new /atom/movable/screen/swap_hand() - using.icon = 'code/modules/wod13/UI/buttons32.dmi' - using.icon_state = "swap_1" - using.screen_loc = ui_swaphand_position(owner,1) - using.hud = src - static_inventory += using - - using = new /atom/movable/screen/swap_hand() - using.icon = 'code/modules/wod13/UI/buttons32.dmi' - using.icon_state = "swap_2" - using.screen_loc = ui_swaphand_position(owner,2) - using.hud = src - static_inventory += using - - using = new /atom/movable/screen/act_intent() - using.icon_state = mymob.a_intent - using.icon = 'code/modules/wod13/UI/buttons32.dmi' - using.hud = src - static_inventory += using - action_intent = using - - using = new/atom/movable/screen/language_menu - using.screen_loc = ui_language_menu - using.icon = 'code/modules/wod13/UI/buttons_wide.dmi' - using.hud = src - static_inventory += using - - using = new /atom/movable/screen/drop() - using.icon = 'code/modules/wod13/UI/buttons_wide.dmi' - using.screen_loc = ui_drop - using.hud = src - static_inventory += using - - using = new /atom/movable/screen/resist() - using.icon = 'code/modules/wod13/UI/buttons_wide.dmi' - using.screen_loc = ui_resist - using.hud = src - hotkeybuttons += using - - throw_icon = new /atom/movable/screen/throw_catch() - throw_icon.icon = 'code/modules/wod13/UI/buttons_wide.dmi' - throw_icon.screen_loc = ui_throw - throw_icon.hud = src - hotkeybuttons += throw_icon - - pull_icon = new /atom/movable/screen/pull() - pull_icon.icon = 'code/modules/wod13/UI/buttons_wide.dmi' - pull_icon.update_icon() - pull_icon.screen_loc = ui_pull - pull_icon.hud = src - static_inventory += pull_icon - -//begin indicators - - healths = new /atom/movable/screen/healths() - healths.icon = 'code/modules/wod13/UI/buttons32.dmi' - healths.hud = src - infodisplay += healths - blood_icon = new /atom/movable/screen/blood() - blood_icon.screen_loc = ui_bloodpool - blood_icon.hud = src - infodisplay += blood_icon - - zone_select = new /atom/movable/screen/zone_sel() - zone_select.icon = 'code/modules/wod13/UI/buttons64.dmi' - zone_select.hud = src - zone_select.update_icon() - static_inventory += zone_select - - for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) - if(inv.slot_id) - inv.hud = src - inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv - inv.update_icon() - -/datum/hud/werewolf/persistent_inventory_update() - if(!mymob) - return - if(!iscrinos(mymob)) - return - var/mob/living/carbon/werewolf/H = mymob - if(hud_version != HUD_STYLE_NOHUD) - for(var/obj/item/I in H.held_items) - I.screen_loc = ui_hand_position(H.get_held_index_of_item(I)) - H.client.screen += I - else - for(var/obj/item/I in H.held_items) - I.screen_loc = null - H.client.screen -= I - -/mob/living/carbon/werewolf/Life() - . = ..() - update_blood_hud() - update_rage_hud() - -/mob/living/Initialize(mapload) - . = ..() - gnosis = new(src) - gnosis.icon = 'modular_darkpack/modules/deprecated/icons/48x48.dmi' - gnosis.plane = ABOVE_HUD_PLANE - gnosis.layer = ABOVE_HUD_LAYER - -/mob/living/proc/update_rage_hud() - if(!client || !hud_used) - return - if(isgarou(src) || iswerewolf(src)) - if(hud_used.rage_icon) - hud_used.rage_icon.overlays -= gnosis - var/mob/living/carbon/C = src - hud_used.rage_icon.icon_state = "rage[C.auspice.rage]" - gnosis.icon_state = "gnosis[C.auspice.gnosis]" - hud_used.rage_icon.overlays |= gnosis - if(hud_used.auspice_icon) - var/mob/living/carbon/C = src - if(C.last_moon_look != 0) - hud_used.auspice_icon.icon_state = "[GLOB.moon_state]" diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/auspices.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/auspices.dmi new file mode 100644 index 000000000000..efd83db23af7 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/auspices.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/corvid.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/corvid.dmi new file mode 100644 index 000000000000..2a85620d7f36 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/corvid.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/crinos.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/crinos.dmi new file mode 100644 index 000000000000..1ea873d3f994 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/corax_forms/crinos.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi new file mode 100644 index 000000000000..9debf63f88ee Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/crinos.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/glabro.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/glabro.dmi new file mode 100644 index 000000000000..b9e56bde76da Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/glabro.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/hispo.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/hispo.dmi new file mode 100644 index 000000000000..ebe6d3627c02 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/hispo.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi new file mode 100644 index 000000000000..187416f28ece Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_forms/lupus.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_languages.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_languages.dmi new file mode 100644 index 000000000000..25eb894453a1 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/garou_languages.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_meters.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_meters.dmi new file mode 100644 index 000000000000..784237294bd9 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_meters.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_transforms.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_transforms.dmi new file mode 100644 index 000000000000..c40a0aff234e Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/hud_transforms.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/silver_dam_status.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/silver_dam_status.dmi new file mode 100644 index 000000000000..6b49d8e4aae6 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/silver_dam_status.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/tribes.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/tribes.dmi new file mode 100644 index 000000000000..45e6712d55ce Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/tribes.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_abilities.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_abilities.dmi new file mode 100644 index 000000000000..087f71f43b1f Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_abilities.dmi differ diff --git a/modular_darkpack/modules/deprecated/icons/werewolf_lupus.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_lupus.dmi similarity index 100% rename from modular_darkpack/modules/deprecated/icons/werewolf_lupus.dmi rename to modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_lupus.dmi diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_ui.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_ui.dmi new file mode 100644 index 000000000000..c6a4c4a02bd5 Binary files /dev/null and b/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_ui.dmi differ diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/readme.md b/modular_darkpack/modules/werewolf_the_apocalypse/readme.md new file mode 100644 index 000000000000..0ab88e7f778f --- /dev/null +++ b/modular_darkpack/modules/werewolf_the_apocalypse/readme.md @@ -0,0 +1,28 @@ +https://github.com/DarkPack13/SecondCity/pull/489 + +## \
+
+ );
+}
+
+function Content(props: PropsWithChildren) {
+ const { children } = props;
+
+ return {title}
+ {children}
+ {children}
;
+}
+
+Window.Content = Content;
+
+mock.module('../layouts', () => ({
+ Window,
+ Layout: Window,
+ Pane: Window,
+}));
diff --git a/tgui/packages/tgui/__mocks__/setup.ts b/tgui/packages/tgui/__mocks__/setup.ts
new file mode 100644
index 000000000000..56c803d832e1
--- /dev/null
+++ b/tgui/packages/tgui/__mocks__/setup.ts
@@ -0,0 +1,21 @@
+import { mock } from 'bun:test';
+
+import './byond';
+import './layouts';
+
+const logger = {
+ debug: () => {},
+ error: () => {},
+ info: () => {},
+ log: () => {},
+ warn: () => {},
+};
+
+mock.module('../logging', () => ({
+ createLogger: () => logger,
+ logger,
+}));
+
+mock.module('../events/act', () => ({
+ sendAct: () => ({}),
+}));
diff --git a/tgui/packages/tgui/assets/transparency_checkerboard.svg b/tgui/packages/tgui/assets/transparency_checkerboard.svg
new file mode 100644
index 000000000000..ecfd3a467d51
--- /dev/null
+++ b/tgui/packages/tgui/assets/transparency_checkerboard.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/tgui/packages/tgui/interfaces/AnomalousWeatherTower.tsx b/tgui/packages/tgui/interfaces/AnomalousWeatherTower.tsx
new file mode 100644
index 000000000000..d2b02b147b6f
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AnomalousWeatherTower.tsx
@@ -0,0 +1,165 @@
+import { useBackend, useSharedState } from 'tgui/backend';
+import {
+ Button,
+ Dropdown,
+ NoticeBox,
+ Section,
+ Stack,
+} from 'tgui-core/components';
+import type { BooleanLike } from 'tgui-core/react';
+import { Window } from '../layouts';
+
+type Weather = {
+ id: string;
+ name: string;
+ desc: string;
+};
+
+type Data = {
+ core_charges: number;
+ max_core_charge: number;
+ weather_charge_cost: number;
+ can_summon_weather: BooleanLike;
+ can_clear_weather: BooleanLike;
+ summonable_weather_types: Weather[];
+ active_weather_on_z: Weather[];
+};
+
+function formatCharges(charges: number, max_charges: number) {
+ return `${(charges / max_charges) * 100}%`;
+}
+
+export const AnomalousWeatherTower = () => {
+ const { act, data } = useBackend();
+ const {
+ core_charges,
+ max_core_charge,
+ weather_charge_cost,
+ can_summon_weather,
+ can_clear_weather,
+ summonable_weather_types,
+ active_weather_on_z,
+ } = data;
+
+ const [selectedWeather, setSelectedWeather] = useSharedState(
+ 'selectedWeather',
+ summonable_weather_types[0],
+ );
+
+ const winHeight = 420 + active_weather_on_z.length * 30;
+
+ let chargeColor = 'green';
+ if (core_charges / max_core_charge <= 0.25) {
+ chargeColor = 'red';
+ } else if (core_charges / max_core_charge <= 0.5) {
+ chargeColor = 'yellow';
+ }
+
+ return (
+ ev.currentTarget.focus()}
+ onWheel={(ev) => {
+ if (!ev.shiftKey) return;
+ ev.preventDefault();
+ setZoom(
+ clamp(zoom + (Math.sign(-ev.deltaY) * 1) / pixelsPerUnit, 1, 3),
+ );
+ }}
+ style={{
+ width: '100%',
+ height: '100%',
+ }}
+ >
+ {children}
+
+
+);
- handleEndDrawing(event: MouseEvent) {
- if (!this.drawing) {
- return;
- }
- this.drawing = false;
- if (this.onCanvasModified !== undefined) {
- this.onCanvasModified(this.modifiedElements);
- }
- }
+type EditableCanvasProps = Pick<
+ CanvasData,
+ 'editorData' | 'editable' | 'allowColorPicker'
+> &
+ CanvasCommonProps;
- handleDropper(event: MouseEvent) {
- event.preventDefault();
- if (!this.props.has_palette) {
- return;
- }
- const coords = this.eventToCoords(event);
- this.onCanvasDropper(coords.x + 1, coords.y + 1); // 1-based index dm side
+const EditableCanvas = (props: EditableCanvasProps) => {
+ const { act } = useBackend();
+ const {
+ editorData,
+ pixelsPerUnit,
+ editable,
+ allowColorPicker,
+ zoom,
+ setZoom,
+ width,
+ height,
+ } = props;
+ const { sprite, colorMode, toolFlags } = editorData;
+ const usingImplement = editable && hasServerColorData(editorData);
+ const {
+ serverSelectedColor,
+ serverPalette,
+ maxServerColors,
+ onSelectServerColor,
+ onAddServerColor,
+ onRemoveServerColor,
+ } = usingImplement ? editorData : {};
+ const [showGrid, setShowGrid] = useState(false);
+ const sidebarItems: ReactNode[] = [];
+ SpriteEditor.syncBackend(onSelectServerColor, serverSelectedColor);
+ if (allowColorPicker) {
+ sidebarItems.push(
+