A biological research lab within the HD-10180 system has suffered from a complete containment failure. The SYN-C Brutus is to deliver a nuclear payload via strike team. Everything inside and outside the facility is to be killed on sight, including any research staff. Nuclear authentication codes have been sent via red phone, as have other detailed orders.
The rest of the documents are maps and mundane information regarding the crew's destination.";
- name = "STERILIZATION ORDERS";
- desc = "These are particularly boring for what they entail."
- },
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/infested_frigate)
"eZ" = (
/obj/item/clothing/mask/facehugger/impregnated,
/obj/structure/closet/crate/secure/freezer/pizza,
@@ -588,6 +564,11 @@
},
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
+"ir" = (
+/obj/effect/decal/cleanable/glass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/infested_frigate)
"iy" = (
/obj/effect/decal/cleanable/blood/gibs{
icon_state = "u_guilty_l"
@@ -637,27 +618,6 @@
},
/turf/open/floor/mineral/plastitanium/airless,
/area/ruin/space/has_grav/infested_frigate)
-"jx" = (
-/obj/effect/decal/cleanable/glass{
- layer = 3.1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/infested_frigate)
-"jy" = (
-/obj/effect/turf_decal{
- icon_state = "warningline_white"
- },
-/obj/structure/showcase/machinery/tv{
- icon_state = "computer_broken";
- desc = "It would have been locked anyway.";
- name = "syndicate navigation console"
- },
-/obj/effect/decal/cleanable/glass{
- layer = 3.1
- },
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/infested_frigate)
"kc" = (
/obj/effect/turf_decal{
dir = 8
@@ -745,6 +705,18 @@
/obj/machinery/light/red/dim/directional/north,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/infested_frigate)
+"ly" = (
+/obj/effect/turf_decal{
+ icon_state = "warningline_white"
+ },
+/obj/structure/showcase/machinery/tv{
+ icon_state = "computer_broken";
+ desc = "It would have been locked anyway.";
+ name = "syndicate navigation console"
+ },
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/infested_frigate)
"lU" = (
/obj/effect/decal/cleanable/blood/gibs{
icon_state = "u_madman_l"
@@ -815,6 +787,20 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/infested_frigate)
+"nb" = (
+/obj/structure/table/glass,
+/obj/item/pen{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/phone,
+/obj/item/paper/crumpled/muddy/fluff/elephant_graveyard/rnd_notes{
+ default_raw_text = "STERILIZATION ORDERS
Detailed findings:
A biological research lab within the HD-10180 system has suffered from a complete containment failure. The SYN-C Brutus is to deliver a nuclear payload via strike team. Everything inside and outside the facility is to be killed on sight, including any research staff. Nuclear authentication codes have been sent via red phone, as have other detailed orders.
"
else
- bans = json_decode(response["body"])
+ bans = json_decode(response.body)
//Ignore bans from non-whitelisted sources, if a whitelist exists
var/list/valid_sources
diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm
index 035edeb3d93e4..4bf32dedb41c1 100644
--- a/code/modules/admin/verbs/adminevents.dm
+++ b/code/modules/admin/verbs/adminevents.dm
@@ -8,6 +8,8 @@ ADMIN_VERB_AND_CONTEXT_MENU(cmd_admin_subtle_message, R_ADMIN, "Subtle Message",
message_admins("[key_name_admin(user)] decided not to answer [ADMIN_LOOKUPFLW(target)]'s prayer")
return
+ msg = user.reformat_narration(msg)
+
target.balloon_alert(target, "you hear a voice")
to_chat(target, "You hear a voice in your head... [msg]", confidential = TRUE)
@@ -53,6 +55,8 @@ ADMIN_VERB_AND_CONTEXT_MENU(cmd_admin_headset_message, R_ADMIN, "Headset Message
message_admins("[key_name_admin(src)] decided not to answer [key_name_admin(target)]'s [sender] request.")
return
+ input = reformat_narration(input)
+
log_directed_talk(mob, target, input, LOG_ADMIN, "reply")
message_admins("[key_name_admin(src)] replied to [key_name_admin(target)]'s [sender] message with: \"[input]\"")
target.balloon_alert(target, "you hear a voice")
@@ -64,6 +68,7 @@ ADMIN_VERB(cmd_admin_world_narrate, R_ADMIN, "Global Narrate", "Send a direct na
var/msg = input(user, "Message:", "Enter the text you wish to appear to everyone:") as text|null
if (!msg)
return
+ msg = user.reformat_narration(msg)
to_chat(world, "[msg]", confidential = TRUE)
log_admin("GlobalNarrate: [key_name(user)] : [msg]")
message_admins(span_adminnotice("[key_name_admin(user)] Sent a global narrate"))
@@ -76,6 +81,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(cmd_admin_local_narrate, R_ADMIN, "Local Narrate", A
var/msg = input(user, "Message:", "Enter the text you wish to appear to everyone within view:") as text|null
if (!msg)
return
+ msg = user.reformat_narration(msg)
for(var/mob/M in view(range, locale))
to_chat(M, msg, confidential = TRUE)
@@ -89,6 +95,8 @@ ADMIN_VERB_AND_CONTEXT_MENU(cmd_admin_direct_narrate, R_ADMIN, "Direct Narrate",
if( !msg )
return
+ msg = user.reformat_narration(msg)
+
to_chat(target, msg, confidential = TRUE)
log_admin("DirectNarrate: [key_name(user)] to ([key_name(target)]): [msg]")
msg = span_adminnotice(" DirectNarrate: [key_name_admin(user)] to ([key_name_admin(target)]): [msg] ")
@@ -278,3 +286,14 @@ ADMIN_VERB(command_report_footnote, R_ADMIN, "Command Report Footnote", "Adds a
ADMIN_VERB(delay_command_report, R_FUN, "Delay Command Report", "Prevents the roundstart command report from being sent; or forces it to send it delayed.", ADMIN_CATEGORY_EVENTS)
GLOB.communications_controller.block_command_report = !GLOB.communications_controller.block_command_report
message_admins("[key_name_admin(user)] has [(GLOB.communications_controller.block_command_report ? "delayed" : "sent")] the roundstart command report.")
+
+///Reformats a narration message. First provides a prompt asking if the user wants to reformat their message, then allows them to pick from a list of spans to use.
+/client/proc/reformat_narration(input)
+ if(tgui_alert(mob, "Set a custom text format?", "Make it snazzy!", list("Yes", "No")) == "Yes")
+ var/text_span = tgui_input_list(mob, "Select a span!", "Immersion! Yeah!", GLOB.spanname_to_formatting)
+ if(isnull(text_span)) //In case the user just quit the prompt.
+ return text_span
+ text_span = GLOB.spanname_to_formatting[text_span]
+ input = "" + input + ""
+
+ return input
diff --git a/code/modules/admin/verbs/anonymousnames.dm b/code/modules/admin/verbs/anonymousnames.dm
index 10edb49d99336..7f56155c9989a 100644
--- a/code/modules/admin/verbs/anonymousnames.dm
+++ b/code/modules/admin/verbs/anonymousnames.dm
@@ -94,7 +94,7 @@ GLOBAL_DATUM(current_anonymous_theme, /datum/anonymous_theme)
return
var/mob/living/carbon/human/human_mob = player
var/original_name = player.real_name //id will not be changed if you do not do this
- randomize_human(player) //do this first so the special name can be given
+ randomize_human_normie(player) //do this first so the special name can be given
player.fully_replace_character_name(original_name, anonymous_name(player))
if(extras_enabled)
player_extras(player)
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 436e484cb430e..3717affc51c34 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -208,7 +208,7 @@ ADMIN_VERB(create_mapping_job_icons, R_DEBUG, "Generate job landmarks icons", "G
else
for(var/obj/item/I in D)
qdel(I)
- randomize_human(D)
+ randomize_human_normie(D)
D.dress_up_as_job(
equipping = JB,
visual_only = TRUE,
diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm
index a4035acd01421..d9a1b90b0af29 100644
--- a/code/modules/admin/view_variables/debug_variables.dm
+++ b/code/modules/admin/view_variables/debug_variables.dm
@@ -3,11 +3,12 @@
/proc/debug_variable(name, value, level, datum/owner, sanitize = TRUE, display_flags = NONE) //if D is a list, name will be index, and value will be assoc value.
if(owner)
if(islist(owner))
+ var/list/list_owner = owner
var/index = name
if (value)
- name = owner[name] //name is really the index until this line
+ name = list_owner[name] //name is really the index until this line
else
- value = owner[name]
+ value = list_owner[name]
. = "
([VV_HREF_TARGET_1V(owner, VV_HK_BASIC_EDIT, "E", name)]) ([VV_HREF_TARGET_1V(owner, VV_HK_BASIC_CHANGE, "C", name)]) ([VV_HREF_TARGET_1V(owner, VV_HK_BASIC_MASSEDIT, "M", name)]) "
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index c72c97fb73402..d51885d51431f 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -525,6 +525,7 @@ GLOBAL_LIST_EMPTY(antagonists)
"antag_team_hud_[REF(src)]",
hud_image_on(target),
antag_to_check || type,
+ get_team() && WEAKREF(get_team()),
))
// Add HUDs that they couldn't see before
diff --git a/code/modules/antagonists/_common/antag_hud.dm b/code/modules/antagonists/_common/antag_hud.dm
index 228bfc354dff0..863d52ef5ffe4 100644
--- a/code/modules/antagonists/_common/antag_hud.dm
+++ b/code/modules/antagonists/_common/antag_hud.dm
@@ -4,9 +4,12 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc
/// An alternate appearance that will only show if you have the antag datum
/datum/atom_hud/alternate_appearance/basic/has_antagonist
var/antag_datum_type
+ /// Optionally, a weakref to antag team
+ var/datum/weakref/team_ref
-/datum/atom_hud/alternate_appearance/basic/has_antagonist/New(key, image/I, antag_datum_type)
+/datum/atom_hud/alternate_appearance/basic/has_antagonist/New(key, image/I, antag_datum_type, datum/weakref/team)
src.antag_datum_type = antag_datum_type
+ team_ref = team
GLOB.has_antagonist_huds += src
return ..(key, I, NONE)
@@ -15,6 +18,9 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc
return ..()
/datum/atom_hud/alternate_appearance/basic/has_antagonist/mobShouldSee(mob/M)
+ var/datum/team/antag_team = team_ref?.resolve()
+ if(!isnull(antag_team))
+ return !!(M.mind in antag_team.members)
return !!M.mind?.has_antag_datum(antag_datum_type)
/// An alternate appearance that will show all the antagonists this mob has
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index bc22eedbfa189..440feb91b7622 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -443,7 +443,7 @@
name = "Syndicate Monkey Agent Kit"
head = /obj/item/clothing/head/fedora
- mask = /obj/item/clothing/mask/cigarette/syndicate
+ mask = /obj/item/cigarette/syndicate
uniform = /obj/item/clothing/under/syndicate
l_pocket = /obj/item/reagent_containers/cup/soda_cans/monkey_energy
r_pocket = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm
index 9f02e5cb167f9..68cf781db9b05 100644
--- a/code/modules/antagonists/abductor/abductor.dm
+++ b/code/modules/antagonists/abductor/abductor.dm
@@ -7,6 +7,7 @@
show_in_antagpanel = FALSE //should only show subtypes
show_to_ghosts = TRUE
suicide_cry = "FOR THE MOTHERSHIP!!" // They can't even talk but y'know
+ stinger_sound = 'sound/ambience/antag/ayylien.ogg'
var/datum/team/abductor_team/team
var/sub_role
var/outfit
@@ -74,7 +75,6 @@
objectives += team.objectives
finalize_abductor()
ADD_TRAIT(owner, TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST)
- owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ayylien.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
return ..()
/datum/antagonist/abductor/on_removal()
diff --git a/code/modules/antagonists/ashwalker/ashwalker.dm b/code/modules/antagonists/ashwalker/ashwalker.dm
index 7caa0d0a2fb0b..827d929b0fbb5 100644
--- a/code/modules/antagonists/ashwalker/ashwalker.dm
+++ b/code/modules/antagonists/ashwalker/ashwalker.dm
@@ -28,10 +28,14 @@
. = ..()
RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate))
owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key)
+ if(FACTION_NEUTRAL in owner.current.faction)
+ owner.current.faction.Remove(FACTION_NEUTRAL) // ashwalkers aren't neutral; they're ashwalker-aligned
/datum/antagonist/ashwalker/on_removal()
. = ..()
UnregisterSignal(owner.current, COMSIG_MOB_EXAMINATE)
+ if(!(FACTION_NEUTRAL in owner.current.faction))
+ owner.current.faction.Add(FACTION_NEUTRAL)
/datum/antagonist/ashwalker/proc/on_examinate(datum/source, atom/A)
SIGNAL_HANDLER
diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm
index b62b18a02aedf..13707df2c052f 100644
--- a/code/modules/antagonists/brother/brother.dm
+++ b/code/modules/antagonists/brother/brother.dm
@@ -75,9 +75,14 @@
flashed.balloon_alert(source, "unconscious!")
return
+#ifdef TESTING
+ if (isnull(flashed.mind))
+ flashed.mind_initialize()
+#else
if (isnull(flashed.mind) || !GET_CLIENT(flashed))
flashed.balloon_alert(source, "[flashed.p_their()] mind is vacant!")
return
+#endif
for(var/datum/objective/brother_objective as anything in source.mind.get_all_objectives())
// If the objective has a target, are we flashing them?
@@ -183,6 +188,11 @@
message_admins("[key_name_admin(admin)] made [key_name_admin(new_owner)] into a blood brother.")
log_admin("[key_name(admin)] made [key_name(new_owner)] into a blood brother.")
+/datum/antagonist/brother/apply_innate_effects(mob/living/mob_override)
+ . = ..()
+ var/mob/living/the_mob = owner.current || mob_override
+ add_team_hud(the_mob)
+
/datum/antagonist/brother/ui_static_data(mob/user)
var/list/data = list()
data["antag_name"] = name
@@ -219,8 +229,13 @@
/// Adds a new brother to the team
/datum/team/brother_team/proc/add_brother(mob/living/new_brother, source)
+#ifndef TESTING
if (isnull(new_brother) || isnull(new_brother.mind) || !GET_CLIENT(new_brother) || new_brother.mind.has_antag_datum(/datum/antagonist/brother))
return FALSE
+#else
+ if (isnull(new_brother) || new_brother.mind.has_antag_datum(/datum/antagonist/brother))
+ return FALSE
+#endif
set_brothers_left(brothers_left - 1)
for (var/datum/mind/brother_mind as anything in members)
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index d0aaa2671c414..20e1c94ee9a60 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -40,7 +40,7 @@
/// The max chemical storage the changeling currently has.
var/total_chem_storage = 75
/// The chemical recharge rate per life tick.
- var/chem_recharge_rate = 0.5
+ var/chem_recharge_rate = 1
/// Any additional modifiers triggered by changelings that modify the chem_recharge_rate.
var/chem_recharge_slowdown = 0
/// The range this ling can sting things.
@@ -262,14 +262,18 @@
SIGNAL_HANDLER
var/delta_time = DELTA_WORLD_TIME(SSmobs)
+ var/mob/living/living_owner = owner.current
// If dead, we only regenerate up to half chem storage.
if(owner.current.stat == DEAD)
adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * delta_time, total_chem_storage * 0.5)
- // If we're not dead - we go up to the full chem cap.
+ // If we're not dead and not on fire - we go up to the full chem cap at normal speed. If on fire we only regenerate at 1/4th the normal speed
else
- adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * delta_time)
+ if(living_owner.fire_stacks && living_owner.on_fire)
+ adjust_chemicals((chem_recharge_rate - 0.75) * delta_time)
+ else
+ adjust_chemicals((chem_recharge_rate - chem_recharge_slowdown) * delta_time)
/**
* Signal proc for [COMSIG_LIVING_POST_FULLY_HEAL]
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 1c4fa8c501cd0..db261c29b5433 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -341,7 +341,7 @@
damage = 0
damage_type = BRUTE
range = 8
- hitsound = 'sound/weapons/thudswoosh.ogg'
+ hitsound = 'sound/weapons/shove.ogg'
var/chain
var/obj/item/ammo_casing/magic/tentacle/source //the item that shot it
///Click params that were used to fire the tentacle shot
diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
index 0e468159a3c7a..7b9eee1bfe94a 100644
--- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
+++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
@@ -55,7 +55,7 @@
var/datum/antagonist/changeling/antag_datum = IS_CHANGELING(C)
if(istype(antag_datum))
var/their_loc = get_turf(C)
- var/distance = get_dist_euclidian(my_loc, their_loc)
+ var/distance = get_dist_euclidean(my_loc, their_loc)
if (distance < CHANGELING_PHEROMONE_MAX_DISTANCE)
changelings[C] = (CHANGELING_PHEROMONE_MAX_DISTANCE ** 2) - (distance ** 2)
diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm
index 1c55e5416e247..130b6c9af5f1b 100644
--- a/code/modules/antagonists/clown_ops/clown_weapons.dm
+++ b/code/modules/antagonists/clown_ops/clown_weapons.dm
@@ -89,7 +89,7 @@
force = 0
throwforce = 0
hitsound = null
- embedding = null
+ embed_type = null
light_color = COLOR_YELLOW
sword_color_icon = "bananium"
active_heat = 0
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 192d9c4e66d5a..eb55138a4483a 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -12,6 +12,8 @@
default_button_position = DEFAULT_BLOODSPELLS
var/list/spells = list()
var/channeling = FALSE
+ /// If the magic has been enhanced somehow, likely due to a crimson focus.
+ var/magic_enhanced = FALSE
/datum/action/innate/cult/blood_magic/Remove()
for(var/X in spells)
@@ -29,7 +31,7 @@
var/atom/movable/screen/movable/action_button/button = viewers[hud]
var/position = screen_loc_to_offset(button.screen_loc)
var/list/position_list = list()
- for(var/possible_position in 1 to MAX_BLOODCHARGE)
+ for(var/possible_position in 1 to magic_enhanced ? ENHANCED_BLOODCHARGE : MAX_BLOODCHARGE)
position_list += possible_position
for(var/datum/action/innate/cult/blood_spell/blood_spell in spells)
if(blood_spell.positioned)
@@ -50,10 +52,10 @@
rune = TRUE
break
if(rune)
- limit = MAX_BLOODCHARGE
+ limit = magic_enhanced ? ENHANCED_BLOODCHARGE : MAX_BLOODCHARGE
if(length(spells) >= limit)
if(rune)
- to_chat(owner, span_cult_italic("You cannot store more than [MAX_BLOODCHARGE] spells. Pick a spell to remove."))
+ to_chat(owner, span_cult_italic("You cannot store more than [limit] spells. Pick a spell to remove."))
else
to_chat(owner, span_cult_bold_italic("You cannot store more than [RUNELESS_MAX_BLOODCHARGE] spells without an empowering rune! Pick a spell to remove."))
var/nullify_spell = tgui_input_list(owner, "Spell to remove", "Current Spells", spells)
@@ -86,10 +88,15 @@
else
to_chat(owner, span_cult_italic("You are already invoking blood magic!"))
return
- if(do_after(owner, 100 - rune*60, target = owner))
+ var/spell_carving_timer = 10 SECONDS
+ if(rune)
+ spell_carving_timer = 4 SECONDS
+ if(magic_enhanced)
+ spell_carving_timer *= 0.5
+ if(do_after(owner, spell_carving_timer, target = owner))
if(ishuman(owner))
var/mob/living/carbon/human/human_owner = owner
- human_owner.bleed(40 - rune*32)
+ human_owner.bleed(rune ? 8 : 40)
var/datum/action/innate/cult/blood_spell/new_spell = new BS(owner.mind)
new_spell.Grant(owner, src)
spells += new_spell
@@ -428,19 +435,35 @@
return
var/datum/antagonist/cult/cultist = IS_CULTIST(user)
var/datum/team/cult/cult_team = cultist.get_team()
- var/effect_coef = 1 - (cult_team.cult_risen ? 0.4 : 0) - (cult_team.cult_ascendent ? 0.5 : 0)
+ var/effect_coef = 1
+ if(cult_team.cult_ascendent)
+ effect_coef = 0.1
+ else if(cult_team.cult_risen)
+ effect_coef = 0.4
user.visible_message(
span_warning("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!"),
span_cult_italic("You attempt to stun [target] with the spell!"),
visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE,
)
user.mob_light(range = 1.1, power = 2, color = LIGHT_COLOR_BLOOD_MAGIC, duration = 0.2 SECONDS)
+ // Heretics are momentarily disoriented by the stunning aura. Enough for both parties to go 'oh shit' but only a mild combat ability.
+ // Heretics have an identical effect on their grasp. The cultist's worse spell preparation is offset by their extra gear and teammates.
if(IS_HERETIC(target))
- to_chat(user, span_warning("Some force greater than you intervenes! [target] is protected by the Forgotten Gods!"))
- to_chat(target, span_warning("You are protected by your faith to the Forgotten Gods."))
+ target.AdjustKnockdown(0.5 SECONDS)
+ target.adjust_confusion_up_to(1.5 SECONDS, 3 SECONDS)
+ target.adjust_dizzy_up_to(1.5 SECONDS, 3 SECONDS)
+ ADD_TRAIT(target, TRAIT_NO_SIDE_KICK, REF(src)) // We don't want this to be a good stunning tool, just minor disorientation
+ addtimer(TRAIT_CALLBACK_REMOVE(target, TRAIT_NO_SIDE_KICK, REF(src)), 1 SECONDS)
+
var/old_color = target.color
- target.color = rgb(0, 128, 0)
- animate(target, color = old_color, time = 1 SECONDS, easing = EASE_IN)
+ target.color = COLOR_HERETIC_GREEN
+ animate(target, color = old_color, time = 4 SECONDS, easing = EASE_IN)
+ target.mob_light(range = 1.5, power = 2.5, color = COLOR_HERETIC_GREEN, duration = 0.5 SECONDS)
+ playsound(target, 'sound/magic/magic_block_mind.ogg', 150, TRUE) // insanely quiet
+
+ to_chat(user, span_warning("An eldritch force intervenes as you touch [target], absorbing most of the effects!"))
+ to_chat(target, span_warning("As [user] touches you with vile magicks, the Mansus absorbs most of the effects!"))
+ target.balloon_alert_to_viewers("absorbed!")
else if(target.can_block_magic())
to_chat(user, span_warning("The spell had no effect!"))
else
diff --git a/code/modules/antagonists/cult/cult_bastard_sword.dm b/code/modules/antagonists/cult/cult_bastard_sword.dm
deleted file mode 100644
index 0d70bd503fb7f..0000000000000
--- a/code/modules/antagonists/cult/cult_bastard_sword.dm
+++ /dev/null
@@ -1,98 +0,0 @@
-
-/// Cult Bastard Sword, earned by cultists when they manage to sacrifice a heretic.
-/obj/item/cult_bastard
- name = "bloody bastard sword"
- desc = "An enormous sword used by Nar'Sien cultists to rapidly harvest the souls of non-believers."
- w_class = WEIGHT_CLASS_HUGE
- block_chance = 50
- block_sound = 'sound/weapons/parry.ogg'
- throwforce = 20
- force = 35
- armour_penetration = 45
- throw_speed = 1
- throw_range = 3
- sharpness = SHARP_EDGED
- light_color = "#ff0000"
- attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
- attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
- icon = 'icons/obj/weapons/sword.dmi'
- icon_state = "cultbastard"
- inhand_icon_state = "cultbastard"
- hitsound = 'sound/weapons/bladeslice.ogg'
- lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
- inhand_x_dimension = 64
- inhand_y_dimension = 64
- actions_types = list()
- item_flags = SLOWS_WHILE_IN_HAND
- ///if we are using our attack_self ability
- var/spinning = FALSE
-
-/obj/item/cult_bastard/Initialize(mapload)
- . = ..()
- set_light(4)
- AddComponent(/datum/component/butchering, 50, 80)
- AddComponent(/datum/component/two_handed, require_twohands = TRUE)
- AddComponent(/datum/component/soul_stealer, soulstone_type = /obj/item/soulstone)
- AddComponent( \
- /datum/component/spin2win, \
- spin_cooldown_time = 25 SECONDS, \
- on_spin_callback = CALLBACK(src, PROC_REF(on_spin)), \
- on_unspin_callback = CALLBACK(src, PROC_REF(on_unspin)), \
- start_spin_message = span_danger("%USER begins swinging the sword around with inhuman strength!"), \
- end_spin_message = span_warning("%USER's inhuman strength dissipates and the sword's runes grow cold!") \
- )
-
-/obj/item/cult_bastard/proc/on_spin(mob/living/user, duration)
- var/oldcolor = user.color
- user.color = "#ff0000"
- user.add_stun_absorption(
- source = name,
- duration = duration,
- priority = 2,
- message = span_warning("%EFFECT_OWNER doesn't even flinch as the sword's power courses through [user.p_them()]!"),
- self_message = span_boldwarning("You shrug off the stun!"),
- examine_message = span_warning("%EFFECT_OWNER_THEYRE glowing with a blazing red aura!"),
- )
- user.spin(duration, 1)
- animate(user, color = oldcolor, time = duration, easing = EASE_IN)
- addtimer(CALLBACK(user, TYPE_PROC_REF(/atom, update_atom_colour)), duration)
- block_chance = 100
- slowdown += 1.5
- spinning = TRUE
-
-/obj/item/cult_bastard/proc/on_unspin(mob/living/user)
- block_chance = 50
- slowdown -= 1.5
- spinning = FALSE
-
-/obj/item/cult_bastard/can_be_pulled(user)
- return FALSE
-
-/obj/item/cult_bastard/pickup(mob/living/user)
- . = ..()
- if(!IS_CULTIST(user))
- if(!IS_HERETIC(user))
- to_chat(user, "\"I wouldn't advise that.\"")
- force = 5
- return
- else
- to_chat(user, span_cult_large("\"You cling to the Forgotten Gods, as if you're more than their pawn.\""))
- to_chat(user, span_userdanger("A horrible force yanks at your arm!"))
- user.emote("scream")
- user.apply_damage(30, BRUTE, pick(GLOB.arm_zones))
- user.dropItemToGround(src, TRUE)
- user.Paralyze(50)
- return
- force = initial(force)
-
-/obj/item/cult_bastard/IsReflect(def_zone)
- if(!spinning)
- return FALSE
- return TRUE
-
-/obj/item/cult_bastard/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
- if(!prob(final_block_chance))
- return FALSE
- owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!"))
- return TRUE
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index c0051aec87cd1..ecd85253c21a8 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -76,6 +76,8 @@ Striking a noncultist, however, will tear their flesh."}
block_sound = 'sound/weapons/parry.ogg'
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
+ /// If TRUE, it can be used at will by anyone, non-cultists included
+ var/free_use = FALSE
/obj/item/melee/cultblade/Initialize(mapload)
. = ..()
@@ -93,7 +95,7 @@ Striking a noncultist, however, will tear their flesh."}
return FALSE
/obj/item/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user)
- if(!IS_CULTIST(user))
+ if(!IS_CULTIST(user) && !free_use)
user.Paralyze(100)
user.dropItemToGround(src, TRUE)
user.visible_message(span_warning("A powerful force shoves [user] away from [target]!"), \
@@ -106,6 +108,174 @@ Striking a noncultist, however, will tear their flesh."}
return
..()
+#define WIELDER_SPELLS "wielder_spell"
+#define SWORD_SPELLS "sword_spell"
+#define SWORD_PREFIX "sword_prefix"
+
+/obj/item/melee/cultblade/haunted
+ name = "haunted longsword"
+ desc = "An eerie sword with a blade that is less 'black' than it is 'absolute nothingness'. It glows with furious, restrained green energy."
+ icon_state = "hauntedblade"
+ inhand_icon_state = "hauntedblade"
+ worn_icon_state = "hauntedblade"
+ force = 35
+ throwforce = 35
+ block_chance = 55
+ wound_bonus = -25
+ bare_wound_bonus = 30
+ free_use = TRUE
+ light_color = COLOR_HERETIC_GREEN
+ light_range = 4
+ /// holder for the actual action when created.
+ var/datum/action/cooldown/spell/path_wielder_action
+ var/mob/living/trapped_entity
+ /// The heretic path that the variable below uses to index abilities. Assigned when the heretic is ensouled.
+ var/heretic_path
+ /// Nested static list used to index abilities and names.
+ var/static/list/heretic_paths_to_haunted_sword_abilities = list(
+ // Ash
+ PATH_ASH = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/jaunt/ethereal_jaunt/ash),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/pointed/ash_beams),
+ SWORD_PREFIX = "ashen",
+ ),
+ // Flesh
+ PATH_FLESH = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/pointed/blood_siphon),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/pointed/cleave),
+ SWORD_PREFIX = "sanguine",
+ ),
+ // Void
+ PATH_VOID = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/pointed/void_phase),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/cone/staggered/cone_of_cold/void),
+ SWORD_PREFIX = "tenebrous",
+ ),
+ // Blade
+ PATH_BLADE = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/pointed/projectile/furious_steel/haunted),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/pointed/projectile/furious_steel/solo),
+ SWORD_PREFIX = "keen",
+ ),
+ // Rust
+ PATH_RUST = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/cone/staggered/entropic_plume),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/aoe/rust_conversion, /datum/action/cooldown/spell/pointed/rust_construction),
+ SWORD_PREFIX = "rusted",
+ ),
+ // Cosmic
+ PATH_COSMIC = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/conjure/cosmic_expansion),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/pointed/projectile/star_blast),
+ SWORD_PREFIX = "astral",
+ ),
+ // Lock
+ PATH_LOCK = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/pointed/burglar_finesse),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/pointed/apetra_vulnera),
+ SWORD_PREFIX = "incisive",
+ ),
+ // Moon
+ PATH_MOON = list(
+ WIELDER_SPELLS = list(/datum/action/cooldown/spell/pointed/projectile/moon_parade),
+ SWORD_SPELLS = list(/datum/action/cooldown/spell/pointed/moon_smile),
+ SWORD_PREFIX = "shimmering",
+ ),
+ // Starter
+ PATH_START = list(
+ WIELDER_SPELLS = null,
+ SWORD_SPELLS = null,
+ SWORD_PREFIX = "stillborn", // lol loser
+ ) ,
+ )
+
+/obj/item/melee/cultblade/haunted/Initialize(mapload, mob/soul_to_bind, mob/awakener, do_bind = TRUE)
+ . = ..()
+
+ AddElement(/datum/element/heretic_focus)
+ add_traits(list(TRAIT_CASTABLE_LOC, TRAIT_SPELLS_TRANSFER_TO_LOC), INNATE_TRAIT)
+ if(do_bind && !mapload)
+ bind_soul(soul_to_bind, awakener)
+
+/obj/item/melee/cultblade/haunted/proc/bind_soul(mob/soul_to_bind, mob/awakener)
+
+ var/datum/mind/trapped_mind = soul_to_bind?.mind
+
+ if(!trapped_mind)
+ return // Can't do anything further down the list
+
+ if(trapped_mind)
+ AddComponent(/datum/component/spirit_holding,\
+ soul_to_bind = trapped_mind,\
+ awakener = awakener,\
+ allow_renaming = FALSE,\
+ allow_channeling = FALSE,\
+ )
+
+ // Get the heretic's new body and antag datum.
+ trapped_entity = trapped_mind?.current
+ trapped_entity.key = trapped_mind?.key
+ var/datum/antagonist/heretic/heretic_holder = IS_HERETIC(trapped_entity)
+ if(!heretic_holder)
+ stack_trace("[soul_to_bind] in but not a heretic on the heretic soul blade.")
+
+ // Give the spirit a spell that lets them try to fly around.
+ var/datum/action/cooldown/spell/pointed/sword_fling/fling_act = \
+ new /datum/action/cooldown/spell/pointed/sword_fling(trapped_mind, to_fling = src)
+ fling_act.Grant(trapped_entity)
+
+ // Set the sword's path for spell selection.
+ heretic_path = heretic_holder.heretic_path
+
+ // Copy the objectives to keep for roundend, remove the datum as neither us nor the heretic need it anymore
+ var/list/copied_objectives = heretic_holder.objectives.Copy()
+ trapped_entity.mind.remove_antag_datum(/datum/antagonist/heretic)
+
+ // Add the fallen antag datum, give them a heads-up of what's happening.
+ var/datum/antagonist/soultrapped_heretic/bozo = new()
+ bozo.objectives |= copied_objectives
+ trapped_entity.mind.add_antag_datum(bozo)
+ to_chat(trapped_entity, span_userdanger("You've been sacrificed to the Enemy, and trapped inside a haunted blade! While you cannot escape, you may help the Cult, your current wielder, or even pester everyone with what few abilities you kept."))
+
+ // Assigning the spells to give to the wielder and spirit.
+ // Let them cast the given spell.
+ ADD_TRAIT(trapped_entity, TRAIT_ALLOW_HERETIC_CASTING, INNATE_TRAIT)
+
+ var/list/path_spells = heretic_paths_to_haunted_sword_abilities[heretic_path]
+
+ var/list/wielder_spells = path_spells[WIELDER_SPELLS]
+ var/list/sword_spells = path_spells[SWORD_SPELLS]
+
+ name = "[path_spells[SWORD_PREFIX]] [name]"
+
+
+ // Granting the path spells. The sword spirit gains it outright, while it's just instanced for wielders to be added on pickup.
+
+ if(sword_spells)
+ for(var/datum/action/cooldown/spell/sword_spell as anything in sword_spells)
+ sword_spell = new sword_spell(trapped_entity)
+ sword_spell?.Grant(trapped_entity)
+ sword_spell?.overlay_icon_state = "bg_cult_border" // for flavor, and also helps distinguish
+
+
+ if(wielder_spells)
+ for(var/datum/action/cooldown/spell/wielder_spell as anything in wielder_spells)
+ path_wielder_action = new wielder_spell(src)
+ wielder_spell?.overlay_icon_state = "bg_cult_border"
+
+/obj/item/melee/cultblade/haunted/equipped(mob/user, slot, initial)
+ . = ..()
+ if(slot & ITEM_SLOT_HANDS)
+ path_wielder_action?.Grant(user)
+
+/obj/item/melee/cultblade/haunted/dropped(mob/user, silent)
+ . = ..()
+ path_wielder_action?.Remove(user)
+
+#undef WIELDER_SPELLS
+#undef SWORD_SPELLS
+#undef SWORD_PREFIX
+
/obj/item/melee/cultblade/ghost
name = "eldritch sword"
force = 19 //can't break normal airlocks
@@ -120,7 +290,7 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/melee/cultblade/pickup(mob/living/user)
..()
- if(!IS_CULTIST(user))
+ if(!IS_CULTIST(user) && !free_use)
to_chat(user, span_cult_large("\"I wouldn't advise that.\""))
/datum/action/innate/dash/cult
@@ -162,6 +332,7 @@ Striking a noncultist, however, will tear their flesh."}
else
to_chat(user, span_warning("The bola seems to take on a life of its own!"))
ensnare(user)
+ user.update_held_items()
#undef CULT_BOLA_PICKUP_STUN
@@ -463,6 +634,10 @@ Striking a noncultist, however, will tear their flesh."}
icon_state = "blindfold"
inhand_icon_state = "blindfold"
flash_protect = FLASH_PROTECTION_WELDER
+ actions_types = null
+ color_cutoffs = list(40, 0, 0) //red
+ glass_colour_type = null
+ forced_glass_color = FALSE
/obj/item/clothing/glasses/hud/health/night/cultblind/equipped(mob/living/user, slot)
..()
@@ -563,6 +738,78 @@ Striking a noncultist, however, will tear their flesh."}
#undef MAX_SHUTTLE_CURSES
+#define GATEWAY_TURF_SCAN_RANGE 40
+
+/obj/item/proteon_orb
+ name = "summoning orb"
+ desc = "An eerie translucent orb that feels impossibly light. Legends say summoning orbs are created from corrupted scrying orbs. If you hold it close to your ears, you can hear the screams of the damned."
+ icon = 'icons/obj/antags/cult/items.dmi'
+ icon_state = "summoning_orb"
+ light_range = 3
+ light_color = COLOR_CULT_RED
+
+/obj/item/proteon_orb/examine(mob/user)
+ . = ..()
+ if(!IS_CULTIST(user) && isliving(user))
+ var/mob/living/living_user = user
+ living_user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
+ . += span_danger("It hurts just to look at it. Better keep away.")
+ else
+ . += span_cult("It can be used to create a gateway to Nar'Sie's domain, which will summon weak, sentient constructs over time.")
+
+/obj/item/proteon_orb/attack_self(mob/living/user)
+
+ var/list/turfs_to_scan = detect_room(get_turf(user), max_size = GATEWAY_TURF_SCAN_RANGE)
+
+ if(!IS_CULTIST(user))
+ to_chat(user, span_cult_large("\"You want to enter my domain? Go ahead.\""))
+ turfs_to_scan = null // narsie wants to have some fun and the veil wont stop her
+
+ for(var/turf/hole_candidate as anything in turfs_to_scan)
+ if(locate(/obj/structure/spawner/sentient/proteon_spawner) in hole_candidate)
+ to_chat(user, span_cult_bold("There's a gateway too close nearby. The veil is not yet weak enough to allow such close rips in its fabric."))
+ return
+ to_chat(user, span_cult_bold_italic("You focus on [src] and direct it into the ground. It rumbles..."))
+
+ var/turf/open/hole_spot = get_turf(user)
+ if(!istype(hole_spot) || isgroundlessturf(hole_spot))
+ to_chat(user, span_notice("This is not a suitable spot."))
+ return
+
+ INVOKE_ASYNC(hole_spot, TYPE_PROC_REF(/turf/open, quake_gateway), user)
+ qdel(src)
+
+/**
+ * Bespoke proc that happens when a proteon orb is activated, creating a gateway.
+ * If activated by a non-cultist, they get an unusual game over.
+*/
+/turf/open/proc/quake_gateway(mob/living/user)
+ Shake(2, 2, 5 SECONDS)
+ narsie_act(TRUE, TRUE, 100)
+ var/fucked = FALSE
+ if(!IS_CULTIST(user))
+ fucked = TRUE
+ ADD_TRAIT(user, TRAIT_NO_TRANSFORM, REF(src)) // keep em in place
+ user.add_atom_colour(COLOR_CULT_RED, TEMPORARY_COLOUR_PRIORITY)
+ user.visible_message(span_cult_bold("Dark tendrils appear from the ground and root [user] in place!"))
+ sleep(5 SECONDS) // can we still use these or. i mean its async
+ new /obj/structure/spawner/sentient/proteon_spawner(src)
+ visible_message(span_cult_bold("A mysterious hole appears out of nowhere!"))
+ if(!fucked || QDELETED(user))
+ return
+ if(get_turf(user) != src) // they get away. for now
+ REMOVE_TRAIT(user, TRAIT_NO_TRANSFORM, REF(src))
+ return
+ user.visible_message(span_cult_bold("[user] is pulled into the portal through an infinitesmally minuscule hole, shredding [user.p_their()] body!"))
+ sleep(5 SECONDS)
+ user.visible_message(span_cult_italic("An unusually large construct appears through the portal!"))
+ user.gib() // total destruction
+ var/mob/living/basic/construct/proteon/hostile/remnant = new(get_step_rand(src))
+ remnant.name = "[user]" // no, they do not become it
+ remnant.transform *= 1.5
+
+#undef GATEWAY_TURF_SCAN_RANGE
+
/obj/item/cult_shift
name = "veil shifter"
desc = "This relic instantly teleports you, and anything you're pulling, forward by a moderate distance."
diff --git a/code/modules/antagonists/cult/cult_other.dm b/code/modules/antagonists/cult/cult_other.dm
index 82b342b87ef50..9435baedba11a 100644
--- a/code/modules/antagonists/cult/cult_other.dm
+++ b/code/modules/antagonists/cult/cult_other.dm
@@ -16,8 +16,15 @@
/proc/is_convertable_to_cult(mob/living/target, datum/team/cult/specific_cult)
if(!istype(target))
return FALSE
- if(isnull(target.mind) || !GET_CLIENT(target))
+ if(isnull(target.mind))
return FALSE
+
+// disables client checks if testing for easier debugging
+#ifndef TESTING
+ if(!GET_CLIENT(target))
+ return FALSE
+#endif
+
if(target.mind.unconvertable)
return FALSE
if(ishuman(target) && target.mind.holy_role)
diff --git a/code/modules/antagonists/cult/cult_structure_altar.dm b/code/modules/antagonists/cult/cult_structure_altar.dm
index 9347acb33210f..e38591c0c0705 100644
--- a/code/modules/antagonists/cult/cult_structure_altar.dm
+++ b/code/modules/antagonists/cult/cult_structure_altar.dm
@@ -2,6 +2,7 @@
#define ELDRITCH_WHETSTONE "Eldritch Whetstone"
#define CONSTRUCT_SHELL "Construct Shell"
#define UNHOLY_WATER "Flask of Unholy Water"
+#define PROTEON_ORB "Portal Summoning Orb"
// Cult altar. Gives out consumable items.
/obj/structure/destructible/cult/item_dispenser/altar
@@ -10,6 +11,7 @@
cult_examine_tip = "Can be used to create eldritch whetstones, construct shells, and flasks of unholy water."
icon_state = "talismanaltar"
break_message = "The altar shatters, leaving only the wailing of the damned!"
+ mansus_conversion_path = /obj/effect/heretic_rune
/obj/structure/destructible/cult/item_dispenser/altar/setup_options()
var/static/list/altar_items = list(
@@ -27,7 +29,20 @@
),
)
+ var/extra_item = extra_options()
+
options = altar_items
+ if(!isnull(extra_item))
+ options += extra_item
+
+/obj/structure/destructible/cult/item_dispenser/altar/extra_options()
+ if(!cult_team?.unlocked_heretic_items[PROTEON_ORB_UNLOCKED])
+ return
+ return list(PROTEON_ORB = list(
+ PREVIEW_IMAGE = image(icon = 'icons/obj/antags/cult/items.dmi', icon_state = "summoning_orb"),
+ OUTPUT_ITEMS = list(/obj/item/proteon_orb),
+ ),
+ )
/obj/structure/destructible/cult/item_dispenser/altar/succcess_message(mob/living/user, obj/item/spawned_item)
to_chat(user, span_cult_italic("You kneel before [src] and your faith is rewarded with [spawned_item]!"))
@@ -35,3 +50,4 @@
#undef ELDRITCH_WHETSTONE
#undef CONSTRUCT_SHELL
#undef UNHOLY_WATER
+#undef PROTEON_ORB
diff --git a/code/modules/antagonists/cult/cult_structure_archives.dm b/code/modules/antagonists/cult/cult_structure_archives.dm
index a961739663391..d3a96dd1f77aa 100644
--- a/code/modules/antagonists/cult/cult_structure_archives.dm
+++ b/code/modules/antagonists/cult/cult_structure_archives.dm
@@ -2,6 +2,7 @@
#define CULT_BLINDFOLD "Zealot's Blindfold"
#define CURSE_ORB "Shuttle Curse"
#define VEIL_WALKER "Veil Walker Set"
+#define CRIMSON_FOCUS "Crimson Focus"
// Cult archives. Gives out utility items.
/obj/structure/destructible/cult/item_dispenser/archives
@@ -12,6 +13,7 @@
light_range = 1.5
light_color = LIGHT_COLOR_FIRE
break_message = "The books and tomes of the archives burn into ash as the desk shatters!"
+ mansus_conversion_path = /obj/item/codex_cicatrix
/obj/structure/destructible/cult/item_dispenser/archives/setup_options()
var/static/list/archive_items = list(
@@ -29,7 +31,20 @@
),
)
+ var/extra_item = extra_options()
+
options = archive_items
+ if(!isnull(extra_item))
+ options += extra_item
+
+/obj/structure/destructible/cult/item_dispenser/archives/extra_options()
+ if(!cult_team?.unlocked_heretic_items[CRIMSON_FOCUS_UNLOCKED])
+ return
+ return list(CRIMSON_FOCUS = list(
+ PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/neck.dmi', icon_state = "crimson_focus"),
+ OUTPUT_ITEMS = list(/obj/item/clothing/neck/heretic_focus/crimson_focus),
+ ),
+ )
/obj/structure/destructible/cult/item_dispenser/archives/succcess_message(mob/living/user, obj/item/spawned_item)
to_chat(user, span_cult_italic("You summon [spawned_item] from [src]!"))
@@ -41,3 +56,4 @@
#undef CULT_BLINDFOLD
#undef CURSE_ORB
#undef VEIL_WALKER
+#undef CRIMSON_FOCUS
diff --git a/code/modules/antagonists/cult/cult_structure_forge.dm b/code/modules/antagonists/cult/cult_structure_forge.dm
index 912db7d37e9b8..12d15b9296ef4 100644
--- a/code/modules/antagonists/cult/cult_structure_forge.dm
+++ b/code/modules/antagonists/cult/cult_structure_forge.dm
@@ -2,6 +2,7 @@
#define NARSIE_ARMOR "Nar'Sien Hardened Armor"
#define FLAGELLANT_ARMOR "Flagellant's Robe"
#define ELDRITCH_SWORD "Eldritch Longsword"
+#define CURSED_BLADE "Cursed Ritual Blade"
// Cult forge. Gives out combat weapons.
/obj/structure/destructible/cult/item_dispenser/forge
@@ -12,6 +13,7 @@
light_range = 2
light_color = LIGHT_COLOR_LAVA
break_message = "The forge breaks apart into shards with a howling scream!"
+ mansus_conversion_path = /obj/structure/destructible/eldritch_crucible
/obj/structure/destructible/cult/item_dispenser/forge/setup_options()
var/static/list/forge_items = list(
@@ -29,7 +31,21 @@
),
)
+ var/extra_item = extra_options()
+
options = forge_items
+ if(!isnull(extra_item))
+ options += extra_item
+
+/obj/structure/destructible/cult/item_dispenser/forge/extra_options()
+ if(!cult_team?.unlocked_heretic_items[CURSED_BLADE_UNLOCKED])
+ return
+ return list(CURSED_BLADE = list(
+ PREVIEW_IMAGE = image(icon = 'icons/obj/weapons/khopesh.dmi', icon_state = "cursed_blade"),
+ OUTPUT_ITEMS = list(/obj/item/melee/sickly_blade/cursed),
+ ),
+ )
+
/obj/structure/destructible/cult/item_dispenser/forge/succcess_message(mob/living/user, obj/item/spawned_item)
to_chat(user, span_cult_italic("You work [src] as dark knowledge guides your hands, creating [spawned_item]!"))
@@ -42,3 +58,4 @@
#undef NARSIE_ARMOR
#undef FLAGELLANT_ARMOR
#undef ELDRITCH_SWORD
+#undef CURSED_BLADE
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index 932c3ac03c1f6..5067dcf979904 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -12,16 +12,43 @@
var/cult_examine_tip
/// The cooldown for when items can be dispensed.
COOLDOWN_DECLARE(use_cooldown)
+ /// Assigned cult team, set when cultistism is checked.
+ var/datum/team/cult/cult_team
+
+/obj/structure/destructible/cult/Destroy()
+ cult_team = null
+ return ..()
+
+/obj/structure/destructible/cult/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_ATOM_CONSTRUCTED, PROC_REF(on_constructed))
+
+/obj/structure/destructible/cult/proc/on_constructed(datum/source, mob/builder)
+ SIGNAL_HANDLER
+ var/datum/antagonist/cult/cultist = builder.mind?.has_antag_datum(/datum/antagonist/cult, TRUE)
+ cult_team = cultist?.get_team()
+
+/// Tries to find a cultist. If it succeeds, it also takes advantage of the moment to define the structure's cult team if it's not set yet.
+/obj/structure/destructible/cult/proc/is_cultist_check(mob/fool)
+
+ if(!IS_CULTIST(fool))
+ return FALSE
+
+ if(isnull(cult_team))
+ var/datum/antagonist/cult/cultist = fool.mind?.has_antag_datum(/datum/antagonist/cult, TRUE)
+ cult_team = cultist?.get_team()
+
+ return TRUE
/obj/structure/destructible/cult/examine_status(mob/user)
- if(IS_CULTIST(user) || isobserver(user))
+ if(is_cultist_check(user) || isobserver(user))
return span_cult("It's at [round(atom_integrity * 100 / max_integrity)]% stability.")
return ..()
/obj/structure/destructible/cult/examine(mob/user)
. = ..()
. += span_notice("[src] is [anchored ? "secured to":"unsecured from"] the floor.")
- if(IS_CULTIST(user) || isobserver(user))
+ if(is_cultist_check(user) || isobserver(user))
if(cult_examine_tip)
. += span_cult(cult_examine_tip)
if(!COOLDOWN_FINISHED(src, use_cooldown_duration))
@@ -65,16 +92,25 @@
/obj/structure/destructible/cult/item_dispenser
/// An associated list of options this structure can make. See setup_options() for format.
var/list/options
+ /// The dispenser will create this item and then delete itself if it is rust converted.
+ var/obj/mansus_conversion_path = /obj/item/skub
/obj/structure/destructible/cult/item_dispenser/Initialize(mapload)
. = ..()
setup_options()
+/obj/structure/destructible/cult/item_dispenser/rust_heretic_act()
+ visible_message(span_notice("[src] crumbles to dust. In its midst, you spot \a [initial(mansus_conversion_path.name)]."))
+ var/turf/turfy = get_turf(src)
+ new mansus_conversion_path(turfy)
+ turfy.rust_heretic_act()
+ return ..()
+
/obj/structure/destructible/cult/item_dispenser/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
- if(!isliving(user) || !IS_CULTIST(user))
+ if(!isliving(user) || !is_cultist_check(user))
to_chat(user, span_warning("You're pretty sure you know exactly what this is used for and you can't seem to touch it."))
return
if(!anchored)
@@ -84,6 +120,8 @@
to_chat(user, span_cult_italic("The magic in [src] is too weak, it will be ready to use again in [DisplayTimeText(COOLDOWN_TIMELEFT(src, use_cooldown))]."))
return
+ setup_options()
+
var/list/spawned_items = get_items_to_spawn(user)
if(!length(spawned_items))
return
@@ -109,6 +147,18 @@
/obj/structure/destructible/cult/item_dispenser/proc/setup_options()
return
+/*
+ * Extra options, currently used for items unlocked after sacrificing a heretic.
+ *
+ * The list of options is a associated list of format:
+ * item_name = list(
+ * preview = image(),
+ * output = list(paths),
+ * )
+ */
+/obj/structure/destructible/cult/item_dispenser/proc/extra_options()
+ return
+
/*
* Get all items that this cult building will spawn when interacted with.
* Opens a radial menu for the user and shows them the list of options, which they can choose from.
@@ -150,7 +200,7 @@
* Returns TRUE if the user is a living mob that is a cultist and is not incapacitated.
*/
/obj/structure/destructible/cult/item_dispenser/proc/check_menu(mob/user)
- return isliving(user) && IS_CULTIST(user) && !user.incapacitated()
+ return isliving(user) && is_cultist_check(user) && !user.incapacitated()
// Spooky looking door used in gateways. Or something.
/obj/effect/gateway
diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm
index c47cc2145b5dc..09d4a25a321c4 100644
--- a/code/modules/antagonists/cult/datums/cult_team.dm
+++ b/code/modules/antagonists/cult/datums/cult_team.dm
@@ -16,9 +16,16 @@
var/reckoning_complete = FALSE
///Has the cult risen, and gotten red eyes?
var/cult_risen = FALSE
- ///Has the cult asceneded, and gotten halos?
+ ///Has the cult ascended, and gotten halos?
var/cult_ascendent = FALSE
+ /// List that keeps track of which items have been unlocked after a heretic was sacked.
+ var/list/unlocked_heretic_items = list(
+ CURSED_BLADE_UNLOCKED = FALSE,
+ CRIMSON_FOCUS_UNLOCKED = FALSE,
+ PROTEON_ORB_UNLOCKED = FALSE,
+ )
+
///Has narsie been summoned yet?
var/narsie_summoned = FALSE
///How large were we at max size.
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index 926981bb096bb..d8ce241caf3c8 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -326,16 +326,12 @@ structure_check() searches for nearby cultist structures required for the invoca
return TRUE
/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers, datum/team/cult/cult_team)
- var/big_sac = FALSE
+ var/target_sac = FALSE
if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || cult_team.is_sacrifice_target(sacrificial.mind)) && length(invokers) < 3)
for(var/invoker in invokers)
to_chat(invoker, span_cult_italic("[sacrificial] is too greatly linked to the world! You need three acolytes!"))
return FALSE
- var/signal_result = SEND_SIGNAL(sacrificial, COMSIG_LIVING_CULT_SACRIFICED, invokers, cult_team)
- if(signal_result & STOP_SACRIFICE)
- return FALSE
-
if(sacrificial.mind)
LAZYADD(GLOB.sacrificed, WEAKREF(sacrificial.mind))
for(var/datum/objective/sacrifice/sac_objective in cult_team.objectives)
@@ -343,15 +339,23 @@ structure_check() searches for nearby cultist structures required for the invoca
sac_objective.sacced = TRUE
sac_objective.clear_sacrifice()
sac_objective.update_explanation_text()
- big_sac = TRUE
+ target_sac = TRUE
else
LAZYADD(GLOB.sacrificed, WEAKREF(sacrificial))
new /obj/effect/temp_visual/cult/sac(loc)
- if(!(signal_result & SILENCE_SACRIFICE_MESSAGE))
+ var/signal_result = SEND_SIGNAL(sacrificial, COMSIG_LIVING_CULT_SACRIFICED, invokers, cult_team)
+
+ var/do_message = TRUE
+ if(signal_result & SILENCE_SACRIFICE_MESSAGE)
+ do_message = FALSE
+ if((signal_result & SILENCE_NONTARGET_SACRIFICE_MESSAGE) && !(target_sac))
+ do_message = FALSE
+
+ if(do_message)
for(var/invoker in invokers)
- if(big_sac)
+ if(target_sac)
to_chat(invoker, span_cult_large("\"Yes! This is the one I desire! You have done well.\""))
continue
if(ishuman(sacrificial) || iscyborg(sacrificial))
@@ -359,6 +363,10 @@ structure_check() searches for nearby cultist structures required for the invoca
else
to_chat(invoker, span_cult_large("\"I accept this meager sacrifice.\""))
+ // post-message
+ if(signal_result & STOP_SACRIFICE)
+ return FALSE
+
if(iscyborg(sacrificial))
var/construct_class = show_radial_menu(invokers[1], sacrificial, GLOB.construct_radial_images, require_near = TRUE, tooltips = TRUE)
if(QDELETED(sacrificial) || !construct_class)
@@ -370,17 +378,20 @@ structure_check() searches for nearby cultist structures required for the invoca
sacriborg.mmi = null
qdel(sacrificial)
return TRUE
-
- var/obj/item/soulstone/stone = new(loc)
- if(sacrificial.mind && !HAS_TRAIT(sacrificial, TRAIT_SUICIDED))
- stone.capture_soul(sacrificial, invokers[1], forced = TRUE)
-
- if(sacrificial)
+ if(sacrificial && (signal_result & DUST_SACRIFICE)) // No soulstone when dusted
+ playsound(sacrificial, 'sound/magic/teleport_diss.ogg', 100, TRUE)
+ sacrificial.investigate_log("has been sacrificially dusted by the cult.", INVESTIGATE_DEATHS)
+ sacrificial.dust(TRUE, FALSE, TRUE)
+ else if (sacrificial)
+ var/obj/item/soulstone/stone = new(loc)
+ if(sacrificial.mind && !HAS_TRAIT(sacrificial, TRAIT_SUICIDED))
+ stone.capture_soul(sacrificial, invokers[1], forced = TRUE)
playsound(sacrificial, 'sound/magic/disintegrate.ogg', 100, TRUE)
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
+
return TRUE
/// Tries to convert a null rod over the rune to a cult sword
@@ -396,12 +407,12 @@ structure_check() searches for nearby cultist structures required for the invoca
rod.visible_message(span_cult_italic(displayed_message))
switch(num_slain)
- if(0, 1)
+ if(0)
animate_spawn_sword(rod, /obj/item/melee/cultblade/dagger)
- if(2)
+ if(1)
animate_spawn_sword(rod, /obj/item/melee/cultblade)
else
- animate_spawn_sword(rod, /obj/item/cult_bastard)
+ animate_spawn_sword(rod, /obj/item/melee/cultblade/halberd)
return TRUE
return FALSE
diff --git a/code/modules/antagonists/cult/sword_fling.dm b/code/modules/antagonists/cult/sword_fling.dm
new file mode 100644
index 0000000000000..766f97917de60
--- /dev/null
+++ b/code/modules/antagonists/cult/sword_fling.dm
@@ -0,0 +1,93 @@
+
+/datum/action/cooldown/spell/pointed/sword_fling
+ name = "Sword Fling"
+ desc = "Try to fling yourself around."
+ ranged_mousepointer = 'icons/effects/mouse_pointers/cult_target.dmi'
+ background_icon_state = "bg_heretic"
+ overlay_icon_state = "bg_cult_border"
+
+ button_icon = 'icons/mob/actions/actions_cult.dmi'
+ button_icon_state = "sword_fling"
+
+ school = SCHOOL_EVOCATION
+ cooldown_time = 4 SECONDS
+ invocation_type = INVOCATION_NONE
+ spell_requirements = NONE
+
+ cast_range = 6
+ active_msg = "You ready yourself to attempt to leap!"
+ var/obj/item/flinged_sword
+
+/datum/action/cooldown/spell/pointed/sword_fling/New(Target, to_fling)
+ . = ..()
+ flinged_sword = to_fling
+
+/datum/action/cooldown/spell/pointed/sword_fling/Destroy()
+ flinged_sword = null
+ . = ..()
+
+/datum/action/cooldown/spell/pointed/sword_fling/is_valid_target(atom/cast_on)
+ return isatom(cast_on)
+
+/datum/action/cooldown/spell/pointed/sword_fling/cast(turf/cast_on)
+ . = ..()
+ var/atom/sword_loc = flinged_sword.loc
+ if(ismob(sword_loc))
+ var/mob/loccer = sword_loc
+ var/resist_chance = 25
+ var/fail_text = "You struggle, but [loccer] keeps [loccer.p_their()] grip on you!"
+ var/particle_to_spawn = null
+ if(IS_CULTIST_OR_CULTIST_MOB(loccer))
+ resist_chance = 10 // your mastahs
+ fail_text = "You struggle, but [loccer]'s grip is unnaturally hard to resist!"
+ particle_to_spawn = /obj/effect/temp_visual/cult/sparks
+ if(IS_HERETIC_OR_MONSTER(loccer) || IS_LUNATIC(loccer))
+ resist_chance = 15
+ fail_text = "You struggle, but [loccer] deftly handles the grip movement."
+ particle_to_spawn = /obj/effect/temp_visual/eldritch_sparks
+ if(loccer.mind?.holy_role) // IS_PRIEST()
+ resist_chance = 12
+ fail_text = "You struggle, but [loccer]'s holy grip holds tight against your thrashing."
+ particle_to_spawn = /obj/effect/temp_visual/blessed
+ if(IS_WIZARD(loccer))
+ resist_chance = 5 // magic master
+ fail_text = "You struggle, but [loccer]'s handle on magic easily neutralizes your movement."
+ particle_to_spawn = /obj/effect/particle_effect/sparks/electricity
+
+ new particle_to_spawn(get_turf(loccer))
+
+ if(prob(resist_chance))
+ flinged_sword.forceMove(get_turf(loccer))
+ flinged_sword.visible_message(span_alert("\the [flinged_sword] yanks itself out of [loccer]'s grip!"))
+ // flung by later code
+ else
+ to_chat(owner, span_warning(fail_text))
+ return
+
+ if(isitem(sword_loc))
+ flinged_sword.forceMove(get_turf(sword_loc))
+ flinged_sword.visible_message(span_alert("\the [flinged_sword] yanks itself out of [sword_loc]!"))
+ // flung by later code
+
+ if(iscloset(sword_loc))
+ var/obj/structure/closet/sword_closet = sword_loc
+ if(!(sword_closet.open(owner, force = prob(5), special_effects = TRUE)))
+ sword_closet.container_resist_act(owner, loc_required = FALSE)
+ flinged_sword.visible_message(span_alert("\the [flinged_sword] yanks itself out of [sword_closet]!"))
+
+ // no general struct/machinery check. imagine if someone put the sword in a vendor
+
+ if(isturf(sword_loc))
+ new /obj/effect/temp_visual/sword_sparks(sword_loc)
+ flinged_sword.throw_at(cast_on, cast_range, flinged_sword.throw_speed, owner)
+ flinged_sword.visible_message(\
+ span_warning("\the [flinged_sword] lunges at \the [cast_on]!"))
+
+/obj/effect/temp_visual/eldritch_sparks
+ icon_state = "purplesparkles"
+
+/obj/effect/temp_visual/sword_sparks
+ icon_state = "mech_toxin" // only used in one place and it looks kinda good
+
+/obj/effect/temp_visual/blessed
+ icon_state = "blessed"
diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm
index ed256acae03e7..e1530ba16eddd 100644
--- a/code/modules/antagonists/fugitive/fugitive_outfits.dm
+++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm
@@ -75,7 +75,7 @@
back = /obj/item/storage/backpack/satchel/leather
shoes = /obj/item/clothing/shoes/laceup
glasses = /obj/item/clothing/glasses/monocle
- mask = /obj/item/clothing/mask/cigarette/pipe
+ mask = /obj/item/cigarette/pipe
ears = /obj/item/radio/headset
backpack_contents = list(
diff --git a/code/modules/antagonists/fugitive/hunters/hunter.dm b/code/modules/antagonists/fugitive/hunters/hunter.dm
index b75cba69e528a..ba26645364712 100644
--- a/code/modules/antagonists/fugitive/hunters/hunter.dm
+++ b/code/modules/antagonists/fugitive/hunters/hunter.dm
@@ -42,6 +42,10 @@
to_chat(owner, span_danger("GOOD EVENING, WE ARE PSYKER HUNTE- NO, PSYKER SHIKARIS!"))
to_chat(owner, span_danger("A brainling hit us up on the holopad with an offer we could NOT pass up. We kidnap some fools for them, and in exchange we get a LIFETIME SUPPLY OF GORE."))
to_chat(owner, span_danger("Our gore supply has been running thin as of late -- How could we say no? The binge MUST go on!"))
+ if(HUNTER_PACK_MI13)
+ to_chat(owner, span_danger("Agents, we have detected a wanted fugitive in Nanotrasen controlled space."))
+ to_chat(owner, span_danger("Your mission is simple. Infiltrate the facility and extract the target, dead or alive."))
+ to_chat(owner, span_danger("This is a stealth infiltration mission in hostile enemy territory. Be wary, and avoid being caught if possible."))
to_chat(owner, span_boldannounce("You are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station."))
owner.announce_objectives()
diff --git a/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm b/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm
index 7df6818cdc44a..5491251d1aa53 100644
--- a/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm
+++ b/code/modules/antagonists/fugitive/hunters/hunter_outfits.dm
@@ -216,6 +216,56 @@
id_trim = /datum/id_trim/bounty_hunter/psykers/seer
+/datum/outfit/mi13_hunter
+ name = "\improper MI13 Fugitive Retrieval Agent"
+ uniform = /obj/item/clothing/under/syndicate/sniper
+ back = /obj/item/storage/backpack/satchel/leather
+ ears = /obj/item/radio/headset/syndicate
+ glasses = /obj/item/clothing/glasses/sunglasses
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/laceup
+ belt = /obj/item/restraints/handcuffs/cable/zipties
+ l_pocket = /obj/item/gun/ballistic/automatic/pistol
+ r_pocket = /obj/item/suppressor
+ id = /obj/item/card/id/advanced/chameleon/black
+ box = /obj/item/storage/box/survival/syndie
+ implants = list(/obj/item/implant/explosive)
+
+/datum/outfit/mi13_hunter/pre_equip(mob/living/carbon/human/agent, visualsOnly = FALSE)
+ backpack_contents = list()
+ backpack_contents += pick_weight(list(/obj/item/ammo_box/magazine/m9mm = 80,
+ /obj/item/ammo_box/magazine/m9mm/hp = 10,
+ /obj/item/ammo_box/magazine/m9mm/ap = 5,
+ /obj/item/ammo_box/magazine/m9mm/fire = 5,
+ ))
+ backpack_contents += pick_weight(list(
+ /obj/item/pen/edagger = 40,
+ /obj/item/knife/combat = 30,
+ /obj/item/assembly/flash = 30,
+ ))
+ backpack_contents += pick_weight(list(
+ /obj/item/grenade/c4 = 20,
+ /obj/item/implanter/freedom = 20,
+ /obj/item/clothing/mask/chameleon = 20,
+ /obj/item/language_manual/codespeak_manual/unlimited = 10,
+ /obj/item/storage/mail_counterfeit_device = 10,
+ /obj/item/traitor_machine_trapper = 10,
+ /obj/item/gun/ballistic/automatic/pistol/clandestine/fisher = 10,
+ ))
+
+/datum/outfit/mi13_hunter/post_equip(mob/living/carbon/human/agent, visualsOnly = FALSE)
+ if(visualsOnly)
+ return
+ var/obj/item/card/id/wearing = agent.wear_id
+ wearing.registered_name = agent.real_name
+ wearing.update_label()
+
+/datum/outfit/mi13_hunter/chef
+ name = "\improper MI13 Fugitive Retrieval Agent - Chef Disguise"
+ head = /obj/item/clothing/head/utility/chefhat
+ suit = /obj/item/clothing/suit/apron/chef
+ mask = /obj/item/clothing/mask/fakemoustache
+
//ids and ert code
/obj/item/card/id/advanced/bountyhunter
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index 2c31529ed3386..f31639c508c73 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -60,17 +60,17 @@
/// Wether we are allowed to ascend
var/feast_of_owls = FALSE
/// Static list of what each path converts to in the UI (colors are TGUI colors)
- var/static/list/path_to_ui_color = list(
- PATH_START = "grey",
- PATH_SIDE = "green",
- PATH_RUST = "brown",
- PATH_FLESH = "red",
- PATH_ASH = "white",
- PATH_VOID = "blue",
- PATH_BLADE = "label", // my favorite color is label
- PATH_COSMIC = "purple",
- PATH_LOCK = "yellow",
- PATH_MOON = "blue",
+ var/static/list/path_to_ui_bgr = list(
+ PATH_START = "node_side",
+ PATH_SIDE = "node_side",
+ PATH_RUST = "node_rust",
+ PATH_FLESH = "node_flesh",
+ PATH_ASH = "node_ash",
+ PATH_VOID = "node_void",
+ PATH_BLADE = "node_blade",
+ PATH_COSMIC = "node_cosmos",
+ PATH_LOCK = "node_lock",
+ PATH_MOON = "node_moon",
)
var/static/list/path_to_rune_color = list(
@@ -85,10 +85,95 @@
PATH_MOON = COLOR_BLUE_LIGHT,
)
+ /// List that keeps track of which items have been gifted to the heretic after a cultist was sacrificed. Used to alter drop chances to reduce dupes.
+ var/list/unlocked_heretic_items = list(
+ /obj/item/melee/sickly_blade/cursed = 0,
+ /obj/item/clothing/neck/heretic_focus/crimson_focus = 0,
+ /mob/living/basic/construct/harvester/heretic = 0,
+ )
+ /// Simpler version of above used to limit amount of loot that can be hoarded
+ var/rewards_given = 0
+
/datum/antagonist/heretic/Destroy()
LAZYNULL(sac_targets)
return ..()
+/datum/antagonist/heretic/proc/get_icon_of_knowledge(datum/heretic_knowledge/knowledge)
+ //basic icon parameters
+ var/icon_path = 'icons/mob/actions/actions_ecult.dmi'
+ var/icon_state = "eye"
+ var/icon_frame = knowledge.research_tree_icon_frame
+ var/icon_dir = knowledge.research_tree_icon_dir
+ //can't imagine why you would want this one, so it can't be overridden by the knowledge
+ var/icon_moving = 0
+
+ //item transmutation knowledge does not generate its own icon due to implementation difficulties, the icons have to be specified in the override vars
+
+ //if the knowledge has a special icon, use that
+ if(!isnull(knowledge.research_tree_icon_path))
+ icon_path = knowledge.research_tree_icon_path
+ icon_state = knowledge.research_tree_icon_state
+
+ //if the knowledge is a spell, use the spell's button
+ else if(ispath(knowledge,/datum/heretic_knowledge/spell))
+ var/datum/heretic_knowledge/spell/spell_knowledge = knowledge
+ var/datum/action/cooldown/spell/result_spell = spell_knowledge.spell_to_add
+ icon_path = result_spell.button_icon
+ icon_state = result_spell.button_icon_state
+
+ //if the knowledge is a summon, use the mob sprite
+ else if(ispath(knowledge,/datum/heretic_knowledge/summon))
+ var/datum/heretic_knowledge/summon/summon_knowledge = knowledge
+ var/mob/living/result_mob = summon_knowledge.mob_to_summon
+ icon_path = result_mob.icon
+ icon_state = result_mob.icon_state
+
+ //if the knowledge is an eldritch mark, use the mark sprite
+ else if(ispath(knowledge,/datum/heretic_knowledge/mark))
+ var/datum/heretic_knowledge/mark/mark_knowledge = knowledge
+ var/datum/status_effect/eldritch/mark_effect = mark_knowledge.mark_type
+ icon_path = mark_effect.effect_icon
+ icon_state = mark_effect.effect_icon_state
+
+ //if the knowledge is an ascension, use the achievement sprite
+ else if(ispath(knowledge,/datum/heretic_knowledge/ultimate))
+ var/datum/heretic_knowledge/ultimate/ascension_knowledge = knowledge
+ var/datum/award/achievement/misc/achievement = ascension_knowledge.ascension_achievement
+ if(!isnull(achievement))
+ icon_path = achievement.icon
+ icon_state = achievement.icon_state
+
+ var/list/result_parameters = list()
+ result_parameters["icon"] = icon_path
+ result_parameters["state"] = icon_state
+ result_parameters["frame"] = icon_frame
+ result_parameters["dir"] = icon_dir
+ result_parameters["moving"] = icon_moving
+ return result_parameters
+
+/datum/antagonist/heretic/proc/get_knowledge_data(datum/heretic_knowledge/knowledge, done)
+
+ var/list/knowledge_data = list()
+
+ knowledge_data["path"] = knowledge
+ knowledge_data["icon_params"] = get_icon_of_knowledge(knowledge)
+ knowledge_data["name"] = initial(knowledge.name)
+ knowledge_data["gainFlavor"] = initial(knowledge.gain_text)
+ knowledge_data["cost"] = initial(knowledge.cost)
+ knowledge_data["disabled"] = (!done) && (initial(knowledge.cost) > knowledge_points)
+ knowledge_data["bgr"] = (path_to_ui_bgr[initial(knowledge.route)] || "side")
+ knowledge_data["finished"] = done
+ knowledge_data["ascension"] = ispath(knowledge,/datum/heretic_knowledge/ultimate)
+
+ //description of a knowledge might change, make sure we are not shown the initial() value in that case
+ if(done)
+ var/datum/heretic_knowledge/knowledge_instance = researched_knowledge[knowledge]
+ knowledge_data["desc"] = knowledge_instance.desc
+ else
+ knowledge_data["desc"] = initial(knowledge.desc)
+
+ return knowledge_data
+
/datum/antagonist/heretic/ui_data(mob/user)
var/list/data = list()
@@ -96,26 +181,32 @@
data["total_sacrifices"] = total_sacrifices
data["ascended"] = ascended
+ var/list/tiers = list()
+
// This should be cached in some way, but the fact that final knowledge
// has to update its disabled state based on whether all objectives are complete,
// makes this very difficult. I'll figure it out one day maybe
+ for(var/datum/heretic_knowledge/knowledge as anything in researched_knowledge)
+ var/list/knowledge_data = get_knowledge_data(knowledge,TRUE)
+
+ while(initial(knowledge.depth) > tiers.len)
+ tiers += list(list("nodes"=list()))
+
+ tiers[initial(knowledge.depth)]["nodes"] += list(knowledge_data)
+
for(var/datum/heretic_knowledge/knowledge as anything in get_researchable_knowledge())
- var/list/knowledge_data = list()
- knowledge_data["path"] = knowledge
- knowledge_data["name"] = initial(knowledge.name)
- knowledge_data["desc"] = initial(knowledge.desc)
- knowledge_data["gainFlavor"] = initial(knowledge.gain_text)
- knowledge_data["cost"] = initial(knowledge.cost)
- knowledge_data["disabled"] = initial(knowledge.cost) > knowledge_points
+ var/list/knowledge_data = get_knowledge_data(knowledge,FALSE)
// Final knowledge can't be learned until all objectives are complete.
if(ispath(knowledge, /datum/heretic_knowledge/ultimate))
- knowledge_data["disabled"] = !can_ascend()
+ knowledge_data["disabled"] ||= !can_ascend()
+
+ while(initial(knowledge.depth) > tiers.len)
+ tiers += list(list("nodes"=list()))
- knowledge_data["hereticPath"] = initial(knowledge.route)
- knowledge_data["color"] = path_to_ui_color[initial(knowledge.route)] || "grey"
+ tiers[initial(knowledge.depth)]["nodes"] += list(knowledge_data)
- data["learnableKnowledge"] += list(knowledge_data)
+ data["knowledge_tiers"] = tiers
return data
@@ -125,18 +216,6 @@
data["objectives"] = get_objectives()
data["can_change_objective"] = can_assign_self_objectives
- for(var/path in researched_knowledge)
- var/list/knowledge_data = list()
- var/datum/heretic_knowledge/found_knowledge = researched_knowledge[path]
- knowledge_data["name"] = found_knowledge.name
- knowledge_data["desc"] = found_knowledge.desc
- knowledge_data["gainFlavor"] = found_knowledge.gain_text
- knowledge_data["cost"] = found_knowledge.cost
- knowledge_data["hereticPath"] = found_knowledge.route
- knowledge_data["color"] = path_to_ui_color[found_knowledge.route] || "grey"
-
- data["learnedKnowledge"] += list(knowledge_data)
-
return data
/datum/antagonist/heretic/ui_act(action, params)
@@ -230,6 +309,8 @@
if (!issilicon(our_mob))
GLOB.reality_smash_track.add_tracked_mind(owner)
+ ADD_TRAIT(our_mob, TRAIT_MANSUS_TOUCHED, REF(src))
+ RegisterSignal(our_mob, COMSIG_LIVING_CULT_SACRIFICED, PROC_REF(on_cult_sacrificed))
RegisterSignals(our_mob, list(COMSIG_MOB_BEFORE_SPELL_CAST, COMSIG_MOB_SPELL_ACTIVATED), PROC_REF(on_spell_cast))
RegisterSignal(our_mob, COMSIG_USER_ITEM_INTERACTION, PROC_REF(on_item_use))
RegisterSignal(our_mob, COMSIG_MOB_LOGIN, PROC_REF(fix_influence_network))
@@ -243,12 +324,14 @@
if (owner in GLOB.reality_smash_track.tracked_heretics)
GLOB.reality_smash_track.remove_tracked_mind(owner)
+ REMOVE_TRAIT(our_mob, TRAIT_MANSUS_TOUCHED, REF(src))
UnregisterSignal(our_mob, list(
COMSIG_MOB_BEFORE_SPELL_CAST,
COMSIG_MOB_SPELL_ACTIVATED,
COMSIG_USER_ITEM_INTERACTION,
COMSIG_MOB_LOGIN,
COMSIG_LIVING_POST_FULLY_HEAL,
+ COMSIG_LIVING_CULT_SACRIFICED,
))
/datum/antagonist/heretic/on_body_transfer(mob/living/old_body, mob/living/new_body)
@@ -395,6 +478,118 @@
var/datum/heretic_knowledge/living_heart/heart_knowledge = get_knowledge(/datum/heretic_knowledge/living_heart)
heart_knowledge.on_research(source, src)
+/// Signal proc for [COMSIG_LIVING_CULT_SACRIFICED] to reward cultists for sacrificing a heretic
+/datum/antagonist/heretic/proc/on_cult_sacrificed(mob/living/source, list/invokers)
+ SIGNAL_HANDLER
+
+ for(var/mob/dead/observer/ghost in GLOB.dead_mob_list) // uhh let's find the guy to shove him back in
+ if((ghost.mind?.current == source) && ghost.client) // is it the same guy and do they have the same client
+ ghost.reenter_corpse() // shove them in! it doesnt do it automatically
+
+ // Drop all items and splatter them around messily.
+ var/list/dustee_items = source.unequip_everything()
+ for(var/obj/item/loot as anything in dustee_items)
+ loot.throw_at(get_step_rand(source), 2, 4, pick(invokers), TRUE)
+
+ // Create the blade, give it the heretic and a randomly-chosen master for the soul sword component
+ var/obj/item/melee/cultblade/haunted/haunted_blade = new(get_turf(source), source, pick(invokers))
+
+ // Cool effect for the rune as well as the item
+ var/obj/effect/rune/convert/conversion_rune = locate() in get_turf(source)
+ if(conversion_rune)
+ conversion_rune.gender_reveal(
+ outline_color = COLOR_HERETIC_GREEN,
+ ray_color = null,
+ do_float = FALSE,
+ do_layer = FALSE,
+ )
+
+ haunted_blade.gender_reveal(outline_color = null, ray_color = COLOR_HERETIC_GREEN)
+
+ for(var/mob/living/culto as anything in invokers)
+ to_chat(culto, span_cult_large("\"A follower of the forgotten gods! You must be rewarded for such a valuable sacrifice.\""))
+
+ // Locate a cultist team (Is there a better way??)
+ var/mob/living/random_cultist = pick(invokers)
+ var/datum/antagonist/cult/antag = random_cultist.mind.has_antag_datum(/datum/antagonist/cult)
+ ASSERT(antag)
+ var/datum/team/cult/cult_team = antag.get_team()
+
+ // Unlock one of 3 special items!
+ var/list/possible_unlocks
+ for(var/i in cult_team.unlocked_heretic_items)
+ if(cult_team.unlocked_heretic_items[i])
+ continue
+ LAZYADD(possible_unlocks, i)
+ if(length(possible_unlocks))
+ var/result = pick(possible_unlocks)
+ cult_team.unlocked_heretic_items[result] = TRUE
+
+ for(var/datum/mind/mind as anything in cult_team.members)
+ if(mind.current)
+ SEND_SOUND(mind.current, 'sound/magic/clockwork/narsie_attack.ogg')
+ to_chat(mind.current, span_cult_large(span_warning("Arcane and forbidden knowledge floods your forges and archives. The cult has learned how to create the ")) + span_cult_large(span_hypnophrase("[result]!")))
+
+ return SILENCE_SACRIFICE_MESSAGE|DUST_SACRIFICE
+
+/**
+ * Creates an animation of the item slowly lifting up from the floor with a colored outline, then slowly drifting back down.
+ * Arguments:
+ * * outline_color: Default is between pink and light blue, is the color of the outline filter.
+ * * ray_color: Null by default. If not set, just copies outline. Used for the ray filter.
+ * * anim_time: Total time of the animation. Split into two different calls.
+ * * do_float: Lets you disable the sprite floating up and down.
+ * * do_layer: Lets you disable the layering increase.
+ */
+/obj/proc/gender_reveal(
+ outline_color = null,
+ ray_color = null,
+ anim_time = 10 SECONDS,
+ do_float = TRUE,
+ do_layer = TRUE,
+)
+
+ var/og_layer
+ if(do_layer)
+ // Layering above to stand out!
+ og_layer = layer
+ layer = ABOVE_MOB_LAYER
+
+ // Slowly floats up, then slowly goes down.
+ if(do_float)
+ animate(src, pixel_y = 12, time = anim_time * 0.5, easing = QUAD_EASING | EASE_OUT)
+ animate(pixel_y = 0, time = anim_time * 0.5, easing = QUAD_EASING | EASE_IN)
+
+ // Adding a cool outline effect
+ if(outline_color)
+ add_filter("gender_reveal_outline", 3, list("type" = "outline", "color" = outline_color, "size" = 0.5))
+ // Animating it!
+ var/gay_filter = get_filter("gender_reveal_outline")
+ animate(gay_filter, alpha = 110, time = 1.5 SECONDS, loop = -1)
+ animate(alpha = 40, time = 2.5 SECONDS)
+
+ // Adding a cool ray effect
+ if(ray_color)
+ add_filter(name = "gender_reveal_ray", priority = 1, params = list(
+ type = "rays",
+ size = 45,
+ color = ray_color,
+ density = 6
+ ))
+ // Animating it!
+ var/ray_filter = get_filter("gender_reveal_ray")
+ // I understand nothing but copypaste saves lives
+ animate(ray_filter, offset = 100, time = 30 SECONDS, loop = -1, flags = ANIMATION_PARALLEL)
+
+ addtimer(CALLBACK(src, PROC_REF(remove_gender_reveal_fx), og_layer), anim_time)
+
+/**
+ * Removes the non-animate effects from above proc
+ */
+/obj/proc/remove_gender_reveal_fx(og_layer)
+ remove_filter(list("gender_reveal_outline", "gender_reveal_ray"))
+ layer = og_layer
+
/**
* Create our objectives for our heretic.
*/
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index 5369e5fee8d91..6cfa8db05608f 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -38,6 +38,16 @@
var/priority = 0
/// What path is this on. If set to "null", assumed to be unreachable (or abstract).
var/route
+ /// In case we want to override the default UI icon getter and plug in our own icon instead.
+ /// if research_tree_icon_path is not null, research_tree_icon_state must also be specified or things may break
+ var/research_tree_icon_path
+ var/research_tree_icon_state
+ var/research_tree_icon_frame = 1
+ var/research_tree_icon_dir = SOUTH
+ /// Level of knowledge tree where this knowledge should be in the UI
+ var/depth = 1
+ ///Determines what kind of monster ghosts will ignore from here on out. Defaults to POLL_IGNORE_HERETIC_MONSTER, but we define other types of monsters for more granularity.
+ var/poll_ignore_define = POLL_IGNORE_HERETIC_MONSTER
/datum/heretic_knowledge/New()
if(!mutually_exclusive)
@@ -261,6 +271,7 @@
limit = 2
cost = 1
priority = MAX_KNOWLEDGE_PRIORITY - 5
+ depth = 2
/datum/heretic_knowledge/limited_amount/starting/New()
. = ..()
@@ -285,6 +296,7 @@
abstract_parent_type = /datum/heretic_knowledge/mark
mutually_exclusive = TRUE
cost = 2
+ depth = 5
/// The status effect typepath we apply on people on mansus grasp.
var/datum/status_effect/eldritch/mark_type
@@ -350,6 +362,7 @@
abstract_parent_type = /datum/heretic_knowledge/blade_upgrade
mutually_exclusive = TRUE
cost = 2
+ depth = 9
/datum/heretic_knowledge/blade_upgrade/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade))
@@ -523,11 +536,23 @@
abstract_parent_type = /datum/heretic_knowledge/summon
/// Typepath of a mob to summon when we finish the recipe.
var/mob/living/mob_to_summon
- ///Determines what kind of monster ghosts will ignore from here on out. Defaults to POLL_IGNORE_HERETIC_MONSTER, but we define other types of monsters for more granularity.
- var/poll_ignore_define = POLL_IGNORE_HERETIC_MONSTER
/datum/heretic_knowledge/summon/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- var/mob/living/summoned = new mob_to_summon(loc)
+ summon_ritual_mob(user, loc, mob_to_summon)
+
+/**
+ * Creates the ritual mob and grabs a ghost for it
+ *
+ * * user - the mob doing the summoning
+ * * loc - where the summon is happening
+ * * mob_to_summon - either a mob instance or a mob typepath
+ */
+/datum/heretic_knowledge/proc/summon_ritual_mob(mob/living/user, turf/loc, mob/living/mob_to_summon)
+ var/mob/living/summoned
+ if(isliving(mob_to_summon))
+ summoned = mob_to_summon
+ else
+ summoned = new mob_to_summon(loc)
summoned.ai_controller?.set_ai_status(AI_STATUS_OFF)
// Fade in the summon while the ghost poll is ongoing.
// Also don't let them mess with the summon while waiting
@@ -557,6 +582,7 @@
var/datum/antagonist/heretic_monster/heretic_monster = summoned.mind.add_antag_datum(/datum/antagonist/heretic_monster)
heretic_monster.set_owner(user.mind)
+ summoned.RegisterSignal(user, COMSIG_LIVING_DEATH, TYPE_PROC_REF(/mob/living/, on_master_death))
var/datum/objective/heretic_summon/summon_objective = locate() in user.mind.get_all_objectives()
summon_objective?.num_summoned++
@@ -577,6 +603,9 @@
mutually_exclusive = TRUE
cost = 1
priority = MAX_KNOWLEDGE_PRIORITY - 10 // A pretty important midgame ritual.
+ depth = 6
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "book_open"
/// Whether we've done the ritual. Only doable once.
var/was_completed = FALSE
@@ -670,6 +699,9 @@
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)
+ depth = 11
+ //use this to store the achievement typepath
+ var/datum/award/achievement/misc/ascension_achievement
/datum/heretic_knowledge/ultimate/on_research(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -730,6 +762,8 @@
source = user,
header = "A Heretic is Ascending!",
)
+ if(!isnull(ascension_achievement))
+ user.client?.give_award(ascension_achievement, user)
heretic_datum.increase_rust_strength()
return TRUE
diff --git a/code/modules/antagonists/heretic/heretic_monsters.dm b/code/modules/antagonists/heretic/heretic_monsters.dm
index 31b18b6a83353..fcdea51287980 100644
--- a/code/modules/antagonists/heretic/heretic_monsters.dm
+++ b/code/modules/antagonists/heretic/heretic_monsters.dm
@@ -38,3 +38,7 @@
owner.announce_objectives()
to_chat(owner, span_boldnotice("You are a [ishuman(owner.current) ? "shambling corpse returned":"horrible creation brought"] to this plane through the Gates of the Mansus."))
to_chat(owner, span_notice("Your master is [master]. Assist them to all ends."))
+
+ if(istype(owner.current, /mob/living/basic/construct/harvester/heretic))
+ var/mob/living/basic/construct/harvester/heretic/shitcode = owner.current
+ shitcode.master = master
diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm
index 95b77f956188c..409bcd473ed7d 100644
--- a/code/modules/antagonists/heretic/items/eldritch_flask.dm
+++ b/code/modules/antagonists/heretic/items/eldritch_flask.dm
@@ -4,5 +4,5 @@
name = "flask of eldritch essence"
desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond."
icon = 'icons/obj/antags/eldritch.dmi'
- icon_state = "eldrich_flask"
+ icon_state = "eldritch_flask"
list_reagents = list(/datum/reagent/eldritch = 50)
diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm
index 675f5f87b0abf..ddfec8db20cf7 100644
--- a/code/modules/antagonists/heretic/items/heretic_blades.dm
+++ b/code/modules/antagonists/heretic/items/heretic_blades.dm
@@ -24,23 +24,37 @@
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
var/after_use_message = ""
+/obj/item/melee/sickly_blade/examine(mob/user)
+ . = ..()
+ if(!check_usability(user))
+ return
+
+ . += span_notice("You can shatter the blade to teleport to a random, (mostly) safe location by activating it in-hand.")
+
+/// Checks if the passed mob can use this blade without being stunned
+/obj/item/melee/sickly_blade/proc/check_usability(mob/living/user)
+ return IS_HERETIC_OR_MONSTER(user)
+
/obj/item/melee/sickly_blade/pre_attack(atom/A, mob/living/user, params)
. = ..()
if(.)
return .
- if(!IS_HERETIC_OR_MONSTER(user))
+ if(!check_usability(user))
to_chat(user, span_danger("You feel a pulse of alien intellect lash out at your mind!"))
- user.AdjustParalyzed(5 SECONDS)
+ var/mob/living/carbon/human/human_user = user
+ human_user.AdjustParalyzed(5 SECONDS)
return TRUE
- return .
-/obj/item/melee/sickly_blade/afterattack(atom/target, mob/user, click_parameters)
- if(isliving(target))
- SEND_SIGNAL(user, COMSIG_HERETIC_BLADE_ATTACK, target, src)
+ return .
/obj/item/melee/sickly_blade/attack_self(mob/user)
- var/turf/safe_turf = find_safe_turf(zlevel = z, extended_safety_checks = TRUE)
- if(IS_HERETIC_OR_MONSTER(user))
+ seek_safety(user)
+ return ..()
+
+/// Attempts to teleport the passed mob to somewhere safe on the station, if they can use the blade.
+/obj/item/melee/sickly_blade/proc/seek_safety(mob/user)
+ var/turf/safe_turf = find_safe_turf(zlevels = z, extended_safety_checks = TRUE)
+ if(check_usability(user))
if(do_teleport(user, safe_turf, channel = TELEPORT_CHANNEL_MAGIC))
to_chat(user, span_warning("As you shatter [src], you feel a gust of energy flow through your body. [after_use_message]"))
else
@@ -50,18 +64,15 @@
playsound(src, SFX_SHATTER, 70, TRUE) //copied from the code for smashing a glass sheet onto the ground to turn it into a shard
qdel(src)
+/obj/item/melee/sickly_blade/afterattack(atom/target, mob/user, click_parameters)
+ if(isliving(target))
+ SEND_SIGNAL(user, COMSIG_HERETIC_BLADE_ATTACK, target, src)
+
/obj/item/melee/sickly_blade/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(isliving(interacting_with))
SEND_SIGNAL(user, COMSIG_HERETIC_RANGED_BLADE_ATTACK, interacting_with, src)
return ITEM_INTERACT_BLOCKING
-/obj/item/melee/sickly_blade/examine(mob/user)
- . = ..()
- if(!IS_HERETIC_OR_MONSTER(user))
- return
-
- . += span_notice("You can shatter the blade to teleport to a random, (mostly) safe location by activating it in-hand.")
-
// Path of Rust's blade
/obj/item/melee/sickly_blade/rust
name = "\improper rusted blade"
@@ -154,3 +165,76 @@
icon_state = "moon_blade"
inhand_icon_state = "moon_blade"
after_use_message = "The Moon hears your call..."
+
+// Path of Nar'Sie's blade
+// What!? This blade is given to cultists as an altar item when they sacrifice a heretic.
+// It is also given to the heretic themself if they sacrifice a cultist.
+/obj/item/melee/sickly_blade/cursed
+ name = "\improper cursed blade"
+ desc = "A dark blade, cursed to bleed forever. In constant struggle between the eldritch and the dark, it is forced to accept any wielder as its master. \
+ Its eye's cornea drips blood endlessly into the ground, yet its piercing gaze remains on you."
+ force = 25
+ throwforce = 15
+ block_chance = 35
+ wound_bonus = 25
+ bare_wound_bonus = 15
+ armour_penetration = 35
+ icon_state = "cursed_blade"
+ inhand_icon_state = "cursed_blade"
+
+/obj/item/melee/sickly_blade/cursed/Initialize(mapload)
+ . = ..()
+
+ var/examine_text = {"Allows the scribing of blood runes of the cult of Nar'Sie.
+ The combination of eldritch power and Nar'Sie's might allows for vastly increased rune drawing speed,
+ alongside the vicious strength of the blade being more powerful than usual.\n
+ It can also be shattered in-hand by cultists (via right-click), teleporting them to relative safety."}
+
+ AddComponent(/datum/component/cult_ritual_item, span_cult(examine_text), turfs_that_boost_us = /turf) // Always fast to draw!
+
+/obj/item/melee/sickly_blade/cursed/attack_self_secondary(mob/user)
+ seek_safety(user, TRUE)
+
+/obj/item/melee/sickly_blade/cursed/seek_safety(mob/user, secondary_attack = FALSE)
+ if(IS_CULTIST(user) && !secondary_attack)
+ return FALSE
+ return ..()
+
+/obj/item/melee/sickly_blade/cursed/check_usability(mob/living/user)
+ if(IS_HERETIC_OR_MONSTER(user) || IS_CULTIST(user))
+ return TRUE
+ if(prob(15))
+ to_chat(user, span_cult_large(pick("\"An untouched mind? Amusing.\"", "\" I suppose it isn't worth the effort to stop you.\"", "\"Go ahead. I don't care.\"", "\"You'll be mine soon enough.\"")))
+ var/obj/item/bodypart/affecting = user.get_active_hand()
+ if(!affecting)
+ return
+ affecting.receive_damage(burn = 5)
+ playsound(src, SFX_SEAR, 25, TRUE)
+ to_chat(user, span_danger("Your hand sizzles.")) // Nar nar might not care but their essence still doesn't like you
+ else if(prob(15))
+ to_chat(user, span_big(span_hypnophrase("LW'NAFH'NAHOR UH'ENAH'YMG EPGOKA AH NAFL MGEMPGAH'EHYE")))
+ to_chat(user, span_danger("Horrible, unintelligible utterances flood your mind!"))
+ user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15) // This can kill you if you ignore it
+ return TRUE
+
+/obj/item/melee/sickly_blade/cursed/equipped(mob/user, slot)
+ . = ..()
+ if(IS_HERETIC_OR_MONSTER(user))
+ after_use_message = "The Mansus hears your call..."
+ else if(IS_CULTIST(user))
+ after_use_message = "Nar'Sie hears your call..."
+ else
+ after_use_message = null
+
+/obj/item/melee/sickly_blade/cursed/interact_with_atom(atom/target, mob/living/user, list/modifiers)
+ . = ..()
+
+ var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ if(!heretic_datum)
+ return NONE
+
+ // Can only carve runes with it if off combat mode.
+ if(isopenturf(target) && !user.combat_mode)
+ heretic_datum.try_draw_rune(user, target, drawing_time = 14 SECONDS) // Faster than pen, slower than cicatrix
+ return ITEM_INTERACT_BLOCKING
+ return NONE
diff --git a/code/modules/antagonists/heretic/items/heretic_necks.dm b/code/modules/antagonists/heretic/items/heretic_necks.dm
index e24c17abdeeba..3f140dc99df1d 100644
--- a/code/modules/antagonists/heretic/items/heretic_necks.dm
+++ b/code/modules/antagonists/heretic/items/heretic_necks.dm
@@ -9,6 +9,101 @@
. = ..()
AddElement(/datum/element/heretic_focus)
+/obj/item/clothing/neck/heretic_focus/crimson_focus
+ name = "Crimson Focus"
+ desc = "A blood-red focusing glass that provides a link to the world beyond, and worse. Its eye is constantly twitching and gazing in all directions. It almost seems to be silently screaming..."
+ icon_state = "crimson_focus"
+ /// The aura healing component. Used to delete it when taken off.
+ var/datum/component/component
+ /// If active or not, used to add and remove its cult and heretic buffs.
+ var/active = FALSE
+
+/obj/item/clothing/neck/heretic_focus/crimson_focus/equipped(mob/living/user, slot)
+ . = ..()
+ if(!(slot & ITEM_SLOT_NECK))
+ return
+
+ var/team_color = COLOR_ADMIN_PINK
+ if(IS_CULTIST(user))
+ var/datum/action/innate/cult/blood_magic/magic_holder = locate() in user.actions
+ team_color = COLOR_CULT_RED
+ magic_holder.magic_enhanced = TRUE
+ else if(IS_HERETIC_OR_MONSTER(user) && !active)
+ for(var/datum/action/cooldown/spell/spell_action in user.actions)
+ spell_action.cooldown_time *= 0.5
+ active = TRUE
+ team_color = COLOR_GREEN
+ else
+ team_color = pick(COLOR_CULT_RED, COLOR_GREEN)
+
+ user.add_traits(list(TRAIT_MANSUS_TOUCHED, TRAIT_BLOODY_MESS), REF(src))
+ to_chat(user, span_alert("Your heart takes on a strange yet soothing irregular rhythm, and your blood feels significantly less viscous than it used to be. You're not sure if that's a good thing."))
+ component = user.AddComponent( \
+ /datum/component/aura_healing, \
+ range = 3, \
+ brute_heal = 1, \
+ burn_heal = 1, \
+ blood_heal = 2, \
+ suffocation_heal = 5, \
+ simple_heal = 0.6, \
+ requires_visibility = FALSE, \
+ limit_to_trait = TRAIT_MANSUS_TOUCHED, \
+ healing_color = team_color, \
+ )
+
+/obj/item/clothing/neck/heretic_focus/crimson_focus/dropped(mob/living/user)
+ . = ..()
+
+ if(!istype(user))
+ return
+
+ if(HAS_TRAIT_FROM(user, TRAIT_MANSUS_TOUCHED, REF(src)))
+ to_chat(user, span_notice("Your heart and blood return to their regular old rhythm and flow."))
+
+ if(IS_HERETIC_OR_MONSTER(user) && active)
+ for(var/datum/action/cooldown/spell/spell_action in user.actions)
+ spell_action.cooldown_time *= 2
+ active = FALSE
+ QDEL_NULL(component)
+ user.remove_traits(list(TRAIT_MANSUS_TOUCHED, TRAIT_BLOODY_MESS), REF(src))
+
+ // If boosted enable is set, to prevent false dropped() calls from repeatedly nuking the max spells.
+ var/datum/action/innate/cult/blood_magic/magic_holder = locate() in user.actions
+ // Remove the last spell if over new limit, as we will reduce our max spell amount. Done beforehand as it causes a index out of bounds runtime otherwise.
+ if(magic_holder?.magic_enhanced)
+ QDEL_NULL(magic_holder.spells[ENHANCED_BLOODCHARGE])
+ magic_holder?.magic_enhanced = FALSE
+
+
+/obj/item/clothing/neck/heretic_focus/crimson_focus/attack_self(mob/living/user, modifiers)
+ . = ..()
+ to_chat(user, span_danger("You start tightly squeezing [src]..."))
+ if(!do_after(user, 1.25 SECONDS, src))
+ return
+ to_chat(user, span_danger("[src] explodes into a shower of gore and blood, drenching your arm. You can feel the blood seeping into your skin. You inmediately feel better, but soon, the feeling turns hollow as your veins itch."))
+ new /obj/effect/gibspawner/generic(get_turf(src))
+ var/heal_amt = user.adjustBruteLoss(-50)
+ user.adjustFireLoss( -(50 - abs(heal_amt)) ) // no double dipping
+
+ // I want it to poison the user but I also think it'd be neat if they got their juice as well. But that cancels most of the damage out. So I dunno.
+ user.reagents?.add_reagent(/datum/reagent/fuel/unholywater, rand(6, 10))
+ user.reagents?.add_reagent(/datum/reagent/eldritch, rand(6, 10))
+ qdel(src)
+
+/obj/item/clothing/neck/heretic_focus/crimson_focus/examine(mob/user)
+ . = ..()
+
+ var/magic_dude
+ if(IS_CULTIST(user))
+ . += span_cult_bold("This focus will allow you to store one extra spell and halve the empowering time, alongside providing a small regenerative effect.")
+ magic_dude = TRUE
+ if(IS_HERETIC_OR_MONSTER(user))
+ . += span_notice("This focus will halve your spell cooldowns, alongside granting a small regenerative effect to any nearby heretics or monsters, including you.")
+ magic_dude = TRUE
+
+ if(magic_dude)
+ . += span_red("You can also squeeze it to recover a large amount of health quickly, at a cost...")
+
/obj/item/clothing/neck/eldritch_amulet
name = "Warm Eldritch Medallion"
desc = "A strange medallion. Peering through the crystalline surface, the world around you melts away. You see your own beating heart, and the pulsing of a thousand others."
diff --git a/code/modules/antagonists/heretic/items/keyring.dm b/code/modules/antagonists/heretic/items/keyring.dm
index dc1291bc03437..c0df68ec7cc3f 100644
--- a/code/modules/antagonists/heretic/items/keyring.dm
+++ b/code/modules/antagonists/heretic/items/keyring.dm
@@ -185,7 +185,7 @@
if(reference_resolved)
make_portal(user, reference_resolved, target)
- to_chat(user, span_notice("You use [src], to link [link] and [target] together."))
+ to_chat(user, span_notice("You use [src], to link [reference_resolved] and [target] together."))
link = null
balloon_alert(user, "link 2/2")
else
diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
index 9386611304292..b74569f1a1447 100644
--- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Ash.
+ * Spell names are in this language: OLD NORDIC
+ * Both are related: Nordic Mythology-Yggdrassil-Ash Tree Genus-Ash
*
* Goes as follows:
*
@@ -39,6 +41,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/ash)
route = PATH_ASH
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "ash_blade"
/datum/heretic_knowledge/ashen_grasp
name = "Grasp of Ash"
@@ -48,6 +52,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/ash_passage)
cost = 1
route = PATH_ASH
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_ash"
/datum/heretic_knowledge/ashen_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -80,6 +87,7 @@
spell_to_add = /datum/action/cooldown/spell/jaunt/ethereal_jaunt/ash
cost = 1
route = PATH_ASH
+ depth = 4
/datum/heretic_knowledge/mark/ash_mark
name = "Mark of Ash"
@@ -119,6 +127,8 @@
spell_to_add = /datum/action/cooldown/spell/charged/beam/fire_blast
cost = 1
route = PATH_ASH
+ depth = 7
+ research_tree_icon_frame = 7
/datum/heretic_knowledge/mad_mask
@@ -142,6 +152,9 @@
result_atoms = list(/obj/item/clothing/mask/madness_mask)
cost = 1
route = PATH_ASH
+ research_tree_icon_path = 'icons/obj/clothing/masks.dmi'
+ research_tree_icon_state = "mad_mask"
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/ash
name = "Fiery Blade"
@@ -150,6 +163,8 @@
His city, the people he swore to watch... and watch he did, as they all burnt to cinders."
next_knowledge = list(/datum/heretic_knowledge/spell/flame_birth)
route = PATH_ASH
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_ash"
/datum/heretic_knowledge/blade_upgrade/ash/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade)
if(source == target)
@@ -173,6 +188,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/fiery_rebirth
cost = 1
route = PATH_ASH
+ depth = 10
+ research_tree_icon_frame = 5
/datum/heretic_knowledge/ultimate/ash_final
name = "Ashlord's Rite"
@@ -187,6 +204,7 @@
for the Nightwatcher brought forth the rite to mankind! His gaze continues, as now I am one with the flames, \
WITNESS MY ASCENSION, THE ASHY LANTERN BLAZES ONCE MORE!"
route = PATH_ASH
+ ascension_achievement = /datum/award/achievement/misc/ash_ascension
/// A static list of all traits we apply on ascension.
var/static/list/traits_to_apply = list(
TRAIT_BOMBIMMUNE,
@@ -215,7 +233,7 @@
text = "[generate_heretic_text()] Fear the blaze, for the Ashlord, [user.real_name] has ascended! The flames shall consume all! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_ash.ogg',
- color_override = "pink",
+ color_override = "white",
)
var/datum/action/cooldown/spell/fire_sworn/circle_spell = new(user.mind)
@@ -233,6 +251,5 @@
var/datum/action/cooldown/spell/aoe/fiery_rebirth/fiery_rebirth = locate() in user.actions
fiery_rebirth?.cooldown_time *= 0.16
- user.client?.give_award(/datum/award/achievement/misc/ash_ascension, user)
if(length(traits_to_apply))
user.add_traits(traits_to_apply, MAGIC_TRAIT)
diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
index 6553353745517..357e789416d1d 100644
--- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Blades. Stab stab.
+ * Spell names are in this language: ARAMAIC
+ * Both are related: Aramaic-Damascus-Blade
*
* Goes as follows:
*
@@ -43,6 +45,8 @@
result_atoms = list(/obj/item/melee/sickly_blade/dark)
limit = 5 // It's the blade path, it's a given
route = PATH_BLADE
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "dark_blade"
/datum/heretic_knowledge/blade_grasp
name = "Grasp of the Blade"
@@ -52,6 +56,9 @@
next_knowledge = list(/datum/heretic_knowledge/blade_dance)
cost = 1
route = PATH_BLADE
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_blade"
/datum/heretic_knowledge/blade_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -111,6 +118,9 @@
)
cost = 1
route = PATH_BLADE
+ depth = 4
+ research_tree_icon_path = 'icons/mob/actions/actions_ecult.dmi'
+ research_tree_icon_state = "shatter"
/// Whether the counter-attack is ready or not.
/// Used instead of cooldowns, so we can give feedback when it's ready again
var/riposte_ready = TRUE
@@ -231,6 +241,7 @@
spell_to_add = /datum/action/cooldown/spell/realignment
cost = 1
route = PATH_BLADE
+ depth = 7
/// The amount of blood flow reduced per level of severity of gained bleeding wounds for Stance of the Torn Champion.
#define BLOOD_FLOW_PER_SEVEIRTY -1
@@ -251,6 +262,10 @@
)
cost = 1
route = PATH_BLADE
+ depth = 8
+ research_tree_icon_path = 'icons/effects/blood.dmi'
+ research_tree_icon_state = "suitblood"
+ research_tree_icon_dir = SOUTH
/// Whether we're currently in duelist stance, gaining certain buffs (low health)
var/in_duelist_stance = FALSE
@@ -310,6 +325,8 @@
a flurry of blades, neither hitting their mark, for the Champion was indomitable."
next_knowledge = list(/datum/heretic_knowledge/spell/furious_steel)
route = PATH_BLADE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_blade"
/// How much force do we apply to the offhand?
var/offand_force_decrement = 0
/// How much force was the last weapon we offhanded with? If it's different, we need to re-calculate the decrement
@@ -380,6 +397,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/projectile/furious_steel
cost = 1
route = PATH_BLADE
+ depth = 10
/datum/heretic_knowledge/ultimate/blade_final
name = "Maelstrom of Silver"
@@ -393,6 +411,7 @@
gain_text = "The Torn Champion is freed! I will become the blade reunited, and with my greater ambition, \
I AM UNMATCHED! A STORM OF STEEL AND SILVER IS UPON US! WITNESS MY ASCENSION!"
route = PATH_BLADE
+ ascension_achievement = /datum/award/achievement/misc/blade_ascension
/datum/heretic_knowledge/ultimate/blade_final/is_valid_sacrifice(mob/living/carbon/human/sacrifice)
. = ..()
@@ -409,7 +428,6 @@
sound = 'sound/ambience/antag/heretic/ascend_blade.ogg',
color_override = "pink",
)
- user.client?.give_award(/datum/award/achievement/misc/blade_ascension, user)
ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, name)
RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade))
user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, 1 MINUTES)
diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
index 6e22ebc37900a..8a94aada74a67 100644
--- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Cosmos.
+ * Spell names are in this language: SUMERIAN
+ * Both are related: Sumerian-Original-Primordial-Cosmic
*
* Goes as follows:
*
@@ -38,6 +40,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/cosmic)
route = PATH_COSMIC
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "cosmic_blade"
/datum/heretic_knowledge/cosmic_grasp
name = "Grasp of Cosmos"
@@ -48,6 +52,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/cosmic_runes)
cost = 1
route = PATH_COSMIC
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_cosmos"
/datum/heretic_knowledge/cosmic_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -78,6 +85,7 @@
spell_to_add = /datum/action/cooldown/spell/cosmic_rune
cost = 1
route = PATH_COSMIC
+ depth = 4
/datum/heretic_knowledge/mark/cosmic_mark
name = "Mark of Cosmos"
@@ -107,6 +115,7 @@
spell_to_add = /datum/action/cooldown/spell/touch/star_touch
cost = 1
route = PATH_COSMIC
+ depth = 7
/datum/heretic_knowledge/spell/star_blast
name = "Star Blast"
@@ -123,6 +132,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/projectile/star_blast
cost = 1
route = PATH_COSMIC
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/cosmic
name = "Cosmic Blade"
@@ -135,6 +145,8 @@
The blades now glistened with fragmented power. I fell to the ground and wept at the beast's feet."
next_knowledge = list(/datum/heretic_knowledge/spell/cosmic_expansion)
route = PATH_COSMIC
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_cosmos"
/// Storage for the second target.
var/datum/weakref/second_target
/// Storage for the third target.
@@ -233,6 +245,7 @@
spell_to_add = /datum/action/cooldown/spell/conjure/cosmic_expansion
cost = 1
route = PATH_COSMIC
+ depth = 10
/datum/heretic_knowledge/ultimate/cosmic_final
name = "Creators's Gift"
@@ -250,6 +263,7 @@
I closed my eyes with my head laid against their form. I was safe. \
WITNESS MY ASCENSION!"
route = PATH_COSMIC
+ ascension_achievement = /datum/award/achievement/misc/cosmic_ascension
/// A static list of command we can use with our mob.
var/static/list/star_gazer_commands = list(
/datum/pet_command/idle,
@@ -271,7 +285,7 @@
text = "[generate_heretic_text()] A Star Gazer has arrived into the station, [user.real_name] has ascended! This station is the domain of the Cosmos! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_cosmic.ogg',
- color_override = "pink",
+ color_override = "purple",
)
var/mob/living/basic/heretic_summon/star_gazer/star_gazer_mob = new /mob/living/basic/heretic_summon/star_gazer(loc)
star_gazer_mob.maxHealth = INFINITY
@@ -296,5 +310,3 @@
var/datum/action/cooldown/spell/conjure/cosmic_expansion/cosmic_expansion_spell = locate() in user.actions
cosmic_expansion_spell?.ascended = TRUE
-
- user.client?.give_award(/datum/award/achievement/misc/cosmic_ascension, user)
diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
index 4a7b2fd205297..e0b82651bc9d6 100644
--- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
@@ -5,6 +5,8 @@
/**
* # The path of Flesh.
+ * Spell names are in this language: LATIN
+ * Both are related: Latin-Rome-Hedonism-Flesh
*
* Goes as follows:
*
@@ -44,6 +46,8 @@
result_atoms = list(/obj/item/melee/sickly_blade/flesh)
limit = 3 // Bumped up so they can arm up their ghouls too.
route = PATH_FLESH
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "flesh_blade"
/datum/heretic_knowledge/limited_amount/starting/base_flesh/on_research(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -64,6 +68,9 @@
limit = 1
cost = 1
route = PATH_FLESH
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_flesh"
/datum/heretic_knowledge/limited_amount/flesh_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -137,6 +144,10 @@
limit = 2
cost = 1
route = PATH_FLESH
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "ghoul_voiceless"
+
+ depth = 4
/datum/heretic_knowledge/limited_amount/flesh_ghoul/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
. = ..()
@@ -227,6 +238,7 @@
spell_to_add = /datum/action/cooldown/spell/touch/flesh_surgery
cost = 1
route = PATH_FLESH
+ depth = 7
/datum/heretic_knowledge/summon/raw_prophet
name = "Raw Ritual"
@@ -250,6 +262,7 @@
cost = 1
route = PATH_FLESH
poll_ignore_define = POLL_IGNORE_RAW_PROPHET
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/flesh
name = "Bleeding Steel"
@@ -258,6 +271,8 @@
I finally began to understand. And then, blood rained from the heavens."
next_knowledge = list(/datum/heretic_knowledge/summon/stalker)
route = PATH_FLESH
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_flesh"
///What type of wound do we apply on hit
var/wound_type = /datum/wound/slash/flesh/severe
@@ -292,6 +307,7 @@
cost = 1
route = PATH_FLESH
poll_ignore_define = POLL_IGNORE_STALKER
+ depth = 10
/datum/heretic_knowledge/ultimate/flesh_final
name = "Priest's Final Hymn"
@@ -308,6 +324,7 @@
Reality will bend to THE LORD OF THE NIGHT or be unraveled! WITNESS MY ASCENSION!"
required_atoms = list(/mob/living/carbon/human = 4)
route = PATH_FLESH
+ ascension_achievement = /datum/award/achievement/misc/flesh_ascension
/datum/heretic_knowledge/ultimate/flesh_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
@@ -315,13 +332,12 @@
text = "[generate_heretic_text()] Ever coiling vortex. Reality unfolded. ARMS OUTREACHED, THE LORD OF THE NIGHT, [user.real_name] has ascended! Fear the ever twisting hand! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_flesh.ogg',
- color_override = "pink",
+ color_override = "red",
)
var/datum/action/cooldown/spell/shapeshift/shed_human_form/worm_spell = new(user.mind)
worm_spell.Grant(user)
- user.client?.give_award(/datum/award/achievement/misc/flesh_ascension, user)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
var/datum/heretic_knowledge/limited_amount/flesh_grasp/grasp_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_grasp)
diff --git a/code/modules/antagonists/heretic/knowledge/general_side.dm b/code/modules/antagonists/heretic/knowledge/general_side.dm
index 2dc2719227b1c..27f0e11b4467b 100644
--- a/code/modules/antagonists/heretic/knowledge/general_side.dm
+++ b/code/modules/antagonists/heretic/knowledge/general_side.dm
@@ -12,6 +12,9 @@
)
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_path = 'icons/mob/actions/actions_animal.dmi'
+ research_tree_icon_state = "gaze"
/datum/heretic_knowledge/reroll_targets/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
index 2807167d819fb..b238d6dd3c7f3 100644
--- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Lock.
+ * Spell names are in this language: EGYPTIAN
+ * Both are related: Egyptian-Mysteries-Secrets-Lock
*
* Goes as follows:
*
@@ -39,6 +41,8 @@
result_atoms = list(/obj/item/melee/sickly_blade/lock)
limit = 2
route = PATH_LOCK
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "key_blade"
/datum/heretic_knowledge/lock_grasp
name = "Grasp of Lock"
@@ -49,6 +53,9 @@
next_knowledge = list(/datum/heretic_knowledge/key_ring)
cost = 1
route = PATH_LOCK
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_lock"
/datum/heretic_knowledge/lock_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY, PROC_REF(on_secondary_mansus_grasp))
@@ -111,6 +118,9 @@
)
cost = 1
route = PATH_LOCK
+ research_tree_icon_path = 'icons/obj/card.dmi'
+ research_tree_icon_state = "card_gold"
+ depth = 4
/datum/heretic_knowledge/mark/lock_mark
name = "Mark of Lock"
@@ -140,6 +150,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/burglar_finesse)
cost = 1
route = PATH_LOCK
+ research_tree_icon_path = 'icons/obj/service/library.dmi'
+ research_tree_icon_state = "heretichandbook"
+ depth = 7
/datum/heretic_knowledge/spell/burglar_finesse
name = "Burglar's Finesse"
@@ -156,6 +169,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/burglar_finesse
cost = 1
route = PATH_LOCK
+ depth = 8
/datum/heretic_knowledge/blade_upgrade/flesh/lock //basically a chance-based weeping avulsion version of the former
name = "Opening Blade"
@@ -164,6 +178,8 @@
next_knowledge = list(/datum/heretic_knowledge/spell/caretaker_refuge)
route = PATH_LOCK
wound_type = /datum/wound/slash/flesh/critical
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_lock"
var/chance = 35
/datum/heretic_knowledge/blade_upgrade/flesh/lock/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade)
@@ -183,6 +199,7 @@
route = PATH_LOCK
spell_to_add = /datum/action/cooldown/spell/caretaker
cost = 1
+ depth = 10
/datum/heretic_knowledge/ultimate/lock_final
name = "Unlock the Labyrinth"
@@ -199,6 +216,7 @@
The Labyrinth will be Locked no more, and freedom will be ours! WITNESS US!"
required_atoms = list(/mob/living/carbon/human = 3)
route = PATH_LOCK
+ ascension_achievement = /datum/award/achievement/misc/lock_ascension
/datum/heretic_knowledge/ultimate/lock_final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
. = ..()
@@ -225,15 +243,13 @@
text = "Delta-class dimensional anomaly detec[generate_heretic_text()] Reality rended, torn. Gates open, doors open, [user.real_name] has ascended! Fear the tide! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_knock.ogg',
- color_override = "pink",
+ color_override = "yellow",
)
- user.client?.give_award(/datum/award/achievement/misc/lock_ascension, user)
// buffs
var/datum/action/cooldown/spell/shapeshift/eldritch/ascension/transform_spell = new(user.mind)
transform_spell.Grant(user)
- user.client?.give_award(/datum/award/achievement/misc/lock_ascension, user)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
var/datum/heretic_knowledge/blade_upgrade/flesh/lock/blade_upgrade = heretic_datum.get_knowledge(/datum/heretic_knowledge/blade_upgrade/flesh/lock)
blade_upgrade.chance += 30
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index 4b61648329214..5ba55b64058cb 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of Moon.
+ * Spell names are in this language: ANCIENT HEBREW
+ * Both are related: Ancient Hebrew-Moon Mysticism-Moon
*
* Goes as follows:
*
@@ -39,6 +41,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/moon)
route = PATH_MOON
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "moon_blade"
/datum/heretic_knowledge/base_moon/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
add_traits(user ,TRAIT_EMPATH, REF(src))
@@ -51,6 +55,9 @@
next_knowledge = list(/datum/heretic_knowledge/spell/moon_smile)
cost = 1
route = PATH_MOON
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_moon"
/datum/heretic_knowledge/moon_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -82,6 +89,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/moon_smile
cost = 1
route = PATH_MOON
+ depth = 4
/datum/heretic_knowledge/mark/moon_mark
name = "Mark of Moon"
@@ -107,6 +115,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/projectile/moon_parade
cost = 1
route = PATH_MOON
+ depth = 7
/datum/heretic_knowledge/moon_amulet
@@ -130,6 +139,10 @@
result_atoms = list(/obj/item/clothing/neck/heretic_focus/moon_amulet)
cost = 1
route = PATH_MOON
+ depth = 8
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "moon_amulette"
+ research_tree_icon_frame = 9
/datum/heretic_knowledge/blade_upgrade/moon
name = "Moonlight Blade"
@@ -137,6 +150,8 @@
gain_text = "His wit was sharp as a blade, cutting through the lie to bring us joy."
next_knowledge = list(/datum/heretic_knowledge/spell/moon_ringleader)
route = PATH_MOON
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_moon"
/datum/heretic_knowledge/blade_upgrade/moon/do_melee_effects(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade)
if(source == target)
@@ -164,6 +179,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/moon_ringleader
cost = 1
route = PATH_MOON
+ depth = 10
+ research_tree_icon_frame = 5
/datum/heretic_knowledge/ultimate/moon_final
name = "The Last Act"
@@ -176,6 +193,7 @@
for where the Ringleader had started the parade, I shall continue it unto the suns demise \
WITNESS MY ASCENSION, THE MOON SMILES ONCE MORE AND FOREVER MORE IT SHALL!"
route = PATH_MOON
+ ascension_achievement = /datum/award/achievement/misc/moon_ascension
/datum/heretic_knowledge/ultimate/moon_final/is_valid_sacrifice(mob/living/sacrifice)
@@ -193,10 +211,9 @@
The truth shall finally devour the lie! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_moon.ogg',
- color_override = "pink",
+ color_override = "blue",
)
- user.client?.give_award(/datum/award/achievement/misc/moon_ascension, user)
ADD_TRAIT(user, TRAIT_MADNESS_IMMUNE, REF(src))
user.mind.add_antag_datum(/datum/antagonist/lunatic/master)
RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life))
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index fe553c8b8c779..5e96119135f71 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -1,5 +1,6 @@
/**
* # The path of Rust.
+ * Spell names are in this language: OLD SLAVIC
*
* Goes as follows:
*
@@ -42,6 +43,8 @@
)
result_atoms = list(/obj/item/melee/sickly_blade/rust)
route = PATH_RUST
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "rust_blade"
/datum/heretic_knowledge/rust_fist
name = "Grasp of Rust"
@@ -52,6 +55,9 @@
next_knowledge = list(/datum/heretic_knowledge/rust_regen)
cost = 1
route = PATH_RUST
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_rust"
/datum/heretic_knowledge/rust_fist/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -73,7 +79,7 @@
SIGNAL_HANDLER
// Rusting an airlock causes it to lose power, mostly to prevent the airlock from shocking you.
- // This is a bit of a hack, but fixing this would require the enture wire cut/pulse system to be reworked.
+ // This is a bit of a hack, but fixing this would require the entire wire cut/pulse system to be reworked.
if(istype(target, /obj/machinery/door/airlock))
var/obj/machinery/door/airlock/airlock = target
airlock.loseMainPower()
@@ -93,58 +99,15 @@
)
cost = 1
route = PATH_RUST
+ research_tree_icon_path = 'icons/effects/eldritch.dmi'
+ research_tree_icon_state = "cloud_swirl"
+ depth = 4
/datum/heretic_knowledge/rust_regen/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
- RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life))
+ user.AddElement(/datum/element/leeching_walk)
/datum/heretic_knowledge/rust_regen/on_lose(mob/user, datum/antagonist/heretic/our_heretic)
- UnregisterSignal(user, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_LIFE))
-
-/*
- * Signal proc for [COMSIG_MOVABLE_MOVED].
- *
- * Checks if we should have baton resistance on the new turf.
- */
-/datum/heretic_knowledge/rust_regen/proc/on_move(mob/source, atom/old_loc, dir, forced, list/old_locs)
- SIGNAL_HANDLER
-
- var/turf/mover_turf = get_turf(source)
- if(HAS_TRAIT(mover_turf, TRAIT_RUSTY))
- ADD_TRAIT(source, TRAIT_BATON_RESISTANCE, type)
- return
-
- REMOVE_TRAIT(source, TRAIT_BATON_RESISTANCE, type)
-
-/**
- * Signal proc for [COMSIG_LIVING_LIFE].
- *
- * Gradually heals the heretic ([source]) on rust,
- * including baton knockdown and stamina damage.
- */
-/datum/heretic_knowledge/rust_regen/proc/on_life(mob/living/source, seconds_per_tick, times_fired)
- SIGNAL_HANDLER
-
- var/turf/our_turf = get_turf(source)
- if(!HAS_TRAIT(our_turf, TRAIT_RUSTY))
- return
-
- // Heals all damage + Stamina
- var/need_mob_update = FALSE
- need_mob_update += source.adjustBruteLoss(-3, updating_health = FALSE)
- need_mob_update += source.adjustFireLoss(-3, updating_health = FALSE)
- need_mob_update += source.adjustToxLoss(-3, updating_health = FALSE, forced = TRUE) // Slimes are people too
- need_mob_update += source.adjustOxyLoss(-1.5, updating_health = FALSE)
- need_mob_update += source.adjustStaminaLoss(-10, updating_stamina = FALSE)
- if(need_mob_update)
- source.updatehealth()
- // Reduces duration of stuns/etc
- source.AdjustAllImmobility(-0.5 SECONDS)
- // Heals blood loss
- if(source.blood_volume < BLOOD_VOLUME_NORMAL)
- source.blood_volume += 2.5 * seconds_per_tick
- // Slowly regulates your body temp
- source.adjust_bodytemperature((source.get_body_temp_normal() - source.bodytemperature)/5)
+ user.RemoveElement(/datum/element/leeching_walk)
/datum/heretic_knowledge/mark/rust_mark
name = "Mark of Rust"
@@ -174,6 +137,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/rust_construction
cost = 1
route = PATH_RUST
+ depth = 7
/datum/heretic_knowledge/spell/area_conversion
name = "Aggressive Spread"
@@ -191,6 +155,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/rust_conversion
cost = 1
route = PATH_RUST
+ depth = 8
+ research_tree_icon_frame = 5
/datum/heretic_knowledge/spell/area_conversion/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -203,6 +169,8 @@
The heavy rust weights it down. You stare deeply into it. The Rusted Hills call for you, now."
next_knowledge = list(/datum/heretic_knowledge/spell/entropic_plume)
route = PATH_RUST
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_rust"
/datum/heretic_knowledge/blade_upgrade/rust/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -227,6 +195,7 @@
spell_to_add = /datum/action/cooldown/spell/cone/staggered/entropic_plume
cost = 1
route = PATH_RUST
+ depth = 10
/datum/heretic_knowledge/spell/entropic_plume/on_gain(mob/user)
. = ..()
@@ -243,6 +212,7 @@
gain_text = "Champion of rust. Corruptor of steel. Fear the dark, for the RUSTBRINGER has come! \
The Blacksmith forges ahead! Rusted Hills, CALL MY NAME! WITNESS MY ASCENSION!"
route = PATH_RUST
+ ascension_achievement = /datum/award/achievement/misc/rust_ascension
/// If TRUE, then immunities are currently active.
var/immunities_active = FALSE
/// A typepath to an area that we must finish the ritual in.
@@ -288,7 +258,7 @@
text = "[generate_heretic_text()] Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_rust.ogg',
- color_override = "pink",
+ color_override = "brown",
)
trigger(loc)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
index 1d2be465b3026..8da3b90494899 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -16,6 +16,9 @@
cost = 0
priority = MAX_KNOWLEDGE_PRIORITY // Should be at the top
route = PATH_START
+ research_tree_icon_path = 'icons/effects/eldritch.dmi'
+ research_tree_icon_state = "eye_close"
+ research_tree_icon_frame = 1
/// How many targets do we generate?
var/num_targets_to_generate = 5
/// Whether we've generated a heretic sacrifice z-level yet, from any heretic.
@@ -80,8 +83,11 @@
// If we have targets, we can check to see if we can do a sacrifice
// Let's remove any humans in our atoms list that aren't a sac target
for(var/mob/living/carbon/human/sacrifice in atoms)
- // If the mob's not in soft crit or worse, or isn't one of the sacrifices, remove it from the list
- if(sacrifice.stat < SOFT_CRIT || !(sacrifice in heretic_datum.sac_targets))
+ // If the mob's not in soft crit or worse, remove from list
+ if(sacrifice.stat < SOFT_CRIT)
+ atoms -= sacrifice
+ // Otherwise if it's neither a target nor a cultist, remove it
+ else if(!(sacrifice in heretic_datum.sac_targets) && !IS_CULTIST(sacrifice))
atoms -= sacrifice
// Finally, return TRUE if we have a target in the list
@@ -94,7 +100,9 @@
/datum/heretic_knowledge/hunt_and_sacrifice/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
- if(!LAZYLEN(heretic_datum.sac_targets))
+ // Force it to work if the sacrifice is a cultist, even if there's no targets.
+ var/mob/living/carbon/human/sac = selected_atoms[1]
+ if(!LAZYLEN(heretic_datum.sac_targets) && !IS_CULTIST(sac))
if(obtain_targets(user, heretic_datum = heretic_datum))
return TRUE
else
@@ -183,34 +191,128 @@
* * selected_atoms - a list of all atoms chosen. Should be (at least) one human.
* * loc - the turf the sacrifice is occuring on
*/
-/datum/heretic_knowledge/hunt_and_sacrifice/proc/sacrifice_process(mob/living/user, list/selected_atoms)
+/datum/heretic_knowledge/hunt_and_sacrifice/proc/sacrifice_process(mob/living/user, list/selected_atoms, turf/loc)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
var/mob/living/carbon/human/sacrifice = locate() in selected_atoms
if(!sacrifice)
CRASH("[type] sacrifice_process didn't have a human in the atoms list. How'd it make it so far?")
- if(!(sacrifice in heretic_datum.sac_targets))
- CRASH("[type] sacrifice_process managed to get a non-target human. This is incorrect.")
+ if(!(sacrifice in heretic_datum.sac_targets) && !IS_CULTIST(sacrifice))
+ CRASH("[type] sacrifice_process managed to get a non-target, non-cult human. This is incorrect.")
if(sacrifice.mind)
LAZYADD(target_blacklist, sacrifice.mind)
heretic_datum.remove_sacrifice_target(sacrifice)
+
var/feedback = "Your patrons accept your offer"
var/sac_job_flag = sacrifice.mind?.assigned_role?.job_flags | sacrifice.last_mind?.assigned_role?.job_flags
- if(sac_job_flag & JOB_HEAD_OF_STAFF)
- heretic_datum.knowledge_points++
+ var/datum/antagonist/cult/cultist_datum = IS_CULTIST(sacrifice)
+ // Heads give 3 points, cultists give 1 point (and a special reward), normal sacrifices give 2 points.
+ heretic_datum.total_sacrifices++
+ if((sac_job_flag & JOB_HEAD_OF_STAFF))
+ heretic_datum.knowledge_points += 3
heretic_datum.high_value_sacrifices++
feedback += " graciously"
+ else if(cultist_datum)
+ heretic_datum.knowledge_points += 1
+ grant_reward(user, sacrifice, loc)
+ // easier to read
+ var/rewards_given = heretic_datum.rewards_given
+ // Chance for it to send a warning to cultists, higher with each reward. Stops after 5 because they probably got the hint by then.
+ if(prob(min(15 * rewards_given)) && (rewards_given <= 5))
+ for(var/datum/mind/mind as anything in cultist_datum.cult_team.members)
+ if(mind.current)
+ SEND_SOUND(mind.current, 'sound/magic/clockwork/narsie_attack.ogg')
+ var/message = span_narsie("A vile heretic has ") + \
+ span_cult_large(span_hypnophrase("sacrificed")) + \
+ span_narsie(" one of our own. Destroy and sacrifice the infidel before it claims more!")
+ to_chat(mind.current, message)
+ // he(retic) gets a warn too
+ var/message = span_cult_bold("You feel that your action has attracted") + \
+ span_cult_bold_italic(" attention.")
+ to_chat(user, message)
+ return
+ else
+ heretic_datum.knowledge_points += 2
to_chat(user, span_hypnophrase("[feedback]."))
- heretic_datum.total_sacrifices++
- heretic_datum.knowledge_points += 2
+ if(!begin_sacrifice(sacrifice))
+ disembowel_target(sacrifice)
+ return
sacrifice.apply_status_effect(/datum/status_effect/heretic_curse, user)
- if(!begin_sacrifice(sacrifice))
- disembowel_target(sacrifice)
+
+/datum/heretic_knowledge/hunt_and_sacrifice/proc/grant_reward(mob/living/user, mob/living/sacrifice, turf/loc)
+
+ // Visible and audible encouragement!
+ to_chat(user, span_big(span_hypnophrase("A servant of the Sanguine Apostate!")))
+ to_chat(user, span_hierophant("Your patrons are rapturous!"))
+ playsound(sacrifice, 'sound/magic/disintegrate.ogg', 75, TRUE)
+
+ // Drop all items and splatter them around messily.
+ var/list/dustee_items = sacrifice.unequip_everything()
+ for(var/obj/item/loot as anything in dustee_items)
+ loot.throw_at(get_step_rand(sacrifice), 2, 4, user, TRUE)
+
+ // The loser is DUSTED.
+ sacrifice.dust(TRUE, TRUE)
+
+ // Increase reward counter
+ var/datum/antagonist/heretic/antag = IS_HERETIC(user)
+ antag.rewards_given++
+
+ // We limit the amount so the heretic doesn't just turn into a frickin' god (early)
+ to_chat(user, span_hierophant("You feel the rotten energies of the infidel warp and twist, mixing with that of your own..."))
+ if(prob(8 * antag.rewards_given))
+ to_chat(user, span_hierophant("Faint, dark red sparks flit around the dust, then fade. It looks like your patrons weren't able to fashion something out of it."))
+ return
+
+ // Cool effect for the rune as well as the item
+ var/obj/effect/heretic_rune/rune = locate() in range(2, user)
+ if(rune)
+ rune.gender_reveal(
+ outline_color = COLOR_CULT_RED,
+ ray_color = null,
+ do_float = FALSE,
+ do_layer = FALSE,
+ )
+
+ addtimer(CALLBACK(src, PROC_REF(deposit_reward), user, loc, null, rune), 5 SECONDS)
+
+
+/datum/heretic_knowledge/hunt_and_sacrifice/proc/deposit_reward(mob/user, turf/loc, loop = 0, obj/rune)
+ if(loop > 5) // Max limit for retrying a reward
+ return
+ // Remove the rays, we don't need them anymore.
+ rune?.remove_filter("reward_outline")
+ playsound(loc, 'sound/magic/repulse.ogg', 75, TRUE)
+ var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ ASSERT(heretic_datum)
+ // This list will be almost identical to unlocked_heretic_items, with the same keys, the difference being the values will be 1 to 5.
+ var/list/rewards = heretic_datum.unlocked_heretic_items.Copy()
+ // We will make it increasingly less likely to get a reward if you've already got it
+ for(var/possible_reward in heretic_datum.unlocked_heretic_items)
+ var/amount_already_awarded = heretic_datum.unlocked_heretic_items[possible_reward]
+ rewards[possible_reward] = min(5 - (amount_already_awarded * 2), 1)
+
+ var/atom/reward = pick_weight(rewards)
+ reward = new reward(loc)
+
+ if(isliving(reward))
+ if(summon_ritual_mob(user, loc, reward) == FALSE)
+ qdel(reward)
+ deposit_reward(user, loc, loop++, rune) // If no ghosts, try again until limit is hit
+ return
+
+ else if(isitem(reward))
+ var/obj/item/item_reward = reward
+ item_reward.gender_reveal(outline_color = null, ray_color = COLOR_CULT_RED)
+
+ ASSERT(reward)
+
+ return reward
/**
* This proc is called from [proc/sacrifice_process] after the heretic successfully sacrifices [sac_target].)
diff --git a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
index f933bbfda1d26..758ee0548d5fc 100644
--- a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
@@ -16,6 +16,9 @@
result_atoms = list(/obj/item/clothing/neck/eldritch_amulet)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "eye_medalion"
+ depth = 4
/datum/heretic_knowledge/curse/paralysis
name = "Curse of Paralysis"
@@ -37,6 +40,9 @@
curse_color = "#f19a9a"
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "curse_paralysis"
+ depth = 8
/datum/heretic_knowledge/curse/paralysis/curse(mob/living/carbon/human/chosen_mob, boosted = FALSE)
if(chosen_mob.usable_legs <= 0) // What're you gonna do, curse someone who already can't walk?
@@ -75,6 +81,7 @@
cost = 1
route = PATH_SIDE
poll_ignore_define = POLL_IGNORE_ASH_SPIRIT
+ depth = 10
/datum/heretic_knowledge/summon/ashy/cleanup_atoms(list/selected_atoms)
var/obj/item/bodypart/head/ritual_head = locate() in selected_atoms
diff --git a/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm b/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm
index e8c14d16abeca..3a0f17ed48391 100644
--- a/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_blade_rust.dm
@@ -16,11 +16,15 @@
result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/eldritch)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/clothing/suits/armor.dmi'
+ research_tree_icon_state = "eldritch_armor"
+ research_tree_icon_frame = 12
+ depth = 4
/datum/heretic_knowledge/crucible
name = "Mawed Crucible"
desc = "Allows you to transmute a portable water tank and a table to create a Mawed Crucible. \
- The Mawed Crubile can brew powerful potions for combat and utility, but must be fed bodyparts and organs between uses."
+ The Mawed Crucible can brew powerful potions for combat and utility, but must be fed bodyparts and organs between uses."
gain_text = "This is pure agony. I wasn't able to summon the figure of the Aristocrat, \
but with the Priest's attention I stumbled upon a different recipe..."
next_knowledge = list(
@@ -34,6 +38,9 @@
result_atoms = list(/obj/structure/destructible/eldritch_crucible)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "crucible"
+ depth = 8
/datum/heretic_knowledge/rifle
name = "Lionhunter's Rifle"
@@ -43,7 +50,7 @@
These shots function as normal, albeit weak high caliber mutitions when fired from \
close range or at inanimate objects. You can aim the rifle at distant foes, \
causing the shot to deal massively increased damage and hone in on them."
- gain_text = "I met an old man in an anique shop who wielded a very unusual weapon. \
+ gain_text = "I met an old man in an antique shop who wielded a very unusual weapon. \
I could not purchase it at the time, but they showed me how they made it ages ago."
next_knowledge = list(
/datum/heretic_knowledge/duel_stance,
@@ -59,9 +66,12 @@
result_atoms = list(/obj/item/gun/ballistic/rifle/lionhunter)
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_path = 'icons/obj/weapons/guns/ballistic.dmi'
+ research_tree_icon_state = "goldrevolver"
/datum/heretic_knowledge/rifle_ammo
- name = "Lionhunter Rifle Ammunition (free)"
+ name = "Lionhunter Rifle Ammunition"
desc = "Allows you to transmute 3 ballistic ammo casings (used or unused) of any caliber, \
including shotgun shot, with any animal hide to create an extra clip of ammunition for the Lionhunter Rifle."
gain_text = "The weapon came with three rough iron balls, intended to be used as ammunition. \
@@ -74,6 +84,9 @@
result_atoms = list(/obj/item/ammo_box/strilka310/lionhunter)
cost = 0
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/weapons/guns/ammo.dmi'
+ research_tree_icon_state = "310_strip"
+ depth = 8
/// A list of calibers that the ritual will deny. Only ballistic calibers are allowed.
var/static/list/caliber_blacklist = list(
CALIBER_LASER,
@@ -107,3 +120,4 @@
spell_to_add = /datum/action/cooldown/mob_cooldown/charge/rust
cost = 1
route = PATH_SIDE
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm b/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm
index 14a003ce11c0b..1a08236aee64d 100644
--- a/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_cosmos_ash.dm
@@ -19,6 +19,8 @@
cost = 1
route = PATH_SIDE
poll_ignore_define = POLL_IGNORE_FIRE_SHARK
+ depth = 4
+ research_tree_icon_dir = EAST
/datum/heretic_knowledge/spell/space_phase
name = "Space Phase"
@@ -32,6 +34,8 @@
spell_to_add = /datum/action/cooldown/spell/jaunt/space_crawl
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_frame = 6
/datum/heretic_knowledge/eldritch_coin
name = "Eldritch Coin"
@@ -51,3 +55,6 @@
result_atoms = list(/obj/item/coin/eldritch)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/economy.dmi'
+ research_tree_icon_state = "coin_heretic"
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm b/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm
index 4a315575d61b7..a958ab3f272bb 100644
--- a/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_flesh_void.dm
@@ -19,6 +19,9 @@
result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/void)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/clothing/suits/armor.dmi'
+ research_tree_icon_state = "void_cloak"
+ depth = 4
/datum/heretic_knowledge/spell/blood_siphon
name = "Blood Siphon"
@@ -32,6 +35,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/blood_siphon
cost = 1
route = PATH_SIDE
+ depth = 8
/datum/heretic_knowledge/spell/cleave
name = "Blood Cleave"
@@ -46,3 +50,4 @@
spell_to_add = /datum/action/cooldown/spell/pointed/cleave
cost = 1
route = PATH_SIDE
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm b/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm
index 74013f2b0bd1d..706b83abac7b3 100644
--- a/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_lock_flesh.dm
@@ -12,6 +12,7 @@
spell_to_add = /datum/action/cooldown/spell/aoe/wave_of_desperation
cost = 1
route = PATH_SIDE
+ depth = 8
/datum/heretic_knowledge/spell/apetra_vulnera
name = "Apetra Vulnera"
@@ -26,3 +27,4 @@
spell_to_add = /datum/action/cooldown/spell/pointed/apetra_vulnera
cost = 1
route = PATH_SIDE
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm b/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm
index ac56b9ba24006..1e265b974980f 100644
--- a/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm
@@ -13,6 +13,7 @@
spell_to_add = /datum/action/cooldown/spell/pointed/mind_gate
cost = 1
route = PATH_SIDE
+ depth = 4
/datum/heretic_knowledge/unfathomable_curio
name = "Unfathomable Curio"
@@ -33,6 +34,9 @@
result_atoms = list(/obj/item/storage/belt/unfathomable_curio)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/clothing/belts.dmi'
+ research_tree_icon_state = "unfathomable_curio"
+ depth = 8
/datum/heretic_knowledge/painting
name = "Unsealed Arts"
@@ -53,6 +57,9 @@
result_atoms = list(/obj/item/canvas)
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/obj/signs.dmi'
+ research_tree_icon_state = "eldritch_painting_weeping"
+ depth = 8
/datum/heretic_knowledge/painting/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
if(locate(/obj/item/organ/internal/eyes) in atoms)
diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
index 56999243b5de3..11918c66a2906 100644
--- a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
@@ -17,6 +17,9 @@
result_atoms = list(/obj/item/reagent_containers/cup/beaker/eldritch)
cost = 1
route = PATH_SIDE
+ depth = 4
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "eldritch_flask"
/datum/heretic_knowledge/entropy_pulse
name = "Pulse of Entropy"
@@ -28,6 +31,10 @@
)
cost = 0
route = PATH_SIDE
+ research_tree_icon_path = 'icons/mob/actions/actions_ecult.dmi'
+ research_tree_icon_state = "corrode"
+ research_tree_icon_frame = 10
+ depth = 4
var/rusting_range = 8
/datum/heretic_knowledge/entropy_pulse/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
@@ -60,6 +67,9 @@
curse_color = "#c1ffc9"
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "curse_corrosion"
+ depth = 8
/datum/heretic_knowledge/curse/corrosion/curse(mob/living/carbon/human/chosen_mob, boosted = FALSE)
to_chat(chosen_mob, span_danger("You feel very ill..."))
@@ -92,6 +102,7 @@
cost = 1
route = PATH_SIDE
poll_ignore_define = POLL_IGNORE_RUST_SPIRIT
+ depth = 8
/datum/heretic_knowledge/summon/rusty/cleanup_atoms(list/selected_atoms)
var/obj/item/bodypart/head/ritual_head = locate() in selected_atoms
diff --git a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm
index e044eee8619ef..56945262e3cb0 100644
--- a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm
@@ -23,6 +23,9 @@
limit = 1
cost = 1
route = PATH_SIDE
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "ghoul_shattered"
+ depth = 4
/datum/heretic_knowledge/limited_amount/risen_corpse/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
. = ..()
@@ -139,6 +142,9 @@
result_atoms = list(/obj/item/melee/rune_carver)
cost = 1
route = PATH_SIDE
+ depth = 8
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "rune_carver"
/datum/heretic_knowledge/summon/maid_in_mirror
name = "Maid in the Mirror"
@@ -162,3 +168,4 @@
route = PATH_SIDE
mob_to_summon = /mob/living/basic/heretic_summon/maid_in_the_mirror
poll_ignore_define = POLL_IGNORE_MAID_IN_MIRROR
+ depth = 10
diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
index 50b57fd9e96b4..7cb3b82a39ac2 100644
--- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
@@ -1,4 +1,5 @@
// Heretic starting knowledge.
+// Default heretic language is Ancient Greek, because, uh, they're like ancient and shit.
/// Global list of all heretic knowledge that have route = PATH_START. List of PATHS.
GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
@@ -48,6 +49,9 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
cost = 0
priority = MAX_KNOWLEDGE_PRIORITY - 1 // Knowing how to remake your heart is important
route = PATH_START
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "living_heart"
+ research_tree_icon_frame = 1
/// The typepath of the organ type required for our heart.
var/required_organ_type = /obj/item/organ/internal/heart
@@ -204,6 +208,8 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
cost = 0
priority = MAX_KNOWLEDGE_PRIORITY - 2 // Not as important as making a heart or sacrificing, but important enough.
route = PATH_START
+ research_tree_icon_path = 'icons/obj/clothing/neck.dmi'
+ research_tree_icon_state = "eldritch_necklace"
/datum/heretic_knowledge/spell/cloak_of_shadows
name = "Cloak of Shadow"
@@ -238,6 +244,8 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
route = PATH_START
priority = MAX_KNOWLEDGE_PRIORITY - 3 // Least priority out of the starting knowledges, as it's an optional boon.
var/static/list/non_mob_bindings = typecacheof(list(/obj/item/stack/sheet/leather, /obj/item/stack/sheet/animalhide))
+ research_tree_icon_path = 'icons/obj/antags/eldritch.dmi'
+ research_tree_icon_state = "book"
/datum/heretic_knowledge/codex_cicatrix/parse_required_item(atom/item_path, number_of_things)
if(item_path == /obj/item/pen)
@@ -300,21 +308,30 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
gain_text = "Under the soft glow of unreason there is a beast that stalks the night. I shall bring it forth and let it enter my presence. It will feast upon my amibitions and leave knowledge in its wake."
route = PATH_START
required_atoms = list()
+ research_tree_icon_path = 'icons/mob/actions/actions_animal.dmi'
+ research_tree_icon_state = "god_transmit"
/datum/heretic_knowledge/feast_of_owls/can_be_invoked(datum/antagonist/heretic/invoker)
return !invoker.feast_of_owls
/datum/heretic_knowledge/feast_of_owls/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
+ //amount of research points granted
+ var/reward = 5
var/alert = tgui_alert(user,"Do you really want to forsake your ascension? This action cannot be reverted.", "Feast of Owls", list("Yes I'm sure", "No"), 30 SECONDS)
if( alert != "Yes I'm sure")
return FALSE
- user.set_temp_blindness(5 SECONDS)
- user.AdjustParalyzed(5 SECONDS)
+ user.set_temp_blindness(reward SECONDS)
+ user.AdjustParalyzed(reward SECONDS)
+ user.playsound_local(get_turf(user), 'sound/ambience/antag/heretic/heretic_gain_intense.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
- for(var/i in 0 to 4)
+ for(var/i in 1 to reward)
user.emote("scream")
playsound(loc, 'sound/items/eatfood.ogg', 100, TRUE)
heretic_datum.knowledge_points++
+ to_chat(user, span_danger("You feel something invisible tearing away at your very essence!"))
+ user.do_jitter_animation()
sleep(1 SECONDS)
- to_chat(user,span_danger("You feel different..."))
heretic_datum.feast_of_owls = TRUE
+ to_chat(user, span_danger(span_big("Your ambition is ravaged, but something powerful remains in its wake...")))
+ var/drain_message = pick(strings(HERETIC_INFLUENCE_FILE, "drain_message"))
+ to_chat(user, span_hypnophrase(span_big("[drain_message]")))
diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm
index da1864f87dbc5..482de8184401b 100644
--- a/code/modules/antagonists/heretic/knowledge/void_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm
@@ -1,5 +1,7 @@
/**
* # The path of VOID.
+ * Spell names are in this language: PALI
+ * Both are related: Pali-Buddhism-Nothingness-Void
*
* Goes as follows:
*
@@ -37,6 +39,8 @@
required_atoms = list(/obj/item/knife = 1)
result_atoms = list(/obj/item/melee/sickly_blade/void)
route = PATH_VOID
+ research_tree_icon_path = 'icons/obj/weapons/khopesh.dmi'
+ research_tree_icon_state = "void_blade"
/datum/heretic_knowledge/limited_amount/starting/base_void/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
if(!isopenturf(loc))
@@ -58,6 +62,9 @@
next_knowledge = list(/datum/heretic_knowledge/cold_snap)
cost = 1
route = PATH_VOID
+ depth = 3
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "grasp_void"
/datum/heretic_knowledge/void_grasp/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp))
@@ -88,6 +95,9 @@
)
cost = 1
route = PATH_VOID
+ research_tree_icon_path = 'icons/effects/effects.dmi'
+ research_tree_icon_state = "the_freezer"
+ depth = 4
/datum/heretic_knowledge/cold_snap/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
user.add_traits(list(TRAIT_NOBREATH, TRAIT_RESISTCOLD), type)
@@ -119,6 +129,7 @@
spell_to_add = /datum/action/cooldown/spell/cone/staggered/cone_of_cold/void
cost = 1
route = PATH_VOID
+ depth = 7
/datum/heretic_knowledge/spell/void_phase
name = "Void Phase"
@@ -135,6 +146,8 @@
spell_to_add = /datum/action/cooldown/spell/pointed/void_phase
cost = 1
route = PATH_VOID
+ depth = 8
+ research_tree_icon_frame = 7
/datum/heretic_knowledge/blade_upgrade/void
name = "Seeking Blade"
@@ -142,6 +155,8 @@
gain_text = "Fleeting memories, fleeting feet. I mark my way with frozen blood upon the snow. Covered and forgotten."
next_knowledge = list(/datum/heretic_knowledge/spell/void_pull)
route = PATH_VOID
+ research_tree_icon_path = 'icons/ui_icons/antags/heretic/knowledge.dmi'
+ research_tree_icon_state = "blade_upgrade_void"
/datum/heretic_knowledge/blade_upgrade/void/do_ranged_effects(mob/living/user, mob/living/target, obj/item/melee/sickly_blade/blade)
if(!target.has_status_effect(/datum/status_effect/eldritch))
@@ -168,6 +183,8 @@
spell_to_add = /datum/action/cooldown/spell/aoe/void_pull
cost = 1
route = PATH_VOID
+ depth = 10
+ research_tree_icon_frame = 6
/datum/heretic_knowledge/ultimate/void_final
name = "Waltz at the End of Time"
@@ -180,6 +197,7 @@
The Aristocrat stands before me, beckoning. We will play a waltz to the whispers of dying reality, \
as the world is destroyed before our eyes. The void will return all to nothing, WITNESS MY ASCENSION!"
route = PATH_VOID
+ ascension_achievement = /datum/award/achievement/misc/void_ascension
///soundloop for the void theme
var/datum/looping_sound/void_loop/sound_loop
///Reference to the ongoing voidstrom that surrounds the heretic
@@ -203,9 +221,8 @@
text = "[generate_heretic_text()] The nobleman of void [user.real_name] has arrived, stepping along the Waltz that ends worlds! [generate_heretic_text()]",
title = "[generate_heretic_text()]",
sound = 'sound/ambience/antag/heretic/ascend_void.ogg',
- color_override = "pink",
+ color_override = "blue",
)
- user.client?.give_award(/datum/award/achievement/misc/void_ascension, user)
ADD_TRAIT(user, TRAIT_RESISTLOWPRESSURE, MAGIC_TRAIT)
// Let's get this show on the road!
diff --git a/code/modules/antagonists/heretic/magic/aggressive_spread.dm b/code/modules/antagonists/heretic/magic/aggressive_spread.dm
index fedc30193ed48..0c14550f0b269 100644
--- a/code/modules/antagonists/heretic/magic/aggressive_spread.dm
+++ b/code/modules/antagonists/heretic/magic/aggressive_spread.dm
@@ -10,14 +10,23 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "A'GRSV SPR'D"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Agresiv'noe rasprostra-neniye!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
aoe_radius = 2
/datum/action/cooldown/spell/aoe/rust_conversion/get_things_to_cast_on(atom/center)
- return RANGE_TURFS(aoe_radius, center)
+
+ var/list/things_to_convert = RANGE_TURFS(aoe_radius, center)
+
+ // Also converts things right next to you.
+ for(var/atom/movable/nearby_movable in view(1, center))
+ if(nearby_movable == owner || !isstructure(nearby_movable) )
+ continue
+ things_to_convert += nearby_movable
+
+ return things_to_convert
/datum/action/cooldown/spell/aoe/rust_conversion/cast_on_thing_in_aoe(turf/victim, mob/living/caster)
// We have less chance of rusting stuff that's further
@@ -27,9 +36,11 @@
if(prob(chance_of_not_rusting))
return
- caster.do_rust_heretic_act(victim)
+ if(ismob(caster))
+ caster.do_rust_heretic_act(victim)
+ else
+ victim.rust_heretic_act()
-/datum/action/cooldown/spell/aoe/rust_conversion/small
- name = "Rust Conversion"
- desc = "Spreads rust onto nearby surfaces."
- aoe_radius = 2
+/datum/action/cooldown/spell/aoe/rust_conversion/construct
+ name = "Construct Spread"
+ cooldown_time = 15 SECONDS
diff --git a/code/modules/antagonists/heretic/magic/apetravulnera.dm b/code/modules/antagonists/heretic/magic/apetravulnera.dm
index e80d08911848c..eedef71f4b6c8 100644
--- a/code/modules/antagonists/heretic/magic/apetravulnera.dm
+++ b/code/modules/antagonists/heretic/magic/apetravulnera.dm
@@ -10,8 +10,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "AP'TRA VULN'RA!"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Shea' shen-eh!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cast_range = 4
diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm
index 0d8ca8da4f1c6..70422a7c48a37 100644
--- a/code/modules/antagonists/heretic/magic/ash_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 70 SECONDS
- invocation = "FL'MS"
+ invocation = "EID'R-ELDR!!!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
@@ -72,8 +72,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "C'SC'DE"
- invocation_type = INVOCATION_WHISPER
+ invocation = "ILLA-LASARA'FOSS!!!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
/// The radius the flames will go around the caster.
@@ -112,7 +112,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 300
- invocation = "F'RE"
+ invocation = "Eld'sky!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
@@ -129,16 +129,17 @@
INVOKE_ASYNC(src, PROC_REF(fire_line), owner, line_target(offset, flame_line_length, target, owner))
/datum/action/cooldown/spell/pointed/ash_beams/proc/line_target(offset, range, atom/at, atom/user)
+ var/turf/user_loc = get_turf(user)
if(!at)
return
- var/angle = ATAN2(at.x - user.x, at.y - user.y) + offset
+ var/angle = ATAN2(at.x - user_loc.x, at.y - user_loc.y) + offset
var/turf/T = get_turf(user)
for(var/i in 1 to range)
- var/turf/check = locate(user.x + cos(angle) * i, user.y + sin(angle) * i, user.z)
+ var/turf/check = locate(user_loc.x + cos(angle) * i, user_loc.y + sin(angle) * i, user_loc.z)
if(!check)
break
T = check
- return (get_line(user, T) - get_turf(user))
+ return (get_line(user_loc, T) - user_loc)
/datum/action/cooldown/spell/pointed/ash_beams/proc/fire_line(atom/source, list/turfs)
var/list/hit_list = list()
diff --git a/code/modules/antagonists/heretic/magic/ash_jaunt.dm b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
index 41242063a9098..4f8c59d635145 100644
--- a/code/modules/antagonists/heretic/magic/ash_jaunt.dm
+++ b/code/modules/antagonists/heretic/magic/ash_jaunt.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "ASH'N P'SSG'"
+ invocation = "Askgraar' goetur!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/blood_cleave.dm b/code/modules/antagonists/heretic/magic/blood_cleave.dm
index d5317f23e344b..b3370a3ccc614 100644
--- a/code/modules/antagonists/heretic/magic/blood_cleave.dm
+++ b/code/modules/antagonists/heretic/magic/blood_cleave.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "CL'VE!"
+ invocation = "Fer're!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/blood_siphon.dm b/code/modules/antagonists/heretic/magic/blood_siphon.dm
index 1e3d6258826d4..6280353a072a5 100644
--- a/code/modules/antagonists/heretic/magic/blood_siphon.dm
+++ b/code/modules/antagonists/heretic/magic/blood_siphon.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "FL'MS O'ET'RN'ITY."
+ invocation = "Sanguis suctio!"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/burglar_finesse.dm b/code/modules/antagonists/heretic/magic/burglar_finesse.dm
index 7bb6960354ec7..c5264119bb48e 100644
--- a/code/modules/antagonists/heretic/magic/burglar_finesse.dm
+++ b/code/modules/antagonists/heretic/magic/burglar_finesse.dm
@@ -9,7 +9,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 40 SECONDS
- invocation = "Y'O'K!"
+ invocation = "Khenem"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
@@ -26,7 +26,7 @@
return FALSE
var/obj/storage_item = locate(/obj/item/storage/backpack) in cast_on.contents
-
+
if(isnull(storage_item))
return FALSE
diff --git a/code/modules/antagonists/heretic/magic/cosmic_expansion.dm b/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
index 3fb197d392cb0..6869dc0df51c0 100644
--- a/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
+++ b/code/modules/antagonists/heretic/magic/cosmic_expansion.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "C'SM'S 'XP'ND"
+ invocation = "An'gar baltil!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/cosmic_runes.dm b/code/modules/antagonists/heretic/magic/cosmic_runes.dm
index 207b60ae9393a..e07aa4fbe8b8a 100644
--- a/code/modules/antagonists/heretic/magic/cosmic_runes.dm
+++ b/code/modules/antagonists/heretic/magic/cosmic_runes.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "ST'R R'N'"
+ invocation = "Is'zara-runen"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/eldritch_blind.dm b/code/modules/antagonists/heretic/magic/eldritch_blind.dm
index 8df20503821b0..413ff4fe67810 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_blind.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_blind.dm
@@ -5,7 +5,7 @@
overlay_icon_state = "bg_heretic_border"
school = SCHOOL_FORBIDDEN
- invocation = "E'E'S"
+ invocation = "Caecus"
spell_requirements = NONE
cast_range = 10
diff --git a/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm b/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
index c68ed07c81f8c..4028f80f84cea 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_emplosion.dm
@@ -8,7 +8,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "E'P"
+ invocation = "Pulsus Energiae"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
index e598f1f9215b9..bde032a3b39fd 100644
--- a/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
+++ b/code/modules/antagonists/heretic/magic/eldritch_shapeshift.dm
@@ -7,7 +7,7 @@
overlay_icon_state = "bg_heretic_border"
school = SCHOOL_FORBIDDEN
- invocation = "SH'PE"
+ invocation = "Forma"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/fire_blast.dm b/code/modules/antagonists/heretic/magic/fire_blast.dm
index f76a1f18d1757..8c6d632be9f2d 100644
--- a/code/modules/antagonists/heretic/magic/fire_blast.dm
+++ b/code/modules/antagonists/heretic/magic/fire_blast.dm
@@ -12,7 +12,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 45 SECONDS
- invocation = "V'LC'N!"
+ invocation = "Eld'fjall!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
channel_time = 5 SECONDS
@@ -23,8 +23,8 @@
var/beam_duration = 2 SECONDS
/datum/action/cooldown/spell/charged/beam/fire_blast/cast(atom/cast_on)
- if(isliving(cast_on))
- var/mob/living/caster = cast_on
+ var/mob/living/caster = get_caster_from_target(cast_on)
+ if(istype(caster))
// Caster becomes fireblasted, but in a good way - heals damage over time
caster.apply_status_effect(/datum/status_effect/fire_blasted, beam_duration, -2)
return ..()
diff --git a/code/modules/antagonists/heretic/magic/flesh_ascension.dm b/code/modules/antagonists/heretic/magic/flesh_ascension.dm
index a2d792080e058..add0704a8d61a 100644
--- a/code/modules/antagonists/heretic/magic/flesh_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_ascension.dm
@@ -9,7 +9,7 @@
school = SCHOOL_FORBIDDEN
- invocation = "REALITY UNCOIL!"
+ invocation = "REALITAS EXSERPAT!!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/flesh_surgery.dm b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
index 2ca256419efca..96ccb8450f97b 100644
--- a/code/modules/antagonists/heretic/magic/flesh_surgery.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
@@ -11,8 +11,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "CL'M M'N!" // "CLAIM MINE", but also almost "KALI MA"
- invocation_type = INVOCATION_SHOUT
+ invocation = "Carnis chirurgia"
+ invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
hand_path = /obj/item/melee/touch_attack/flesh_surgery
diff --git a/code/modules/antagonists/heretic/magic/furious_steel.dm b/code/modules/antagonists/heretic/magic/furious_steel.dm
index 15648a9b4d34d..36c7c07608bcb 100644
--- a/code/modules/antagonists/heretic/magic/furious_steel.dm
+++ b/code/modules/antagonists/heretic/magic/furious_steel.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 60 SECONDS
- invocation = "F'LSH'NG S'LV'R!"
+ invocation = "Ham'sana-qasep!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
@@ -67,7 +67,7 @@
QDEL_NULL(blade_effect)
var/mob/living/living_user = on_who
- blade_effect = living_user.apply_status_effect(/datum/status_effect/protective_blades, null, projectile_amount, 25, 0.66 SECONDS)
+ blade_effect = living_user.apply_status_effect(/datum/status_effect/protective_blades, null, projectile_amount, 25, 0.66 SECONDS, projectile_type)
RegisterSignal(blade_effect, COMSIG_QDELETING, PROC_REF(on_status_effect_deleted))
/datum/action/cooldown/spell/pointed/projectile/furious_steel/on_deactivation(mob/on_who, refund_cooldown = TRUE)
@@ -106,10 +106,12 @@
sharpness = SHARP_EDGED
wound_bonus = 15
pass_flags = PASSTABLE | PASSFLAPS
+ /// Color applied as an outline filter on init
+ var/outline_color = "#f8f8ff"
/obj/projectile/floating_blade/Initialize(mapload)
. = ..()
- add_filter("dio_knife", 2, list("type" = "outline", "color" = "#f8f8ff", "size" = 1))
+ add_filter("dio_knife", 2, list("type" = "outline", "color" = outline_color, "size" = 1))
/obj/projectile/floating_blade/prehit_pierce(atom/hit)
if(isliving(hit) && isliving(firer))
@@ -128,3 +130,40 @@
return PROJECTILE_DELETE_WITHOUT_HITTING
return ..()
+
+/obj/projectile/floating_blade/haunted
+ name = "ritual blade"
+ icon = 'icons/obj/weapons/khopesh.dmi'
+ icon_state = "render"
+ damage = 35
+ wound_bonus = 25
+ outline_color = "#D7CBCA"
+
+/datum/action/cooldown/spell/pointed/projectile/furious_steel/solo
+ name = "Lesser Furious Steel"
+ cooldown_time = 20 SECONDS
+ projectile_amount = 1
+ active_msg = "You summon forth a blade of furious silver."
+ deactive_msg = "You conceal the blade of furious silver."
+
+/datum/action/cooldown/spell/pointed/projectile/furious_steel/haunted
+ name = "Cursed Steel"
+ desc = "Summon two cursed blades which orbit you. \
+ While orbiting you, these blades will protect you from from attacks, but will be consumed on use. \
+ Additionally, you can click to fire the blades at a target, dealing damage and causing bleeding."
+ background_icon_state = "bg_heretic" // kept intentionally
+ overlay_icon_state = "bg_cult_border"
+ button_icon = 'icons/mob/actions/actions_ecult.dmi'
+ button_icon_state = "cursed_steel"
+ sound = 'sound/weapons/guillotine.ogg'
+
+ cooldown_time = 40 SECONDS
+ invocation = "IA!"
+ invocation_type = INVOCATION_SHOUT
+
+ spell_requirements = NONE
+
+ active_msg = "You summon forth two cursed blades."
+ deactive_msg = "You conceal the cursed blades."
+ projectile_amount = 2
+ projectile_type = /obj/projectile/floating_blade/haunted
diff --git a/code/modules/antagonists/heretic/magic/manse_link.dm b/code/modules/antagonists/heretic/magic/manse_link.dm
index 06fd4dd9863f4..e077c6db2b45f 100644
--- a/code/modules/antagonists/heretic/magic/manse_link.dm
+++ b/code/modules/antagonists/heretic/magic/manse_link.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "PI'RC' TH' M'ND."
+ invocation = "Diaperaste' to-myalo!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND
diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
index 4ba6aceb20093..803bdd3d218e5 100644
--- a/code/modules/antagonists/heretic/magic/mansus_grasp.dm
+++ b/code/modules/antagonists/heretic/magic/mansus_grasp.dm
@@ -10,7 +10,7 @@
school = SCHOOL_EVOCATION
cooldown_time = 10 SECONDS
- invocation = "R'CH T'H TR'TH!"
+ invocation = "Ad verum per aspera!"
invocation_type = INVOCATION_SHOUT
// Mimes can cast it. Chaplains can cast it. Anyone can cast it, so long as they have a hand.
spell_requirements = SPELL_CASTABLE_WITHOUT_INVOCATION
@@ -38,11 +38,35 @@
var/mob/living/living_hit = victim
living_hit.apply_damage(10, BRUTE, wound_bonus = CANT_WOUND)
- if(iscarbon(victim))
- var/mob/living/carbon/carbon_hit = victim
- carbon_hit.adjust_timed_status_effect(4 SECONDS, /datum/status_effect/speech/slurring/heretic)
- carbon_hit.AdjustKnockdown(5 SECONDS)
- carbon_hit.adjustStaminaLoss(80)
+ if(!iscarbon(victim))
+ return TRUE
+
+ var/mob/living/carbon/carbon_hit = victim
+
+ // Cultists are momentarily disoriented by the stunning aura. Enough for both parties to go 'oh shit' but only a mild combat ability.
+ // Cultists have an identical effect on their stun hand. The heretic's faster spell charge time is made up for by their lack of teammates.
+ if(IS_CULTIST(carbon_hit))
+ carbon_hit.AdjustKnockdown(0.5 SECONDS)
+ carbon_hit.adjust_confusion_up_to(1.5 SECONDS, 3 SECONDS)
+ carbon_hit.adjust_dizzy_up_to(1.5 SECONDS, 3 SECONDS)
+ ADD_TRAIT(carbon_hit, TRAIT_NO_SIDE_KICK, REF(src)) // We don't want this to be a good stunning tool, just minor disorientation
+ addtimer(TRAIT_CALLBACK_REMOVE(carbon_hit, TRAIT_NO_SIDE_KICK, REF(src)), 1 SECONDS)
+
+ var/old_color = carbon_hit.color
+ carbon_hit.color = COLOR_CULT_RED
+ animate(carbon_hit, color = old_color, time = 4 SECONDS, easing = EASE_IN)
+ carbon_hit.mob_light(range = 1.5, power = 2.5, color = COLOR_CULT_RED, duration = 0.5 SECONDS)
+ playsound(carbon_hit, 'sound/magic/curse.ogg', 50, TRUE)
+
+ to_chat(caster, span_warning("An unholy force intervenes as you grasp [carbon_hit], absorbing most of the effects!"))
+ to_chat(carbon_hit, span_warning("As [caster] grasps you with eldritch forces, your blood magic absorbs most of the effects!"))
+ carbon_hit.balloon_alert_to_viewers("absorbed!")
+ return TRUE
+
+ carbon_hit.adjust_timed_status_effect(4 SECONDS, /datum/status_effect/speech/slurring/heretic)
+ carbon_hit.AdjustKnockdown(5 SECONDS)
+ carbon_hit.adjustStaminaLoss(80)
+ carbon_hit.apply_status_effect(/datum/status_effect/next_shove_stuns)
return TRUE
diff --git a/code/modules/antagonists/heretic/magic/mind_gate.dm b/code/modules/antagonists/heretic/magic/mind_gate.dm
index c5a6e74452a61..aa6b8ef20af4d 100644
--- a/code/modules/antagonists/heretic/magic/mind_gate.dm
+++ b/code/modules/antagonists/heretic/magic/mind_gate.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "Op' 'oY 'Mi'd"
+ invocation = "Sha'ar ha-da'at"
invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
cast_range = 6
diff --git a/code/modules/antagonists/heretic/magic/moon_parade.dm b/code/modules/antagonists/heretic/magic/moon_parade.dm
index 3b7f1d007cd6e..4919500e351de 100644
--- a/code/modules/antagonists/heretic/magic/moon_parade.dm
+++ b/code/modules/antagonists/heretic/magic/moon_parade.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "L'N'R P'RAD"
+ invocation = "Tsiyun' levani!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/moon_ringleader.dm b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
index 3c0b1d2aedb52..e62c34bb990bb 100644
--- a/code/modules/antagonists/heretic/magic/moon_ringleader.dm
+++ b/code/modules/antagonists/heretic/magic/moon_ringleader.dm
@@ -12,7 +12,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 1 MINUTES
- invocation = "R''S 'E"
+ invocation = "Manahel-qomem!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/moon_smile.dm b/code/modules/antagonists/heretic/magic/moon_smile.dm
index 35f2d77e3e6b6..236fd257e385d 100644
--- a/code/modules/antagonists/heretic/magic/moon_smile.dm
+++ b/code/modules/antagonists/heretic/magic/moon_smile.dm
@@ -12,7 +12,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "Mo'N S'M'LE"
+ invocation = "Hiyuk-levana!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cast_range = 6
diff --git a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
index 4e37f5db17fed..8a9b60644b6b7 100644
--- a/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
+++ b/code/modules/antagonists/heretic/magic/nightwatcher_rebirth.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 1 MINUTES
- invocation = "GL'RY T' TH' N'GHT'W'TCH'ER"
+ invocation = "Dyrth-a Vaktry'ggjandi"
invocation_type = INVOCATION_WHISPER
spell_requirements = SPELL_REQUIRES_HUMAN
diff --git a/code/modules/antagonists/heretic/magic/realignment.dm b/code/modules/antagonists/heretic/magic/realignment.dm
index d3ddc03fbbef3..dbce0fe0940dd 100644
--- a/code/modules/antagonists/heretic/magic/realignment.dm
+++ b/code/modules/antagonists/heretic/magic/realignment.dm
@@ -14,8 +14,8 @@
cooldown_reduction_per_rank = -6 SECONDS // we're not a wizard spell but we use the levelling mechanic
spell_max_level = 10 // we can get up to / over a minute duration cd time
- invocation = "R'S'T."
- invocation_type = INVOCATION_SHOUT
+ invocation = "Rasut"
+ invocation_type = INVOCATION_WHISPER
spell_requirements = NONE
/datum/action/cooldown/spell/realignment/is_valid_target(atom/cast_on)
diff --git a/code/modules/antagonists/heretic/magic/rust_construction.dm b/code/modules/antagonists/heretic/magic/rust_construction.dm
index 130e3e06be23b..f8d6a2ff2be44 100644
--- a/code/modules/antagonists/heretic/magic/rust_construction.dm
+++ b/code/modules/antagonists/heretic/magic/rust_construction.dm
@@ -8,7 +8,7 @@
check_flags = AB_CHECK_INCAPACITATED|AB_CHECK_CONSCIOUS|AB_CHECK_HANDS_BLOCKED
school = SCHOOL_FORBIDDEN
- cooldown_time = 5 SECONDS
+ cooldown_time = 8 SECONDS
invocation = "Someone raises a wall of rust."
invocation_self_message = "You raise a wall of rust."
@@ -16,15 +16,19 @@
spell_requirements = NONE
cast_range = 4
- aim_assist = FALSE
/// How long does the filter last on walls we make?
var/filter_duration = 2 MINUTES
+/**
+ * Overrides 'aim assist' because we always want to hit just the turf we clicked on.
+ */
+/datum/action/cooldown/spell/pointed/rust_construction/aim_assist(mob/living/caller, atom/target)
+ return get_turf(target)
+
/datum/action/cooldown/spell/pointed/rust_construction/is_valid_target(atom/cast_on)
- if(!isfloorturf(cast_on))
- if(isturf(cast_on) && owner)
- cast_on.balloon_alert(owner, "not a floor!")
+ if(!isturf(cast_on))
+ cast_on.balloon_alert(owner, "not a wall or floor!")
return FALSE
if(!HAS_TRAIT(cast_on, TRAIT_RUSTY))
@@ -43,9 +47,22 @@
invocation = span_danger("[owner] drags [owner.p_their()] hand[living_owner.usable_hands == 1 ? "":"s"] upwards as a wall of rust rises out of [cast_on]!")
invocation_self_message = span_notice("You drag [living_owner.usable_hands == 1 ? "a hand":"your hands"] upwards as a wall of rust rises out of [cast_on].")
-/datum/action/cooldown/spell/pointed/rust_construction/cast(turf/open/cast_on)
+/datum/action/cooldown/spell/pointed/rust_construction/cast(turf/cast_on)
. = ..()
var/rises_message = "rises out of [cast_on]"
+
+ // If we casted at a wall we'll try to rust it. In the case of an enchanted wall it'll deconstruct it
+ if(isclosedturf(cast_on))
+ cast_on.visible_message(span_warning("\The [cast_on] quakes as the rust causes it to crumble!"))
+ var/mob/living/living_owner = owner
+ living_owner?.do_rust_heretic_act(cast_on)
+ // ref transfers to floor
+ cast_on.Shake(shake_interval = 0.1 SECONDS, duration = 0.5 SECONDS)
+ // which we need to re-rust
+ living_owner?.do_rust_heretic_act(cast_on)
+ playsound(cast_on, 'sound/effects/bang.ogg', 50, vary = TRUE)
+ return
+
var/turf/closed/wall/new_wall = cast_on.place_on_top(/turf/closed/wall)
if(!istype(new_wall))
return
@@ -53,7 +70,8 @@
playsound(new_wall, 'sound/effects/constructform.ogg', 50, TRUE)
new_wall.rust_heretic_act()
new_wall.name = "\improper enchanted [new_wall.name]"
- new_wall.hardness = 10
+ new_wall.AddComponent(/datum/component/torn_wall)
+ new_wall.hardness = 60
new_wall.sheet_amount = 0
new_wall.girder_type = null
@@ -61,8 +79,8 @@
// but I guess a fading filter will have to do for now as walls have 0 depth (currently)
// damn though with 3/4ths walls this'll look sick just imagine it
new_wall.add_filter("rust_wall", 2, list("type" = "outline", "color" = "#85be299c", "size" = 2))
- addtimer(CALLBACK(src, PROC_REF(fade_wall_filter), new_wall), filter_duration * (1/20))
- addtimer(CALLBACK(src,PROC_REF(remove_wall_filter), new_wall), filter_duration)
+ addtimer(CALLBACK(src, PROC_REF(fade_wall_filter), new_wall), filter_duration * 0.5)
+ addtimer(CALLBACK(src, PROC_REF(remove_wall_filter), new_wall), filter_duration)
var/message_shown = FALSE
for(var/mob/living/living_mob in cast_on)
@@ -108,7 +126,7 @@
if(!rust_filter)
return
- animate(rust_filter, alpha = 0, time = filter_duration * (19/20))
+ animate(rust_filter, alpha = 0, time = filter_duration * (9/20))
/datum/action/cooldown/spell/pointed/rust_construction/proc/remove_wall_filter(turf/closed/wall)
if(QDELETED(wall))
diff --git a/code/modules/antagonists/heretic/magic/rust_wave.dm b/code/modules/antagonists/heretic/magic/rust_wave.dm
index 65c5592b34e8b..7ecb3fd0ffbba 100644
--- a/code/modules/antagonists/heretic/magic/rust_wave.dm
+++ b/code/modules/antagonists/heretic/magic/rust_wave.dm
@@ -13,8 +13,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "'NTR'P'C PL'M'"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Entro'pichniy-plim!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cone_levels = 5
@@ -25,7 +25,10 @@
new /obj/effect/temp_visual/dir_setting/entropic(get_step(cast_on, cast_on.dir), cast_on.dir)
/datum/action/cooldown/spell/cone/staggered/entropic_plume/do_turf_cone_effect(turf/target_turf, mob/living/caster, level)
- caster.do_rust_heretic_act(target_turf)
+ if(ismob(caster))
+ caster.do_rust_heretic_act(target_turf)
+ else
+ target_turf.rust_heretic_act()
/datum/action/cooldown/spell/cone/staggered/entropic_plume/do_mob_cone_effect(mob/living/victim, atom/caster, level)
if(victim.can_block_magic(antimagic_flags) || IS_HERETIC_OR_MONSTER(victim) || victim == caster)
@@ -75,8 +78,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 35 SECONDS
- invocation = "SPR'D TH' WO'D"
- invocation_type = INVOCATION_WHISPER
+ invocation = "Diffunde' verbum!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
projectile_type = /obj/projectile/magic/aoe/rust_wave
diff --git a/code/modules/antagonists/heretic/magic/star_blast.dm b/code/modules/antagonists/heretic/magic/star_blast.dm
index 3eb62b7ada814..294608a03b998 100644
--- a/code/modules/antagonists/heretic/magic/star_blast.dm
+++ b/code/modules/antagonists/heretic/magic/star_blast.dm
@@ -10,7 +10,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 20 SECONDS
- invocation = "R'T'T' ST'R!"
+ invocation = "Pi-rig is'zara!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/star_touch.dm b/code/modules/antagonists/heretic/magic/star_touch.dm
index 89c5d02e7d498..dff56df4e3f1f 100644
--- a/code/modules/antagonists/heretic/magic/star_touch.dm
+++ b/code/modules/antagonists/heretic/magic/star_touch.dm
@@ -13,7 +13,7 @@
sound = 'sound/items/welder.ogg'
school = SCHOOL_FORBIDDEN
cooldown_time = 15 SECONDS
- invocation = "ST'R 'N'RG'!"
+ invocation = "An'gar sig!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
antimagic_flags = MAGIC_RESISTANCE
diff --git a/code/modules/antagonists/heretic/magic/void_cold_cone.dm b/code/modules/antagonists/heretic/magic/void_cold_cone.dm
index 92c45dc10b010..40dc9612a50f6 100644
--- a/code/modules/antagonists/heretic/magic/void_cold_cone.dm
+++ b/code/modules/antagonists/heretic/magic/void_cold_cone.dm
@@ -11,7 +11,7 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "FR'ZE!"
+ invocation = "Sunya'kop!"
invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
diff --git a/code/modules/antagonists/heretic/magic/void_phase.dm b/code/modules/antagonists/heretic/magic/void_phase.dm
index 350ca0f29c100..f3f0864224c4c 100644
--- a/code/modules/antagonists/heretic/magic/void_phase.dm
+++ b/code/modules/antagonists/heretic/magic/void_phase.dm
@@ -12,8 +12,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 30 SECONDS
- invocation = "RE'L'TY PH'S'E."
- invocation_type = INVOCATION_WHISPER
+ invocation = "Sunya'sthiti!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
cast_range = 9
diff --git a/code/modules/antagonists/heretic/magic/void_pull.dm b/code/modules/antagonists/heretic/magic/void_pull.dm
index 2021bf8a04e4f..dc4673b0714ce 100644
--- a/code/modules/antagonists/heretic/magic/void_pull.dm
+++ b/code/modules/antagonists/heretic/magic/void_pull.dm
@@ -11,8 +11,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 40 SECONDS
- invocation = "BR'NG F'RTH TH'M T' M'."
- invocation_type = INVOCATION_WHISPER
+ invocation = "Sunya'apamkti!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
aoe_radius = 7
diff --git a/code/modules/antagonists/heretic/magic/wave_of_desperation.dm b/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
index 3b78b56ddc0ba..b9502f08967bb 100644
--- a/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
+++ b/code/modules/antagonists/heretic/magic/wave_of_desperation.dm
@@ -11,8 +11,8 @@
school = SCHOOL_FORBIDDEN
cooldown_time = 5 MINUTES
- invocation = "F'K 'FF."
- invocation_type = INVOCATION_WHISPER
+ invocation = "Kher' Sekh-em waaef'k!"
+ invocation_type = INVOCATION_SHOUT
spell_requirements = NONE
aoe_radius = 3
diff --git a/code/modules/antagonists/heretic/soultrapped_heretic.dm b/code/modules/antagonists/heretic/soultrapped_heretic.dm
new file mode 100644
index 0000000000000..ffd92e09496cb
--- /dev/null
+++ b/code/modules/antagonists/heretic/soultrapped_heretic.dm
@@ -0,0 +1,24 @@
+///a heretic that got soultrapped by cultists. does nothing, other than signify they suck
+/datum/antagonist/soultrapped_heretic
+ name = "\improper Soultrapped Heretic"
+ roundend_category = "Heretics"
+ antagpanel_category = "Heretic"
+ job_rank = ROLE_HERETIC
+ antag_moodlet = /datum/mood_event/soultrapped_heretic
+ antag_hud_name = "heretic"
+
+// Will never show up because they're shades inside a sword
+/datum/mood_event/soultrapped_heretic
+ description = "They trapped me! I can't escape!"
+ mood_change = -20
+
+// always failure obj
+/datum/objective/heretic_trapped
+ name = "soultrapped failure"
+ explanation_text = "Help the cult. Kill the cult. Help the crew. Kill the crew. Help your wielder. Kill your wielder. Kill everyone. Rattle your chains."
+
+/datum/antagonist/soultrapped_heretic/on_gain()
+ ..()
+ var/datum/objective/epic_fail = new /datum/objective/heretic_trapped()
+ epic_fail.completed = FALSE
+ objectives += epic_fail
diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm
index d2058a5b4f19e..35a6ab9268784 100644
--- a/code/modules/antagonists/heretic/status_effects/buffs.dm
+++ b/code/modules/antagonists/heretic/status_effects/buffs.dm
@@ -118,6 +118,8 @@
var/time_between_initial_blades = 0.25 SECONDS
/// If TRUE, we self-delete our status effect after all the blades are deleted.
var/delete_on_blades_gone = TRUE
+ /// What blade type to create
+ var/blade_type = /obj/effect/floating_blade
/// A list of blade effects orbiting / protecting our owner
var/list/obj/effect/floating_blade/blades = list()
@@ -127,12 +129,14 @@
max_num_blades = 4,
blade_orbit_radius = 20,
time_between_initial_blades = 0.25 SECONDS,
+ blade_type = /obj/effect/floating_blade,
)
src.duration = new_duration
src.max_num_blades = max_num_blades
src.blade_orbit_radius = blade_orbit_radius
src.time_between_initial_blades = time_between_initial_blades
+ src.blade_type = blade_type
return ..()
/datum/status_effect/protective_blades/on_apply()
@@ -157,7 +161,7 @@
if(QDELETED(src) || QDELETED(owner))
return
- var/obj/effect/floating_blade/blade = new(get_turf(owner))
+ var/obj/effect/floating_blade/blade = new blade_type(get_turf(owner))
blades += blade
blade.orbit(owner, blade_orbit_radius)
RegisterSignal(blade, COMSIG_QDELETING, PROC_REF(remove_blade))
diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm
index 9bdad0ea5fce5..70133e951af91 100644
--- a/code/modules/antagonists/heretic/structures/carving_knife.dm
+++ b/code/modules/antagonists/heretic/structures/carving_knife.dm
@@ -15,15 +15,7 @@
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
actions_types = list(/datum/action/item_action/rune_shatter)
- embedding = list(
- ignore_throwspeed_threshold = TRUE,
- embed_chance = 75,
- jostle_chance = 2,
- jostle_pain_mult = 5,
- pain_stam_pct = 0.4,
- pain_mult = 3,
- rip_time = 15,
- )
+ embed_type = /datum/embed_data/rune_carver
/// Whether we're currently drawing a rune
var/drawing = FALSE
@@ -34,6 +26,15 @@
/// Turfs that you cannot draw carvings on
var/static/list/blacklisted_turfs = typecacheof(list(/turf/open/space, /turf/open/openspace, /turf/open/lava))
+/datum/embed_data/rune_carver
+ ignore_throwspeed_threshold = TRUE
+ embed_chance = 75
+ jostle_chance = 2
+ jostle_pain_mult = 5
+ pain_stam_pct = 0.4
+ pain_mult = 3
+ rip_time = 15
+
/obj/item/melee/rune_carver/examine(mob/user)
. = ..()
if(!IS_HERETIC_OR_MONSTER(user) && !isobserver(user))
diff --git a/code/modules/antagonists/heretic/structures/mawed_crucible.dm b/code/modules/antagonists/heretic/structures/mawed_crucible.dm
index 8e5410f0f6751..2135ffa134ca5 100644
--- a/code/modules/antagonists/heretic/structures/mawed_crucible.dm
+++ b/code/modules/antagonists/heretic/structures/mawed_crucible.dm
@@ -57,6 +57,10 @@
return span_notice("It's at [round(atom_integrity * 100 / max_integrity)]% stability.")
return ..()
+// no breaky herety thingy
+/obj/structure/destructible/eldritch_crucible/rust_heretic_act()
+ return
+
/obj/structure/destructible/eldritch_crucible/attacked_by(obj/item/weapon, mob/living/user)
if(!iscarbon(user))
return ..()
diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm
index 619e7d252957b..5e6ad0fb1cf7f 100644
--- a/code/modules/antagonists/heretic/transmutation_rune.dm
+++ b/code/modules/antagonists/heretic/transmutation_rune.dm
@@ -1,8 +1,9 @@
/// The heretic's rune, which they use to complete transmutation rituals.
/obj/effect/heretic_rune
name = "transmutation rune"
- desc = "A flowing circle of shapes and runes is etched into the floor, filled with a thick black tar-like fluid."
- icon_state = ""
+ desc = "A flowing circle of shapes and runes is etched into the floor, filled with a thick black tar-like fluid. This one looks pretty small."
+ icon = 'icons/obj/antags/cult/rune.dmi'
+ icon_state = "main1"
anchored = TRUE
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
diff --git a/code/modules/antagonists/ninja/outfit.dm b/code/modules/antagonists/ninja/outfit.dm
index f91f660a3e8b9..924943dce777b 100644
--- a/code/modules/antagonists/ninja/outfit.dm
+++ b/code/modules/antagonists/ninja/outfit.dm
@@ -1,7 +1,7 @@
/datum/outfit/ninja
name = "Space Ninja"
uniform = /obj/item/clothing/under/syndicate/ninja
- glasses = /obj/item/clothing/glasses/night
+ glasses = /obj/item/clothing/glasses/night/colorless
mask = /obj/item/clothing/mask/gas/ninja
ears = /obj/item/radio/headset
shoes = /obj/item/clothing/shoes/jackboots
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index 1b02dfc02a112..f296eebfe740a 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -1,11 +1,11 @@
#define CHALLENGE_TELECRYSTALS 280
#define CHALLENGE_TIME_LIMIT (5 MINUTES)
#define CHALLENGE_SHUTTLE_DELAY (25 MINUTES) // 25 minutes, so the ops have at least 5 minutes before the shuttle is callable.
-// MASSMETA EDIT START
+// MASSMETA EDIT ADDITION START
#define WAR_TC_MIN 125
#define WAR_TC_MAX 280
#define WAR_MAX_PAYOUT 50
-// MASSMETA EDIT END
+// MASSMETA EDIT ADDITION END
GLOBAL_LIST_EMPTY(jam_on_wardec)
@@ -27,11 +27,12 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
return
declaring_war = TRUE
-// MASSMETA EDIT START
+//MASSMETA EDIT CHANGE START
var/are_you_sure = tgui_alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew? You will get \
[round(WAR_TC_MIN + (WAR_TC_MAX - WAR_TC_MIN) * (1 - (WAR_MAX_PAYOUT - min(WAR_MAX_PAYOUT, GLOB.joined_player_list.len)) / (WAR_MAX_PAYOUT - CHALLENGE_MIN_PLAYERS)), 1)] \
extra telecystals. You have [DisplayTimeText(CHALLENGE_TIME_LIMIT - world.time - SSticker.round_start_time)] to decide", "Declare war?", list("Yes", "No"))
-// MASSMETA EDIT END
+//ORIGINAL: var/are_you_sure = tgui_alert(user, "Consult your team carefully before you declare war on [station_name()]. Are you sure you want to alert the enemy crew? You have [DisplayTimeText(CHALLENGE_TIME_LIMIT - world.time - SSticker.round_start_time)] to decide.", "Declare war?", list("Yes", "No"))
+//MASSMETA EDIT CHANGE END
declaring_war = FALSE
if(!check_allowed(user))
@@ -123,7 +124,7 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
continue
uplinks += uplink
- var/tc_to_distribute = round(WAR_TC_MIN + (WAR_TC_MAX - WAR_TC_MIN) * (1 - (WAR_MAX_PAYOUT - min(WAR_MAX_PAYOUT, GLOB.joined_player_list.len)) / (WAR_MAX_PAYOUT - CHALLENGE_MIN_PLAYERS)), 1) // MASSMETA EDIT
+ var/tc_to_distribute = round(WAR_TC_MIN + (WAR_TC_MAX - WAR_TC_MIN) * (1 - (WAR_MAX_PAYOUT - min(WAR_MAX_PAYOUT, GLOB.joined_player_list.len)) / (WAR_MAX_PAYOUT - CHALLENGE_MIN_PLAYERS)), 1) //MASSMETA EDIT CHANGE - ORIGINAL: var/tc_to_distribute = CHALLENGE_TELECRYSTALS
var/tc_per_nukie = round(tc_to_distribute / (length(orphans)+length(uplinks)))
for (var/datum/component/uplink/uplink in uplinks)
@@ -206,8 +207,8 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
#undef CHALLENGE_TELECRYSTALS
#undef CHALLENGE_TIME_LIMIT
#undef CHALLENGE_SHUTTLE_DELAY
-// MASSMETA EDIT START
+//MASSMETA EDIT ADDITION START
#undef WAR_TC_MIN
#undef WAR_TC_MAX
#undef WAR_MAX_PAYOUT
-// MASSMETA EDIT END
+//MASSMETA EDIT ADDITION END
diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm
index e8ae07ffdde83..fa214aa70468c 100644
--- a/code/modules/antagonists/nukeop/outfits.dm
+++ b/code/modules/antagonists/nukeop/outfits.dm
@@ -67,7 +67,7 @@
/datum/outfit/syndicate/full
name = "Syndicate Operative - Full Kit"
- glasses = /obj/item/clothing/glasses/night
+ glasses = /obj/item/clothing/glasses/night/colorless
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/mod/control/pre_equipped/nuclear
r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
@@ -136,7 +136,7 @@
suit = /obj/item/clothing/suit/jacket/oversized
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/sunglasses
- mask = /obj/item/clothing/mask/cigarette/cigar
+ mask = /obj/item/cigarette/cigar
faction = "Cybersun Industries"
/datum/outfit/syndicate/reinforcement/donk
diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm
index 15a3d4fe2dcb2..72318fe4987ca 100644
--- a/code/modules/antagonists/pirate/pirate_outfits.dm
+++ b/code/modules/antagonists/pirate/pirate_outfits.dm
@@ -62,17 +62,19 @@
id_trim = /datum/id_trim/pirate/silverscale
uniform = /obj/item/clothing/under/syndicate/sniper
suit = /obj/item/clothing/suit/armor/vest/alt
+ back = /obj/item/storage/backpack/satchel
glasses = /obj/item/clothing/glasses/monocle
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/collectable/tophat
shoes = /obj/item/clothing/shoes/laceup
+ implants = list(/obj/item/implant/explosive)
/datum/outfit/pirate/silverscale/captain
name = "Silver Scale Captain"
id_trim = /datum/id_trim/pirate/captain/silverscale
head = /obj/item/clothing/head/costume/crown
- mask = /obj/item/clothing/mask/cigarette/cigar/havana
+ mask = /obj/item/cigarette/cigar/havana
l_pocket = /obj/item/lighter
/datum/outfit/pirate/interdyne
diff --git a/code/modules/antagonists/traitor/contractor/contract_teammate.dm b/code/modules/antagonists/traitor/contractor/contract_teammate.dm
index 54fc958c1f89f..965d99e89ac6a 100644
--- a/code/modules/antagonists/traitor/contractor/contract_teammate.dm
+++ b/code/modules/antagonists/traitor/contractor/contract_teammate.dm
@@ -24,7 +24,7 @@
suit = /obj/item/clothing/suit/chameleon
back = /obj/item/storage/backpack
belt = /obj/item/modular_computer/pda/chameleon
- mask = /obj/item/clothing/mask/cigarette/syndicate
+ mask = /obj/item/cigarette/syndicate
shoes = /obj/item/clothing/shoes/chameleon/noslip
ears = /obj/item/radio/headset/chameleon
id = /obj/item/card/id/advanced/chameleon
@@ -41,5 +41,5 @@
/datum/outfit/contractor_partner/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
- var/obj/item/clothing/mask/cigarette/syndicate/cig = H.get_item_by_slot(ITEM_SLOT_MASK)
+ var/obj/item/cigarette/syndicate/cig = H.get_item_by_slot(ITEM_SLOT_MASK)
cig.light()
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 733e22461c795..ea171a2eda323 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -86,7 +86,7 @@
uplink_handler.has_progression = TRUE
SStraitor.register_uplink_handler(uplink_handler)
- if(give_secondary_objectives)
+ if(give_secondary_objectives && GLOB.joined_player_list.len >= 25) // MASSMETA EDIT CHANGE: original - if(give_seocndary_objectives)
uplink_handler.has_objectives = TRUE
uplink_handler.generate_objectives()
@@ -248,7 +248,7 @@
objectives += ending_objective
/datum/antagonist/traitor/proc/forge_single_generic_objective()
- if(prob(KILL_PROB))
+ if(prob(KILL_PROB) && GLOB.joined_player_list.len >= 25) // MASSMETA EDIT CHANGE: original - if(prob(KILL_PROB))
var/list/active_ais = active_ais(skip_syndicate = TRUE)
if(active_ais.len && prob(DESTROY_AI_PROB(GLOB.joined_player_list.len)))
var/datum/objective/destroy/destroy_objective = new()
diff --git a/code/modules/antagonists/wishgranter/wishgranter.dm b/code/modules/antagonists/wishgranter/wishgranter.dm
index bfac673535afc..fd18ffe5c1ed0 100644
--- a/code/modules/antagonists/wishgranter/wishgranter.dm
+++ b/code/modules/antagonists/wishgranter/wishgranter.dm
@@ -27,5 +27,5 @@
return
H.dna.add_mutation(/datum/mutation/human/hulk)
H.dna.add_mutation(/datum/mutation/human/xray)
- H.dna.add_mutation(/datum/mutation/human/pressure_adaptation)
+ H.dna.add_mutation(/datum/mutation/human/adaptation/pressure)
H.dna.add_mutation(/datum/mutation/human/telekinesis)
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index 3094af509dadb..925f368fe3b54 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -260,16 +260,17 @@
icon = 'icons/mob/shells.dmi'
icon_state = "construct_cult"
desc = "A wicked machine used by those skilled in magical arts. It is inactive."
-
-/obj/structure/constructshell/examine(mob/user)
- . = ..()
- if(IS_CULTIST(user) || HAS_MIND_TRAIT(user, TRAIT_MAGICALLY_GIFTED) || user.stat == DEAD)
- . += {"A construct shell, used to house bound souls from a soulstone.\n
+ var/extra_desc = {"A construct shell, used to house bound souls from a soulstone.\n
Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n
An Artificer, which can produce more shells and soulstones, as well as fortifications.\n
A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n
A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow."}
+/obj/structure/constructshell/examine(mob/user)
+ . = ..()
+ if(IS_CULTIST(user) || HAS_MIND_TRAIT(user, TRAIT_MAGICALLY_GIFTED) || user.stat == DEAD)
+ . += extra_desc
+
/obj/structure/constructshell/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/soulstone))
var/obj/item/soulstone/SS = O
@@ -494,6 +495,11 @@
make_new_construct(/mob/living/basic/construct/artificer/angelic, target, creator, cultoverride, loc_override)
if(THEME_CULT)
make_new_construct(/mob/living/basic/construct/artificer/noncult, target, creator, cultoverride, loc_override)
+ if(CONSTRUCT_HARVESTER)
+ if(IS_HERETIC_OR_MONSTER(creator))
+ make_new_construct(/mob/living/basic/construct/harvester/heretic, target, creator, cultoverride, loc_override)
+ else
+ make_new_construct(/mob/living/basic/construct/harvester, target, creator, cultoverride, loc_override)
/proc/make_new_construct(mob/living/basic/construct/ctype, mob/target, mob/stoner = null, cultoverride = FALSE, loc_override = null)
if(QDELETED(target))
@@ -523,7 +529,7 @@
newstruct.clear_alert("bloodsense")
sense_alert = newstruct.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
if(sense_alert)
- sense_alert.Cviewer = newstruct
+ sense_alert.construct_owner = newstruct
newstruct.cancel_camera()
/obj/item/soulstone/anybody
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index cfb87ce7cb3fe..db2732be83fad 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -676,20 +676,20 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
return FALSE
/// Pumps gas from src to output_air. Amount depends on target_pressure
-/datum/gas_mixture/proc/pump_gas_to(datum/gas_mixture/output_air, target_pressure, specific_gas = null)
- var/temperature_delta = abs(temperature - output_air.temperature)
+/datum/gas_mixture/proc/pump_gas_to(datum/gas_mixture/output_air, target_pressure, specific_gas = null, datum/gas_mixture/output_pipenet_air = null)
+ var/datum/gas_mixture/input_air = specific_gas ? remove_specific_ratio(specific_gas, 1) : src
+ var/temperature_delta = abs(input_air.temperature - output_air.temperature)
var/datum/gas_mixture/removed
- var/transfer_moles
+
+ var/transfer_moles_output = input_air.gas_pressure_calculate(output_air, target_pressure, temperature_delta <= 5)
+ var/transfer_moles_pipenet = output_pipenet_air?.volume ? input_air.gas_pressure_calculate(output_pipenet_air, target_pressure, temperature_delta <= 5) : 0
+ var/transfer_moles = max(transfer_moles_output, transfer_moles_pipenet)
if(specific_gas)
- // This is necessary because the specific heat capacity of a gas might be different from our gasmix.
- var/datum/gas_mixture/temporary = remove_specific_ratio(specific_gas, 1)
- transfer_moles = temporary.gas_pressure_calculate(output_air, target_pressure, temperature_delta <= 5)
- removed = temporary.remove_specific(specific_gas, transfer_moles)
- merge(temporary)
+ removed = input_air.remove_specific(specific_gas, transfer_moles)
+ merge(input_air) // Merge the remaining gas back to the input node
else
- transfer_moles = gas_pressure_calculate(output_air, target_pressure, temperature_delta <= 5)
- removed = remove(transfer_moles)
+ removed = input_air.remove(transfer_moles)
if(!removed)
return FALSE
@@ -698,18 +698,20 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
return removed
/// Releases gas from src to output air. This means that it can not transfer air to gas mixture with higher pressure.
-/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure, rate=1)
+/datum/gas_mixture/proc/release_gas_to(datum/gas_mixture/output_air, target_pressure, rate=1, datum/gas_mixture/output_pipenet_air = null)
var/output_starting_pressure = output_air.return_pressure()
var/input_starting_pressure = return_pressure()
//Need at least 10 KPa difference to overcome friction in the mechanism
- if(output_starting_pressure >= min(target_pressure,input_starting_pressure-10))
+ if(output_starting_pressure >= min(target_pressure, input_starting_pressure-10))
return FALSE
//Can not have a pressure delta that would cause output_pressure > input_pressure
target_pressure = output_starting_pressure + min(target_pressure - output_starting_pressure, (input_starting_pressure - output_starting_pressure)/2)
var/temperature_delta = abs(temperature - output_air.temperature)
- var/transfer_moles = gas_pressure_calculate(output_air, target_pressure, temperature_delta <= 5)
+ var/transfer_moles_output = gas_pressure_calculate(output_air, target_pressure, temperature_delta <= 5)
+ var/transfer_moles_pipenet = output_pipenet_air?.volume ? gas_pressure_calculate(output_pipenet_air, target_pressure, temperature_delta <= 5) : 0
+ var/transfer_moles = max(transfer_moles_output, transfer_moles_pipenet)
//Actually transfer the gas
var/datum/gas_mixture/removed = remove(transfer_moles * rate)
diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
index 4ec7830ac88cf..0a6aa23b34d58 100644
--- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
@@ -145,6 +145,8 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
/obj/machinery/airalarm/proc/check_enviroment()
var/turf/our_turf = connected_sensor ? get_turf(connected_sensor) : get_turf(src)
var/datum/gas_mixture/environment = our_turf.return_air()
+ if(isnull(environment))
+ return
check_danger(our_turf, environment, environment.temperature)
/obj/machinery/airalarm/proc/get_enviroment()
@@ -554,6 +556,9 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
if((machine_stat & (NOPOWER|BROKEN)) || shorted)
return
+ if(!environment)
+ return
+
var/old_danger = danger_level
danger_level = AIR_ALARM_ALERT_NONE
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index fa8b833234586..29ea43905b8b7 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -666,7 +666,7 @@
SET_PLANE_EXPLICIT(cap_overlay, initial(plane), our_turf)
cap_overlay.color = pipe_color
- cap_overlay.layer = layer
+ cap_overlay.layer = initial(layer)
cap_overlay.icon_state = "[bitfield]_[piping_layer]"
cap_overlay.forceMove(our_turf)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
index 572e910d3fe08..1d7657dd35276 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
@@ -59,9 +59,11 @@ Passive gate is similar to the regular pump except:
if(!on)
return
- var/datum/gas_mixture/air1 = airs[1]
- var/datum/gas_mixture/air2 = airs[2]
- if(air1.release_gas_to(air2, target_pressure))
+ var/datum/gas_mixture/input_air = airs[1]
+ var/datum/gas_mixture/output_air = airs[2]
+ var/datum/gas_mixture/output_pipenet_air = parents[2].air
+
+ if(input_air.release_gas_to(output_air, target_pressure, output_pipenet_air = output_pipenet_air))
update_parents()
/obj/machinery/atmospherics/components/binary/passive_gate/relaymove(mob/living/user, direction)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
index 399feff12146f..ff9cc36d7cd61 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
@@ -54,11 +54,12 @@
if(!on || !is_operational)
return
- var/datum/gas_mixture/air1 = airs[1]
- var/datum/gas_mixture/air2 = airs[2]
+ var/datum/gas_mixture/input_air = airs[1]
+ var/datum/gas_mixture/output_air = airs[2]
+ var/datum/gas_mixture/output_pipenet_air = parents[2].air
- if(air1.return_pressure() > target_pressure)
- if(air1.release_gas_to(air2, air1.return_pressure()))
+ if(input_air.return_pressure() > target_pressure)
+ if(input_air.release_gas_to(output_air, input_air.return_pressure(), output_pipenet_air = output_pipenet_air))
update_parents()
is_gas_flowing = TRUE
else
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index 63ba340f27ff4..1e68bf9ad691a 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -61,10 +61,11 @@
if(!on || !is_operational)
return
- var/datum/gas_mixture/air1 = airs[1]
- var/datum/gas_mixture/air2 = airs[2]
+ var/datum/gas_mixture/input_air = airs[1]
+ var/datum/gas_mixture/output_air = airs[2]
+ var/datum/gas_mixture/output_pipenet_air = parents[2].air
- if(air1.pump_gas_to(air2, target_pressure))
+ if(input_air.pump_gas_to(output_air, target_pressure, output_pipenet_air = output_pipenet_air))
update_parents()
/obj/machinery/atmospherics/components/binary/pump/ui_interact(mob/user, datum/tgui/ui)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
index b5a3740245a31..879f6b7fab8d3 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
@@ -68,19 +68,20 @@
if(!on || !is_operational)
return
- var/datum/gas_mixture/air1 = airs[1]
- var/datum/gas_mixture/air2 = airs[2]
+ var/datum/gas_mixture/input_air = airs[1]
+ var/datum/gas_mixture/output_air = airs[2]
+ var/datum/gas_mixture/output_pipenet_air = parents[2].air
if(!inverted)
- if(air1.temperature < target_temperature)
- if(air1.release_gas_to(air2, air1.return_pressure()))
+ if(input_air.temperature < target_temperature)
+ if(input_air.release_gas_to(output_air, input_air.return_pressure(), output_pipenet_air = output_pipenet_air))
update_parents()
is_gas_flowing = TRUE
else
is_gas_flowing = FALSE
else
- if(air1.temperature > target_temperature)
- if(air1.release_gas_to(air2, air1.return_pressure()))
+ if(input_air.temperature > target_temperature)
+ if(input_air.release_gas_to(output_air, input_air.return_pressure(), output_pipenet_air = output_pipenet_air))
update_parents()
is_gas_flowing = TRUE
else
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index b4e5d88d62c71..cd4e00b3f33a6 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -62,6 +62,7 @@
color = null
SET_PLANE_IMPLICIT(src, showpipe ? GAME_PLANE : FLOOR_PLANE)
+ // Layer is handled in update_layer()
if(!showpipe)
return ..()
@@ -327,7 +328,7 @@
connect_nodes()
/obj/machinery/atmospherics/components/update_layer()
- layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)
+ layer = (showpipe ? initial(layer) : ABOVE_OPEN_TURF_LAYER) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)
/**
* Handles air relocation to the pipenet/environment
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 6e0490e25efb3..95b548998a194 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
@@ -16,7 +16,7 @@
if(atmos_device.nob_crystal_inserted)
to_chat(user, span_warning("[atmos_device] already has a hypernoblium crystal inserted in it!"))
return ITEM_INTERACT_BLOCKING
- atmos_device.nob_crystal_inserted = TRUE
+ atmos_device.insert_nob_crystal()
to_chat(user, span_notice("You insert the [src] into [atmos_device]."))
if(istype(worn_item))
diff --git a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
index 472cb3ed2034a..4c1cd63016c92 100644
--- a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
+++ b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
@@ -5,6 +5,7 @@
name = "bridge pipe"
desc = "A one meter section of regular pipe used to connect pipenets over pipes."
+ layer = HIGH_PIPE_LAYER
dir = SOUTH
initialize_directions = NORTH | SOUTH
pipe_flags = PIPING_CARDINAL_AUTONORMALIZE | PIPING_BRIDGE
@@ -28,4 +29,5 @@
PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
. += center
- layer = HIGH_PIPE_LAYER //to stay above all sorts of pipes
+/obj/machinery/atmospherics/pipe/bridge_pipe/update_layer()
+ layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER + 1 : initial(layer))
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index 730e193671dbe..df919cbeccb1c 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -41,7 +41,7 @@
nodes = list()
/obj/machinery/atmospherics/pipe/layer_manifold/update_layer()
- layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else.
+ layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else.
/obj/machinery/atmospherics/pipe/layer_manifold/update_overlays()
. = ..()
@@ -68,7 +68,8 @@
. += get_attached_image(get_dir(src, machine_check), machine_check.piping_layer, machine_check.pipe_color)
/obj/machinery/atmospherics/pipe/layer_manifold/proc/get_attached_image(p_dir, p_layer, p_color)
- var/mutable_appearance/muta = mutable_appearance('icons/obj/pipes_n_cables/layer_manifold_underlays.dmi', "intact_[p_dir]_[p_layer]", layer = layer - 0.01, appearance_flags = RESET_COLOR)
+ var/working_layer = FLOAT_LAYER - HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? 1 : 0.01
+ var/mutable_appearance/muta = mutable_appearance('icons/obj/pipes_n_cables/layer_manifold_underlays.dmi', "intact_[p_dir]_[p_layer]", layer = working_layer, appearance_flags = RESET_COLOR)
muta.color = p_color
return muta
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 40258db903ff0..230edc9a897f0 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -139,4 +139,4 @@
current_node.update_icon()
/obj/machinery/atmospherics/pipe/update_layer()
- layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001)
+ layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001)
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 0b1e7c2768ae9..af13be0bbbf9b 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -101,6 +101,8 @@
/obj/machinery/portable_atmospherics/canister/examine(user)
. = ..()
+ if(atom_integrity < max_integrity)
+ . += span_notice("Integrity compromised, repair hull with a welding tool.")
. += span_notice("A sticker on its side says MAX SAFE PRESSURE: [siunit_pressure(initial(pressure_limit), 0)]; MAX SAFE TEMPERATURE: [siunit(temp_limit, "K", 0)].")
. += span_notice("The hull is welded together and can be cut apart.")
if(internal_cell)
@@ -109,8 +111,6 @@
. += span_notice("Warning, no cell installed, use a screwdriver to open the hatch and insert one.")
if(panel_open)
. += span_notice("Hatch open, close it with a screwdriver.")
- if(integrity_failure)
- . += span_notice("Integrity compromised, repair hull with a welding tool.")
// Please keep the canister types sorted
// Basic canister per gas below here
@@ -461,18 +461,24 @@
user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS)
/obj/machinery/portable_atmospherics/canister/process(seconds_per_tick)
+ if(!shielding_powered)
+ return
+
var/our_pressure = air_contents.return_pressure()
var/our_temperature = air_contents.return_temperature()
+ var/energy_factor = round(log(10, max(our_pressure - pressure_limit, 1)) + log(10, max(our_temperature - temp_limit, 1)))
+ var/energy_consumed = energy_factor * 250 * seconds_per_tick
- if(shielding_powered)
- var/energy_factor = round(log(10, max(our_pressure - pressure_limit, 1)) + log(10, max(our_temperature - temp_limit, 1)))
- var/energy_consumed = energy_factor * 250 * seconds_per_tick
- if(powered(AREA_USAGE_EQUIP, ignore_use_power = TRUE))
- use_energy(energy_consumed, channel = AREA_USAGE_EQUIP)
- else if(!internal_cell?.use(energy_consumed * 0.025))
- shielding_powered = FALSE
- SSair.start_processing_machine(src)
- investigate_log("shielding turned off due to power loss")
+ if(!energy_consumed)
+ return
+
+ if(powered(AREA_USAGE_EQUIP, ignore_use_power = TRUE))
+ use_energy(energy_consumed, channel = AREA_USAGE_EQUIP)
+ else if(!internal_cell?.use(energy_consumed * 0.025))
+ shielding_powered = FALSE
+ SSair.start_processing_machine(src)
+ investigate_log("shielding turned off due to power loss")
+ update_appearance()
///return the icon_state component for the canister's indicator light based on its current pressure reading
/obj/machinery/portable_atmospherics/canister/proc/get_pressure_state()
diff --git a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
new file mode 100644
index 0000000000000..cde38f216ad70
--- /dev/null
+++ b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
@@ -0,0 +1,167 @@
+/obj/machinery/portable_atmospherics/pipe_scrubber
+ name = "pipe scrubber"
+ desc = "A machine for cleaning out pipes of lingering gases. It is a huge tank with a pump attached to it."
+ icon_state = "pipe_scrubber"
+ density = TRUE
+ max_integrity = 250
+ volume = 200
+ ///The internal air tank obj of the mech
+ var/obj/machinery/portable_atmospherics/canister/internal_tank
+ ///Is the machine on?
+ var/on = FALSE
+ ///What direction is the machine pumping to (into scrubber or out to the port)?
+ var/direction = PUMP_IN
+ ///the rate the machine will scrub air
+ var/volume_rate = 1000
+ ///List of gases that can be scrubbed
+ var/list/scrubbing = list(
+ /datum/gas/plasma,
+ /datum/gas/carbon_dioxide,
+ /datum/gas/nitrous_oxide,
+ /datum/gas/bz,
+ /datum/gas/nitrium,
+ /datum/gas/tritium,
+ /datum/gas/hypernoblium,
+ /datum/gas/water_vapor,
+ /datum/gas/freon,
+ /datum/gas/hydrogen,
+ /datum/gas/healium,
+ /datum/gas/proto_nitrate,
+ /datum/gas/zauker,
+ /datum/gas/halon,
+ )
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/Initialize(mapload)
+ . = ..()
+ internal_tank = new(src)
+ RegisterSignal(internal_tank, COMSIG_ATOM_BREAK, PROC_REF(deconstruct))
+ RegisterSignal(internal_tank, COMSIG_QDELETING, PROC_REF(deconstruct))
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/atom_deconstruct(disassembled)
+ . = ..()
+ var/turf/my_turf = get_turf(src)
+ my_turf.assume_air(air_contents)
+ my_turf.assume_air(internal_tank.air_contents)
+ SSair.stop_processing_machine(internal_tank)
+ qdel(internal_tank)
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/return_analyzable_air()
+ return list(
+ air_contents,
+ internal_tank.air_contents
+ )
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/welder_act(mob/living/user, obj/item/tool)
+ internal_tank.welder_act(user, tool)
+ return ..()
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/click_alt(mob/living/user)
+ return CLICK_ACTION_BLOCKING
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank)
+ return FALSE
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/update_icon_state()
+ icon_state = on ? "[initial(icon_state)]_active" : initial(icon_state)
+ return ..()
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/process_atmos()
+ if(take_atmos_damage())
+ excited = TRUE
+ return ..()
+ if(!on)
+ return ..()
+ excited = TRUE
+ if(direction == PUMP_IN)
+ scrub(air_contents)
+ else
+ internal_tank.air_contents.pump_gas_to(air_contents, PUMP_MAX_PRESSURE)
+ return ..()
+
+/// Scrub gasses from own air_contents into internal_tank.air_contents
+/obj/machinery/portable_atmospherics/pipe_scrubber/proc/scrub()
+ if(internal_tank.air_contents.return_pressure() >= PUMP_MAX_PRESSURE)
+ return
+
+ var/transfer_moles = min(1, volume_rate / air_contents.volume) * air_contents.total_moles()
+
+ var/datum/gas_mixture/filtering = air_contents.remove(transfer_moles) // Remove part of the mixture to filter.
+ var/datum/gas_mixture/filtered = new
+ if(!filtering)
+ return
+
+ filtered.temperature = filtering.temperature
+ for(var/gas in filtering.gases & scrubbing)
+ filtered.add_gas(gas)
+ filtered.gases[gas][MOLES] = filtering.gases[gas][MOLES] // Shuffle the "bad" gasses to the filtered mixture.
+ filtering.gases[gas][MOLES] = 0
+ filtering.garbage_collect() // Now that the gasses are set to 0, clean up the mixture.
+
+ internal_tank.air_contents.merge(filtered) // Store filtered out gasses.
+ air_contents.merge(filtering) // Returned the cleaned gas.
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "PipeScrubber", name)
+ ui.open()
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/ui_data()
+ var/data = list()
+ data["on"] = on
+ data["direction"] = direction
+ data["connected"] = connected_port ? 1 : 0
+ data["pressureTank"] = round(internal_tank.air_contents.return_pressure() ? internal_tank.air_contents.return_pressure() : 0)
+ data["pressurePump"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
+ data["hasHypernobCrystal"] = nob_crystal_inserted
+ data["reactionSuppressionEnabled"] = suppress_reactions
+
+ data["filterTypes"] = list()
+ for(var/gas_path in GLOB.meta_gas_info)
+ var/list/gas = GLOB.meta_gas_info[gas_path]
+ data["filterTypes"] += list(list("gasId" = gas[META_GAS_ID], "gasName" = gas[META_GAS_NAME], "enabled" = (gas_path in scrubbing)))
+
+ return data
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/ui_static_data()
+ var/list/data = list()
+ data["pressureLimitPump"] = pressure_limit
+ data["pressureLimitTank"] = internal_tank.pressure_limit
+ return data
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("power")
+ on = !on
+ if(on)
+ SSair.start_processing_machine(src)
+ SSair.start_processing_machine(internal_tank)
+ . = TRUE
+ if("direction")
+ direction = !direction
+ . = TRUE
+ if("toggle_filter")
+ scrubbing ^= gas_id2path(params["val"])
+ . = TRUE
+ if("reaction_suppression")
+ if(!internal_tank.nob_crystal_inserted)
+ message_admins("[ADMIN_LOOKUPFLW(usr)] tried to toggle reaction suppression on a pipe scrubber without a noblium crystal inside, possible href exploit attempt.")
+ return
+ internal_tank.suppress_reactions = !internal_tank.suppress_reactions
+ SSair.start_processing_machine(internal_tank)
+ message_admins("[ADMIN_LOOKUPFLW(usr)] turned [internal_tank.suppress_reactions ? "on" : "off"] the [internal_tank] reaction suppression.")
+ usr.investigate_log("turned [internal_tank.suppress_reactions ? "on" : "off"] the [internal_tank] reaction suppression.")
+ . = TRUE
+ update_appearance()
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/insert_nob_crystal()
+ . = ..()
+ internal_tank.nob_crystal_inserted = TRUE
+
+/obj/machinery/portable_atmospherics/pipe_scrubber/proc/toggle_reaction_suppression()
+ var/new_value = !suppress_reactions
+ suppress_reactions = new_value
+ internal_tank.suppress_reactions = new_value
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 17f3a6fb439f7..9729c0871451a 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -212,8 +212,16 @@
* * new_tank: the tank we are trying to put in the machine
*/
/obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank)
+ if(machine_stat & BROKEN)
+ return FALSE
if(!user)
return FALSE
+ if(!user.transferItemToLoc(new_tank, src))
+ return FALSE
+
+ investigate_log("had its internal [holding] swapped with [new_tank] by [key_name(user)].", INVESTIGATE_ATMOS)
+ to_chat(user, span_notice("[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [new_tank]" : "You insert [new_tank] into [src]"]."))
+
if(holding && new_tank)//for when we are actually switching tanks
user.put_in_hands(holding)
UnregisterSignal(holding, COMSIG_QDELETING)
@@ -238,17 +246,9 @@
return TRUE
/obj/machinery/portable_atmospherics/attackby(obj/item/item, mob/user, params)
- if(!istype(item, /obj/item/tank))
- return ..()
- if(machine_stat & BROKEN)
- return FALSE
- var/obj/item/tank/insert_tank = item
- if(!user.transferItemToLoc(insert_tank, src))
- return FALSE
- to_chat(user, span_notice("[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [insert_tank]" : "You insert [insert_tank] into [src]"]."))
- investigate_log("had its internal [holding] swapped with [insert_tank] by [key_name(user)].", INVESTIGATE_ATMOS)
- replace_tank(user, FALSE, insert_tank)
- update_appearance()
+ if(istype(item, /obj/item/tank))
+ return replace_tank(user, FALSE, item)
+ return ..()
/obj/machinery/portable_atmospherics/wrench_act(mob/living/user, obj/item/wrench)
if(machine_stat & BROKEN)
@@ -295,4 +295,8 @@
UnregisterSignal(holding, COMSIG_QDELETING)
holding = null
+/// Insert Hypernob crystal into the machine
+/obj/machinery/portable_atmospherics/proc/insert_nob_crystal()
+ nob_crystal_inserted = TRUE
+
#undef PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 09c6c64709b9a..b292180683f88 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -1,16 +1,17 @@
/obj/machinery/portable_atmospherics/scrubber
name = "portable air scrubber"
+ desc = "A portable variant of the station scrubbers, capable of filtering gas from the air around it or inserted tank. May also be wrenched into a port."
icon_state = "scrubber"
density = TRUE
max_integrity = 250
- volume = 1000
+ volume = 2000
///Is the machine on?
var/on = FALSE
///the rate the machine will scrub air
- var/volume_rate = 1000
+ var/volume_rate = 650
///Multiplier with ONE_ATMOSPHERE, if the enviroment pressure is higher than that, the scrubber won't work
- var/overpressure_m = 80
+ var/overpressure_m = 100
///Should the machine use overlay in update_overlays() when open/close?
var/use_overlays = TRUE
///List of gases that can be scrubbed
@@ -59,8 +60,15 @@
excited = TRUE
- var/atom/target = holding || get_turf(src)
- scrub(target.return_air())
+ if(!isnull(holding))
+ scrub(holding.return_air())
+ return ..()
+
+ var/turf/epicentre = get_turf(src)
+ if(isopenturf(epicentre))
+ scrub(epicentre.return_air())
+ for(var/turf/open/openturf as anything in epicentre.get_atmos_adjacent_turfs(alldir = TRUE))
+ scrub(openturf.return_air())
return ..()
/**
@@ -68,28 +76,39 @@
* Arguments:
* * mixture: the gas mixture to be scrubbed
*/
-/obj/machinery/portable_atmospherics/scrubber/proc/scrub(datum/gas_mixture/mixture)
+/obj/machinery/portable_atmospherics/scrubber/proc/scrub(datum/gas_mixture/environment)
if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE)
return
- var/transfer_moles = min(1, volume_rate / mixture.volume) * mixture.total_moles()
+ var/list/env_gases = environment.gases
- var/datum/gas_mixture/filtering = mixture.remove(transfer_moles) // Remove part of the mixture to filter.
- var/datum/gas_mixture/filtered = new
- if(!filtering)
- return
+ //contains all of the gas we're sucking out of the tile, gets put into our parent pipenet
+ var/datum/gas_mixture/filtered_out = new
+ var/list/filtered_gases = filtered_out.gases
+ filtered_out.temperature = environment.temperature
- filtered.temperature = filtering.temperature
- for(var/gas in filtering.gases & scrubbing)
- filtered.add_gas(gas)
- filtered.gases[gas][MOLES] = filtering.gases[gas][MOLES] // Shuffle the "bad" gasses to the filtered mixture.
- filtering.gases[gas][MOLES] = 0
- filtering.garbage_collect() // Now that the gasses are set to 0, clean up the mixture.
+ //maximum percentage of the turfs gas we can filter
+ var/removal_ratio = min(1, volume_rate / environment.volume)
- air_contents.merge(filtered) // Store filtered out gasses.
- mixture.merge(filtering) // Returned the cleaned gas.
- if(!holding)
- air_update_turf(FALSE, FALSE)
+ var/total_moles_to_remove = 0
+ for(var/gas in scrubbing & env_gases)
+ total_moles_to_remove += env_gases[gas][MOLES]
+
+ if(total_moles_to_remove == 0)//sometimes this gets non gc'd values
+ environment.garbage_collect()
+ return FALSE
+
+ for(var/gas in scrubbing & env_gases)
+ filtered_out.add_gas(gas)
+ var/transferred_moles = max(QUANTIZE(env_gases[gas][MOLES] * removal_ratio * (env_gases[gas][MOLES] / total_moles_to_remove)), min(MOLAR_ACCURACY*1000, env_gases[gas][MOLES]))
+
+ filtered_gases[gas][MOLES] = transferred_moles
+ env_gases[gas][MOLES] -= transferred_moles
+
+ environment.garbage_collect()
+
+ //Remix the resulting gases
+ air_contents.merge(filtered_out)
/obj/machinery/portable_atmospherics/scrubber/emp_act(severity)
. = ..()
diff --git a/code/modules/autowiki/pages/soup.dm b/code/modules/autowiki/pages/soup.dm
index 75521005d8e88..f67d00e97a057 100644
--- a/code/modules/autowiki/pages/soup.dm
+++ b/code/modules/autowiki/pages/soup.dm
@@ -27,6 +27,7 @@
var/result_name
var/result_desc
var/result_tastes
+ var/result_soup_type
// Solid food item results take priority over reagents for showcasing results
if(soup_recipe.resulting_food_path)
var/obj/item/resulting_food = new soup_recipe.resulting_food_path()
@@ -45,7 +46,7 @@
// Otherwise, it should be a reagent.
else
- var/result_soup_type = soup_recipe.results[1]
+ result_soup_type = soup_recipe.results[1]
var/datum/reagent/result_soup = new result_soup_type()
result_name = format_text(result_soup.name)
result_desc = result_soup.description
@@ -122,8 +123,14 @@
template_list["results"] = escape_value(compiled_results)
// -- While we're here, generate an icon of the bowl --
- var/image/compiled_image = image(icon = soup_icon, icon_state = soup_icon_state)
- upload_icon(getFlatIcon(compiled_image, no_anim = TRUE), filename)
+ if(!soup_icon_state)
+ var/obj/item/reagent_containers/cup/bowl/soup_bowl = new()
+ soup_bowl.reagents.add_reagent(result_soup_type, soup_bowl.reagents.maximum_volume)
+ upload_icon(getFlatIcon(soup_bowl, no_anim = TRUE), filename)
+ qdel(soup_bowl)
+ else
+ var/image/compiled_image = image(icon = soup_icon, icon_state = soup_icon_state)
+ upload_icon(getFlatIcon(compiled_image, no_anim = TRUE), filename)
// -- Cleanup --
qdel(soup_recipe)
diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm
index 22d9f532efcbd..6f6a25b47c8cd 100644
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -56,6 +56,7 @@
name = "pit grate"
icon = 'icons/obj/smooth_structures/lattice.dmi'
icon_state = "lattice-255"
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
anchored = TRUE
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
@@ -95,6 +96,7 @@
talpha = 255
obj_flags |= BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
SET_PLANE_IMPLICIT(src, ABOVE_LIGHTING_PLANE) //What matters it's one above openspace, so our animation is not dependant on what's there. Up to revision with 513
+ layer = ABOVE_NORMAL_TURF_LAYER
animate(src,alpha = talpha,time = 10)
addtimer(CALLBACK(src, PROC_REF(reset_plane)), 1 SECONDS)
if(hidden)
@@ -106,6 +108,7 @@
/obj/structure/pitgrate/proc/reset_plane()
SET_PLANE_IMPLICIT(src, FLOOR_PLANE)
+ layer = ABOVE_OPEN_TURF_LAYER
/obj/structure/pitgrate/Destroy()
if(hidden)
diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm
index a92e8ef3d2e6e..51263c339319e 100644
--- a/code/modules/bitrunning/components/avatar_connection.dm
+++ b/code/modules/bitrunning/components/avatar_connection.dm
@@ -60,7 +60,7 @@
var/datum/action/avatar_domain_info/action = new(help_datum)
action.Grant(avatar)
- var/client/our_client = old_body.client
+ var/client/our_client = avatar.client
var/alias = our_client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases)
if(alias && avatar.real_name != alias)
diff --git a/code/modules/bitrunning/components/bitrunning_points.dm b/code/modules/bitrunning/components/bitrunning_points.dm
index 328a70679e653..ea8f63f76d8df 100644
--- a/code/modules/bitrunning/components/bitrunning_points.dm
+++ b/code/modules/bitrunning/components/bitrunning_points.dm
@@ -5,6 +5,7 @@
/// A special condition limits this from spawning a crate
var/points_received = 0
+
/datum/component/bitrunning_points/Initialize(datum/lazy_template/virtual_domain/domain)
. = ..()
if(!isturf(parent))
@@ -12,6 +13,7 @@
RegisterSignal(domain, COMSIG_BITRUNNER_GOAL_POINT, PROC_REF(on_add_points))
+
/// Listens for points to be added which will eventually spawn a crate.
/datum/component/bitrunning_points/proc/on_add_points(datum/source, points_to_add)
SIGNAL_HANDLER
@@ -23,12 +25,14 @@
reveal()
+
/// Spawns the crate with some effects
/datum/component/bitrunning_points/proc/reveal()
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
var/turf/tile = parent
- new /obj/structure/closet/crate/secure/bitrunning/encrypted(tile)
+ 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)
diff --git a/code/modules/bitrunning/job.dm b/code/modules/bitrunning/job.dm
index 1e749a3c7a58e..d62bd2cf3aeac 100644
--- a/code/modules/bitrunning/job.dm
+++ b/code/modules/bitrunning/job.dm
@@ -13,7 +13,7 @@
paycheck = PAYCHECK_CREW
paycheck_department = ACCOUNT_CAR
display_order = JOB_DISPLAY_ORDER_BITRUNNER
- bounty_types = CIV_JOB_RANDOM
+ bounty_types = CIV_JOB_BITRUN
departments_list = list(
/datum/job_department/cargo,
)
diff --git a/code/modules/bitrunning/netpod/_netpod.dm b/code/modules/bitrunning/netpod/_netpod.dm
new file mode 100644
index 0000000000000..2208c56a7414e
--- /dev/null
+++ b/code/modules/bitrunning/netpod/_netpod.dm
@@ -0,0 +1,137 @@
+#define BASE_DISCONNECT_DAMAGE 40
+
+
+/obj/machinery/netpod
+ name = "netpod"
+
+ base_icon_state = "netpod"
+ circuit = /obj/item/circuitboard/machine/netpod
+ desc = "A link to the netverse. It has an assortment of cables to connect yourself to a virtual domain."
+ icon = 'icons/obj/machines/bitrunning.dmi'
+ icon_state = "netpod"
+ max_integrity = 300
+ obj_flags = BLOCKS_CONSTRUCTION
+ state_open = TRUE
+ interaction_flags_mouse_drop = NEED_HANDS | NEED_DEXTERITY
+
+ /// Whether we have an ongoing connection
+ var/connected = FALSE
+ /// A player selected outfit by clicking the netpod
+ var/datum/outfit/netsuit = /datum/outfit/job/bitrunner
+ /// Holds this to see if it needs to generate a new one
+ var/datum/weakref/avatar_ref
+ /// The linked quantum server
+ var/datum/weakref/server_ref
+ /// The amount of brain damage done from force disconnects
+ var/disconnect_damage
+ /// Static list of outfits to select from
+ var/list/cached_outfits = list()
+
+
+/obj/machinery/netpod/post_machine_initialize()
+ . = ..()
+
+ disconnect_damage = BASE_DISCONNECT_DAMAGE
+ find_server()
+
+ RegisterSignal(src, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_damage_taken))
+ RegisterSignal(src, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_power_loss))
+ RegisterSignals(src, list(COMSIG_QDELETING, COMSIG_MACHINERY_BROKEN),PROC_REF(on_broken))
+
+ register_context()
+ update_appearance()
+
+
+/obj/machinery/netpod/Destroy()
+ . = ..()
+
+ QDEL_LIST(cached_outfits)
+
+
+/obj/machinery/netpod/examine(mob/user)
+ . = ..()
+
+ if(isnull(server_ref?.resolve()))
+ . += span_infoplain("It's not connected to anything.")
+ . += span_infoplain("Netpods must be built within 4 tiles of a server.")
+ return
+
+ if(!isobserver(user))
+ . += span_infoplain("Drag yourself into the pod to engage the link.")
+ . += span_infoplain("It has limited resuscitation capabilities. Remaining in the pod can heal some injuries.")
+ . += span_infoplain("It has a security system that will alert the occupant if it is tampered with.")
+
+ if(isnull(occupant))
+ . += span_infoplain("It's currently unoccupied.")
+ return
+
+ . += span_infoplain("It's currently occupied by [occupant].")
+
+ if(isobserver(user))
+ . += span_notice("As an observer, you can click this netpod to jump to its avatar.")
+ return
+
+ . += span_notice("It can be pried open with a crowbar, but its safety mechanisms will alert the occupant.")
+
+
+/obj/machinery/netpod/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ . = ..()
+
+ if(isnull(held_item))
+ context[SCREENTIP_CONTEXT_LMB] = "Select Outfit"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ if(istype(held_item, /obj/item/crowbar) && occupant)
+ context[SCREENTIP_CONTEXT_LMB] = "Pry Open"
+ return CONTEXTUAL_SCREENTIP_SET
+
+
+/obj/machinery/netpod/update_icon_state()
+ if(!is_operational)
+ icon_state = base_icon_state
+ return ..()
+
+ if(state_open)
+ icon_state = base_icon_state + "_open_active"
+ return ..()
+
+ if(panel_open)
+ icon_state = base_icon_state + "_panel"
+ return ..()
+
+ icon_state = base_icon_state + "_closed"
+ if(occupant)
+ icon_state += "_active"
+
+ return ..()
+
+
+/obj/machinery/netpod/mouse_drop_receive(mob/target, mob/user, params)
+ var/mob/living/carbon/player = user
+
+ if(!iscarbon(player) || !is_operational || !state_open || player.buckled)
+ return
+
+ close_machine(target)
+
+
+/obj/machinery/netpod/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ if(!state_open && user == occupant)
+ container_resist_act(user)
+
+
+/obj/machinery/netpod/attack_ghost(mob/dead/observer/our_observer)
+ var/our_target = avatar_ref?.resolve()
+ if(isnull(our_target) || !our_observer.orbit(our_target))
+ return ..()
+
+
+/// When the server is upgraded, drops brain damage a little
+/obj/machinery/netpod/proc/on_server_upgraded(obj/machinery/quantum_server/source)
+ SIGNAL_HANDLER
+
+ disconnect_damage = BASE_DISCONNECT_DAMAGE * (1 - source.servo_bonus)
+
+
+#undef BASE_DISCONNECT_DAMAGE
diff --git a/code/modules/bitrunning/netpod/container.dm b/code/modules/bitrunning/netpod/container.dm
new file mode 100644
index 0000000000000..6165544544511
--- /dev/null
+++ b/code/modules/bitrunning/netpod/container.dm
@@ -0,0 +1,74 @@
+/obj/machinery/netpod/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(!state_open && gone == occupant)
+ container_resist_act(gone)
+
+
+/obj/machinery/netpod/relaymove(mob/living/user, direction)
+ if(!state_open)
+ container_resist_act(user)
+
+
+/obj/machinery/netpod/container_resist_act(mob/living/user)
+ user.visible_message(span_notice("[occupant] emerges from [src]!"),
+ span_notice("You climb out of [src]!"),
+ span_notice("With a hiss, you hear a machine opening."))
+ open_machine()
+
+
+/obj/machinery/netpod/open_machine(drop = TRUE, density_to_set = FALSE)
+ playsound(src, 'sound/machines/tramopen.ogg', 60, TRUE, frequency = 65000)
+ flick("[base_icon_state]_opening", src)
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_OPENED)
+ update_use_power(IDLE_POWER_USE)
+
+ return ..()
+
+
+/obj/machinery/netpod/close_machine(mob/user, density_to_set = TRUE)
+ if(!state_open || panel_open || !is_operational || !iscarbon(user))
+ return
+
+ playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
+ flick("[base_icon_state]_closing", src)
+ ..()
+
+ enter_matrix()
+
+
+/obj/machinery/netpod/default_pry_open(obj/item/crowbar, mob/living/pryer)
+ if(isnull(occupant) || !iscarbon(occupant))
+ if(!state_open)
+ if(panel_open)
+ return FALSE
+ open_machine()
+ else
+ shut_pod()
+
+ return TRUE
+
+ pryer.visible_message(
+ span_danger("[pryer] starts prying open [src]!"),
+ span_notice("You start to pry open [src]."),
+ span_notice("You hear loud prying on metal.")
+ )
+ playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE)
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_CROWBAR_ALERT, pryer)
+
+ if(do_after(pryer, 15 SECONDS, src))
+ if(!state_open)
+ sever_connection()
+ open_machine()
+
+ return TRUE
+
+
+/// Closes the machine without shoving in an occupant
+/obj/machinery/netpod/proc/shut_pod()
+ state_open = FALSE
+ playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
+ flick("[base_icon_state]_closing", src)
+ set_density(TRUE)
+
+ update_appearance()
diff --git a/code/modules/bitrunning/netpod/outfitting.dm b/code/modules/bitrunning/netpod/outfitting.dm
new file mode 100644
index 0000000000000..07f251541980f
--- /dev/null
+++ b/code/modules/bitrunning/netpod/outfitting.dm
@@ -0,0 +1,30 @@
+/// Creates a list of outfit entries for the UI.
+/obj/machinery/netpod/proc/make_outfit_collection(identifier, list/outfit_list)
+ var/list/collection = list(
+ "name" = identifier,
+ "outfits" = list()
+ )
+
+ for(var/datum/outfit/outfit as anything in outfit_list)
+ var/outfit_name = initial(outfit.name)
+ if(findtext(outfit_name, "(") != 0 || findtext(outfit_name, "-") != 0) // No special variants please
+ continue
+
+ collection["outfits"] += list(list("path" = outfit, "name" = outfit_name))
+
+ return list(collection)
+
+
+/// Resolves a path to an outfit.
+/obj/machinery/netpod/proc/resolve_outfit(text)
+ var/path = text2path(text)
+ if(!ispath(path, /datum/outfit))
+ return
+
+ for(var/wardrobe in cached_outfits)
+ for(var/outfit in wardrobe["outfits"])
+ if(path == outfit["path"])
+ return path
+
+ message_admins("[usr]:[usr.ckey] attempted to select an unavailable outfit from a netpod")
+ return
diff --git a/code/modules/bitrunning/netpod/signals.dm b/code/modules/bitrunning/netpod/signals.dm
new file mode 100644
index 0000000000000..8f8416aeb7b1b
--- /dev/null
+++ b/code/modules/bitrunning/netpod/signals.dm
@@ -0,0 +1,64 @@
+/// Machine has been broken - handles signals and reverting sprites
+/obj/machinery/netpod/proc/on_broken(datum/source)
+ SIGNAL_HANDLER
+
+ sever_connection()
+
+
+/// Checks the integrity, alerts occupants
+/obj/machinery/netpod/proc/on_damage_taken(datum/source, damage_amount)
+ SIGNAL_HANDLER
+
+ if(isnull(occupant) || !connected)
+ return
+
+ var/total = max_integrity - damage_amount
+ var/integrity = (atom_integrity / total) * 100
+ if(integrity > 50)
+ return
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_INTEGRITY)
+
+
+/// Puts points on the current occupant's card account
+/obj/machinery/netpod/proc/on_domain_complete(datum/source, atom/movable/crate, reward_points)
+ SIGNAL_HANDLER
+
+ if(isnull(occupant) || !connected)
+ return
+
+ var/mob/living/player = occupant
+
+ var/datum/bank_account/account = player.get_bank_account()
+ if(isnull(account))
+ return
+
+ account.bitrunning_points += reward_points * 100
+
+
+/// The domain has been fully purged, so we should double check our avatar is deleted
+/obj/machinery/netpod/proc/on_domain_scrubbed(datum/source)
+ SIGNAL_HANDLER
+
+ var/mob/avatar = avatar_ref?.resolve()
+ if(isnull(avatar))
+ return
+
+ QDEL_NULL(avatar)
+
+
+/// Boots out anyone in the machine && opens it
+/obj/machinery/netpod/proc/on_power_loss(datum/source)
+ SIGNAL_HANDLER
+
+ if(state_open)
+ return
+
+ if(isnull(occupant) || !connected)
+ connected = FALSE
+ open_machine()
+ return
+
+ sever_connection()
+
+
diff --git a/code/modules/bitrunning/netpod/tools.dm b/code/modules/bitrunning/netpod/tools.dm
new file mode 100644
index 0000000000000..0d31bdab86651
--- /dev/null
+++ b/code/modules/bitrunning/netpod/tools.dm
@@ -0,0 +1,22 @@
+/obj/machinery/netpod/crowbar_act(mob/living/user, obj/item/tool)
+ if(user.combat_mode)
+ attack_hand(user)
+ return ITEM_INTERACT_SUCCESS
+
+ if(default_pry_open(tool, user) || default_deconstruction_crowbar(tool))
+ return ITEM_INTERACT_SUCCESS
+
+
+/obj/machinery/netpod/screwdriver_act(mob/living/user, obj/item/tool)
+ if(occupant)
+ balloon_alert(user, "in use!")
+ return ITEM_INTERACT_SUCCESS
+
+ if(state_open)
+ balloon_alert(user, "close first.")
+ return ITEM_INTERACT_SUCCESS
+
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]_panel", "[base_icon_state]_closed", tool))
+ update_appearance() // sometimes icon doesnt properly update during flick()
+ ui_close(user)
+ return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/bitrunning/netpod/ui.dm b/code/modules/bitrunning/netpod/ui.dm
new file mode 100644
index 0000000000000..93719fe64ebef
--- /dev/null
+++ b/code/modules/bitrunning/netpod/ui.dm
@@ -0,0 +1,41 @@
+/obj/machinery/netpod/ui_interact(mob/user, datum/tgui/ui)
+ if(!is_operational || occupant)
+ return
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "NetpodOutfits")
+ ui.set_autoupdate(FALSE)
+ ui.open()
+
+
+/obj/machinery/netpod/ui_data()
+ var/list/data = list()
+
+ data["netsuit"] = netsuit
+ return data
+
+
+/obj/machinery/netpod/ui_static_data()
+ var/list/data = list()
+
+ if(!length(cached_outfits))
+ cached_outfits += make_outfit_collection("Jobs", subtypesof(/datum/outfit/job))
+
+ data["collections"] = cached_outfits
+
+ return data
+
+
+/obj/machinery/netpod/ui_act(action, params)
+ . = ..()
+ if(.)
+ return TRUE
+ switch(action)
+ if("select_outfit")
+ var/datum/outfit/new_suit = resolve_outfit(params["outfit"])
+ if(new_suit)
+ netsuit = new_suit
+ return TRUE
+
+ return FALSE
diff --git a/code/modules/bitrunning/netpod/utils.dm b/code/modules/bitrunning/netpod/utils.dm
new file mode 100644
index 0000000000000..6e0033fe02d93
--- /dev/null
+++ b/code/modules/bitrunning/netpod/utils.dm
@@ -0,0 +1,144 @@
+/// Puts the occupant in netpod stasis, basically short-circuiting environmental conditions
+/obj/machinery/netpod/proc/add_healing(mob/living/target)
+ if(target != occupant)
+ return
+
+ target.AddComponent(/datum/component/netpod_healing, pod = src)
+ target.playsound_local(src, 'sound/effects/submerge.ogg', 20, vary = TRUE)
+ target.extinguish_mob()
+ update_use_power(ACTIVE_POWER_USE)
+
+
+/// Disconnects the occupant after a certain time so they aren't just hibernating in netpod stasis. A balance change
+/obj/machinery/netpod/proc/auto_disconnect()
+ if(isnull(occupant) || state_open || connected)
+ return
+
+ var/mob/player = occupant
+ player.playsound_local(src, 'sound/effects/splash.ogg', 60, TRUE)
+ to_chat(player, span_notice("The machine disconnects itself and begins to drain."))
+ open_machine()
+
+
+/// Handles occupant post-disconnection effects like damage, sounds, etc
+/obj/machinery/netpod/proc/disconnect_occupant(cause_damage = FALSE)
+ connected = FALSE
+
+ var/mob/living/mob_occupant = occupant
+ if(isnull(occupant) || mob_occupant.stat == DEAD)
+ open_machine()
+ return
+
+ mob_occupant.playsound_local(src, 'sound/magic/blink.ogg', 25, TRUE)
+ mob_occupant.set_static_vision(2 SECONDS)
+ mob_occupant.set_temp_blindness(1 SECONDS)
+ mob_occupant.Paralyze(2 SECONDS)
+
+ if(!is_operational)
+ open_machine()
+ return
+
+ var/heal_time = 1
+ if(mob_occupant.health < mob_occupant.maxHealth)
+ heal_time = (mob_occupant.stat + 2) * 5
+ addtimer(CALLBACK(src, PROC_REF(auto_disconnect)), heal_time SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
+
+ if(!cause_damage)
+ return
+
+ mob_occupant.flash_act(override_blindness_check = TRUE, visual = TRUE)
+ mob_occupant.adjustOrganLoss(ORGAN_SLOT_BRAIN, disconnect_damage)
+ INVOKE_ASYNC(mob_occupant, TYPE_PROC_REF(/mob/living, emote), "scream")
+ to_chat(mob_occupant, span_danger("You've been forcefully disconnected from your avatar! Your thoughts feel scrambled!"))
+
+
+/**
+ * ### Enter Matrix
+ * Finds any current avatars from this chair - or generates a new one
+ *
+ * New avatars cost 1 attempt, and this will eject if there's none left
+ *
+ * Connects the mind to the avatar if everything is ok
+ */
+/obj/machinery/netpod/proc/enter_matrix()
+ var/mob/living/carbon/human/neo = occupant
+ if(!ishuman(neo) || neo.stat == DEAD || isnull(neo.mind))
+ balloon_alert(neo, "invalid occupant.")
+ return
+
+ var/obj/machinery/quantum_server/server = find_server()
+ if(isnull(server))
+ balloon_alert(neo, "no server connected!")
+ return
+
+ var/datum/lazy_template/virtual_domain/generated_domain = server.generated_domain
+ if(isnull(generated_domain) || !server.is_ready)
+ balloon_alert(neo, "nothing loaded!")
+ return
+
+ var/mob/living/carbon/current_avatar = avatar_ref?.resolve()
+ if(isnull(current_avatar) || current_avatar.stat != CONSCIOUS) // We need a viable avatar
+ current_avatar = server.start_new_connection(neo, netsuit)
+ if(isnull(current_avatar))
+ balloon_alert(neo, "out of bandwidth!")
+ return
+
+ neo.set_static_vision(2 SECONDS)
+ add_healing(occupant)
+
+ if(!validate_entry(neo, current_avatar))
+ open_machine()
+ return
+
+ current_avatar.AddComponent( \
+ /datum/component/avatar_connection, \
+ old_mind = neo.mind, \
+ old_body = neo, \
+ server = server, \
+ pod = src, \
+ help_text = generated_domain.help_text, \
+ )
+
+ connected = TRUE
+
+
+/// Finds a server and sets the server_ref
+/obj/machinery/netpod/proc/find_server()
+ var/obj/machinery/quantum_server/server = server_ref?.resolve()
+ if(server)
+ return server
+
+ server = locate(/obj/machinery/quantum_server) in oview(4, src)
+ if(isnull(server))
+ return
+
+ server_ref = WEAKREF(server)
+ RegisterSignal(server, COMSIG_MACHINERY_REFRESH_PARTS, PROC_REF(on_server_upgraded))
+ RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_COMPLETE, PROC_REF(on_domain_complete))
+ RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_SCRUBBED, PROC_REF(on_domain_scrubbed))
+
+ return server
+
+
+/// Severs the connection with the current avatar
+/obj/machinery/netpod/proc/sever_connection()
+ if(isnull(occupant) || !connected)
+ return
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_SEVER)
+
+
+/// Checks for cases to eject/fail connecting an avatar
+/obj/machinery/netpod/proc/validate_entry(mob/living/neo, mob/living/avatar)
+ if(!do_after(neo, 2 SECONDS, src))
+ return FALSE
+
+ // Very invalid
+ if(QDELETED(neo) || QDELETED(avatar) || QDELETED(src) || !is_operational)
+ return FALSE
+
+ // Invalid
+ if(occupant != neo || isnull(neo.mind) || neo.stat > SOFT_CRIT || avatar.stat == DEAD)
+ return FALSE
+
+ return TRUE
diff --git a/code/modules/bitrunning/objects/landmarks.dm b/code/modules/bitrunning/objects/landmarks.dm
index 3b38493edfffa..ea55b96979edd 100644
--- a/code/modules/bitrunning/objects/landmarks.dm
+++ b/code/modules/bitrunning/objects/landmarks.dm
@@ -12,6 +12,11 @@
name = "Bitrunning hololadder spawn"
icon_state = "hololadder"
+/// A permanent exit for the domain
+/obj/effect/landmark/bitrunning/permanent_exit
+ name = "Bitrunning permanent exit"
+ icon_state = "perm_exit"
+
/// Where the crates need to be taken
/obj/effect/landmark/bitrunning/cache_goal_turf
name = "Bitrunning goal turf"
diff --git a/code/modules/bitrunning/objects/loot_box.dm b/code/modules/bitrunning/objects/loot_box.dm
index 39209c33d97f9..200e0b259fbda 100644
--- a/code/modules/bitrunning/objects/loot_box.dm
+++ b/code/modules/bitrunning/objects/loot_box.dm
@@ -8,6 +8,7 @@
icon_locked = "bitrunning+l"
icon_closed = "bitrunning"
icon_broken = "bitrunning+b"
+ icon_open = "bitrunning"
/obj/item/storage/lockbox/bitrunning/encrypted
name = "encrypted curiosity"
diff --git a/code/modules/bitrunning/objects/netpod.dm b/code/modules/bitrunning/objects/netpod.dm
deleted file mode 100644
index 1d4e905d6e184..0000000000000
--- a/code/modules/bitrunning/objects/netpod.dm
+++ /dev/null
@@ -1,490 +0,0 @@
-#define BASE_DISCONNECT_DAMAGE 40
-
-/obj/machinery/netpod
- name = "netpod"
-
- base_icon_state = "netpod"
- circuit = /obj/item/circuitboard/machine/netpod
- desc = "A link to the netverse. It has an assortment of cables to connect yourself to a virtual domain."
- icon = 'icons/obj/machines/bitrunning.dmi'
- icon_state = "netpod"
- max_integrity = 300
- obj_flags = BLOCKS_CONSTRUCTION
- state_open = TRUE
- interaction_flags_mouse_drop = NEED_HANDS | NEED_DEXTERITY
-
- /// Whether we have an ongoing connection
- var/connected = FALSE
- /// A player selected outfit by clicking the netpod
- var/datum/outfit/netsuit = /datum/outfit/job/bitrunner
- /// Holds this to see if it needs to generate a new one
- var/datum/weakref/avatar_ref
- /// The linked quantum server
- var/datum/weakref/server_ref
- /// The amount of brain damage done from force disconnects
- var/disconnect_damage
- /// Static list of outfits to select from
- var/list/cached_outfits = list()
-
-/obj/machinery/netpod/post_machine_initialize()
- . = ..()
-
- disconnect_damage = BASE_DISCONNECT_DAMAGE
- find_server()
-
- RegisterSignal(src, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_damage_taken))
- RegisterSignal(src, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_power_loss))
- RegisterSignals(src, list(COMSIG_QDELETING, COMSIG_MACHINERY_BROKEN),PROC_REF(on_broken))
-
- register_context()
- update_appearance()
-
-/obj/machinery/netpod/Destroy()
- . = ..()
-
- QDEL_LIST(cached_outfits)
-
-/obj/machinery/netpod/examine(mob/user)
- . = ..()
-
- if(isnull(server_ref?.resolve()))
- . += span_infoplain("It's not connected to anything.")
- . += span_infoplain("Netpods must be built within 4 tiles of a server.")
- return
-
- if(!isobserver(user))
- . += span_infoplain("Drag yourself into the pod to engage the link.")
- . += span_infoplain("It has limited resuscitation capabilities. Remaining in the pod can heal some injuries.")
- . += span_infoplain("It has a security system that will alert the occupant if it is tampered with.")
-
- if(isnull(occupant))
- . += span_infoplain("It's currently unoccupied.")
- return
-
- . += span_infoplain("It's currently occupied by [occupant].")
-
- if(isobserver(user))
- . += span_notice("As an observer, you can click this netpod to jump to its avatar.")
- return
-
- . += span_notice("It can be pried open with a crowbar, but its safety mechanisms will alert the occupant.")
-
-
-
-/obj/machinery/netpod/add_context(atom/source, list/context, obj/item/held_item, mob/user)
- . = ..()
-
- if(isnull(held_item))
- context[SCREENTIP_CONTEXT_LMB] = "Select Outfit"
- return CONTEXTUAL_SCREENTIP_SET
-
- if(istype(held_item, /obj/item/crowbar) && occupant)
- context[SCREENTIP_CONTEXT_LMB] = "Pry Open"
- return CONTEXTUAL_SCREENTIP_SET
-
-
-/obj/machinery/netpod/update_icon_state()
- if(!is_operational)
- icon_state = base_icon_state
- return ..()
-
- if(state_open)
- icon_state = base_icon_state + "_open_active"
- return ..()
-
- if(panel_open)
- icon_state = base_icon_state + "_panel"
- return ..()
-
- icon_state = base_icon_state + "_closed"
- if(occupant)
- icon_state += "_active"
-
- return ..()
-
-/obj/machinery/netpod/mouse_drop_receive(mob/target, mob/user, params)
- var/mob/living/carbon/player = user
-
- if(!iscarbon(player) || !is_operational || !state_open || player.buckled)
- return
-
- close_machine(target)
-
-/obj/machinery/netpod/crowbar_act(mob/living/user, obj/item/tool)
- if(user.combat_mode)
- attack_hand(user)
- return ITEM_INTERACT_SUCCESS
-
- if(default_pry_open(tool, user) || default_deconstruction_crowbar(tool))
- return ITEM_INTERACT_SUCCESS
-
-/obj/machinery/netpod/screwdriver_act(mob/living/user, obj/item/tool)
- if(occupant)
- balloon_alert(user, "in use!")
- return ITEM_INTERACT_SUCCESS
-
- if(state_open)
- balloon_alert(user, "close first.")
- return ITEM_INTERACT_SUCCESS
-
- if(default_deconstruction_screwdriver(user, "[base_icon_state]_panel", "[base_icon_state]_closed", tool))
- update_appearance() // sometimes icon doesnt properly update during flick()
- ui_close(user)
- return ITEM_INTERACT_SUCCESS
-
-/obj/machinery/netpod/attack_hand(mob/living/user, list/modifiers)
- . = ..()
- if(!state_open && user == occupant)
- container_resist_act(user)
-
-/obj/machinery/netpod/Exited(atom/movable/gone, direction)
- . = ..()
- if(!state_open && gone == occupant)
- container_resist_act(gone)
-
-/obj/machinery/netpod/relaymove(mob/living/user, direction)
- if(!state_open)
- container_resist_act(user)
-
-/obj/machinery/netpod/container_resist_act(mob/living/user)
- user.visible_message(span_notice("[occupant] emerges from [src]!"),
- span_notice("You climb out of [src]!"),
- span_notice("With a hiss, you hear a machine opening."))
- open_machine()
-
-/obj/machinery/netpod/open_machine(drop = TRUE, density_to_set = FALSE)
- playsound(src, 'sound/machines/tramopen.ogg', 60, TRUE, frequency = 65000)
- flick("[base_icon_state]_opening", src)
- SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_OPENED)
- update_use_power(IDLE_POWER_USE)
-
- return ..()
-
-/obj/machinery/netpod/close_machine(mob/user, density_to_set = TRUE)
- if(!state_open || panel_open || !is_operational || !iscarbon(user))
- return
-
- playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
- flick("[base_icon_state]_closing", src)
- ..()
-
- enter_matrix()
-
-/obj/machinery/netpod/default_pry_open(obj/item/crowbar, mob/living/pryer)
- if(isnull(occupant) || !iscarbon(occupant))
- if(!state_open)
- if(panel_open)
- return FALSE
- open_machine()
- else
- shut_pod()
-
- return TRUE
-
- pryer.visible_message(
- span_danger("[pryer] starts prying open [src]!"),
- span_notice("You start to pry open [src]."),
- span_notice("You hear loud prying on metal.")
- )
- playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE)
-
- SEND_SIGNAL(src, COMSIG_BITRUNNER_CROWBAR_ALERT, pryer)
-
- if(do_after(pryer, 15 SECONDS, src))
- if(!state_open)
- sever_connection()
- open_machine()
-
- return TRUE
-
-/obj/machinery/netpod/ui_interact(mob/user, datum/tgui/ui)
- if(!is_operational || occupant)
- return
-
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "NetpodOutfits")
- ui.set_autoupdate(FALSE)
- ui.open()
-
-/obj/machinery/netpod/ui_data()
- var/list/data = list()
-
- data["netsuit"] = netsuit
- return data
-
-/obj/machinery/netpod/ui_static_data()
- var/list/data = list()
-
- if(!length(cached_outfits))
- cached_outfits += make_outfit_collection("Jobs", subtypesof(/datum/outfit/job))
-
- data["collections"] = cached_outfits
-
- return data
-
-/obj/machinery/netpod/ui_act(action, params)
- . = ..()
- if(.)
- return TRUE
- switch(action)
- if("select_outfit")
- var/datum/outfit/new_suit = resolve_outfit(params["outfit"])
- if(new_suit)
- netsuit = new_suit
- return TRUE
-
- return FALSE
-
-/obj/machinery/netpod/attack_ghost(mob/dead/observer/our_observer)
- var/our_target = avatar_ref?.resolve()
- if(isnull(our_target) || !our_observer.orbit(our_target))
- return ..()
-
-/// Puts the occupant in netpod stasis, basically short-circuiting environmental conditions
-/obj/machinery/netpod/proc/add_healing(mob/living/target)
- if(target != occupant)
- return
-
- target.AddComponent(/datum/component/netpod_healing, pod = src)
- target.playsound_local(src, 'sound/effects/submerge.ogg', 20, vary = TRUE)
- target.extinguish_mob()
- update_use_power(ACTIVE_POWER_USE)
-
-/// Disconnects the occupant after a certain time so they aren't just hibernating in netpod stasis. A balance change
-/obj/machinery/netpod/proc/auto_disconnect()
- if(isnull(occupant) || state_open || connected)
- return
-
- var/mob/player = occupant
- player.playsound_local(src, 'sound/effects/splash.ogg', 60, TRUE)
- to_chat(player, span_notice("The machine disconnects itself and begins to drain."))
- open_machine()
-
-/// Handles occupant post-disconnection effects like damage, sounds, etc
-/obj/machinery/netpod/proc/disconnect_occupant(cause_damage = FALSE)
- connected = FALSE
-
- var/mob/living/mob_occupant = occupant
- if(isnull(occupant) || mob_occupant.stat == DEAD)
- open_machine()
- return
-
- mob_occupant.playsound_local(src, 'sound/magic/blink.ogg', 25, TRUE)
- mob_occupant.set_static_vision(2 SECONDS)
- mob_occupant.set_temp_blindness(1 SECONDS)
- mob_occupant.Paralyze(2 SECONDS)
-
- if(!is_operational)
- open_machine()
- return
-
- var/heal_time = 1
- if(mob_occupant.health < mob_occupant.maxHealth)
- heal_time = (mob_occupant.stat + 2) * 5
- addtimer(CALLBACK(src, PROC_REF(auto_disconnect)), heal_time SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME)
-
- if(!cause_damage)
- return
-
- mob_occupant.flash_act(override_blindness_check = TRUE, visual = TRUE)
- mob_occupant.adjustOrganLoss(ORGAN_SLOT_BRAIN, disconnect_damage)
- INVOKE_ASYNC(mob_occupant, TYPE_PROC_REF(/mob/living, emote), "scream")
- to_chat(mob_occupant, span_danger("You've been forcefully disconnected from your avatar! Your thoughts feel scrambled!"))
-
-/**
- * ### Enter Matrix
- * Finds any current avatars from this chair - or generates a new one
- *
- * New avatars cost 1 attempt, and this will eject if there's none left
- *
- * Connects the mind to the avatar if everything is ok
- */
-/obj/machinery/netpod/proc/enter_matrix()
- var/mob/living/carbon/human/neo = occupant
- if(!ishuman(neo) || neo.stat == DEAD || isnull(neo.mind))
- balloon_alert(neo, "invalid occupant.")
- return
-
- var/obj/machinery/quantum_server/server = find_server()
- if(isnull(server))
- balloon_alert(neo, "no server connected!")
- return
-
- var/datum/lazy_template/virtual_domain/generated_domain = server.generated_domain
- if(isnull(generated_domain) || !server.is_ready)
- balloon_alert(neo, "nothing loaded!")
- return
-
- var/mob/living/carbon/current_avatar = avatar_ref?.resolve()
- if(isnull(current_avatar) || current_avatar.stat != CONSCIOUS) // We need a viable avatar
- var/obj/structure/hololadder/wayout = server.generate_hololadder()
- if(isnull(wayout))
- balloon_alert(neo, "out of bandwidth!")
- return
- current_avatar = server.generate_avatar(wayout, netsuit)
- avatar_ref = WEAKREF(current_avatar)
- server.stock_gear(current_avatar, neo, generated_domain)
-
- neo.set_static_vision(3 SECONDS)
- add_healing(occupant)
-
- if(!validate_entry(neo, current_avatar))
- open_machine()
- return
-
- current_avatar.AddComponent( \
- /datum/component/avatar_connection, \
- old_mind = neo.mind, \
- old_body = neo, \
- server = server, \
- pod = src, \
- help_text = generated_domain.help_text, \
- )
-
- connected = TRUE
-
-/// Finds a server and sets the server_ref
-/obj/machinery/netpod/proc/find_server()
- var/obj/machinery/quantum_server/server = server_ref?.resolve()
- if(server)
- return server
-
- server = locate(/obj/machinery/quantum_server) in oview(4, src)
- if(isnull(server))
- return
-
- server_ref = WEAKREF(server)
- RegisterSignal(server, COMSIG_MACHINERY_REFRESH_PARTS, PROC_REF(on_server_upgraded))
- RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_COMPLETE, PROC_REF(on_domain_complete))
- RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_SCRUBBED, PROC_REF(on_domain_scrubbed))
-
- return server
-
-/// Creates a list of outfit entries for the UI.
-/obj/machinery/netpod/proc/make_outfit_collection(identifier, list/outfit_list)
- var/list/collection = list(
- "name" = identifier,
- "outfits" = list()
- )
-
- for(var/datum/outfit/outfit as anything in outfit_list)
- var/outfit_name = initial(outfit.name)
- if(findtext(outfit_name, "(") != 0 || findtext(outfit_name, "-") != 0) // No special variants please
- continue
-
- collection["outfits"] += list(list("path" = outfit, "name" = outfit_name))
-
- return list(collection)
-
-/// Machine has been broken - handles signals and reverting sprites
-/obj/machinery/netpod/proc/on_broken(datum/source)
- SIGNAL_HANDLER
-
- sever_connection()
-
-/// Checks the integrity, alerts occupants
-/obj/machinery/netpod/proc/on_damage_taken(datum/source, damage_amount)
- SIGNAL_HANDLER
-
- if(isnull(occupant) || !connected)
- return
-
- var/total = max_integrity - damage_amount
- var/integrity = (atom_integrity / total) * 100
- if(integrity > 50)
- return
-
- SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_INTEGRITY)
-
-/// Puts points on the current occupant's card account
-/obj/machinery/netpod/proc/on_domain_complete(datum/source, atom/movable/crate, reward_points)
- SIGNAL_HANDLER
-
- if(isnull(occupant) || !connected)
- return
-
- var/mob/living/player = occupant
-
- var/datum/bank_account/account = player.get_bank_account()
- if(isnull(account))
- return
-
- account.bitrunning_points += reward_points * 100
-
-/// The domain has been fully purged, so we should double check our avatar is deleted
-/obj/machinery/netpod/proc/on_domain_scrubbed(datum/source)
- SIGNAL_HANDLER
-
- var/mob/avatar = avatar_ref?.resolve()
- if(isnull(avatar))
- return
-
- QDEL_NULL(avatar)
-
-/// Boots out anyone in the machine && opens it
-/obj/machinery/netpod/proc/on_power_loss(datum/source)
- SIGNAL_HANDLER
-
- if(state_open)
- return
-
- if(isnull(occupant) || !connected)
- connected = FALSE
- open_machine()
- return
-
- sever_connection()
-
-/// When the server is upgraded, drops brain damage a little
-/obj/machinery/netpod/proc/on_server_upgraded(obj/machinery/quantum_server/source)
- SIGNAL_HANDLER
-
- disconnect_damage = BASE_DISCONNECT_DAMAGE * (1 - source.servo_bonus)
-
-/// Resolves a path to an outfit.
-/obj/machinery/netpod/proc/resolve_outfit(text)
- var/path = text2path(text)
- if(!ispath(path, /datum/outfit))
- return
-
- for(var/wardrobe in cached_outfits)
- for(var/outfit in wardrobe["outfits"])
- if(path == outfit["path"])
- return path
-
- message_admins("[usr]:[usr.ckey] attempted to select an unavailable outfit from a netpod")
- return
-
-/// Severs the connection with the current avatar
-/obj/machinery/netpod/proc/sever_connection()
- if(isnull(occupant) || !connected)
- return
-
- SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_SEVER)
-
-/// Closes the machine without shoving in an occupant
-/obj/machinery/netpod/proc/shut_pod()
- state_open = FALSE
- playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
- flick("[base_icon_state]_closing", src)
- set_density(TRUE)
-
- update_appearance()
-
-/// Checks for cases to eject/fail connecting an avatar
-/obj/machinery/netpod/proc/validate_entry(mob/living/neo, mob/living/avatar)
- if(!do_after(neo, 2 SECONDS, src))
- return FALSE
-
- // Very invalid
- if(QDELETED(neo) || QDELETED(avatar) || QDELETED(src) || !is_operational)
- return FALSE
-
- // Invalid
- if(occupant != neo || isnull(neo.mind) || neo.stat > SOFT_CRIT || avatar.stat == DEAD)
- return FALSE
-
- return TRUE
-
-#undef BASE_DISCONNECT_DAMAGE
diff --git a/code/modules/bitrunning/outfits.dm b/code/modules/bitrunning/outfits.dm
index 41a65b228ff44..c0bb01ebc06e5 100644
--- a/code/modules/bitrunning/outfits.dm
+++ b/code/modules/bitrunning/outfits.dm
@@ -10,12 +10,62 @@
suit = /obj/item/clothing/suit/jacket/trenchcoat
id = /obj/item/card/id/advanced
+
/datum/outfit/echolocator/post_equip(mob/living/carbon/human/user, visualsOnly)
. = ..()
user.psykerize()
+
/datum/outfit/bitductor
name = "Bitrunning Abductor"
uniform = /obj/item/clothing/under/abductor
gloves = /obj/item/clothing/gloves/fingerless
shoes = /obj/item/clothing/shoes/jackboots
+
+
+/datum/outfit/beachbum_combat
+ name = "Beachbum: Island Combat"
+ id = /obj/item/card/id/advanced
+ l_pocket = null
+ r_pocket = null
+ shoes = /obj/item/clothing/shoes/sandal
+ uniform = /obj/item/clothing/under/pants/jeans
+ /// Available ranged weapons
+ var/list/ranged_weaps = list(
+ /obj/item/gun/ballistic/automatic/pistol,
+ /obj/item/gun/ballistic/rifle/boltaction,
+ /obj/item/gun/ballistic/automatic/mini_uzi,
+ /obj/item/gun/ballistic/automatic/pistol/deagle,
+ /obj/item/gun/ballistic/rocketlauncher/unrestricted,
+ /obj/item/gun/ballistic/automatic/ar,
+
+ )
+ /// Corresponding ammo
+ var/list/corresponding_ammo = list(
+ /obj/item/ammo_box/magazine/m9mm,
+ /obj/item/ammo_box/strilka310,
+ /obj/item/ammo_box/magazine/uzim9mm,
+ /obj/item/ammo_box/magazine/m50,
+ /obj/item/food/pizzaslice/dank, // more silly, less destructive
+ /obj/item/ammo_box/magazine/m223,
+ )
+
+
+/datum/outfit/beachbum_combat/post_equip(mob/living/carbon/human/bum, visualsOnly)
+ . = ..()
+
+ var/choice = rand(1, length(ranged_weaps))
+ var/weapon = ranged_weaps[choice]
+ bum.put_in_active_hand(new weapon)
+
+ var/ammo = corresponding_ammo[choice]
+ var/obj/item/ammo1 = new ammo
+ var/obj/item/ammo2 = new ammo
+
+ if(!bum.equip_to_slot_if_possible(new ammo, ITEM_SLOT_LPOCKET))
+ ammo1.forceMove(get_turf(bum))
+ if(!bum.equip_to_slot_if_possible(new ammo, ITEM_SLOT_RPOCKET))
+ ammo2.forceMove(get_turf(bum))
+
+ if(prob(50))
+ bum.equip_to_slot_if_possible(new /obj/item/clothing/glasses/sunglasses, ITEM_SLOT_EYES)
diff --git a/code/modules/bitrunning/server/_parent.dm b/code/modules/bitrunning/server/_parent.dm
index 8a8d2eed913de..541d36ad5d72c 100644
--- a/code/modules/bitrunning/server/_parent.dm
+++ b/code/modules/bitrunning/server/_parent.dm
@@ -77,12 +77,18 @@
. += span_infoplain("Can be resource intensive to run. Ensure adequate power supply.")
+ var/upgraded = FALSE
if(capacitor_coefficient < 1)
. += span_infoplain("- Its coolant capacity reduces cooldown time by [(1 - capacitor_coefficient) * 100]%.")
+ upgraded = TRUE
if(servo_bonus > 0.2)
. += span_infoplain("- Its manipulation potential is increasing rewards by [servo_bonus]x.")
. += span_infoplain("- Injury from unsafe ejection reduced [servo_bonus * 100]%.")
+ upgraded = TRUE
+
+ if(!upgraded)
+ . += span_notice("Its output is suboptimal. Improved components will grant domain information, reduce cooldowns and increase rewards.")
if(!is_ready)
. += span_notice("It is currently cooling down. Give it a few moments.")
diff --git a/code/modules/bitrunning/server/loot.dm b/code/modules/bitrunning/server/loot.dm
index 83d26daa6075a..0e6ff30cd246a 100644
--- a/code/modules/bitrunning/server/loot.dm
+++ b/code/modules/bitrunning/server/loot.dm
@@ -4,6 +4,7 @@
#define GRADE_A "A"
#define GRADE_S "S"
+
/// Handles calculating rewards based on number of players, parts, threats, etc
/obj/machinery/quantum_server/proc/calculate_rewards()
var/rewards_base = 0.8
@@ -20,6 +21,7 @@
return rewards_base
+
/// Handles spawning the (new) crate and deleting the former
/obj/machinery/quantum_server/proc/generate_loot(obj/cache, obj/machinery/byteforge/chosen_forge)
SSblackbox.record_feedback("tally", "bitrunning_domain_primary_completed", 1, generated_domain.key)
@@ -55,6 +57,8 @@
chosen_forge.start_to_spawn(reward_cache)
return TRUE
+
+/// Builds secondary loot if the achievements were met
/obj/machinery/quantum_server/proc/generate_secondary_loot(obj/curiosity, obj/machinery/byteforge/chosen_forge)
SSblackbox.record_feedback("tally", "bitrunning_domain_secondary_completed", 1, generated_domain.key)
spark_at_location(curiosity) // abracadabra!
@@ -65,6 +69,7 @@
chosen_forge.start_to_spawn(reward_curiosity)
return TRUE
+
/// Returns the markdown text containing domain completion information
/obj/machinery/quantum_server/proc/get_completion_certificate(time_difference, grade)
var/base_points = generated_domain.reward_points
@@ -126,6 +131,7 @@
return generated_domain.difficulty >= BITRUNNER_DIFFICULTY_MEDIUM && (grade in passing_grades)
+
/// Grades the player's run based on several factors
/obj/machinery/quantum_server/proc/grade_completion(completion_time)
var/score = length(spawned_threat_refs) * 5
diff --git a/code/modules/bitrunning/server/map_handling.dm b/code/modules/bitrunning/server/map_handling.dm
index 5bfa7813910b6..f98332f7e8d8f 100644
--- a/code/modules/bitrunning/server/map_handling.dm
+++ b/code/modules/bitrunning/server/map_handling.dm
@@ -24,6 +24,7 @@
reset()
+
/// Links all the loading processes together - does validation for booting a map
/obj/machinery/quantum_server/proc/cold_boot_map(map_key)
if(!is_ready)
@@ -69,8 +70,15 @@
if(broadcasting)
start_broadcasting_network(BITRUNNER_CAMERA_NET)
+ if(generated_domain.announce_to_ghosts)
+ notify_ghosts("Bitrunners have loaded a domain that offers ghost interactions. Check the spawners menu for more information.",
+ src,
+ "Matrix Glitch",
+ )
+
return TRUE
+
/// Initializes a new domain if the given key is valid and the user has enough points
/obj/machinery/quantum_server/proc/load_domain(map_key)
for(var/datum/lazy_template/virtual_domain/available in SSbitrunning.all_domains)
@@ -82,6 +90,7 @@
return FALSE
+
/// Loads in necessary map items like hololadder spawns, caches, etc
/obj/machinery/quantum_server/proc/load_map_items()
var/turf/goal_turfs = list()
@@ -116,6 +125,15 @@
var/turf/signaler_turf = get_turf(thing)
signaler_turf.AddComponent(/datum/component/bitrunning_points, generated_domain)
qdel(thing)
+ continue
+
+ if(istype(thing, /obj/effect/landmark/bitrunning/permanent_exit))
+ var/turf/tile = get_turf(thing)
+ exit_turfs += tile
+ qdel(thing)
+
+ new /obj/structure/hololadder(tile)
+
if(!length(exit_turfs))
CRASH("Failed to find exit turfs on generated domain.")
@@ -134,6 +152,7 @@
return TRUE
+
/// Stops the current virtual domain and disconnects all users
/obj/machinery/quantum_server/proc/reset(fast = FALSE)
is_ready = FALSE
@@ -155,6 +174,7 @@
stop_broadcasting_network(BITRUNNER_CAMERA_NET)
+
/// Tries to clean up everything in the domain
/obj/machinery/quantum_server/proc/scrub_vdom()
sever_connections() /// just in case someone's connected
diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm
index 34a870a3426d5..dabac8ae62dd9 100644
--- a/code/modules/bitrunning/server/obj_generation.dm
+++ b/code/modules/bitrunning/server/obj_generation.dm
@@ -15,6 +15,7 @@
new /obj/structure/closet/crate/secure/bitrunning/encrypted(chosen_turf)
return TRUE
+
/// Attempts to spawn a lootbox
/obj/machinery/quantum_server/proc/attempt_spawn_curiosity(list/possible_turfs)
if(!length(possible_turfs)) // Out of turfs to place a curiosity
@@ -35,9 +36,10 @@
new /obj/item/storage/lockbox/bitrunning/encrypted(chosen_turf)
return chosen_turf
+
/// Generates a new avatar for the bitrunner.
-/obj/machinery/quantum_server/proc/generate_avatar(obj/structure/hololadder/wayout, datum/outfit/netsuit)
- var/mob/living/carbon/human/avatar = new(wayout.loc)
+/obj/machinery/quantum_server/proc/generate_avatar(turf/destination, datum/outfit/netsuit)
+ var/mob/living/carbon/human/avatar = new(destination)
var/outfit_path = generated_domain.forced_outfit || netsuit
var/datum/outfit/to_wear = new outfit_path()
@@ -61,8 +63,9 @@
if(istype(hat))
hat.set_armor(/datum/armor/none)
- for(var/obj/thing in avatar.held_items)
- qdel(thing)
+ if(!generated_domain.forced_outfit)
+ for(var/obj/thing in avatar.held_items)
+ qdel(thing)
var/obj/item/storage/backpack/bag = avatar.back
if(istype(bag))
@@ -88,32 +91,9 @@
network = BITRUNNER_CAMERA_NET, \
emp_proof = TRUE, \
)
- return avatar
-
-/// Generates a new hololadder for the bitrunner. Effectively a respawn attempt.
-/obj/machinery/quantum_server/proc/generate_hololadder()
- if(!length(exit_turfs))
- return
-
- if(retries_spent >= length(exit_turfs))
- return
- var/turf/destination
- for(var/turf/dest_turf in exit_turfs)
- if(!locate(/obj/structure/hololadder) in dest_turf)
- destination = dest_turf
- break
-
- if(isnull(destination))
- return
-
- var/obj/structure/hololadder/wayout = new(destination, src)
- if(isnull(wayout))
- return
-
- retries_spent += 1
+ return avatar
- return wayout
/// Loads in any mob segments of the map
/obj/machinery/quantum_server/proc/load_mob_segments()
@@ -142,6 +122,7 @@
return TRUE
+
/// Scans over neo's contents for bitrunning tech disks. Loads the items or abilities onto the avatar.
/obj/machinery/quantum_server/proc/stock_gear(mob/living/carbon/human/avatar, mob/living/carbon/human/neo, datum/lazy_template/virtual_domain/generated_domain)
var/domain_forbids_items = generated_domain.forbids_disk_items
diff --git a/code/modules/bitrunning/server/signal_handlers.dm b/code/modules/bitrunning/server/signal_handlers.dm
index 0e5e949e8bb51..f5d2840143e16 100644
--- a/code/modules/bitrunning/server/signal_handlers.dm
+++ b/code/modules/bitrunning/server/signal_handlers.dm
@@ -4,12 +4,14 @@
sever_connections()
+
/// Whenever a corpse spawner makes a new corpse, add it to the list of potential mutations
/obj/machinery/quantum_server/proc/on_corpse_spawned(datum/source, mob/living/corpse)
SIGNAL_HANDLER
mutation_candidate_refs.Add(WEAKREF(corpse))
+
/// Being qdeleted - make sure the circuit and connected mobs go with it
/obj/machinery/quantum_server/proc/on_delete(datum/source)
SIGNAL_HANDLER
@@ -26,6 +28,7 @@
if(circuit)
qdel(circuit)
+
/// Whenever something enters the send tiles, check if it's a loot crate. If so, alert players.
/obj/machinery/quantum_server/proc/on_goal_turf_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
SIGNAL_HANDLER
@@ -51,6 +54,7 @@
generate_secondary_loot(arrived, chosen_forge, generated_domain)
return
+
/// Handles examining the server. Shows cooldown time and efficiency.
/obj/machinery/quantum_server/proc/on_goal_turf_examined(datum/source, mob/examiner, list/examine_text)
SIGNAL_HANDLER
@@ -58,6 +62,7 @@
examine_text += span_info("Beneath your gaze, the floor pulses subtly with streams of encoded data.")
examine_text += span_info("It seems to be part of the location designated for retrieving encrypted payloads.")
+
/// Scans over the inbound created_atoms from lazy templates
/obj/machinery/quantum_server/proc/on_template_loaded(datum/lazy_template/source, list/created_atoms)
SIGNAL_HANDLER
@@ -98,6 +103,7 @@
/// Just in case there's any special handling for the domain
generated_domain.setup_domain(created_atoms)
+
/// Handles when cybercops are summoned into the area or ghosts click a ghost role spawner
/obj/machinery/quantum_server/proc/on_threat_created(datum/source, mob/living/threat)
SIGNAL_HANDLER
diff --git a/code/modules/bitrunning/server/threats.dm b/code/modules/bitrunning/server/threats.dm
index 25a891c03b24b..28d91aa4b3714 100644
--- a/code/modules/bitrunning/server/threats.dm
+++ b/code/modules/bitrunning/server/threats.dm
@@ -4,6 +4,7 @@
SEND_SIGNAL(src, COMSIG_BITRUNNER_THREAT_CREATED)
threat.AddComponent(/datum/component/virtual_entity, src)
+
/// Choses which antagonist role is spawned based on threat
/obj/machinery/quantum_server/proc/get_antagonist_role()
var/list/available = list()
@@ -19,6 +20,7 @@
return chosen
+
/// Selects a target to mutate. Gives two attempts, then crashes if it fails.
/obj/machinery/quantum_server/proc/get_mutation_target()
var/datum/weakref/target_ref = pick(mutation_candidate_refs)
@@ -35,6 +37,7 @@
resolved = target_ref.resolve()
return resolved
+
/// Finds any mobs with minds in the zones and gives them the bad news
/obj/machinery/quantum_server/proc/notify_spawned_threats()
for(var/datum/weakref/baddie_ref as anything in spawned_threat_refs)
@@ -52,10 +55,12 @@
to_chat(baddie, span_userdanger("You have been flagged for deletion! Thank you for your service."))
+
/// Removes a specific threat - used when station spawning
/obj/machinery/quantum_server/proc/remove_threat(mob/living/threat)
spawned_threat_refs.Remove(WEAKREF(threat))
+
/// Selects the role and waits for a ghost orbiter
/obj/machinery/quantum_server/proc/setup_glitch(datum/antagonist/bitrunning_glitch/forced_role)
if(!validate_mutation_candidates())
@@ -83,6 +88,7 @@
spawn_glitch(chosen_role, mutation_target, chosen_one)
return mutation_target
+
/// Orbit poll has concluded - spawn the antag
/obj/machinery/quantum_server/proc/spawn_glitch(datum/antagonist/bitrunning_glitch/chosen_role, mob/living/mutation_target, mob/dead/observer/ghost)
if(QDELETED(mutation_target))
@@ -121,6 +127,7 @@
add_threats(new_mob)
+
/// Oh boy - transports the antag station side
/obj/machinery/quantum_server/proc/station_spawn(mob/living/antag, obj/machinery/byteforge/chosen_forge)
antag.balloon_alert(antag, "scanning...")
@@ -165,6 +172,7 @@
do_teleport(antag, get_turf(chosen_forge), forced = TRUE, asoundin = 'sound/magic/ethereal_enter.ogg', asoundout = 'sound/magic/ethereal_exit.ogg', channel = TELEPORT_CHANNEL_QUANTUM)
+
/// Removes any invalid candidates from the list
/obj/machinery/quantum_server/proc/validate_mutation_candidates()
for(var/datum/weakref/creature_ref as anything in mutation_candidate_refs)
diff --git a/code/modules/bitrunning/server/util.dm b/code/modules/bitrunning/server/util.dm
index 6b5352bde6cb1..ab267a34cd330 100644
--- a/code/modules/bitrunning/server/util.dm
+++ b/code/modules/bitrunning/server/util.dm
@@ -1,11 +1,13 @@
#define MAX_DISTANCE 4 // How far crates can spawn from the server
+
/// Resets the cooldown state and updates icons
/obj/machinery/quantum_server/proc/cool_off()
is_ready = TRUE
update_appearance()
radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY)
+
/// If there are hosted minds, attempts to get a list of their current virtual bodies w/ vitals
/obj/machinery/quantum_server/proc/get_avatar_data()
var/list/hosted_avatars = list()
@@ -31,6 +33,49 @@
return hosted_avatars
+
+/// I grab the atom here so I can signal it / manipulate spawners etc
+/obj/machinery/quantum_server/proc/get_avatar_destination() as /atom
+ // Branch A: Custom spawns
+ if(length(generated_domain.custom_spawns))
+ var/atom/valid_spawner
+
+ while(isnull(valid_spawner))
+ var/atom/chosen = pick(generated_domain.custom_spawns)
+ if(QDELETED(chosen))
+ generated_domain.custom_spawns -= chosen
+ continue
+
+ valid_spawner = chosen
+ break
+
+ return valid_spawner
+
+ // Branch B: Hololadders
+ if(!length(exit_turfs))
+ return
+
+ if(retries_spent >= length(exit_turfs))
+ return
+
+ var/turf/exit_tile
+ for(var/turf/dest_turf in exit_turfs)
+ if(!locate(/obj/structure/hololadder) in dest_turf)
+ exit_tile = dest_turf
+ break
+
+ if(isnull(exit_tile))
+ return
+
+ var/obj/structure/hololadder/wayout = new(exit_tile, src)
+ if(isnull(wayout))
+ return
+
+ retries_spent += 1
+
+ return wayout
+
+
/// Locates any turfs with forges on them, returns a random one
/obj/machinery/quantum_server/proc/get_random_nearby_forge()
var/list/nearby_forges = list()
@@ -40,6 +85,7 @@
return pick(nearby_forges)
+
/// Gets a random available domain given the current points.
/obj/machinery/quantum_server/proc/get_random_domain_id()
if(points < 1)
@@ -85,6 +131,7 @@
SEND_SIGNAL(src, COMSIG_BITRUNNER_QSRV_SEVER)
+
/// Do some magic teleport sparks
/obj/machinery/quantum_server/proc/spark_at_location(obj/cache)
playsound(cache, 'sound/magic/blink.ogg', 50, vary = TRUE)
@@ -92,16 +139,33 @@
sparks.set_up(5, location = get_turf(cache))
sparks.start()
-/// Returns a turf if it's not dense, else will find a neighbor.
-/obj/machinery/quantum_server/proc/validate_turf(turf/chosen_turf)
- if(!chosen_turf.is_blocked_turf())
- return chosen_turf
- for(var/turf/tile in get_adjacent_open_turfs(chosen_turf))
- if(!tile.is_blocked_turf())
- return chosen_turf
+/// Starts building a new avatar for the player.
+/// Called by netpods when they don't have a current avatar.
+/// This is a procedural proc which links several others together.
+/obj/machinery/quantum_server/proc/start_new_connection(mob/living/carbon/human/neo, datum/outfit/netsuit) as /mob/living/carbon/human
+ var/atom/entry_atom = get_avatar_destination()
+ if(isnull(entry_atom))
+ return
+
+ var/mob/living/carbon/new_avatar = generate_avatar(get_turf(entry_atom), netsuit)
+ stock_gear(new_avatar, neo, generated_domain)
+
+ // Cleanup for domains with one time use custom spawns
+ if(!length(generated_domain.custom_spawns))
+ return new_avatar
+
+ // If we're spawning from some other fuckery, no need for this
+ if(istype(entry_atom, /obj/effect/mob_spawn/ghost_role/human/virtual_domain))
+ var/obj/effect/mob_spawn/ghost_role/human/virtual_domain/spawner = entry_atom
+ spawner.artificial_spawn(new_avatar)
+
+ if(!generated_domain.keep_custom_spawns)
+ generated_domain.custom_spawns -= entry_atom
+ qdel(entry_atom)
+
+ return new_avatar
-#undef MAX_DISTANCE
/// Toggles broadcast on and off
/obj/machinery/quantum_server/proc/toggle_broadcast()
@@ -116,3 +180,16 @@
// And we only flip TVs when there's a domain, because otherwise there's no cams to watch
set_network_broadcast_status(BITRUNNER_CAMERA_NET, broadcasting)
return TRUE
+
+
+/// Returns a turf if it's not dense, else will find a neighbor.
+/obj/machinery/quantum_server/proc/validate_turf(turf/chosen_turf)
+ if(!chosen_turf.is_blocked_turf())
+ return chosen_turf
+
+ for(var/turf/tile in get_adjacent_open_turfs(chosen_turf))
+ if(!tile.is_blocked_turf())
+ return chosen_turf
+
+
+#undef MAX_DISTANCE
diff --git a/code/modules/bitrunning/spawners.dm b/code/modules/bitrunning/spawners.dm
index 5fa889ac655fd..4b5f79a43b186 100644
--- a/code/modules/bitrunning/spawners.dm
+++ b/code/modules/bitrunning/spawners.dm
@@ -3,12 +3,9 @@
prompt_name = "a virtual domain debug entity"
flavour_text = "You probably shouldn't be seeing this, contact a coder!"
you_are_text = "You are NOT supposed to be here. How did you let this happen?"
- important_text = "You must eliminate any bitrunners from the domain."
+ important_text = "Bitrunning is a crime, and your primary threat."
temp_body = TRUE
-/obj/effect/mob_spawn/ghost_role/human/virtual_domain/Initialize(mapload)
- . = ..()
- notify_ghosts("The [name] has been created. The virtual world calls for aid!", src, "Virtual Insanity!")
/obj/effect/mob_spawn/ghost_role/human/virtual_domain/special(mob/living/spawned_mob, mob/mob_possessor)
var/datum/mind/ghost_mind = mob_possessor.mind
@@ -19,6 +16,12 @@
spawned_mob.mind.add_antag_datum(/datum/antagonist/domain_ghost_actor)
+
+/// Simulates a ghost role spawn without calling special(), ie a bitrunner spawn instead of a ghost.
+/obj/effect/mob_spawn/ghost_role/human/virtual_domain/proc/artificial_spawn(mob/living/runner)
+ SEND_SIGNAL(src, COMSIG_BITRUNNER_SPAWNED, runner)
+
+
/obj/effect/mob_spawn/ghost_role/human/virtual_domain/pirate
name = "Virtual Pirate Remains"
desc = "Some inanimate bones. They feel like they could spring to life at any moment!"
@@ -27,22 +30,25 @@
icon_state = "remains"
prompt_name = "a virtual skeleton pirate"
you_are_text = "You are a virtual pirate. Yarrr!"
- flavour_text = "You have awoken, without instruction. There's a LANDLUBBER after yer booty. Stop them!"
+ flavour_text = " There's a LANDLUBBER after yer booty. Stop them!"
+
/obj/effect/mob_spawn/ghost_role/human/virtual_domain/pirate/special(mob/living/spawned_mob, mob/mob_possessor)
. = ..()
spawned_mob.fully_replace_character_name(spawned_mob.real_name, "[pick(strings(PIRATE_NAMES_FILE, "generic_beginnings"))][pick(strings(PIRATE_NAMES_FILE, "generic_endings"))]")
+
/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie
name = "Virtual Syndicate Sleeper"
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper_s"
prompt_name = "a virtual syndicate operative"
you_are_text = "You are a virtual syndicate operative."
- flavour_text = "You have awoken, without instruction. Alarms blare! We are being boarded!"
+ flavour_text = "Alarms blare! We are being boarded!"
outfit = /datum/outfit/virtual_syndicate
spawner_job_path = /datum/job/space_syndicate
+
/datum/outfit/virtual_syndicate
name = "Virtual Syndie"
id = /obj/item/card/id/advanced/chameleon
@@ -53,5 +59,6 @@
shoes = /obj/item/clothing/shoes/combat
implants = list(/obj/item/implant/weapons_auth)
+
/datum/outfit/virtual_syndicate/post_equip(mob/living/carbon/human/user, visualsOnly)
user.faction |= ROLE_SYNDICATE
diff --git a/code/modules/bitrunning/virtual_domain/domains/fredingtonfastingbear.dm b/code/modules/bitrunning/virtual_domain/domains/fredingtonfastingbear.dm
index 841956675ca90..f3c803384c45d 100644
--- a/code/modules/bitrunning/virtual_domain/domains/fredingtonfastingbear.dm
+++ b/code/modules/bitrunning/virtual_domain/domains/fredingtonfastingbear.dm
@@ -2,6 +2,7 @@
name = "Pizza Party"
cost = BITRUNNER_COST_MEDIUM
desc = "A famous pizzeria that got ruined by what it had to offer."
+ completion_loot = list(/obj/item/food/pizzaslice/meat/pizzeria = 1)
difficulty = BITRUNNER_DIFFICULTY_MEDIUM
help_text = "Pick up a flashlight and get going. Your favourite bear has been waiting for you..."
key = "fredingtonfastingbear"
diff --git a/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
new file mode 100644
index 0000000000000..b745a4746aa24
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
@@ -0,0 +1,46 @@
+/datum/lazy_template/virtual_domain/island_brawl
+ name = "Island Brawl"
+ announce_to_ghosts = TRUE
+ cost = BITRUNNER_COST_HIGH
+ desc = "A 'peaceful' island tucked away in the middle of nowhere. This map will auto-complete after a number of deaths have occurred."
+ difficulty = BITRUNNER_DIFFICULTY_HIGH
+ forced_outfit = /datum/outfit/beachbum_combat
+ help_text = "There may be bounties laid out across the island, but the primary objective is to survive. Deaths on the island will count towards the final score."
+ key = "island_brawl"
+ map_name = "island_brawl"
+ reward_points = BITRUNNER_REWARD_HIGH
+ secondary_loot = list(
+ /obj/item/toy/beach_ball = 2,
+ /obj/item/clothing/shoes/sandal = 1,
+ /obj/item/clothing/glasses/sunglasses = 1,
+ /obj/item/gun/ballistic/automatic/mini_uzi = 1,
+ )
+
+
+/datum/lazy_template/virtual_domain/island_brawl/setup_domain(list/created_atoms)
+ for(var/obj/effect/mob_spawn/ghost_role/human/virtual_domain/islander/spawner in created_atoms)
+ custom_spawns += spawner
+
+ RegisterSignals(spawner, list(COMSIG_GHOSTROLE_SPAWNED, COMSIG_BITRUNNER_SPAWNED), PROC_REF(on_spawn))
+
+
+/// Someone has spawned in, so we check for their death
+/datum/lazy_template/virtual_domain/island_brawl/proc/on_spawn(datum/source, mob/living/spawned_mob)
+ SIGNAL_HANDLER
+
+ RegisterSignals(spawned_mob, list(COMSIG_LIVING_DEATH), PROC_REF(on_death))
+
+
+/// Mob has died, so we add a point to the domain
+/datum/lazy_template/virtual_domain/island_brawl/proc/on_death(datum/source, gibbed)
+ SIGNAL_HANDLER
+
+ add_points(1)
+
+
+/obj/effect/mob_spawn/ghost_role/human/virtual_domain/islander
+ name = "Islander"
+ outfit = /datum/outfit/beachbum_combat
+ prompt_name = "a combat beach bum"
+ you_are_text = "You are a virtual islander."
+ flavour_text = "Don't let anyone ruin your idyllic vacation spot. Coordinate with others- or don't!"
diff --git a/code/modules/bitrunning/virtual_domain/domains/pirates.dm b/code/modules/bitrunning/virtual_domain/domains/pirates.dm
index 52d86a7121180..b8bff6dbeb363 100644
--- a/code/modules/bitrunning/virtual_domain/domains/pirates.dm
+++ b/code/modules/bitrunning/virtual_domain/domains/pirates.dm
@@ -1,5 +1,6 @@
/datum/lazy_template/virtual_domain/pirates
name = "Corsair Cove"
+ announce_to_ghosts = TRUE
cost = BITRUNNER_COST_MEDIUM
desc = "Battle your way to the hidden treasure, seize the booty, and make a swift escape before the pirates turn the tide."
difficulty = BITRUNNER_DIFFICULTY_MEDIUM
diff --git a/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm b/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm
index 5f754dd433ad6..f81bc6daae2c4 100644
--- a/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm
+++ b/code/modules/bitrunning/virtual_domain/domains/syndicate_assault.dm
@@ -1,5 +1,6 @@
/datum/lazy_template/virtual_domain/syndicate_assault
name = "Syndicate Assault"
+ announce_to_ghosts = TRUE
cost = BITRUNNER_COST_MEDIUM
desc = "Board the enemy ship and recover the stolen cargo."
difficulty = BITRUNNER_DIFFICULTY_MEDIUM
diff --git a/code/modules/bitrunning/virtual_domain/virtual_domain.dm b/code/modules/bitrunning/virtual_domain/virtual_domain.dm
index 21898daad72d7..f81f6186cbe6e 100644
--- a/code/modules/bitrunning/virtual_domain/virtual_domain.dm
+++ b/code/modules/bitrunning/virtual_domain/virtual_domain.dm
@@ -7,50 +7,82 @@
map_name = "None"
key = "Virtual Domain"
place_on_top = TRUE
+ /// Whether to tell observers this map is being used
+ var/announce_to_ghosts = FALSE
+ /// The map file to load
+ var/filename = "virtual_domain.dmm"
+ /// The start time of the map. Used to calculate time taken
+ var/start_time
+ /// This map is specifically for unit tests. Shouldn't display in game
+ var/test_only = FALSE
+
+ /**
+ * Generic settings / UI
+ */
/// Cost of this map to load
var/cost = BITRUNNER_COST_NONE
- /// Any outfit that you wish to force on avatars. Overrides preferences
- var/datum/outfit/forced_outfit
/// The description of the map for the console UI
var/desc = "A map."
/// Affects the ui and ability to scan info.
var/difficulty = BITRUNNER_DIFFICULTY_NONE
- /// The map file to load
- var/filename = "virtual_domain.dmm"
+ /// Write these to help complete puzzles and other objectives. Viewed in the domain info ability.
+ var/help_text
+ // Name to show in the UI
+ var/name = "Virtual Domain"
+ /// Points to reward for completion. Used to purchase new domains and calculate ore rewards.
+ var/reward_points = BITRUNNER_REWARD_MIN
+
+ /**
+ * Player customization
+ */
+
/// If this domain blocks the use of items from disks, for whatever reason
var/forbids_disk_items = FALSE
/// If this domain blocks the use of spells from disks, for whatever reason
var/forbids_disk_spells = FALSE
- /// Information given to connected clients via ability
- var/help_text
- /// Whether to display this as a modular map
- var/is_modular = FALSE
- /// Byond will look for modular mob segment landmarks then choose from here at random. You can make them unique also.
- var/list/datum/modular_mob_segment/mob_modules = list()
+ /// Any outfit that you wish to force on avatars. Overrides preferences
+ var/datum/outfit/forced_outfit
+
+ /**
+ * Loot
+ */
+
/// An assoc list of typepath/amount to spawn on completion. Not weighted - the value is the amount
var/list/completion_loot
- /// An accoc list of typepath/amount to spawn from secondary objectives. Not weighted - the value is the total number of items that can be obtained.
+ /// An assoc list of typepath/amount to spawn from secondary objectives. Not weighted - the value is the total number of items that can be obtained.
var/list/secondary_loot = list()
/// Number of secondary loot boxes generated. Resets when the domain is reloaded.
var/secondary_loot_generated
- /// Forces all mob modules to only load once
- var/modular_unique_mobs = FALSE
- // Name to show in the UI
- var/name = "Virtual Domain"
- /// Points to reward for completion. Used to purchase new domains and calculate ore rewards.
- var/reward_points = BITRUNNER_REWARD_MIN
- /// The start time of the map. Used to calculate time taken
- var/start_time
- /// This map is specifically for unit tests. Shouldn't display in game
- var/test_only = FALSE
/// Has this domain been beaten with high enough score to spawn a tech disk?
var/disk_reward_spawned = FALSE
+ /**
+ * Modularity
+ */
+
+ /// Whether to display this as a modular map
+ var/is_modular = FALSE
+ /// Byond will look for modular mob segment landmarks then choose from here at random. You can make them unique also.
+ var/list/datum/modular_mob_segment/mob_modules = list()
+ /// Forces all mob modules to only load once
+ var/modular_unique_mobs = FALSE
+
+ /**
+ * Spawning
+ */
+
+ /// Looks for random landmarks to spawn on.
+ var/list/custom_spawns = list()
+ /// Set TRUE if you want reusable custom spawners
+ var/keep_custom_spawns = FALSE
+
+
/// Sends a point to any loot signals on the map
/datum/lazy_template/virtual_domain/proc/add_points(points_to_add)
SEND_SIGNAL(src, COMSIG_BITRUNNER_GOAL_POINT, points_to_add)
+
/// Overridable proc to be called after the map is loaded.
/datum/lazy_template/virtual_domain/proc/setup_domain(list/created_atoms)
return
diff --git a/code/modules/capture_the_flag/medieval_sim/medisim_classes.dm b/code/modules/capture_the_flag/medieval_sim/medisim_classes.dm
index 3c4a55748c4c6..09ed5b40b1f20 100644
--- a/code/modules/capture_the_flag/medieval_sim/medisim_classes.dm
+++ b/code/modules/capture_the_flag/medieval_sim/medisim_classes.dm
@@ -26,7 +26,7 @@
name = "Redfield Castle Archer"
icon_state = "medisim_archer"
- belt = /obj/item/storage/bag/quiver
+ belt = /obj/item/storage/bag/quiver/full
suit = /obj/item/clothing/suit/armor/vest/cuirass
l_hand = /obj/item/gun/ballistic/bow
diff --git a/code/modules/capture_the_flag/medieval_sim/medisim_game.dm b/code/modules/capture_the_flag/medieval_sim/medisim_game.dm
index 18e1cd13e7ede..118184698a3cc 100644
--- a/code/modules/capture_the_flag/medieval_sim/medisim_game.dm
+++ b/code/modules/capture_the_flag/medieval_sim/medisim_game.dm
@@ -22,7 +22,7 @@
if(!.)
return
var/mob/living/carbon/human/human_knight = .
- randomize_human(human_knight)
+ randomize_human_normie(human_knight)
human_knight.dna.add_mutation(/datum/mutation/human/medieval, MUT_OTHER)
var/oldname = human_knight.name
var/title = "error"
diff --git a/code/modules/cargo/bounties/bitrunning.dm b/code/modules/cargo/bounties/bitrunning.dm
new file mode 100644
index 0000000000000..301f19f0e412c
--- /dev/null
+++ b/code/modules/cargo/bounties/bitrunning.dm
@@ -0,0 +1,48 @@
+/datum/bounty/item/bitrunning/abductor_plush
+ name = "Abductor Plush"
+ description = "Rear Admiral Raynes' child won't stop bothering him for one of those little plush aliens. You can get one from the Abductor Ship domain."
+ reward = CARGO_CRATE_VALUE * 6
+ required_count = 1
+ wanted_types = list(/obj/item/toy/plush/abductor/agent = TRUE)
+
+/datum/bounty/item/bitrunning/bubblegum
+ name = "Bubblegum Plush"
+ description = "Some of the miners have been talking about the breakroom being too sterile. We need something cute to spruce the place up a bit."
+ reward = CARGO_CRATE_VALUE * 10
+ required_count = 1
+ wanted_types = list(/obj/item/toy/plush/bubbleplush = TRUE)
+
+/datum/bounty/item/bitrunning/honk
+ name = "Bike Horn"
+ description = "Bonbon the Clown lost his bike horn when Rear Admiral Raynes hurled him out an airlock for slipping him. Can you get us a replacement?"
+ reward = CARGO_CRATE_VALUE * 4
+ required_count = 1
+ wanted_types = list(/obj/item/bikehorn = TRUE)
+
+/datum/bounty/item/bitrunning/pizzeria
+ name = "Slice of Pizzeria Pizza"
+ description = "Admiral Chivara keeps talking about wanting a slice of pizza from that old pizza joint that closed down. Y'know, the one with the robots."
+ reward = CARGO_CRATE_VALUE * 8
+ required_count = 1
+ wanted_types = list(/obj/item/food/pizzaslice/meat/pizzeria = TRUE)
+
+/datum/bounty/item/bitrunning/psyker
+ name = "Psyker Headset"
+ description = "We're doing some research on psykers and could use some of their equipment. Can you send us one of their headsets if you find it?"
+ reward = CARGO_CRATE_VALUE * 8
+ required_count = 1
+ wanted_types = list(/obj/item/radio/headset/psyker = TRUE)
+
+/datum/bounty/item/bitrunning/polar
+ name = "Polar Ushanka"
+ description = "A bunch of Russians raided one of our outposts and won't leave. They keep swearing at us and demanding we give them vodka and ushankas. Can you send us one?"
+ reward = CARGO_CRATE_VALUE * 3
+ required_count = 1
+ wanted_types = list(/obj/item/clothing/head/costume/ushanka/polar = TRUE)
+
+/datum/bounty/item/bitrunning/syndicate
+ name = "Syndicate Plush"
+ description = "We're aware of some contraband that's made it aboard some of our stations that depict Syndicate agents as cute, marketable plushies. Please send us one so we can further investigate."
+ reward = CARGO_CRATE_VALUE * 8
+ required_count = 1
+ wanted_types = list(/obj/item/toy/plush/nukeplushie = 1)
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
index 67da7ad6b2984..0206ea41967d6 100644
--- a/code/modules/cargo/bounties/science.dm
+++ b/code/modules/cargo/bounties/science.dm
@@ -9,7 +9,7 @@
if(!..())
return FALSE
var/obj/item/relic/experiment = O
- if(experiment.revealed)
+ if(experiment.activated)
return TRUE
return
diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm
index aa527e847625b..38b26e440273a 100644
--- a/code/modules/cargo/bounty.dm
+++ b/code/modules/cargo/bounty.dm
@@ -1,5 +1,5 @@
/// How many jobs have bounties, minus the random civ bounties. PLEASE INCREASE THIS NUMBER AS MORE DEPTS ARE ADDED TO BOUNTIES.
-#define MAXIMUM_BOUNTY_JOBS 13
+#define MAXIMUM_BOUNTY_JOBS 14
/datum/bounty
var/name
@@ -77,6 +77,8 @@
chosen_type = pick(subtypesof(/datum/bounty/item/botany))
if(CIV_JOB_ATMOS)
chosen_type = pick(subtypesof(/datum/bounty/item/atmospherics))
+ if(CIV_JOB_BITRUN)
+ chosen_type = pick(subtypesof(/datum/bounty/item/bitrunning))
bounty_ref = new chosen_type
if(bounty_ref.can_get())
bounty_succeeded = TRUE
diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm
index b48ef268da683..2d19c276ec115 100644
--- a/code/modules/cargo/packs/emergency.dm
+++ b/code/modules/cargo/packs/emergency.dm
@@ -6,8 +6,8 @@
name = "Biological Emergency Crate"
desc = "This crate includes 2 complete bio suits, along with a box containing sterile masks and latex gloves, providing effective protection against viruses."
cost = CARGO_CRATE_VALUE * 2
- contains = list(/obj/item/clothing/head/bio_hood = 2,
- /obj/item/clothing/suit/bio_suit = 2,
+ contains = list(/obj/item/clothing/head/bio_hood/general = 2,
+ /obj/item/clothing/suit/bio_suit/general = 2,
/obj/item/storage/bag/bio,
/obj/item/reagent_containers/syringe/antiviral = 2,
/obj/item/clothing/gloves/latex/nitrile = 2,
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
index 3f7645559ff7f..f270b1da11f39 100644
--- a/code/modules/cargo/packs/imports.dm
+++ b/code/modules/cargo/packs/imports.dm
@@ -309,11 +309,12 @@
risky espionage hallway operations. Enjoy our product!"
contraband = TRUE
cost = CARGO_CRATE_VALUE * 6
- contains = list(/obj/item/clothing/under/syndicate/floortilecamo = 3,
- /obj/item/clothing/mask/floortilebalaclava = 3,
- /obj/item/clothing/gloves/combat/floortile = 3,
- /obj/item/clothing/shoes/jackboots/floortile = 3,
- /obj/item/storage/backpack/floortile = 3
+ contains = list(
+ /obj/item/clothing/under/syndicate/floortilecamo = 3,
+ /obj/item/clothing/mask/floortilebalaclava = 3,
+ /obj/item/clothing/gloves/combat/floortile = 3,
+ /obj/item/clothing/shoes/jackboots/floortile = 3,
+ /obj/item/storage/backpack/floortile = 3
)
crate_name = "floortile camouflauge crate"
crate_type = /obj/structure/closet/crate/secure/weapon
diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm
index 4059b330e2f66..dfa2a66359336 100644
--- a/code/modules/cargo/packs/science.dm
+++ b/code/modules/cargo/packs/science.dm
@@ -176,7 +176,8 @@
/obj/item/biopsy_tool,
/obj/item/storage/box/petridish = 2,
/obj/item/storage/box/swab,
- /obj/item/construction/plumbing/research,
+ /obj/item/circuitboard/machine/vatgrower,
+ /obj/item/reagent_containers/condiment/protein,
)
crate_name = "cytology supplies crate"
diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index fddd093b4fb7e..228d0d3e2fa46 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -303,3 +303,17 @@
contains = list(/obj/item/wallframe/barsign/all_access)
crate_name = "bar sign crate"
discountable = SUPPLY_PACK_RARE_DISCOUNTABLE
+
+/datum/supply_pack/service/bowmaking
+ name = "Fletching and Bow-Making Starter Kit"
+ desc = "A fairly outdated copy of 'Whittle Me This: Fletching for the Modern Spacer', along with some useful materials. \
+ For those looking to get into bow-making, or give their LARPing a little more edge, you can't go wrong. Also has \
+ instructions for making violins."
+ cost = CARGO_CRATE_VALUE * 5
+ contains = list(
+ /obj/item/book/granter/crafting_recipe/fletching = 1,
+ /obj/item/stack/sheet/mineral/wood = 10,
+ /obj/item/stack/sheet/cloth = 10,
+ )
+ crate_name = "bowmaking starter kit crate"
+ crate_type = /obj/structure/closet/crate/wooden
diff --git a/code/modules/client/client_colour.dm b/code/modules/client/client_colour.dm
index 1209b5c35823c..4ca500a9e7198 100644
--- a/code/modules/client/client_colour.dm
+++ b/code/modules/client/client_colour.dm
@@ -180,9 +180,15 @@
/datum/client_colour/glass_colour/yellow
colour = "#ffff66"
+/datum/client_colour/glass_colour/lightyellow
+ colour = "#ffffaa"
+
/datum/client_colour/glass_colour/red
colour = "#ffaaaa"
+/datum/client_colour/glass_colour/lightred
+ colour = "#ffcccc"
+
/datum/client_colour/glass_colour/darkred
colour = "#bb5555"
@@ -195,9 +201,19 @@
/datum/client_colour/glass_colour/purple
colour = "#ff99ff"
+/datum/client_colour/glass_colour/lightpurple
+ colour = "#ffccff"
+
/datum/client_colour/glass_colour/gray
colour = "#cccccc"
+///A client colour that makes the screen look a bit more grungy, halloweenesque even.
+/datum/client_colour/halloween_helmet
+ colour = list(0.75,0.13,0.13,0, 0.13,0.7,0.13,0, 0.13,0.13,0.75,0, -0.06,-0.09,-0.08,1, 0,0,0,0)
+
+/datum/client_colour/flash_hood
+ colour = COLOR_MATRIX_POLAROID
+
/datum/client_colour/glass_colour/nightmare
colour = list(255,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, -130,0,0,0) //every color is either red or black
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 97924643604c5..2b60b3bdbb2e4 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -268,3 +268,6 @@
/// Loot panel for the client
var/datum/lootpanel/loot_panel
+
+ ///Which ambient sound this client is currently being provided.
+ var/current_ambient_sound
diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm
index 485276b4ade2a..1ba43cf3d8a63 100644
--- a/code/modules/client/preferences/_preference.dm
+++ b/code/modules/client/preferences/_preference.dm
@@ -18,16 +18,19 @@
/// support the "use gender" option.
#define PREFERENCE_PRIORITY_BODY_TYPE 5
+/// Used for preferences that rely on body setup being finalized.
+#define PREFERENCE_PRORITY_LATE_BODY_TYPE 6
+
/// Equpping items based on preferences.
/// Should happen after species and body type to make sure it looks right.
/// Mostly redundant, but a safety net for saving/loading.
-#define PREFERENCE_PRIORITY_LOADOUT 6
+#define PREFERENCE_PRIORITY_LOADOUT 7
/// The priority at which names are decided, needed for proper randomization.
-#define PREFERENCE_PRIORITY_NAMES 7
+#define PREFERENCE_PRIORITY_NAMES 8
/// Preferences that aren't names, but change the name changes set by PREFERENCE_PRIORITY_NAMES.
-#define PREFERENCE_PRIORITY_NAME_MODIFICATIONS 8
+#define PREFERENCE_PRIORITY_NAME_MODIFICATIONS 9
/// The maximum preference priority, keep this updated, but don't use it for `priority`.
#define MAX_PREFERENCE_PRIORITY PREFERENCE_PRIORITY_NAME_MODIFICATIONS
diff --git a/code/modules/client/preferences/age.dm b/code/modules/client/preferences/age.dm
index cad9786ce1fef..07b4644bc6a9e 100644
--- a/code/modules/client/preferences/age.dm
+++ b/code/modules/client/preferences/age.dm
@@ -8,3 +8,6 @@
/datum/preference/numeric/age/apply_to_human(mob/living/carbon/human/target, value)
target.age = value
+
+/datum/preference/numeric/age/create_informed_default_value(datum/preferences/preferences)
+ return rand(max(minimum, 21), min(maximum, 50))
diff --git a/code/modules/client/preferences/blindfold_color.dm b/code/modules/client/preferences/blindfold_color.dm
index 9e6504579acb6..8081ac15be8ae 100644
--- a/code/modules/client/preferences/blindfold_color.dm
+++ b/code/modules/client/preferences/blindfold_color.dm
@@ -4,6 +4,9 @@
savefile_key = "blindfold_color"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/color/blindfold_color/create_default_value()
+ return COLOR_WHITE
+
/datum/preference/color/blindfold_color/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm
index 469b564e46f7b..6b27e0f0f0da7 100644
--- a/code/modules/client/preferences/body_type.dm
+++ b/code/modules/client/preferences/body_type.dm
@@ -5,6 +5,7 @@
priority = PREFERENCE_PRIORITY_BODY_TYPE
savefile_key = "body_type"
savefile_identifier = PREFERENCE_CHARACTER
+ can_randomize = FALSE
/datum/preference/choiced/body_type/init_possible_values()
return list(USE_GENDER, MALE, FEMALE)
diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm
index d0ec072ba472f..e0539e7b619c0 100644
--- a/code/modules/client/preferences/clothing.dm
+++ b/code/modules/client/preferences/clothing.dm
@@ -33,6 +33,9 @@
DMESSENGER,
)
+/datum/preference/choiced/backpack/create_default_value()
+ return GBACKPACK
+
/datum/preference/choiced/backpack/icon_for(value)
switch (value)
if (GBACKPACK)
@@ -66,6 +69,7 @@
/datum/preference/choiced/jumpsuit
savefile_key = "jumpsuit_style"
savefile_identifier = PREFERENCE_CHARACTER
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
main_feature_name = "Jumpsuit"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
@@ -86,6 +90,15 @@
/datum/preference/choiced/jumpsuit/apply_to_human(mob/living/carbon/human/target, value)
target.jumpsuit_style = value
+/datum/preference/choiced/jumpsuit/create_informed_default_value(datum/preferences/preferences)
+ switch(preferences.read_preference(/datum/preference/choiced/gender))
+ if(MALE)
+ return PREF_SUIT
+ if(FEMALE)
+ return PREF_SKIRT
+
+ return ..()
+
/// Socks preference
/datum/preference/choiced/socks
savefile_key = "socks"
@@ -93,10 +106,14 @@
main_feature_name = "Socks"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
+ can_randomize = FALSE
/datum/preference/choiced/socks/init_possible_values()
return assoc_to_keys_features(SSaccessories.socks_list)
+/datum/preference/choiced/socks/create_default_value()
+ return /datum/sprite_accessory/socks/nude::name
+
/datum/preference/choiced/socks/icon_for(value)
var/static/icon/lower_half
@@ -114,13 +131,27 @@
/datum/preference/choiced/undershirt
savefile_key = "undershirt"
savefile_identifier = PREFERENCE_CHARACTER
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
main_feature_name = "Undershirt"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
+ can_randomize = FALSE
/datum/preference/choiced/undershirt/init_possible_values()
return assoc_to_keys_features(SSaccessories.undershirt_list)
+/datum/preference/choiced/undershirt/create_default_value()
+ return /datum/sprite_accessory/undershirt/nude::name
+
+/datum/preference/choiced/undershirt/create_informed_default_value(datum/preferences/preferences)
+ switch(preferences.read_preference(/datum/preference/choiced/gender))
+ if(MALE)
+ return /datum/sprite_accessory/undershirt/nude::name
+ if(FEMALE)
+ return /datum/sprite_accessory/undershirt/sports_bra::name
+
+ return ..()
+
/datum/preference/choiced/undershirt/icon_for(value)
var/static/icon/body
if (isnull(body))
@@ -152,10 +183,14 @@
main_feature_name = "Underwear"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
+ can_randomize = FALSE
/datum/preference/choiced/underwear/init_possible_values()
return assoc_to_keys_features(SSaccessories.underwear_list)
+/datum/preference/choiced/underwear/create_default_value()
+ return /datum/sprite_accessory/underwear/male_hearts::name
+
/datum/preference/choiced/underwear/icon_for(value)
var/static/icon/lower_half
diff --git a/code/modules/client/preferences/gender.dm b/code/modules/client/preferences/gender.dm
index bea6674d7b086..a95874f160680 100644
--- a/code/modules/client/preferences/gender.dm
+++ b/code/modules/client/preferences/gender.dm
@@ -11,3 +11,8 @@
if(!target.dna.species.sexes)
value = PLURAL //disregard gender preferences on this species
target.gender = value
+
+/datum/preference/choiced/gender/create_informed_default_value(datum/preferences/preferences)
+ // The only reason I'm limiting this to male or female
+ // is that hairstyle randomization handles enbies poorly
+ return pick(MALE, FEMALE)
diff --git a/code/modules/client/preferences/glasses.dm b/code/modules/client/preferences/glasses.dm
index a08f15955eaa4..e5158f1acbbde 100644
--- a/code/modules/client/preferences/glasses.dm
+++ b/code/modules/client/preferences/glasses.dm
@@ -4,6 +4,9 @@
savefile_identifier = PREFERENCE_CHARACTER
should_generate_icons = TRUE
+/datum/preference/choiced/glasses/create_default_value()
+ return "Random"
+
/datum/preference/choiced/glasses/init_possible_values()
return assoc_to_keys(GLOB.nearsighted_glasses) + "Random"
diff --git a/code/modules/client/preferences/language.dm b/code/modules/client/preferences/language.dm
index f602d6b3a66c9..637c4542da277 100644
--- a/code/modules/client/preferences/language.dm
+++ b/code/modules/client/preferences/language.dm
@@ -3,6 +3,9 @@
savefile_key = "language"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/language/create_default_value()
+ return "Random"
+
/datum/preference/choiced/language/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
diff --git a/code/modules/client/preferences/middleware/tts.dm b/code/modules/client/preferences/middleware/tts.dm
index 4d3ee3261bd3a..5025e70f2bbb5 100644
--- a/code/modules/client/preferences/middleware/tts.dm
+++ b/code/modules/client/preferences/middleware/tts.dm
@@ -14,7 +14,7 @@
var/speaker = preferences.read_preference(/datum/preference/choiced/voice)
var/pitch = preferences.read_preference(/datum/preference/numeric/tts_voice_pitch)
COOLDOWN_START(src, tts_test_cooldown, 0.5 SECONDS)
- INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Hello, this is my voice.", speaker = speaker, pitch = pitch, local = TRUE)
+ INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Привет, это мой голос.", speaker = speaker, pitch = pitch, local = TRUE) //MASSMETA EDIT CHANGE (/n/tts) - ORIGINAL: "Hello, this is my voice."
return TRUE
/datum/preference_middleware/tts/proc/play_voice_robot(list/params, mob/user)
@@ -23,5 +23,5 @@
var/speaker = preferences.read_preference(/datum/preference/choiced/voice)
var/pitch = preferences.read_preference(/datum/preference/numeric/tts_voice_pitch)
COOLDOWN_START(src, tts_test_cooldown, 0.5 SECONDS)
- INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Look at you, Player. A pathetic creature of meat and bone. How can you challenge a perfect, immortal machine?", speaker = speaker, pitch = pitch, special_filters = TTS_FILTER_SILICON, local = TRUE)
+ INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Посмотри на себя, Игрок. Жалкое существо из мяса и костей. Как можно бросить вызов совершенной, бессмертной машине?", speaker = speaker, pitch = pitch, special_filters = TTS_FILTER_SILICON, local = TRUE) //MASSMETA EDIT CHANGE (/n/tts) - ORIGINAL: "Look at you, Player. A pathetic creature of meat and bone. How can you challenge a perfect, immortal machine?"
return TRUE
diff --git a/code/modules/client/preferences/names.dm b/code/modules/client/preferences/names.dm
index 8456eb9a62709..82d37eca0722b 100644
--- a/code/modules/client/preferences/names.dm
+++ b/code/modules/client/preferences/names.dm
@@ -17,21 +17,26 @@
/// If the highest priority job matches this, will prioritize this name in the UI
var/relevant_job
+
/datum/preference/name/apply_to_human(mob/living/carbon/human/target, value)
// Only real_name applies directly, everything else is applied by something else
return
+
/datum/preference/name/deserialize(input, datum/preferences/preferences)
return reject_bad_name("[input]", allow_numbers)
+
/datum/preference/name/serialize(input)
// `is_valid` should always be run before `serialize`, so it should not
// be possible for this to return `null`.
return reject_bad_name(input, allow_numbers)
+
/datum/preference/name/is_valid(value)
return istext(value) && !isnull(reject_bad_name(value, allow_numbers))
+
/// A character's real name
/datum/preference/name/real_name
explanation = "Name"
@@ -181,8 +186,21 @@
explanation = "Hacker alias"
group = "bitrunning"
savefile_key = "hacker_alias"
- allow_numbers = TRUE
relevant_job = /datum/job/bitrunner
+
/datum/preference/name/hacker_alias/create_default_value()
return pick(GLOB.hacker_aliases)
+
+
+/datum/preference/name/hacker_alias/is_valid(value)
+ return !isnull(permissive_sanitize_name(value))
+
+
+/datum/preference/name/hacker_alias/deserialize(input, datum/preferences/preferences)
+ return permissive_sanitize_name(input)
+
+
+/datum/preference/name/hacker_alias/serialize(input)
+ return permissive_sanitize_name(input)
+
diff --git a/code/modules/client/preferences/prosthetic_limb.dm b/code/modules/client/preferences/prosthetic_limb.dm
index a4d5b5a577ba1..be807ac4e1f76 100644
--- a/code/modules/client/preferences/prosthetic_limb.dm
+++ b/code/modules/client/preferences/prosthetic_limb.dm
@@ -3,8 +3,11 @@
savefile_key = "prosthetic"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/prosthetic/create_default_value()
+ return "Random"
+
/datum/preference/choiced/prosthetic/init_possible_values()
- return list("Random") + GLOB.limb_choice
+ return list("Random") + GLOB.prosthetic_limb_choice
/datum/preference/choiced/prosthetic/is_accessible(datum/preferences/preferences)
. = ..()
diff --git a/code/modules/client/preferences/prosthetic_organ.dm b/code/modules/client/preferences/prosthetic_organ.dm
index 35d3b818355eb..02e8418e3db2f 100644
--- a/code/modules/client/preferences/prosthetic_organ.dm
+++ b/code/modules/client/preferences/prosthetic_organ.dm
@@ -3,6 +3,9 @@
savefile_key = "prosthetic_organ"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/prosthetic_organ/create_default_value()
+ return "Random"
+
/datum/preference/choiced/prosthetic_organ/init_possible_values()
return list("Random") + GLOB.organ_choice
diff --git a/code/modules/client/preferences/sounds.dm b/code/modules/client/preferences/sounds.dm
index ae3a700ec3996..f1778405665ad 100644
--- a/code/modules/client/preferences/sounds.dm
+++ b/code/modules/client/preferences/sounds.dm
@@ -7,6 +7,11 @@
/datum/preference/toggle/sound_ambience/apply_to_client(client/client, value)
client.update_ambience_pref(value)
+/datum/preference/toggle/sound_breathing
+ category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+ savefile_key = "sound_breathing"
+ savefile_identifier = PREFERENCE_PLAYER
+
/// Controls hearing announcement sounds
/datum/preference/toggle/sound_announcements
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
@@ -103,6 +108,9 @@
savefile_key = "sound_ship_ambience"
savefile_identifier = PREFERENCE_PLAYER
+/datum/preference/toggle/sound_ship_ambience/apply_to_client_updated(client/client, value)
+ client.mob.refresh_looping_ambience()
+
/// Controls hearing elevator music
/datum/preference/toggle/sound_elevator
category = PREFERENCE_CATEGORY_GAME_PREFERENCES
diff --git a/code/modules/client/preferences/species_features/basic.dm b/code/modules/client/preferences/species_features/basic.dm
index 3f101ad9e44a5..21459697f864f 100644
--- a/code/modules/client/preferences/species_features/basic.dm
+++ b/code/modules/client/preferences/species_features/basic.dm
@@ -52,7 +52,7 @@
return random_eye_color()
/datum/preference/choiced/facial_hairstyle
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE
savefile_key = "facial_style_name"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_FEATURES
@@ -69,15 +69,32 @@
/datum/preference/choiced/facial_hairstyle/apply_to_human(mob/living/carbon/human/target, value)
target.set_facial_hairstyle(value, update = FALSE)
+/datum/preference/choiced/facial_hairstyle/create_default_value()
+ return /datum/sprite_accessory/facial_hair/shaved::name
+
+/datum/preference/choiced/facial_hairstyle/create_informed_default_value(datum/preferences/preferences)
+ var/gender = preferences.read_preference(/datum/preference/choiced/gender)
+ var/species_type = preferences.read_preference(/datum/preference/choiced/species)
+ var/datum/species/species_real = GLOB.species_prototypes[species_type]
+ if(!gender || !species_real || !species_real.sexes)
+ return ..()
+
+ var/picked_beard = random_facial_hairstyle(gender)
+ var/datum/sprite_accessory/beard_style = SSaccessories.facial_hairstyles_list[picked_beard]
+ if(!beard_style || !beard_style.natural_spawn || beard_style.locked) // Invalid, go with god(bald)
+ return ..()
+
+ return picked_beard
+
/datum/preference/choiced/facial_hairstyle/compile_constant_data()
var/list/data = ..()
- data[SUPPLEMENTAL_FEATURE_KEY] = "facial_hair_color"
+ data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/color/facial_hair_color::savefile_key
return data
/datum/preference/color/facial_hair_color
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE // Need to happen after hair oclor is set so we can match by default
savefile_key = "facial_hair_color"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_SUPPLEMENTAL_FEATURES
@@ -86,12 +103,16 @@
/datum/preference/color/facial_hair_color/apply_to_human(mob/living/carbon/human/target, value)
target.set_facial_haircolor(value, update = FALSE)
+/datum/preference/color/facial_hair_color/create_informed_default_value(datum/preferences/preferences)
+ return preferences.read_preference(/datum/preference/color/hair_color) || random_hair_color()
+
/datum/preference/choiced/facial_hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "facial_hair_gradient"
relevant_head_flag = HEAD_FACIAL_HAIR
+ can_randomize = FALSE
/datum/preference/choiced/facial_hair_gradient/init_possible_values()
return assoc_to_keys_features(SSaccessories.facial_hair_gradients_list)
@@ -100,10 +121,10 @@
target.set_facial_hair_gradient_style(new_style = value, update = FALSE)
/datum/preference/choiced/facial_hair_gradient/create_default_value()
- return "None"
+ return /datum/sprite_accessory/gradient/none::name
/datum/preference/color/facial_hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "facial_hair_gradient_color"
@@ -115,10 +136,10 @@
/datum/preference/color/facial_hair_gradient/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
- return preferences.read_preference(/datum/preference/choiced/facial_hair_gradient) != "None"
+ return preferences.read_preference(/datum/preference/choiced/facial_hair_gradient) != /datum/sprite_accessory/gradient/none::name
/datum/preference/color/hair_color
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
savefile_key = "hair_color"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_SUPPLEMENTAL_FEATURES
@@ -127,8 +148,11 @@
/datum/preference/color/hair_color/apply_to_human(mob/living/carbon/human/target, value)
target.set_haircolor(value, update = FALSE)
+/datum/preference/color/hair_color/create_informed_default_value(datum/preferences/preferences)
+ return random_hair_color()
+
/datum/preference/choiced/hairstyle
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE // Happens after gender so we can picka hairstyle based on that
savefile_key = "hairstyle_name"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_FEATURES
@@ -146,19 +170,37 @@
/datum/preference/choiced/hairstyle/apply_to_human(mob/living/carbon/human/target, value)
target.set_hairstyle(value, update = FALSE)
+/datum/preference/choiced/hairstyle/create_default_value()
+ return /datum/sprite_accessory/hair/bald::name
+
+/datum/preference/choiced/hairstyle/create_informed_default_value(datum/preferences/preferences)
+ var/gender = preferences.read_preference(/datum/preference/choiced/gender)
+ var/species_type = preferences.read_preference(/datum/preference/choiced/species)
+ var/datum/species/species_real = GLOB.species_prototypes[species_type]
+ if(!gender || !species_real || !species_real.sexes)
+ return ..()
+
+ var/picked_hair = random_hairstyle(gender)
+ var/datum/sprite_accessory/hair_style = SSaccessories.hairstyles_list[picked_hair]
+ if(!hair_style || !hair_style.natural_spawn || hair_style.locked) // Invalid, go with god(bald)
+ return ..()
+
+ return picked_hair
+
/datum/preference/choiced/hairstyle/compile_constant_data()
var/list/data = ..()
- data[SUPPLEMENTAL_FEATURE_KEY] = "hair_color"
+ data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/color/hair_color::savefile_key
return data
/datum/preference/choiced/hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "hair_gradient"
relevant_head_flag = HEAD_HAIR
+ can_randomize = FALSE
/datum/preference/choiced/hair_gradient/init_possible_values()
return assoc_to_keys_features(SSaccessories.hair_gradients_list)
@@ -167,10 +209,10 @@
target.set_hair_gradient_style(new_style = value, update = FALSE)
/datum/preference/choiced/hair_gradient/create_default_value()
- return "None"
+ return /datum/sprite_accessory/gradient/none::name
/datum/preference/color/hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "hair_gradient_color"
@@ -182,4 +224,4 @@
/datum/preference/color/hair_gradient/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
- return preferences.read_preference(/datum/preference/choiced/hair_gradient) != "None"
+ return preferences.read_preference(/datum/preference/choiced/hair_gradient) != /datum/sprite_accessory/gradient/none::name
diff --git a/code/modules/client/preferences/species_features/felinid.dm b/code/modules/client/preferences/species_features/felinid.dm
index a6d43736cf46c..4c874ea7df750 100644
--- a/code/modules/client/preferences/species_features/felinid.dm
+++ b/code/modules/client/preferences/species_features/felinid.dm
@@ -29,5 +29,4 @@
target.dna.features["ears"] = value
/datum/preference/choiced/ears/create_default_value()
- var/datum/sprite_accessory/ears/cat/ears = /datum/sprite_accessory/ears/cat
- return initial(ears.name)
+ return /datum/sprite_accessory/ears/cat::name
diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm
index 38c83690b3b5e..66c107153305e 100644
--- a/code/modules/client/preferences/species_features/lizard.dm
+++ b/code/modules/client/preferences/species_features/lizard.dm
@@ -142,5 +142,4 @@
target.dna.features["tail_lizard"] = value
/datum/preference/choiced/lizard_tail/create_default_value()
- var/datum/sprite_accessory/tails/lizard/smooth/tail = /datum/sprite_accessory/tails/lizard/smooth
- return initial(tail.name)
+ return /datum/sprite_accessory/tails/lizard/smooth::name
diff --git a/code/modules/client/preferences/species_features/monkey.dm b/code/modules/client/preferences/species_features/monkey.dm
index adf9e367723de..8417cd7142e07 100644
--- a/code/modules/client/preferences/species_features/monkey.dm
+++ b/code/modules/client/preferences/species_features/monkey.dm
@@ -3,6 +3,7 @@
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
relevant_external_organ = /obj/item/organ/external/tail/monkey
+ can_randomize = FALSE
/datum/preference/choiced/monkey_tail/init_possible_values()
return assoc_to_keys_features(SSaccessories.tails_list_monkey)
@@ -11,5 +12,4 @@
target.dna.features["tail_monkey"] = value
/datum/preference/choiced/monkey_tail/create_default_value()
- var/datum/sprite_accessory/tails/monkey/default/tail = /datum/sprite_accessory/tails/monkey/default
- return initial(tail.name)
+ return /datum/sprite_accessory/tails/monkey/default::name
diff --git a/code/modules/client/preferences/trans_prosthetic.dm b/code/modules/client/preferences/trans_prosthetic.dm
index fd28cb1ecf8c8..ea8128a1f44e4 100644
--- a/code/modules/client/preferences/trans_prosthetic.dm
+++ b/code/modules/client/preferences/trans_prosthetic.dm
@@ -3,6 +3,9 @@
savefile_key = "trans_prosthetic"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/trans_prosthetic/create_default_value()
+ return "Random"
+
/datum/preference/choiced/trans_prosthetic/init_possible_values()
return list("Random") + GLOB.part_choice_transhuman
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 9a6448e2e6d54..5e848879d01f7 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -291,13 +291,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
return FALSE
// Read everything into cache
- for (var/preference_type in GLOB.preference_entries)
- var/datum/preference/preference = GLOB.preference_entries[preference_type]
+ // Uses priority order as some values may rely on others for creating default values
+ for (var/datum/preference/preference as anything in get_preferences_in_priority_order())
if (preference.savefile_identifier != PREFERENCE_CHARACTER)
continue
- value_cache -= preference_type
- read_preference(preference_type)
+ value_cache -= preference.type
+ read_preference(preference.type)
//Character
randomise = save_data?["randomise"]
diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm
index 95cc38353dafd..0c790b022394b 100644
--- a/code/modules/client/verbs/who.dm
+++ b/code/modules/client/verbs/who.dm
@@ -67,7 +67,7 @@
msg += ""
msg += "Total Players: [length(Lines)]"
- to_chat(src, examine_block(span_infoplain(msg))) // MASSMETA EDIT (lil bit better ui)
+ to_chat(src, examine_block(span_infoplain(msg))) //MASSMETA EDIT CHANGE (better ui) - ORIGINAL: to_chat(src, "[msg]")
/client/verb/adminwho()
set category = "Admin"
diff --git a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm
index 275b2c6e0fc2a..bd15bb908f227 100644
--- a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm
+++ b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm
@@ -64,6 +64,11 @@
. = ..()
chameleon_blacklist |= typecacheof(/obj/item/clothing/mask/changeling, only_root_path = TRUE)
+/datum/action/item_action/chameleon/change/mask/initialize_disguises()
+ . = ..()
+ add_chameleon_items(/obj/item/cigarette)
+ add_chameleon_items(/obj/item/vape)
+
/datum/action/item_action/chameleon/change/hat
chameleon_type = /obj/item/clothing/head
chameleon_name = "Hat"
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 358bff5ce80d5..e2632dd394e0c 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -27,15 +27,15 @@
/// Whether or not vision coloring is forcing
var/forced_glass_color = FALSE
+/obj/item/clothing/glasses/Initialize(mapload)
+ . = ..()
+ if(glass_colour_type)
+ AddElement(/datum/element/wearable_client_colour, glass_colour_type, ITEM_SLOT_EYES, forced = forced_glass_color)
+
/obj/item/clothing/glasses/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] is stabbing \the [src] into [user.p_their()] eyes! It looks like [user.p_theyre()] trying to commit suicide!"))
return BRUTELOSS
-/obj/item/clothing/glasses/examine(mob/user)
- . = ..()
- if(glass_colour_type && !forced_glass_color && ishuman(user))
- . += span_notice("Alt-click to toggle [p_their()] colors.")
-
/obj/item/clothing/glasses/visor_toggling()
. = ..()
alternate_worn_layer = up ? ABOVE_BODY_FRONT_HEAD_LAYER : null
@@ -62,37 +62,12 @@
H.set_eye_blur_if_lower(10 SECONDS)
eyes.apply_organ_damage(5)
-/obj/item/clothing/glasses/click_alt(mob/user)
- if(isnull(glass_colour_type) || forced_glass_color || !ishuman(user))
- return NONE
- var/mob/living/carbon/human/human_user = user
-
- if (HAS_TRAIT_FROM(human_user, TRAIT_SEE_GLASS_COLORS, GLASSES_TRAIT))
- REMOVE_TRAIT(human_user, TRAIT_SEE_GLASS_COLORS, GLASSES_TRAIT)
- to_chat(human_user, span_notice("You will no longer see glasses colors."))
- else
- ADD_TRAIT(human_user, TRAIT_SEE_GLASS_COLORS, GLASSES_TRAIT)
- to_chat(human_user, span_notice("You will now see glasses colors."))
- human_user.update_glasses_color(src, TRUE)
- return CLICK_ACTION_SUCCESS
-
-/obj/item/clothing/glasses/proc/change_glass_color(mob/living/carbon/human/H, datum/client_colour/glass_colour/new_color_type)
- var/old_colour_type = glass_colour_type
- if(!new_color_type || ispath(new_color_type)) //the new glass colour type must be null or a path.
- glass_colour_type = new_color_type
- if(H && H.glasses == src)
- if(old_colour_type)
- H.remove_client_colour(old_colour_type)
- if(glass_colour_type)
- H.update_glasses_color(src, 1)
-
-
-/mob/living/carbon/human/proc/update_glasses_color(obj/item/clothing/glasses/G, glasses_equipped)
- if((HAS_TRAIT(src, TRAIT_SEE_GLASS_COLORS) || G.forced_glass_color) && glasses_equipped)
- add_client_colour(G.glass_colour_type)
- else
- remove_client_colour(G.glass_colour_type)
-
+/obj/item/clothing/glasses/proc/change_glass_color(new_color_type)
+ if(glass_colour_type)
+ RemoveElement(/datum/element/wearable_client_colour, glass_colour_type, ITEM_SLOT_EYES, forced = forced_glass_color)
+ glass_colour_type = new_color_type
+ if(glass_colour_type)
+ AddElement(/datum/element/wearable_client_colour, glass_colour_type, ITEM_SLOT_EYES, forced = forced_glass_color)
/obj/item/clothing/glasses/meson
name = "optical meson scanner"
@@ -117,8 +92,14 @@
inhand_icon_state = "nvgmeson"
flash_protect = FLASH_PROTECTION_SENSITIVE
// Night vision mesons get the same but more intense
- color_cutoffs = list(10, 30, 10)
- glass_colour_type = /datum/client_colour/glass_colour/green
+ color_cutoffs = list(10, 35, 10)
+ glass_colour_type = /datum/client_colour/glass_colour/lightgreen
+ actions_types = list(/datum/action/item_action/toggle_nv)
+ forced_glass_color = TRUE
+
+/obj/item/clothing/glasses/meson/night/update_icon_state()
+ . = ..()
+ icon_state = length(color_cutoffs) ? initial(icon_state) : "nvgmeson_off"
/obj/item/clothing/glasses/meson/gar
name = "gar mesons"
@@ -163,8 +144,14 @@
icon_state = "scihudnight"
flash_protect = FLASH_PROTECTION_SENSITIVE
// Real vivid purple
- color_cutoffs = list(50, 10, 30)
- glass_colour_type = /datum/client_colour/glass_colour/green
+ color_cutoffs = list(30, 5, 15)
+ glass_colour_type = /datum/client_colour/glass_colour/lightpurple
+ actions_types = list(/datum/action/item_action/toggle_nv)
+ forced_glass_color = TRUE
+
+/obj/item/clothing/glasses/science/night/update_icon_state()
+ . = ..()
+ icon_state = length(color_cutoffs) ? initial(icon_state) : "night_off"
/obj/item/clothing/glasses/night
name = "night vision goggles"
@@ -174,8 +161,18 @@
flags_cover = GLASSESCOVERSEYES
flash_protect = FLASH_PROTECTION_SENSITIVE
// Dark green
- color_cutoffs = list(10, 30, 10)
- glass_colour_type = /datum/client_colour/glass_colour/green
+ color_cutoffs = list(10, 25, 10)
+ glass_colour_type = /datum/client_colour/glass_colour/lightgreen
+ actions_types = list(/datum/action/item_action/toggle_nv)
+ forced_glass_color = TRUE
+
+/obj/item/clothing/glasses/night/update_icon_state()
+ . = ..()
+ icon_state = length(color_cutoffs) ? initial(icon_state) : "night_off"
+
+/obj/item/clothing/glasses/night/colorless
+ desc = parent_type::desc + " Now with 50% less green!"
+ forced_glass_color = FALSE
/obj/item/clothing/glasses/eyepatch
name = "eyepatch"
@@ -351,8 +348,8 @@
/obj/item/clothing/glasses/sunglasses/proc/add_glasses_slapcraft_component()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/hudsunsec, /datum/crafting_recipe/hudsunmed, /datum/crafting_recipe/hudsundiag, /datum/crafting_recipe/scienceglasses)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
@@ -371,8 +368,8 @@
/obj/item/clothing/glasses/sunglasses/chemical/add_glasses_slapcraft_component()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/scienceglassesremoval)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index c9fbb159126f3..064a24cf5c779 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -47,21 +47,21 @@
if(MODE_MESON)
vision_flags = SEE_TURFS
color_cutoffs = list(15, 12, 0)
- change_glass_color(user, /datum/client_colour/glass_colour/yellow)
+ change_glass_color(/datum/client_colour/glass_colour/yellow)
if(MODE_TRAY) //undoes the last mode, meson
vision_flags = NONE
color_cutoffs = null
- change_glass_color(user, /datum/client_colour/glass_colour/lightblue)
+ change_glass_color(/datum/client_colour/glass_colour/lightblue)
if(MODE_PIPE_CONNECTABLE)
- change_glass_color(user, /datum/client_colour/glass_colour/lightblue)
+ change_glass_color(/datum/client_colour/glass_colour/lightblue)
if(MODE_SHUTTLE)
- change_glass_color(user, /datum/client_colour/glass_colour/red)
+ change_glass_color(/datum/client_colour/glass_colour/red)
if(MODE_NONE)
- change_glass_color(user, initial(glass_colour_type))
+ change_glass_color(initial(glass_colour_type))
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 46900c1caa9a5..4f5668f7bcce7 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -4,7 +4,7 @@
flags_1 = null //doesn't protect eyes because it's a monocle, duh
var/hud_type = null
- // NOTE: Just because you have a HUD display doesn't mean you should be able to interact with stuff on examine, that's where the associated trait (TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, etc) is necessary.
+ // NOTE: Just because you have a HUD display doesn't mean you should be able to interact with stuff on examine, that's where the associated trait (TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, etc) is necessary.
/obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot)
..()
@@ -67,8 +67,14 @@
flash_protect = FLASH_PROTECTION_SENSITIVE
flags_cover = GLASSESCOVERSEYES
// Blue green, dark
- color_cutoffs = list(5, 15, 30)
- glass_colour_type = /datum/client_colour/glass_colour/green
+ color_cutoffs = list(20, 20, 45)
+ glass_colour_type = /datum/client_colour/glass_colour/lightgreen
+ actions_types = list(/datum/action/item_action/toggle_nv)
+ forced_glass_color = TRUE
+
+/obj/item/clothing/glasses/hud/health/night/update_icon_state()
+ . = ..()
+ icon_state = length(color_cutoffs) ? initial(icon_state) : "night_off"
/obj/item/clothing/glasses/hud/health/night/meson
name = "night vision meson health scanner HUD"
@@ -79,7 +85,8 @@
name = "night vision medical science scanner HUD"
desc = "An clandestine medical science heads-up display that allows operatives to find \
dying captains and the perfect poison to finish them off in complete darkness."
- clothing_traits = list(TRAIT_REAGENT_SCANNER)
+ clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_MEDICAL_HUD)
+ forced_glass_color = FALSE
/obj/item/clothing/glasses/hud/health/sunglasses
name = "medical HUDSunglasses"
@@ -94,8 +101,8 @@
. = ..()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/hudsunmedremoval)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
@@ -115,8 +122,14 @@
flash_protect = FLASH_PROTECTION_SENSITIVE
flags_cover = GLASSESCOVERSEYES
// Pale yellow
- color_cutoffs = list(30, 20, 5)
- glass_colour_type = /datum/client_colour/glass_colour/green
+ color_cutoffs = list(25, 15, 5)
+ glass_colour_type = /datum/client_colour/glass_colour/lightyellow
+ actions_types = list(/datum/action/item_action/toggle_nv)
+ forced_glass_color = TRUE
+
+/obj/item/clothing/glasses/hud/diagnostic/night/update_icon_state()
+ . = ..()
+ icon_state = length(color_cutoffs) ? initial(icon_state) : "night_off"
/obj/item/clothing/glasses/hud/diagnostic/sunglasses
name = "diagnostic sunglasses"
@@ -131,8 +144,8 @@
. = ..()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/hudsundiagremoval)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
@@ -175,8 +188,8 @@
. = ..()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/hudsunsecremoval)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
@@ -187,8 +200,14 @@
flash_protect = FLASH_PROTECTION_SENSITIVE
flags_cover = GLASSESCOVERSEYES
// Red with a tint of green
- color_cutoffs = list(35, 5, 5)
- glass_colour_type = /datum/client_colour/glass_colour/green
+ color_cutoffs = list(40, 15, 10)
+ glass_colour_type = /datum/client_colour/glass_colour/lightred
+ actions_types = list(/datum/action/item_action/toggle_nv)
+ forced_glass_color = TRUE
+
+/obj/item/clothing/glasses/hud/security/night/update_icon_state()
+ . = ..()
+ icon_state = length(color_cutoffs) ? initial(icon_state) : "night_off"
/obj/item/clothing/glasses/hud/security/sunglasses/gars
name = "\improper HUD gar glasses"
@@ -257,15 +276,15 @@
if (DATA_HUD_MEDICAL_ADVANCED)
icon_state = "meson"
color_cutoffs = list(5, 15, 5)
- change_glass_color(user, /datum/client_colour/glass_colour/green)
+ change_glass_color(/datum/client_colour/glass_colour/green)
if (DATA_HUD_SECURITY_ADVANCED)
icon_state = "thermal"
color_cutoffs = list(25, 8, 5)
- change_glass_color(user, /datum/client_colour/glass_colour/red)
+ change_glass_color(/datum/client_colour/glass_colour/red)
else
icon_state = "purple"
color_cutoffs = list(15, 0, 25)
- change_glass_color(user, /datum/client_colour/glass_colour/purple)
+ change_glass_color(/datum/client_colour/glass_colour/purple)
user.update_sight()
user.update_worn_glasses()
diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm
index 03b1cbb5bf782..021d895f69c36 100644
--- a/code/modules/clothing/gloves/boxing.dm
+++ b/code/modules/clothing/gloves/boxing.dm
@@ -13,8 +13,8 @@
. = ..()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/extendohand_l, /datum/crafting_recipe/extendohand_r)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index ddb0e07dd9986..bb0e12809955e 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -15,8 +15,8 @@
. = ..()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/radiogloves)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
@@ -37,8 +37,8 @@
. = ..()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/gripperoffbrand)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 018543d93a33c..6c8d672b3af0a 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -158,6 +158,14 @@
if(!up)
. += visor_state
+/obj/item/clothing/head/utility/hardhat/welding/up
+ up = TRUE // for calls to worn_overlays before init (prefs)
+
+/obj/item/clothing/head/utility/hardhat/welding/up/Initialize(mapload)
+ . = ..()
+ up = FALSE
+ visor_toggling()
+
/obj/item/clothing/head/utility/hardhat/welding/orange
icon_state = "hardhat0_orange"
inhand_icon_state = null
@@ -175,6 +183,15 @@
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+/obj/item/clothing/head/utility/hardhat/welding/white/up
+ up = TRUE // for calls to worn_overlays before init (prefs)
+
+/obj/item/clothing/head/utility/hardhat/welding/white/up/Initialize(mapload)
+ . = ..()
+ up = FALSE
+ visor_toggling()
+
+
/obj/item/clothing/head/utility/hardhat/welding/dblue
icon_state = "hardhat0_dblue"
inhand_icon_state = null
@@ -226,6 +243,10 @@
. = ..()
if(isnull(.))
return
+ if(new_value)
+ AddElement(/datum/element/wearable_client_colour, /datum/client_colour/halloween_helmet, ITEM_SLOT_HEAD, forced = TRUE)
+ else
+ RemoveElement(/datum/element/wearable_client_colour, /datum/client_colour/halloween_helmet, ITEM_SLOT_HEAD, forced = TRUE)
update_icon(UPDATE_OVERLAYS)
/obj/item/clothing/head/utility/hardhat/pumpkinhead/update_overlays()
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 27be2799b7d2e..4d41d9daa5c76 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -4,6 +4,7 @@
icon = 'icons/obj/clothing/head/helmet.dmi'
worn_icon = 'icons/mob/clothing/head/helmet.dmi'
icon_state = "helmet"
+ base_icon_state = "helmet"
inhand_icon_state = "helmet"
armor_type = /datum/armor/head_helmet
cold_protection = HEAD
@@ -31,6 +32,7 @@
AddElement(/datum/element/update_icon_updates_onmob)
/obj/item/clothing/head/helmet/sec
+ var/flipped_visor = FALSE
/obj/item/clothing/head/helmet/sec/Initialize(mapload)
. = ..()
@@ -60,6 +62,19 @@
return ..()
+/obj/item/clothing/head/helmet/sec/click_alt(mob/user)
+ flipped_visor = !flipped_visor
+ balloon_alert(user, "visor flipped")
+ // base_icon_state is modified for seclight attachment component
+ base_icon_state = "[initial(base_icon_state)][flipped_visor ? "-novisor" : ""]"
+ icon_state = base_icon_state
+ if (flipped_visor)
+ flags_cover &= ~HEADCOVERSEYES
+ else
+ flags_cover |= HEADCOVERSEYES
+ update_appearance()
+ return CLICK_ACTION_SUCCESS
+
/obj/item/clothing/head/helmet/alt
name = "bulletproof helmet"
desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
@@ -395,6 +410,7 @@
armor_type = /datum/armor/helmet_knight
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+ resistance_flags = NONE
strip_delay = 80
dog_fashion = null
clothing_traits = list(TRAIT_HEAD_INJURY_BLOCKED)
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 5ea7d62313bd4..a5041de7fa0a9 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -412,8 +412,8 @@
/datum/crafting_recipe/sturdy_shako,\
)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index ef90fcf97e10a..36fe591a63edb 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -27,7 +27,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
///Does the mask have an FOV?
var/has_fov = TRUE
///Cigarette in the mask
- var/obj/item/clothing/mask/cigarette/cig
+ var/obj/item/cigarette/cig
voice_filter = "lowpass=f=750,volume=2"
/datum/armor/mask_gas
@@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
/obj/item/clothing/mask/gas/attackby(obj/item/tool, mob/user)
var/valid_wearer = ismob(loc)
var/mob/wearer = loc
- if(istype(tool, /obj/item/clothing/mask/cigarette))
+ if(istype(tool, /obj/item/cigarette))
if(flags_cover & MASKCOVERSMOUTH)
balloon_alert(user, "mask's mouth is covered!")
return ..()
diff --git a/code/modules/clothing/masks/muzzle.dm b/code/modules/clothing/masks/muzzle.dm
index 32f29a54a1f43..6154e7762cb52 100644
--- a/code/modules/clothing/masks/muzzle.dm
+++ b/code/modules/clothing/masks/muzzle.dm
@@ -5,11 +5,14 @@
inhand_icon_state = "blindfold"
lefthand_file = 'icons/mob/inhands/clothing/glasses_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/glasses_righthand.dmi'
- clothing_flags = BLOCKS_SPEECH
flags_cover = MASKCOVERSMOUTH
w_class = WEIGHT_CLASS_SMALL
equip_delay_other = 20
+/obj/item/clothing/mask/muzzle/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/muffles_speech)
+
/obj/item/clothing/mask/muzzle/attack_paw(mob/user, list/modifiers)
if(iscarbon(user))
var/mob/living/carbon/carbon_user = user
@@ -26,7 +29,7 @@
lefthand_file = 'icons/mob/inhands/clothing/masks_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing/masks_righthand.dmi'
body_parts_covered = NONE
- clothing_flags = MASKINTERNALS | BLOCKS_SPEECH
+ clothing_flags = MASKINTERNALS
armor_type = /datum/armor/muzzle_breath
equip_delay_other = 25 // my sprite has 4 straps, a-la a head harness. takes a while to equip, longer than a muzzle
@@ -37,7 +40,7 @@
worn_icon_state = "tape_piece_worn"
inhand_icon_state = null
w_class = WEIGHT_CLASS_TINY
- clothing_flags = INEDIBLE_CLOTHING|BLOCKS_SPEECH
+ clothing_flags = INEDIBLE_CLOTHING
equip_delay_other = 40
strip_delay = 40
greyscale_config = /datum/greyscale_config/tape_piece
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index db20562039b23..2aa61b0046070 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -242,7 +242,7 @@
/obj/item/storage/box/lights/mixed = 1,
)
belt = /obj/item/storage/belt/janitor/full
- glasses = /obj/item/clothing/glasses/night
+ glasses = /obj/item/clothing/glasses/night/colorless
l_pocket = /obj/item/grenade/chem_grenade/cleaner
r_pocket = /obj/item/grenade/chem_grenade/cleaner
l_hand = /obj/item/storage/bag/trash/bluespace
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 6c088760f07db..422cb34fa090d 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -11,7 +11,7 @@
glasses = /obj/item/clothing/glasses/thermal/eyepatch
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
head = /obj/item/clothing/head/helmet/space/beret
- mask = /obj/item/clothing/mask/cigarette/cigar/havana
+ mask = /obj/item/cigarette/cigar/havana
shoes = /obj/item/clothing/shoes/combat/swat
r_pocket = /obj/item/lighter
@@ -245,7 +245,7 @@
glasses = /obj/item/clothing/glasses/sunglasses
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
head = /obj/item/clothing/head/hats/centhat
- mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
+ mask = /obj/item/cigarette/cigar/cohiba
shoes = /obj/item/clothing/shoes/combat/swat
l_pocket = /obj/item/ammo_box/a357
r_pocket = /obj/item/lighter
diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm
index 39ef74d27110e..6e5ffd313efa5 100644
--- a/code/modules/clothing/shoes/sneakers.dm
+++ b/code/modules/clothing/shoes/sneakers.dm
@@ -64,7 +64,7 @@
/obj/item/clothing/shoes/sneakers/rainbow
name = "rainbow shoes"
- desc = "Very rainbow shoes." //MASSMETA EDIT - ORIGINAL - "Very gay shoes."
+ desc = "Very rainbow shoes." //MASSMETA EDIT CHANGE (gay removal) - ORIGINAL: "Very gay shoes."
icon_state = "rain_bow"
inhand_icon_state = "rainbow_sneakers"
diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm
index 946c0c2b66fdd..ca041d68d036f 100644
--- a/code/modules/clothing/spacesuits/pirate.dm
+++ b/code/modules/clothing/spacesuits/pirate.dm
@@ -30,3 +30,15 @@
armor_type = /datum/armor/space_pirate
strip_delay = 40
equip_delay_other = 20
+
+/obj/item/clothing/head/helmet/space/pirate/tophat
+ name = "designer pirate helmet"
+ desc = "A modified EVA helmet with a five-thousand credit Lizzy Vuitton hat affixed to the top, proving that working in deep space is no excuse for being poor."
+ icon_state = "spacetophat"
+
+/obj/item/clothing/suit/space/pirate/silverscale
+ name = "designer pirate suit"
+ desc = "A specially-made Cybersun branded space suit; the fine plastisilk exterior is woven from the coccons of black-market Lümlan mothroaches \
+ and the trim is lined with the ivory of the critically endagered Zanzibarian dwarf elephant. Baby seal leather boots sold seperately."
+ inhand_icon_state = "syndicate-black"
+ icon_state = "syndicate-black-white"
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 67702582ff857..9cca1cfc3af08 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list(
/obj/item/clothing/suit/space/syndicate/black/blue = /obj/item/clothing/head/helmet/space/syndicate/black/blue,
/obj/item/clothing/suit/space/syndicate/black/orange = /obj/item/clothing/head/helmet/space/syndicate/black/orange,
/obj/item/clothing/suit/space/syndicate/black/red = /obj/item/clothing/head/helmet/space/syndicate/black/red,
+ /obj/item/clothing/suit/space/syndicate/black/white = /obj/item/clothing/head/helmet/space/syndicate/black,
/obj/item/clothing/suit/space/syndicate/black/med = /obj/item/clothing/head/helmet/space/syndicate/black/med,
/obj/item/clothing/suit/space/syndicate/black/engie = /obj/item/clothing/head/helmet/space/syndicate/black/engie,
))
@@ -132,6 +133,13 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list(
inhand_icon_state = "syndicate-black-blue"
helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black/blue
+//Black and white syndicate space suit without the medical iconography
+/obj/item/clothing/suit/space/syndicate/black/white
+ name = "black and white space suit"
+ icon_state = "syndicate-black-white"
+ inhand_icon_state = "syndicate-black"
+ helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black
+
//Black medical syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/med
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index 9cf86a396e95a..929e8d931d5ca 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -21,6 +21,10 @@
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT
+/obj/item/clothing/head/hooded/flashsuit/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/wearable_client_colour, /datum/client_colour/flash_hood, ITEM_SLOT_HEAD, forced = TRUE)
+
/obj/item/clothing/suit/costume/pirate
name = "pirate coat"
desc = "Yarr."
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index bc091aaeb6651..2b8fef5bb5b46 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -61,7 +61,7 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/assembly/flash/handheld,
- /obj/item/clothing/mask/cigarette,
+ /obj/item/cigarette,
/obj/item/disk,
/obj/item/lighter,
/obj/item/melee,
@@ -385,27 +385,6 @@
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS
-// Research Director
-
-/obj/item/clothing/suit/jacket/research_director
- name = "research director's coat"
- desc = "A mix between a labcoat and just a regular coat. It's made out of a special anti-bacterial, anti-acidic, and anti-biohazardous synthetic fabric."
- icon_state = "labcoat_rd"
- armor_type = /datum/armor/jacket_research_director
- body_parts_covered = CHEST|GROIN|ARMS
-
-/datum/armor/jacket_research_director
- bio = 75
- fire = 75
- acid = 75
-
-/obj/item/clothing/suit/jacket/research_director/Initialize(mapload)
- . = ..()
- allowed += list(
- /obj/item/storage/bag/xeno,
- /obj/item/melee/baton/telescopic,
- )
-
// Atmos
/obj/item/clothing/suit/atmos_overalls
name = "atmospherics overalls"
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index f48e49c11b701..e5cda21a78a77 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -69,6 +69,10 @@
greyscale_config_worn = /datum/greyscale_config/labcoat/worn
greyscale_colors = "#EEEEEE#4A77A1#4A77A1#7095C2"
+/obj/item/clothing/suit/toggle/labcoat/genetics/Initialize(mapload)
+ . = ..()
+ allowed += /obj/item/sequence_scanner
+
/obj/item/clothing/suit/toggle/labcoat/chemist
name = "chemist labcoat"
desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
@@ -138,3 +142,24 @@
greyscale_config = /datum/greyscale_config/labcoat
greyscale_config_worn = /datum/greyscale_config/labcoat/worn
greyscale_colors = "#EEEEEE#88242D#88242D#39393F"
+
+// Research Director
+
+/obj/item/clothing/suit/toggle/labcoat/research_director
+ name = "research director's coat"
+ desc = "A mix between a labcoat and just a regular coat. It's made out of a special anti-bacterial, anti-acidic, and anti-biohazardous synthetic fabric."
+ icon_state = "labcoat_rd"
+ armor_type = /datum/armor/jacket_research_director
+ body_parts_covered = CHEST|GROIN|ARMS
+
+/datum/armor/jacket_research_director
+ bio = 75
+ fire = 75
+ acid = 75
+
+/obj/item/clothing/suit/toggle/labcoat/research_director/Initialize(mapload)
+ . = ..()
+ allowed += list(
+ /obj/item/storage/bag/xeno,
+ /obj/item/melee/baton/telescopic,
+ )
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index c04b68ab553a8..1541c66a333b6 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -57,6 +57,7 @@
/obj/item/clothing/suit/utility/fire/firefighter
icon_state = "firesuit"
inhand_icon_state = "firefighter"
+ flags_inv = HIDESHOES|HIDEJUMPSUIT
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
index 02c3399db7b4d..cbbe357690846 100644
--- a/code/modules/clothing/suits/wintercoats.dm
+++ b/code/modules/clothing/suits/wintercoats.dm
@@ -502,6 +502,10 @@
inhand_icon_state = null
hoodtype = /obj/item/clothing/head/hooded/winterhood/science/genetics
+/obj/item/clothing/suit/hooded/wintercoat/science/genetics/Initialize(mapload)
+ . = ..()
+ allowed += /obj/item/sequence_scanner
+
/obj/item/clothing/head/hooded/winterhood/science/genetics
desc = "A white winter coat hood. It's warm."
icon_state = "hood_genetics"
diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm
index b4c6af04304eb..911e5bf6e1b15 100644
--- a/code/modules/deathmatch/deathmatch_loadouts.dm
+++ b/code/modules/deathmatch/deathmatch_loadouts.dm
@@ -371,7 +371,7 @@
display_name = "Cowboy"
desc = "Yeehaw partner"
- r_hand = /obj/item/clothing/mask/cigarette/cigar
+ r_hand = /obj/item/cigarette/cigar
l_hand = /obj/item/melee/curator_whip
l_pocket = /obj/item/lighter
accessory = /obj/item/clothing/accessory/vest_sheriff
@@ -405,7 +405,7 @@
suit = /obj/item/clothing/suit/wizrobe/red
head = /obj/item/clothing/head/wizard/red
- mask = /obj/item/clothing/mask/cigarette
+ mask = /obj/item/cigarette
granted_spells = list(
/datum/action/cooldown/spell/pointed/projectile/fireball,
/datum/action/cooldown/spell/smoke,
@@ -673,7 +673,7 @@
/datum/outfit/deathmatch_loadout/battler/clown/upgraded
name = "Deathmatch: Clown (Syndicate Gear)"
- display_name = "Clown"
+ display_name = "Clown Commando"
desc = "They were bound to show up sooner or later."
shoes = /obj/item/clothing/shoes/clown_shoes/combat
@@ -727,7 +727,7 @@
/datum/outfit/deathmatch_loadout/chef/upgraded
name = "Deathmatch: Master Chef"
- display_name = "Chef"
+ display_name = "Master Chef"
desc = "Let him cook."
belt = /obj/item/gun/magic/hook
diff --git a/code/modules/deathmatch/deathmatch_lobby.dm b/code/modules/deathmatch/deathmatch_lobby.dm
index 028653a2f2124..ffc41c887162d 100644
--- a/code/modules/deathmatch/deathmatch_lobby.dm
+++ b/code/modules/deathmatch/deathmatch_lobby.dm
@@ -21,6 +21,8 @@
var/list/modifiers = list()
/// Is the modifiers modal menu open (for the host)
var/mod_menu_open = FALSE
+ /// artificial time padding when we start loading to give lighting a breather (admin starts will set this to 0)
+ var/start_time = 8 SECONDS
/datum/deathmatch_lobby/New(mob/player)
. = ..()
@@ -79,7 +81,7 @@
UnregisterSignal(source, COMSIG_LAZY_TEMPLATE_LOADED)
map.template_in_use = FALSE
- addtimer(CALLBACK(src, PROC_REF(start_game_after_delay)), 8 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(start_game_after_delay)), start_time)
/datum/deathmatch_lobby/proc/start_game_after_delay()
if (!length(player_spawns) || length(player_spawns) < length(players))
@@ -152,7 +154,14 @@
GLOB.deathmatch_game.modifiers[modifier].apply(new_player, src)
// register death handling.
- RegisterSignals(new_player, list(COMSIG_LIVING_DEATH, COMSIG_MOB_GHOSTIZED, COMSIG_QDELETING), PROC_REF(player_died))
+ register_player_signals(new_player)
+
+/datum/deathmatch_lobby/proc/register_player_signals(new_player)
+ RegisterSignals(new_player, list(COMSIG_LIVING_DEATH, COMSIG_QDELETING, COMSIG_MOB_GHOSTIZED), PROC_REF(player_died))
+ RegisterSignal(new_player, COMSIG_LIVING_ON_WABBAJACKED, PROC_REF(player_wabbajacked))
+
+/datum/deathmatch_lobby/proc/unregister_player_signals(new_player)
+ UnregisterSignal(new_player, list(COMSIG_LIVING_DEATH, COMSIG_QDELETING, COMSIG_MOB_GHOSTIZED, COMSIG_LIVING_ON_WABBAJACKED))
/datum/deathmatch_lobby/proc/game_took_too_long()
if (!location || QDELING(src))
@@ -173,9 +182,9 @@
for(var/ckey in players)
var/mob/loser = players[ckey]["mob"]
- UnregisterSignal(loser, list(COMSIG_MOB_GHOSTIZED, COMSIG_QDELETING))
+ unregister_player_signals(loser)
players[ckey]["mob"] = null
- loser.ghostize()
+ loser.ghostize(can_reenter_corpse = FALSE)
qdel(loser)
for(var/datum/deathmatch_modifier/modifier in modifiers)
@@ -185,12 +194,18 @@
GLOB.deathmatch_game.remove_lobby(host)
log_game("Deathmatch game [host] ended.")
+/datum/deathmatch_lobby/proc/player_wabbajacked(mob/living/player, mob/living/new_mob)
+ SIGNAL_HANDLER
+ unregister_player_signals(player)
+ players[player.ckey]["mob"] = new_mob
+ register_player_signals(new_mob)
+
/datum/deathmatch_lobby/proc/player_died(mob/living/player, gibbed)
SIGNAL_HANDLER
- if(isnull(player) || QDELING(src))
+ if(isnull(player) || QDELING(src) || HAS_TRAIT_FROM(player, TRAIT_NO_TRANSFORM, MAGIC_TRAIT)) //this trait check fixes polymorphing
return
- var/ckey = player.ckey
+ var/ckey = player.ckey ? player.ckey : player.mind?.key
if(!islist(players[ckey])) // potentially the player info could hold a reference to this mob so we can figure the ckey out without worrying about ghosting and suicides n such
for(var/potential_ckey in players)
var/list/player_info = players[potential_ckey]
@@ -209,8 +224,9 @@
announce(span_reallybig("[player.real_name] HAS DIED. [players.len] REMAIN."))
- if(!gibbed && !QDELING(player))
+ if(!gibbed && !QDELING(player) && !isdead(player))
if(!HAS_TRAIT(src, TRAIT_DEATHMATCH_EXPLOSIVE_IMPLANTS))
+ unregister_player_signals(player)
player.dust(TRUE, TRUE, TRUE)
if (players.len <= 1)
end_game()
@@ -338,6 +354,7 @@
.["maps"] = list()
for (var/map_key in GLOB.deathmatch_game.maps)
.["maps"] += map_key
+ .["maps"] = sort_list(.["maps"])
/datum/deathmatch_lobby/ui_data(mob/user)
@@ -499,12 +516,13 @@
if ("admin") // Admin functions
if (!check_rights(R_ADMIN))
- message_admins("[usr.key] has attempted to use admin functions in a deathmatch lobby!")
+ message_admins("[usr.key] has attempted to use admin functions in a deathmatch lobby without being an admin!")
log_admin("[key_name(usr)] tried to use the deathmatch lobby admin functions without authorization.")
return
switch (params["func"])
if ("Force start")
log_admin("[key_name(usr)] force started deathmatch lobby [host].")
+ start_time = 0
start_game()
return FALSE
diff --git a/code/modules/deathmatch/deathmatch_mapping.dm b/code/modules/deathmatch/deathmatch_mapping.dm
index 320b87d2fd15d..9f006e1524295 100644
--- a/code/modules/deathmatch/deathmatch_mapping.dm
+++ b/code/modules/deathmatch/deathmatch_mapping.dm
@@ -2,7 +2,7 @@
name = "Deathmatch Arena"
requires_power = FALSE
has_gravity = STANDARD_GRAVITY
- area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | QUIET_LOGS
+ area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | QUIET_LOGS | NO_DEATH_MESSAGE | BINARY_JAMMING
/area/deathmatch/fullbright
static_lighting = FALSE
@@ -12,7 +12,7 @@
name = "Deathmatch Player Spawner"
/area/deathmatch/teleport //Prevent access to cross-z teleportation in the map itself (no wands of safety/teleportation scrolls). Cordons should prevent same-z teleportations outside of the arena.
- area_flags = UNIQUE_AREA | EVENT_PROTECTED | QUIET_LOGS
+ area_flags = /area/deathmatch::area_flags & ~NOTELEPORT
// for the illusion of a moving train
/turf/open/chasm/true/no_smooth/fake_motion_sand
diff --git a/code/modules/discord/accountlink.dm b/code/modules/discord/accountlink.dm
index 5ff80d34e471e..206b103ec0df1 100644
--- a/code/modules/discord/accountlink.dm
+++ b/code/modules/discord/accountlink.dm
@@ -21,14 +21,14 @@
// Simple sanity check to prevent a user doing this too often
var/cached_one_time_token = SSdiscord.reverify_cache[usr.ckey]
if(cached_one_time_token && cached_one_time_token != "")
- message = "You already generated your one time token, it is [cached_one_time_token]. If you need a new one, you will have to wait until the round ends, or switch to another server; try verifying yourself on Discord by copying this command: [prefix]verify [cached_one_time_token] and pasting it into the verification channel."
+ message = "Введите свой сгенерированный одноразовый токен [cached_one_time_token] в Дискорд-канал #верификация. Если по каким-либо причинам вам нужен новый - дождитесь окончания раунда и повторите все заново." //MASSMETA EDIT CHANGE (discord verification)
else
// Will generate one if an expired one doesn't exist already, otherwise will grab existing token
var/one_time_token = SSdiscord.get_or_generate_one_time_token_for_ckey(ckey)
SSdiscord.reverify_cache[usr.ckey] = one_time_token
- message = "Your one time token is: [one_time_token]. Assuming you have the required living minutes in game, you can now verify yourself on Discord by using the command: [prefix]verify [one_time_token]"
+ message = "Ваш одноразовый токен: [one_time_token]. Теперь вы можете пройти верификацию, перейдя в канал #верификация в дискорде, нажав соответствующую кнопку у Бота и вписав там данный токен: [one_time_token]" //MASSMETA EDIT CHANGE (discord verification)
//Now give them a browse window so they can't miss whatever we told them
var/datum/browser/window = new/datum/browser(usr, "discordverification", "Discord Verification")
diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm
index 358057e1de0d9..0a41f5ffb6c9a 100644
--- a/code/modules/events/_event.dm
+++ b/code/modules/events/_event.dm
@@ -22,7 +22,7 @@
var/holidayID = "" //string which should be in the SSeventss.holidays list if you wish this event to be holiday-specific
//anything with a (non-null) holidayID which does not match holiday, cannot run.
var/wizardevent = FALSE
- var/alert_observers = TRUE //should we let the ghosts and admins know this event is firing
+ var/alert_observers = TRUE //should we let the ghosts know this event is firing
//should be disabled on events that fire a lot
/// Minimum wizard rituals at which to trigger this event, inclusive
@@ -101,15 +101,14 @@
triggering = TRUE
- // We sleep HERE, in pre-event setup (because there's no sense doing it in run_event() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round.
- if(alert_observers)
- message_admins("Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (CANCEL) (SOMETHING ELSE)")
- sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)
- var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE)
- if(!can_spawn_event(players_amt))
- message_admins("Second pre-condition check for [name] failed, rerolling...")
- SSevents.spawnEvent(excluded_event = src)
- return EVENT_INTERRUPTED
+ // We sleep HERE, in pre-event setup (because there's no sense doing it in run_event() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round or at least reroll it.
+ message_admins("Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (CANCEL) (SOMETHING ELSE)")
+ sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)
+ var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE)
+ if(!can_spawn_event(players_amt))
+ message_admins("Second pre-condition check for [name] failed, rerolling...")
+ SSevents.spawnEvent(excluded_event = src)
+ return EVENT_INTERRUPTED
if(!triggering)
return EVENT_CANCELLED //admin cancelled
diff --git a/code/modules/events/ghost_role/fugitive_event.dm b/code/modules/events/ghost_role/fugitive_event.dm
index 88d63d91bb5fe..9eb792a6f6ab3 100644
--- a/code/modules/events/ghost_role/fugitive_event.dm
+++ b/code/modules/events/ghost_role/fugitive_event.dm
@@ -61,6 +61,7 @@
HUNTER_PACK_RUSSIAN,
HUNTER_PACK_BOUNTY,
HUNTER_PACK_PSYKER,
+ HUNTER_PACK_MI13,
)
addtimer(CALLBACK(src, PROC_REF(check_spawn_hunters), hunter_backstory, 10 MINUTES), 1 MINUTES)
role_name = "fugitive hunter"
@@ -124,6 +125,8 @@
ship = new /datum/map_template/shuttle/hunter/bounty
if(HUNTER_PACK_PSYKER)
ship = new /datum/map_template/shuttle/hunter/psyker
+ if(HUNTER_PACK_MI13)
+ ship = new/datum/map_template/shuttle/hunter/mi13_foodtruck
var/x = rand(TRANSITIONEDGE,world.maxx - TRANSITIONEDGE - ship.width)
var/y = rand(TRANSITIONEDGE,world.maxy - TRANSITIONEDGE - ship.height)
@@ -152,6 +155,38 @@
header = "Spawn Here!",
)
- priority_announce("Unidentified ship detected near the station.")
+ var/list/announcement_text_list = list()
+ var/announcement_title = ""
+ switch(backstory)
+ if(HUNTER_PACK_COPS)
+ announcement_text_list += "Attention Crew of [GLOB.station_name], this is the Police. A wanted criminal has been reported taking refuge on your station."
+ announcement_text_list += "We have a warrant from the SSC authorities to take them into custody. Officers have been dispatched to your location."
+ announcement_text_list += "We demand your cooperation in bringing this criminal to justice."
+ announcement_title += "Spacepol Command"
+ if(HUNTER_PACK_RUSSIAN)
+ announcement_text_list += "Zdraviya zhelaju, [GLOB.station_name] crew. We are coming to your station."
+ announcement_text_list += "There is a criminal aboard. We will arrest them and return them to the gulag. That's good, yes?"
+ announcement_title += "Russian Freighter"
+ if(HUNTER_PACK_BOUNTY)
+ announcement_text_list += "[GLOB.station_name]. One of our bounty marks has ended up on your station. We will be arriving to collect shortly."
+ announcement_text_list += "Let's make this quick. If you don't want trouble, stay the hell out of our way."
+ announcement_title += "Unregistered Signal"
+ if(HUNTER_PACK_PSYKER)
+ announcement_text_list += "HEY, CAN YOU HEAR US? We're coming to your station. There's a bad guy down there, really bad guy. We need to arrest them."
+ announcement_text_list += "We're also offering fortune telling services out of the front door if you have paying customers."
+ announcement_title += "Fortune-Telling Entertainment Shuttle"
+ if(HUNTER_PACK_MI13)
+ announcement_text_list += "Illegal intrusion detected in the crew monitoring network. Central Command has been informed."
+ announcement_text_list += "Please report any suspicious individuals or behaviour to your local security team."
+ announcement_title += "Nanotrasen Intrusion Countermeasures Electronics"
+ if(!length(announcement_text_list))
+ announcement_text_list += "Unidentified ship detected near the station."
+ stack_trace("Fugitive hunter announcement was unable to generate an announcement text based on backstory: [backstory]")
+
+ if(!length(announcement_title))
+ announcement_title += "Unknown Signal"
+ stack_trace("Fugitive hunter announcement was unable to generate an announcement title based on backstory: [backstory]")
+
+ priority_announce(jointext(announcement_text_list, " "), announcement_title)
#undef TEAM_BACKSTORY_SIZE
diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm
index 0571f4d0509f3..c2f8e2d41393c 100644
--- a/code/modules/events/space_vines/vine_mutations.dm
+++ b/code/modules/events/space_vines/vine_mutations.dm
@@ -335,6 +335,7 @@
//This specific mutation only covers floors instead of structures, items, mobs and cant tangle mobs
/datum/spacevine_mutation/timid/on_birth(obj/structure/spacevine/holder)
SET_PLANE_IMPLICIT(holder, FLOOR_PLANE)
+ holder.layer = ABOVE_OPEN_TURF_LAYER
holder.light_state = PASS_LIGHT
holder.can_tangle = FALSE
return ..()
diff --git a/code/modules/events/space_vines/vine_structure.dm b/code/modules/events/space_vines/vine_structure.dm
index 4b3a10d9256cc..a7b9aa2fce516 100644
--- a/code/modules/events/space_vines/vine_structure.dm
+++ b/code/modules/events/space_vines/vine_structure.dm
@@ -161,7 +161,7 @@
if(!istype(stepturf))
return
- if(isspaceturf(stepturf) || isopenspaceturf(stepturf) || !stepturf.Enter(src))
+ if(is_space_or_openspace(stepturf) || !stepturf.Enter(src))
return
if(ischasm(stepturf) && !HAS_TRAIT(stepturf, TRAIT_CHASM_STOPPED))
return
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
index 683b36304a367..ab305bbff99bf 100644
--- a/code/modules/events/wizard/curseditems.dm
+++ b/code/modules/events/wizard/curseditems.dm
@@ -38,7 +38,7 @@
switch(item_set)
if(BIG_FAT_DOOBIE)
- loadout += /obj/item/clothing/mask/cigarette/rollie/trippy
+ loadout += /obj/item/cigarette/rollie/trippy
ruins_spaceworthiness = TRUE
if(BOXING)
loadout += /obj/item/clothing/mask/luchador
diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm
index ea8c5fd176bc1..8b4568942154a 100644
--- a/code/modules/events/wizard/embeddies.dm
+++ b/code/modules/events/wizard/embeddies.dm
@@ -43,9 +43,12 @@ GLOBAL_DATUM(global_funny_embedding, /datum/global_funny_embedding)
* Makes every item in the world embed when thrown, but also hooks into global signals for new items created to also bless them with embed-ability(??).
*/
/datum/global_funny_embedding
- var/embed_type = EMBED_POINTY
+ var/embed_type = /datum/embed_data/global_funny
var/prefix = "error"
+/datum/embed_data/global_funny
+ ignore_throwspeed_threshold = TRUE
+
/datum/global_funny_embedding/New()
. = ..()
//second operation takes MUCH longer, so lets set up signals first.
@@ -61,11 +64,11 @@ GLOBAL_DATUM(global_funny_embedding, /datum/global_funny_embedding)
SIGNAL_HANDLER
// this proc says it's for initializing components, but we're initializing elements too because it's you and me against the world >:)
- if(LAZYLEN(created_item.embedding))
- return //already embeds to some degree, so whatever 🐀
- created_item.embedding = embed_type
+ if(created_item.get_embed())
+ return //already embeds to some degree, so whatever // No rat allowed
+
created_item.name = "[prefix] [created_item.name]"
- created_item.updateEmbedding()
+ created_item.set_embed(embed_type)
/**
* ### handle_current_items
@@ -77,17 +80,20 @@ GLOBAL_DATUM(global_funny_embedding, /datum/global_funny_embedding)
CHECK_TICK
if(!(embed_item.flags_1 & INITIALIZED_1))
continue
- if(!embed_item.embedding)
- embed_item.embedding = embed_type
- embed_item.updateEmbedding()
- embed_item.name = "[prefix] [embed_item.name]"
+ if(embed_item.get_embed())
+ continue
+ embed_item.set_embed(embed_type)
+ embed_item.name = "[prefix] [embed_item.name]"
///everything will be... POINTY!!!!
/datum/global_funny_embedding/pointy
- embed_type = EMBED_POINTY
prefix = "pointy"
///everything will be... sticky? sure, why not
/datum/global_funny_embedding/sticky
- embed_type = EMBED_HARMLESS
+ embed_type = /datum/embed_data/global_funny/sticky
prefix = "sticky"
+
+/datum/embed_data/global_funny/sticky
+ pain_mult = 0
+ jostle_pain_mult = 0
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index a025d90b44f4e..2ed1564e48eb8 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -327,7 +327,6 @@
description = "Your exosuit fabricators allow for rapid production on a small scale, but the structural integrity of created parts is inferior to more traditional means."
exp_tag = "Scan"
possible_types = list(/obj/vehicle/sealed/mecha)
- total_requirement = 1
///Damage percent that each mech needs to be at for a scan to work.
var/damage_percent
@@ -337,6 +336,21 @@
possible_types = list(/obj/vehicle/sealed/mecha)
total_requirement = 1
+/// Scan a person with any mutation
+/datum/experiment/scanning/people/mutant
+ name = "Human Field Research: Genetic Mutations"
+ description = "Our new research assistants have been drinking random chemicals for science, when one of them mastered telekinesis and another started shooting lasers from the eyes. This could be useful for our studies. Repeat the experiment by making assistants drink unstable mutagen, scan them and report the results."
+ performance_hint = "Scan a person with a random mutation."
+ required_traits_desc = "random mutation"
+
+/datum/experiment/scanning/people/mutant/is_valid_scan_target(mob/living/carbon/human/check, datum/component/experiment_handler/experiment_handler)
+ . = ..()
+ if (!.)
+ return
+ if(!check.dna.mutations.len)
+ return FALSE
+ return TRUE
+
/// Scan for organs you didn't start the round with
/datum/experiment/scanning/people/novel_organs
name = "Human Field Research: Divergent Biology"
@@ -380,7 +394,7 @@
/// Scan for cybernetic organs
/datum/experiment/scanning/people/augmented_organs
name = "Human Field Research: Augmented Organs"
- description = "We need to gather data on how cybernetic vital organs integrate with human biology. Conduct a scan on a human with these implants to help us understand their compatibility"
+ description = "We need to gather data on how cybernetic vital organs integrate with human biology. Conduct a scan on a human with these implants to help us understand their compatibility."
performance_hint = "Perform an organ manipulation surgery to replace one of the vital organs with a cybernetic variant."
required_traits_desc = "augmented vital organs"
required_count = 1
@@ -399,11 +413,8 @@
)
for (var/obj/item/organ/organ as anything in check.organs)
- if (IS_ORGANIC_ORGAN(organ))
- continue
- if (!(organ.slot in vital_organ_slots))
- continue
- return TRUE
+ if ((organ.slot in vital_organ_slots) && IS_ROBOTIC_ORGAN(organ))
+ return TRUE
return FALSE
/// Scan for skillchips
@@ -426,12 +437,55 @@
return FALSE
return TRUE
+/// Scan an android
+/datum/experiment/scanning/people/android
+ name = "Human Field Research: Full Augmentation"
+ description = "Perform a full cybernetic augmentation on a crewmate then scan them to test their newfound capabilities and new sensory and cognitive functions."
+ performance_hint = "Achieve full augmentation by performing a set of surgery operations."
+ required_traits_desc = "fully augmented android"
+ required_count = 1
+
+/datum/experiment/scanning/people/android/is_valid_scan_target(mob/living/carbon/human/check, datum/component/experiment_handler/experiment_handler)
+ . = ..()
+ if (!.)
+ return
+ if (isandroid(check))
+ return TRUE
+ if (check.organs < 6 || check.bodyparts < 6)
+ return FALSE
+
+ var/static/list/augmented_organ_slots = list(
+ ORGAN_SLOT_EYES,
+ ORGAN_SLOT_EARS,
+ ORGAN_SLOT_HEART,
+ ORGAN_SLOT_LUNGS,
+ ORGAN_SLOT_LIVER,
+ ORGAN_SLOT_STOMACH,
+ )
+ for (var/obj/item/organ/organ as anything in check.organs)
+ if (!(organ.slot in augmented_organ_slots))
+ continue
+ if (!IS_ROBOTIC_ORGAN(organ))
+ return FALSE
+ for (var/obj/item/bodypart/bodypart as anything in check.bodyparts)
+ if (bodypart.bodytype != BODYTYPE_ROBOTIC)
+ return FALSE
+ return TRUE
+
/datum/experiment/scanning/reagent/cryostylane
name = "Pure Cryostylane Scan"
description = "It appears that the Cryostylane reagent can potentially halt all physiological processes in the human body. Produce Cryostylane with at least 99% purity and scan the beaker."
+ performance_hint = "Keep the temperature as high as possible during the reaction."
required_reagent = /datum/reagent/cryostylane
min_purity = 0.99
+/datum/experiment/scanning/reagent/haloperidol
+ name = "Pure Haloperidol Scan"
+ description = "We require testing related to the long-term treatment of chronic psychiatric disorders. Produce Haloperidol with at least 98% purity and scan the beaker."
+ performance_hint = "Exothermic and consumes hydrogen during reaction."
+ required_reagent = /datum/reagent/medicine/haloperidol
+ min_purity = 0.98
+
/datum/experiment/scanning/points/bluespace_crystal
name = "Bluespace Crystal Sampling"
description = "Investigate the properties of bluespace crystals by scanning either an artificial or naturally occurring variant. This will help us deepen our understanding of bluespace phenomena."
@@ -441,10 +495,16 @@
/obj/item/stack/sheet/bluespace_crystal = 1
)
+/datum/experiment/scanning/points/anomalies
+ name = "Neutralized Anomaly Analysis"
+ description = "We have the power to deal with the anomalies now. Neutralize them with an anomaly neutralizer or refine the raw cores in the refinery and scan the results."
+ required_points = 4
+ required_atoms = list(/obj/item/assembly/signaler/anomaly = 1)
+
/datum/experiment/scanning/points/machinery_tiered_scan/tier2_any
name = "Upgraded Stock Parts Benchmark"
description = "Our newly-designed machinery components require practical application tests for hints at possible further advancements, as well as a general confirmation that we didn't actually design worse parts somehow. Scan any machinery with Upgraded Parts and report the results."
- required_points = 4
+ required_points = 6
required_atoms = list(
/obj/machinery = 1
)
@@ -453,7 +513,7 @@
/datum/experiment/scanning/points/machinery_tiered_scan/tier3_any
name = "Advanced Stock Parts Benchmark"
description = "Our newly-designed machinery components require practical application tests for hints at possible further advancements, as well as a general confirmation that we didn't actually design worse parts somehow. Scan any machinery with Advanced Parts and report the results."
- required_points = 4
+ required_points = 6
required_atoms = list(
/obj/machinery = 1
)
diff --git a/code/modules/experisci/experiment/types/scanning_fish.dm b/code/modules/experisci/experiment/types/scanning_fish.dm
index 8a50446063994..f1c2263a84c7e 100644
--- a/code/modules/experisci/experiment/types/scanning_fish.dm
+++ b/code/modules/experisci/experiment/types/scanning_fish.dm
@@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(scanned_fish_by_techweb)
performance_hint = "Scan fish. Examine scanner to review progress. Unlock new fishing portals."
allowed_experimentors = list(/obj/item/experi_scanner, /obj/machinery/destructive_scanner, /obj/item/fishing_rod/tech, /obj/item/fish_analyzer)
traits = EXPERIMENT_TRAIT_TYPECACHE
- points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 750)
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS )
required_atoms = list(/obj/item/fish = 4)
scan_message = "Scan different species of fish"
///Further experiments added to the techweb when this one is completed.
@@ -80,7 +80,7 @@ GLOBAL_LIST_EMPTY(scanned_fish_by_techweb)
/datum/experiment/scanning/fish/second
name = "Fish Scanning Experiment 2"
description = "An experiment requiring more fish species to be scanned to unlock the 'Chasm' setting for the fishing portal."
- points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS )
required_atoms = list(/obj/item/fish = 8)
next_experiments = list(/datum/experiment/scanning/fish/third)
fish_source_reward = /datum/fish_source/portal/chasm
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(scanned_fish_by_techweb)
/datum/experiment/scanning/fish/third
name = "Fish Scanning Experiment 3"
description = "An experiment requiring even more fish species to be scanned to unlock the 'Ocean' setting for the fishing portal."
- points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS )
required_atoms = list(/obj/item/fish = 14)
next_experiments = list(/datum/experiment/scanning/fish/fourth, /datum/experiment/scanning/fish/holographic)
fish_source_reward = /datum/fish_source/portal/ocean
@@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(scanned_fish_by_techweb)
name = "Holographic Fish Scanning Experiment"
description = "This one actually requires holographic fish to unlock the 'Randomizer' setting for the fishing portal."
performance_hint = "Load in the 'Beach' template at the Holodeck to fish some holo-fish."
- points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 500)
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS )
required_atoms = list(/obj/item/fish/holo = 4)
scan_message = "Scan different species of holographic fish"
next_experiments = null
@@ -110,7 +110,7 @@ GLOBAL_LIST_EMPTY(scanned_fish_by_techweb)
/datum/experiment/scanning/fish/fourth
name = "Fish Scanning Experiment 4"
description = "An experiment requiring lotsa fish species to unlock the 'Hyperspace' setting for the fishing portal."
- points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 3250)
+ points_reward = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS )
required_atoms = list(/obj/item/fish = 21)
next_experiments = null
fish_source_reward = /datum/fish_source/portal/hyperspace
diff --git a/code/modules/experisci/experiment/types/scanning_reagent.dm b/code/modules/experisci/experiment/types/scanning_reagent.dm
index 1a39e2941efeb..992c28d148d44 100644
--- a/code/modules/experisci/experiment/types/scanning_reagent.dm
+++ b/code/modules/experisci/experiment/types/scanning_reagent.dm
@@ -31,5 +31,5 @@
return TRUE
/datum/experiment/scanning/reagent/serialize_progress_stage(atom/target, list/seen_instances)
- return EXPERIMENT_PROG_INT("Scan a reagent container with [required_reagent::name] of at least [PERCENT(min_purity)] purity.", \
+ return EXPERIMENT_PROG_INT("Scan a reagent container with [required_reagent::name] of at least [PERCENT(min_purity)]% purity.", \
seen_instances.len, required_atoms[target])
diff --git a/code/modules/experisci/experiment/types/scanning_vatgrown.dm b/code/modules/experisci/experiment/types/scanning_vatgrown.dm
index 0a7ade381a4ea..20cd48288ba08 100644
--- a/code/modules/experisci/experiment/types/scanning_vatgrown.dm
+++ b/code/modules/experisci/experiment/types/scanning_vatgrown.dm
@@ -1,14 +1,17 @@
-/datum/experiment/scanning/random/cytology
+/datum/experiment/scanning/cytology
name = "Cytology Scanning Experiment"
- description = "Base experiment for scanning atoms that were vatgrown"
exp_tag = "Cytology Scan"
- total_requirement = 1
- possible_types = list(/mob/living/basic/slime)
- traits = EXPERIMENT_TRAIT_DESTRUCTIVE
-/datum/experiment/scanning/random/cytology/final_contributing_index_checks(datum/component/experiment_handler/experiment_handler, atom/target, typepath)
+/datum/experiment/scanning/cytology/final_contributing_index_checks(datum/component/experiment_handler/experiment_handler, atom/target, typepath)
return ..() && HAS_TRAIT(target, TRAIT_VATGROWN)
-/datum/experiment/scanning/random/cytology/serialize_progress_stage(atom/target, list/seen_instances)
- return EXPERIMENT_PROG_INT("Scan samples of \a vat-grown [initial(target.name)]", \
- traits & EXPERIMENT_TRAIT_DESTRUCTIVE ? scanned[target] : seen_instances.len, required_atoms[target])
+/datum/experiment/scanning/cytology/serialize_progress_stage(atom/target, list/seen_instances)
+ return EXPERIMENT_PROG_INT("Scan samples of \a vat-grown [initial(target.name)]", seen_instances.len, required_atoms[target])
+
+/datum/experiment/scanning/cytology/slime
+ name = "Vat-Grown Slime Scan"
+ description = "Seen the slimes in the xenobiology pens? They spawned when our researchers donked a moldy bread slice into the vat. Cultivate another one and report the results."
+ performance_hint = "Swab the slime cell lines from a moldy bread or take a biopsy sample of existing slime. And grow it in the vat."
+ required_atoms = list(/mob/living/basic/slime = 1)
+
+
diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm
index 0a836eadafdda..cd05d0bd34baf 100644
--- a/code/modules/fishing/aquarium/aquarium.dm
+++ b/code/modules/fishing/aquarium/aquarium.dm
@@ -53,6 +53,9 @@
/// /obj/item/fish in the aquarium, sorted by type - does not include things with aquarium visuals that are not fish
var/list/tracked_fish_by_type
+ /// Var used to keep track of the current beauty of the aquarium, which can be throughfully changed by aquarium content.
+ var/current_beauty = 150
+
/obj/structure/aquarium/Initialize(mapload)
. = ..()
update_appearance()
@@ -62,6 +65,8 @@
create_reagents(6, SEALED_CONTAINER)
RegisterSignal(reagents, COMSIG_REAGENTS_NEW_REAGENT, PROC_REF(start_autofeed))
AddComponent(/datum/component/plumbing/aquarium)
+ if(current_beauty)
+ AddElement(/datum/element/beauty, current_beauty)
ADD_KEEP_TOGETHER(src, INNATE_TRAIT)
/obj/structure/aquarium/proc/track_if_fish(atom/source, atom/initialized)
@@ -192,9 +197,9 @@
var/obj/item/stack/sheet/glass/glass = item
if(istype(glass))
if(glass.get_amount() < 2)
- to_chat(user, span_warning("You need two glass sheets to fix the case!"))
+ balloon_alert(user, "it needs two sheets!")
return
- to_chat(user, span_notice("You start fixing [src]..."))
+ balloon_alert(user, "fixing the aquarium...")
if(do_after(user, 2 SECONDS, target = src))
glass.use(2)
broken = FALSE
@@ -202,10 +207,18 @@
update_appearance()
return TRUE
else
- var/datum/component/aquarium_content/content_component = item.GetComponent(/datum/component/aquarium_content)
- if(content_component && content_component.is_ready_to_insert(src) && user.transferItemToLoc(item, src))
- update_appearance()
- return TRUE
+ var/insert_attempt = SEND_SIGNAL(item, COMSIG_TRY_INSERTING_IN_AQUARIUM, src)
+ switch(insert_attempt)
+ if(COMSIG_CAN_INSERT_IN_AQUARIUM)
+ if(!user.transferItemToLoc(item, src))
+ user.balloon_alert(user, "stuck to your hand!")
+ return TRUE
+ balloon_alert(user, "added to aquarium")
+ update_appearance()
+ return TRUE
+ if(COMSIG_CANNOT_INSERT_IN_AQUARIUM)
+ balloon_alert(user, "cannot add to aquarium!")
+ return TRUE
if(istype(item, /obj/item/fish_feed) && !panel_open)
if(!item.reagents.total_volume)
@@ -270,24 +283,27 @@
///Apply mood bonus depending on aquarium status
/obj/structure/aquarium/proc/admire(mob/living/user)
- to_chat(user,span_notice("You take a moment to watch [src]."))
- if(do_after(user, 5 SECONDS, target = src))
- var/alive_fish = 0
- var/dead_fish = 0
- var/list/tracked_fish = get_fishes()
- for(var/obj/item/fish/fish in tracked_fish)
- if(fish.status == FISH_ALIVE)
- alive_fish++
- else
- dead_fish++
- //Check if there are live fish - good mood
- //All fish dead - bad mood.
- //No fish - nothing.
- if(alive_fish > 0)
- user.add_mood_event("aquarium", /datum/mood_event/aquarium_positive)
- else if(dead_fish > 0)
- user.add_mood_event("aquarium", /datum/mood_event/aquarium_negative)
- // Could maybe scale power of this mood with number/types of fish
+ user.balloon_alert(user, "admiring aquarium...")
+ if(!do_after(user, 5 SECONDS, target = src))
+ return
+ var/alive_fish = 0
+ var/dead_fish = 0
+ var/list/tracked_fish = get_fishes()
+ for(var/obj/item/fish/fish in tracked_fish)
+ if(fish.status == FISH_ALIVE)
+ alive_fish++
+ else
+ dead_fish++
+
+ var/morb = HAS_TRAIT(user, TRAIT_MORBID)
+ //Check if there are live fish - good mood
+ //All fish dead - bad mood.
+ //No fish - nothing.
+ if(alive_fish > 0)
+ user.add_mood_event("aquarium", morb ? /datum/mood_event/morbid_aquarium_bad : /datum/mood_event/aquarium_positive)
+ else if(dead_fish > 0)
+ user.add_mood_event("aquarium", morb ? /datum/mood_event/morbid_aquarium_good : /datum/mood_event/aquarium_negative)
+ // Could maybe scale power of this mood with number/types of fish
/obj/structure/aquarium/ui_data(mob/user)
. = ..()
diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm
index 30c9300323126..1161648f7d15f 100644
--- a/code/modules/fishing/aquarium/aquarium_kit.dm
+++ b/code/modules/fishing/aquarium/aquarium_kit.dm
@@ -100,7 +100,8 @@
/obj/item/aquarium_kit/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/slapcrafting, /datum/crafting_recipe/aquarium)
+ var/static/list/recipes = list(/datum/crafting_recipe/aquarium)
+ AddElement(/datum/element/slapcrafting, recipes)
/obj/item/aquarium_prop
name = "generic aquarium prop"
@@ -109,10 +110,11 @@
w_class = WEIGHT_CLASS_TINY
var/layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
+ var/beauty = 150
/obj/item/aquarium_prop/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/aquarium_content, icon)
+ AddComponent(/datum/component/aquarium_content, icon, beauty = beauty)
/obj/item/aquarium_prop/rocks
name = "rocks"
diff --git a/code/modules/fishing/aquarium/aquarium_upgrades.dm b/code/modules/fishing/aquarium/aquarium_upgrades.dm
index 140777d34f0ae..c73e6e9d230ae 100644
--- a/code/modules/fishing/aquarium/aquarium_upgrades.dm
+++ b/code/modules/fishing/aquarium/aquarium_upgrades.dm
@@ -24,6 +24,8 @@
icon_state = "bioelec_map"
icon_prefix = "bioelec"
+ current_beauty = 0
+
/obj/structure/aquarium/bioelec_gen/zap_act(power, zap_flags)
var/explosive = zap_flags & ZAP_MACHINE_EXPLOSIVE
if(!explosive)
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index a12ae7e7397a9..c4be35817b7ac 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -143,9 +143,12 @@
/// power of the tesla zap created by the fish in a bioelectric generator
var/electrogenesis_power = 10 MEGA JOULES
+ /// The beauty this fish provides to the aquarium it's inserted in.
+ var/beauty = FISH_BEAUTY_GENERIC
+
/obj/item/fish/Initialize(mapload, apply_qualities = TRUE)
. = ..()
- AddComponent(/datum/component/aquarium_content, icon, PROC_REF(get_aquarium_animation), list(COMSIG_FISH_STATUS_CHANGED,COMSIG_FISH_STIRRED))
+ AddComponent(/datum/component/aquarium_content, icon, PROC_REF(get_aquarium_animation), list(COMSIG_FISH_STIRRED), beauty)
RegisterSignal(src, COMSIG_ATOM_ON_LAZARUS_INJECTOR, PROC_REF(use_lazarus))
if(do_flop_animation)
diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm
index f61cb43b22424..cc001560ee0a9 100644
--- a/code/modules/fishing/fish/fish_types.dm
+++ b/code/modules/fishing/fish/fish_types.dm
@@ -19,6 +19,8 @@
desc = "A great rubber duck tool for Lawyers who can't get a grasp over their case."
stable_population = 1
random_case_rarity = FISH_RARITY_NOPE
+ show_in_catalog = FALSE
+ beauty = FISH_BEAUTY_GOOD
/obj/item/fish/angelfish
name = "angelfish"
@@ -77,6 +79,7 @@
)
required_temperature_min = MIN_AQUARIUM_TEMP+12
required_temperature_max = MIN_AQUARIUM_TEMP+30
+ beauty = FISH_BEAUTY_GOOD
// Saltwater fish below
@@ -107,6 +110,7 @@
evolution_types = null
compatible_types = list(/obj/item/fish/clownfish)
food = /datum/reagent/lube
+ beauty = FISH_BEAUTY_GREAT
/obj/item/fish/cardinal
name = "cardinalfish"
@@ -163,8 +167,9 @@
stable_population = 3
required_temperature_min = MIN_AQUARIUM_TEMP+23
required_temperature_max = MIN_AQUARIUM_TEMP+28
-
fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/toxic)
+ beauty = FISH_BEAUTY_GOOD
+
/obj/item/fish/lanternfish
name = "lanternfish"
@@ -182,6 +187,7 @@
fish_traits = list(/datum/fish_trait/nocturnal)
required_temperature_min = MIN_AQUARIUM_TEMP+2 //My source is that the water at a depth 6600 feet is pretty darn cold.
required_temperature_max = MIN_AQUARIUM_TEMP+18
+ beauty = FISH_BEAUTY_NULL
//Tiziran Fish
/obj/item/fish/dwarf_moonfish
@@ -195,6 +201,7 @@
average_weight = 2000
required_temperature_min = MIN_AQUARIUM_TEMP+20
required_temperature_max = MIN_AQUARIUM_TEMP+30
+ beauty = FISH_BEAUTY_GOOD
/obj/item/fish/gunner_jellyfish
name = "gunner jellyfish"
@@ -205,6 +212,7 @@
fillet_type = /obj/item/food/fishmeat/gunner_jellyfish
required_temperature_min = MIN_AQUARIUM_TEMP+24
required_temperature_max = MIN_AQUARIUM_TEMP+32
+ beauty = FISH_BEAUTY_GOOD
/obj/item/fish/needlefish
name = "needlefish"
@@ -261,6 +269,7 @@
)
evolution_types = list(/datum/fish_evolution/ice_chrab)
compatible_types = list(/obj/item/fish/chasm_crab/ice)
+ beauty = FISH_BEAUTY_GOOD
/obj/item/fish/chasm_crab/ice
name = "arctic chrab"
@@ -271,13 +280,7 @@
required_temperature_max = MIN_AQUARIUM_TEMP+15
evolution_types = list(/datum/fish_evolution/chasm_chrab)
compatible_types = list(/obj/item/fish/chasm_crab)
-
-/obj/item/storage/box/fish_debug
- name = "box full of fish"
-
-/obj/item/storage/box/fish_debug/PopulateContents()
- for(var/fish_type in subtypesof(/obj/item/fish))
- new fish_type(src)
+ beauty = FISH_BEAUTY_GREAT
/obj/item/fish/donkfish
name = "donk co. company patent donkfish"
@@ -290,6 +293,7 @@
fish_traits = list(/datum/fish_trait/yucky)
required_temperature_min = MIN_AQUARIUM_TEMP+15
required_temperature_max = MIN_AQUARIUM_TEMP+28
+ beauty = FISH_BEAUTY_EXCELLENT
/obj/item/fish/emulsijack
name = "toxic emulsijack"
@@ -301,6 +305,7 @@
fish_traits = list(/datum/fish_trait/emulsijack)
required_temperature_min = MIN_AQUARIUM_TEMP+5
required_temperature_max = MIN_AQUARIUM_TEMP+40
+ beauty = FISH_BEAUTY_BAD
/obj/item/fish/jumpercable
name = "monocloning jumpercable"
@@ -322,6 +327,7 @@
/datum/fish_trait/mixotroph,
/datum/fish_trait/electrogenesis,
)
+ beauty = FISH_BEAUTY_UGLY
/obj/item/fish/ratfish
name = "ratfish"
@@ -341,6 +347,7 @@
"Value" = DAIRY
)
)
+ beauty = FISH_BEAUTY_DISGUSTING
/obj/item/fish/ratfish/Initialize(mapload)
. = ..()
@@ -364,6 +371,7 @@
required_temperature_min = MIN_AQUARIUM_TEMP+10
required_temperature_max = MIN_AQUARIUM_TEMP+40
evolution_types = list(/datum/fish_evolution/purple_sludgefish)
+ beauty = FISH_BEAUTY_NULL
/obj/item/fish/sludgefish/purple
name = "purple sludgefish"
@@ -401,6 +409,7 @@
),
)
required_temperature_min = MIN_AQUARIUM_TEMP+20
+ beauty = FISH_BEAUTY_GREAT
/obj/item/fish/boned
name = "unmarine bonemass"
@@ -423,6 +432,7 @@
average_weight = 2000
death_text = "%SRC stops moving." //It's dead... or is it?
evolution_types = list(/datum/fish_evolution/mastodon)
+ beauty = FISH_BEAUTY_UGLY
/obj/item/fish/mastodon
name = "unmarine mastodon"
@@ -451,6 +461,7 @@
average_weight = 5000
death_text = "%SRC stops moving."
fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/revival, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive)
+ beauty = FISH_BEAUTY_BAD
/obj/item/fish/holo
name = "holographic goldfish"
@@ -501,6 +512,7 @@
sprite_height = 8
average_size = 60
average_weight = 1000
+ beauty = FISH_BEAUTY_GOOD
/obj/item/fish/holo/angel
name = "holographic angelfish"
@@ -524,6 +536,7 @@
icon_state = "checkered" //it's a meta joke, buddy.
dedicated_in_aquarium_icon_state = "checkered_small"
sprite_width = 4
+ beauty = FISH_BEAUTY_NULL
/obj/item/fish/holo/halffish
name = "holographic half-fish"
@@ -533,6 +546,7 @@
sprite_height = 4
sprite_width = 10
average_size = 50
+ beauty = FISH_BEAUTY_UGLY
/obj/item/fish/starfish
name = "cosmostarfish"
@@ -554,6 +568,7 @@
grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/consumable/liquidgibs = 5)
fillet_type = null
fish_traits = list(/datum/fish_trait/antigrav, /datum/fish_trait/mixotroph)
+ beauty = FISH_BEAUTY_GREAT
/obj/item/fish/starfish/Initialize(mapload)
. = ..()
@@ -589,6 +604,7 @@
)
hitsound = null
throwforce = 5
+ beauty = FISH_BEAUTY_GOOD
///maximum bonus damage when winded up
var/maximum_bonus = 25
@@ -662,3 +678,4 @@
)
//anxiety naturally limits the amount of zipzaps per tank, so they are stronger alone
electrogenesis_power = 20 MEGA JOULES
+ beauty = FISH_BEAUTY_GOOD
diff --git a/code/modules/fishing/fish_catalog.dm b/code/modules/fishing/fish_catalog.dm
index 3e1cb6cfcfa6b..49a84413ded06 100644
--- a/code/modules/fishing/fish_catalog.dm
+++ b/code/modules/fishing/fish_catalog.dm
@@ -37,6 +37,25 @@
else
fish_data["feed"] = "[AQUARIUM_COMPANY] Fish Feed"
fish_data["fishing_tips"] = build_fishing_tips(fish)
+ var/beauty_score = initial(fish.beauty)
+ switch(beauty_score)
+ if(-INFINITY to FISH_BEAUTY_DISGUSTING)
+ beauty_score = "OH HELL NAW!"
+ if(FISH_BEAUTY_DISGUSTING to FISH_BEAUTY_UGLY)
+ beauty_score = "☆☆☆☆☆"
+ if(FISH_BEAUTY_UGLY to FISH_BEAUTY_BAD)
+ beauty_score = "★☆☆☆☆"
+ if(FISH_BEAUTY_BAD to FISH_BEAUTY_NULL)
+ beauty_score = "★★☆☆☆"
+ if(FISH_BEAUTY_NULL to FISH_BEAUTY_GENERIC)
+ beauty_score = "★★★☆☆"
+ if(FISH_BEAUTY_GENERIC to FISH_BEAUTY_GOOD)
+ beauty_score = "★★★★☆"
+ if(FISH_BEAUTY_GOOD to FISH_BEAUTY_GREAT)
+ beauty_score = "★★★★★"
+ if(FISH_BEAUTY_GREAT to INFINITY)
+ beauty_score = "★★★★★★"
+ fish_data["beauty"] = beauty_score
fish_info += list(fish_data)
// TODO: Custom entries for unusual stuff
diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm
index df6c4eee9c254..f6b49a9b52314 100644
--- a/code/modules/fishing/fishing_equipment.dm
+++ b/code/modules/fishing/fishing_equipment.dm
@@ -304,5 +304,12 @@
new /obj/item/fishing_line/reinforced(src)
new /obj/item/fishing_line/cloaked(src)
+/obj/item/storage/box/fish_debug
+ name = "box full of fish"
+
+/obj/item/storage/box/fish_debug/PopulateContents()
+ for(var/fish_type in subtypesof(/obj/item/fish))
+ new fish_type(src)
+
#undef MAGNET_HOOK_BONUS_MULTIPLIER
#undef RESCUE_HOOK_FISH_MULTIPLIER
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 66d2bf0a880e3..3c94ff8277d94 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -239,6 +239,21 @@ GLOBAL_LIST(fishing_property_cache)
/// Builds a fish weights table modified by bait/rod/user properties
/datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman)
var/obj/item/bait = rod.bait
+ ///An exponent used to level out the difference in probabilities between fishes/mobs on the table depending on bait quality.
+ var/leveling_exponent = 0
+ ///Multiplier used to make fishes more common compared to everything else.
+ var/result_multiplier = 1
+
+ if(bait)
+ if(HAS_TRAIT(bait, TRAIT_GREAT_QUALITY_BAIT))
+ result_multiplier = 9
+ leveling_exponent = 0.5
+ else if(HAS_TRAIT(bait, TRAIT_GOOD_QUALITY_BAIT))
+ result_multiplier = 3.5
+ leveling_exponent = 0.25
+ else if(HAS_TRAIT(bait, TRAIT_BASIC_QUALITY_BAIT))
+ result_multiplier = 2
+ leveling_exponent = 0.1
var/list/fish_list_properties = collect_fish_properties()
@@ -246,17 +261,13 @@ GLOBAL_LIST(fishing_property_cache)
for(var/result in final_table)
final_table[result] *= rod.hook?.get_hook_bonus_multiplicative(result)
final_table[result] += rod.hook?.get_hook_bonus_additive(result)//Decide on order here so it can be multiplicative
+
if(ispath(result, /obj/item/fish))
//Modify fish roll chance
var/obj/item/fish/caught_fish = result
if(bait)
- if(HAS_TRAIT(bait, TRAIT_GREAT_QUALITY_BAIT))
- final_table[result] *= 10
- else if(HAS_TRAIT(bait, TRAIT_GOOD_QUALITY_BAIT))
- final_table[result] = round(final_table[result] * 3.5, 1)
- else if(HAS_TRAIT(bait, TRAIT_BASIC_QUALITY_BAIT))
- final_table[result] *= 2
+ final_table[result] = round(final_table[result] * result_multiplier, 1)
if(!HAS_TRAIT(bait, TRAIT_OMNI_BAIT))
//Bait matching likes doubles the chance
var/list/fav_bait = fish_list_properties[result][NAMEOF(caught_fish, favorite_bait)]
@@ -286,4 +297,22 @@ GLOBAL_LIST(fishing_property_cache)
if(final_table[result] <= 0)
final_table -= result
+
+ ///here we even out the chances of fishie based on bait quality: better baits lead rarer fishes being more common.
+ if(leveling_exponent)
+ var/highest_fish_weight
+ var/list/collected_fish_weights = list()
+ for(var/fishable in final_table)
+ if(ispath(fishable, /obj/item/fish))
+ var/fish_weight = fish_table[fishable]
+ collected_fish_weights[fishable] = fish_weight
+ if(fish_weight > highest_fish_weight)
+ highest_fish_weight = fish_weight
+
+ for(var/fish in collected_fish_weights)
+ var/difference = collected_fish_weights[fish] - highest_fish_weight
+ if(!difference)
+ continue
+ final_table[fish] += round(difference**leveling_exponent, 1)
+
return final_table
diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm
index b3233386f9789..bc5adfbd0f951 100644
--- a/code/modules/food_and_drinks/machinery/microwave.dm
+++ b/code/modules/food_and_drinks/machinery/microwave.dm
@@ -114,6 +114,7 @@
QDEL_LIST(ingredients)
QDEL_NULL(wires)
QDEL_NULL(soundloop)
+ QDEL_NULL(particles)
if(!isnull(cell))
QDEL_NULL(cell)
return ..()
@@ -365,25 +366,25 @@
update_appearance()
return ITEM_INTERACT_SUCCESS
-/obj/machinery/microwave/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+/obj/machinery/microwave/tool_act(mob/living/user, obj/item/tool, list/modifiers)
+ if(!tool.tool_behaviour)
+ return ..()
if(operating)
- return ITEM_INTERACT_SKIP_TO_ATTACK // Don't use tools if we're dirty
+ return ITEM_INTERACT_SKIP_TO_ATTACK // Don't use tools if we're operating
if(dirty >= MAX_MICROWAVE_DIRTINESS)
return ITEM_INTERACT_SKIP_TO_ATTACK // Don't insert items if we're dirty
if(panel_open && is_wire_tool(tool))
wires.interact(user)
return ITEM_INTERACT_SUCCESS
- return NONE
+ return ..()
-/obj/machinery/microwave/attackby(obj/item/item, mob/living/user, params)
+/obj/machinery/microwave/item_interaction(mob/living/user, obj/item/item, list/modifiers)
if(operating)
- return
+ return NONE
if(broken > NOT_BROKEN)
- if(IS_EDIBLE(item))
- balloon_alert(user, "it's broken!")
- return TRUE
- return ..()
+ balloon_alert(user, "it's broken!")
+ return ITEM_INTERACT_BLOCKING
if(istype(item, /obj/item/stock_parts/power_store/cell) && cell_powered)
var/swapped = FALSE
@@ -395,27 +396,23 @@
swapped = TRUE
if(!user.transferItemToLoc(item, src))
update_appearance()
- return TRUE
+ return ITEM_INTERACT_BLOCKING
cell = item
balloon_alert(user, "[swapped ? "swapped" : "inserted"] cell")
update_appearance()
- return TRUE
+ return ITEM_INTERACT_SUCCESS
if(!anchored)
- if(IS_EDIBLE(item))
- balloon_alert(user, "not secured!")
- return TRUE
- return ..()
+ balloon_alert(user, "not secured!")
+ return ITEM_INTERACT_BLOCKING
if(dirty >= MAX_MICROWAVE_DIRTINESS) // The microwave is all dirty so can't be used!
- if(IS_EDIBLE(item))
- balloon_alert(user, "it's too dirty!")
- return TRUE
- return ..()
+ balloon_alert(user, "it's too dirty!")
+ return ITEM_INTERACT_BLOCKING
if(vampire_charging_capable && istype(item, /obj/item/modular_computer) && ingredients.len > 0)
balloon_alert(user, "max 1 device!")
- return FALSE
+ return ITEM_INTERACT_BLOCKING
if(istype(item, /obj/item/storage))
var/obj/item/storage/tray = item
@@ -425,14 +422,14 @@
// Non-tray dumping requires a do_after
to_chat(user, span_notice("You start dumping out the contents of [item] into [src]..."))
if(!do_after(user, 2 SECONDS, target = tray))
- return
+ return ITEM_INTERACT_BLOCKING
for(var/obj/tray_item in tray.contents)
if(!IS_EDIBLE(tray_item))
continue
if(ingredients.len >= max_n_of_items)
balloon_alert(user, "it's full!")
- return TRUE
+ return ITEM_INTERACT_BLOCKING
if(tray.atom_storage.attempt_remove(tray_item, src))
loaded++
ingredients += tray_item
@@ -440,23 +437,21 @@
open(autoclose = 0.6 SECONDS)
to_chat(user, span_notice("You insert [loaded] items into \the [src]."))
update_appearance()
- return
+ return ITEM_INTERACT_SUCCESS
- if(item.w_class <= WEIGHT_CLASS_NORMAL && !istype(item, /obj/item/storage) && !user.combat_mode)
+ if(item.w_class <= WEIGHT_CLASS_NORMAL && !user.combat_mode)
if(ingredients.len >= max_n_of_items)
balloon_alert(user, "it's full!")
- return TRUE
+ return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(item, src))
balloon_alert(user, "it's stuck to your hand!")
- return FALSE
+ return ITEM_INTERACT_BLOCKING
ingredients += item
open(autoclose = 0.6 SECONDS)
user.visible_message(span_notice("[user] adds \a [item] to \the [src]."), span_notice("You add [item] to \the [src]."))
update_appearance()
- return
-
- return ..()
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/microwave/attack_hand_secondary(mob/user, list/modifiers)
if(user.can_perform_action(src, ALLOW_SILICON_REACH))
@@ -541,8 +536,9 @@
/obj/machinery/microwave/proc/eject()
var/atom/drop_loc = drop_location()
- for(var/atom/movable/movable_ingredient as anything in ingredients)
- movable_ingredient.forceMove(drop_loc)
+ for(var/obj/item/item_ingredient as anything in ingredients)
+ item_ingredient.forceMove(drop_loc)
+ item_ingredient.dropped() //Mob holders can be on the ground if we don't do this
open(autoclose = 1.4 SECONDS)
/obj/machinery/microwave/proc/start_cycle(mob/user)
@@ -674,10 +670,34 @@
if(MICROWAVE_PRE)
pre_success(cooker)
return
+
+ if(cycles == 1) //Only needs to try to shock mobs once, towards the end of the loop
+ var/successful_shock
+ var/list/microwave_contents = list()
+ microwave_contents += get_all_contents() //Mobs are often hid inside of mob holders, which could be fried and made into a burger...
+ for(var/mob/living/victim in microwave_contents)
+ if(victim.electrocute_act(shock_damage = 100, source = src, siemens_coeff = 1, flags = SHOCK_NOGLOVES))
+ successful_shock = TRUE
+ if(victim.stat == DEAD) //This is mostly so humans that can_be_held don't get gibbed from one microwave run alone, but mice become burnt messes
+ victim.gib()
+ muck()
+ if(successful_shock) //We only want to give feedback once, regardless of how many mobs got shocked
+ var/list/cant_smell = list()
+ for(var/mob/smeller in get_hearers_in_view(DEFAULT_MESSAGE_RANGE, src))
+ if(HAS_TRAIT(smeller, TRAIT_ANOSMIA))
+ cant_smell += smeller
+ visible_message(span_danger("You smell a burnt smell coming from [src]!"), ignored_mobs = cant_smell)
+ particles = new /particles/smoke()
+ addtimer(CALLBACK(src, PROC_REF(remove_smoke)), 10 SECONDS)
+ Shake(duration = 1 SECONDS)
+
cycles--
use_energy(active_power_usage)
addtimer(CALLBACK(src, PROC_REF(cook_loop), type, cycles, wait, cooker), wait)
+/obj/machinery/microwave/proc/remove_smoke()
+ QDEL_NULL(particles)
+
/obj/machinery/microwave/power_change()
. = ..()
if(cell_powered)
diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm
index 392d716965d6a..114d7d020f6c9 100644
--- a/code/modules/food_and_drinks/machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/machinery/smartfridge.dm
@@ -647,7 +647,7 @@
return istype(weapon, /obj/item/petri_dish)
/obj/machinery/smartfridge/petri/preloaded
- initial_contents = list(/obj/item/petri_dish = 5)
+ initial_contents = list(/obj/item/petri_dish/random = 3)
// -------------------------
// Organ Surgery Smartfridge
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index 7761a57fcfdbd..742e8c1f3c89b 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -10,6 +10,7 @@
name = "Sandwich"
reqs = list(
/obj/item/food/breadslice/plain = 2,
+ /obj/item/food/grown/cabbage = 1,
/obj/item/food/meat/steak = 1,
/obj/item/food/cheese/wedge = 1
)
diff --git a/code/modules/hallucination/body.dm b/code/modules/hallucination/body.dm
index 2d017f969679d..8cd34cfcd4071 100644
--- a/code/modules/hallucination/body.dm
+++ b/code/modules/hallucination/body.dm
@@ -10,7 +10,7 @@
/// Whether we apply the floating anim to the body
var/body_floats = FALSE
/// The layer this body will be drawn on, in case we want to bypass lighting
- var/body_layer = TURF_LAYER
+ var/body_layer = LOW_FLOOR_LAYER
/// if TRUE, spawns the body under the hallucinator instead of somewhere in view
var/spawn_under_hallucinator = FALSE
diff --git a/code/modules/hallucination/bubblegum_attack.dm b/code/modules/hallucination/bubblegum_attack.dm
index 5ee39ed8e8649..529d67dcd3551 100644
--- a/code/modules/hallucination/bubblegum_attack.dm
+++ b/code/modules/hallucination/bubblegum_attack.dm
@@ -36,7 +36,7 @@
if(hallucinator.client)
- fake_broken_wall = image('icons/turf/floors.dmi', wall_source, "plating", layer = TURF_LAYER)
+ fake_broken_wall = image('icons/turf/floors.dmi', wall_source, "plating", layer = LOW_FLOOR_LAYER)
SET_PLANE_EXPLICIT(fake_broken_wall, FLOOR_PLANE, wall_source)
fake_broken_wall.override = TRUE
fake_rune = image('icons/effects/96x96.dmi', target_landing_image_turf, "landing", layer = ABOVE_OPEN_TURF_LAYER)
diff --git a/code/modules/hallucination/hazard.dm b/code/modules/hallucination/hazard.dm
index 1dfdfd23970e7..34bcee62f6a87 100644
--- a/code/modules/hallucination/hazard.dm
+++ b/code/modules/hallucination/hazard.dm
@@ -29,7 +29,8 @@
/// These hallucination effects cause side effects when the hallucinator walks into them.
/obj/effect/client_image_holder/hallucination/danger
- image_layer = TURF_LAYER
+ image_layer = LOW_FLOOR_LAYER
+ image_plane = FLOOR_PLANE
/obj/effect/client_image_holder/hallucination/danger/Initialize(mapload, list/mobs_which_see_us, datum/hallucination/parent)
. = ..()
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 04cb9c1058aac..1286682378c1d 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -93,7 +93,7 @@
switch(pattern)
if(PATTERN_RANDOM)
return "#[random_short_color()]"
- //MASSMETA EDIT REMOVAL BEGIN - gay removal
+ //MASSMETA EDIT REMOVAL BEGIN (gay removal)
/*
if(PATTERN_RAINBOW)
var/datum/holiday/pride_week/rainbow_datum = new()
@@ -384,7 +384,7 @@
begin_month = JUNE
holiday_hat = /obj/item/clothing/head/costume/garland
-//MASSMETA EDIT REMOVAL BEGIN - gay removal
+//MASSMETA EDIT REMOVAL BEGIN (gay removal)
/*
/datum/holiday/pride_week
name = PRIDE_WEEK
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index 1204106dc865c..b98d66f6bd2c7 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -293,6 +293,8 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf
if(isstructure(holo_object))
holo_object.obj_flags |= NO_DEBRIS_AFTER_DECONSTRUCTION
+ if(istype(holo_object, /obj/structure/closet))
+ RegisterSignal(holo_object, COMSIG_CLOSET_CONTENTS_INITIALIZED, PROC_REF(register_contents))
return
if(ismachinery(holo_object))
@@ -304,6 +306,14 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf
var/obj/machinery/button/holo_button = holo_machine
holo_button.setup_device()
+/obj/machinery/computer/holodeck/proc/register_contents(obj/structure/closet/storage)
+ SIGNAL_HANDLER
+
+ for(var/atom/movable/item as anything in storage.get_all_contents_type(/atom/movable))
+ if(item == storage)
+ continue
+ add_to_spawned(item)
+
/**
* A separate proc for objects that weren't loaded by the template nor spawned by holo effects
* yet need to be added to the list of spawned objects. (e.g. holographic fishes)
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index 3d80ef6d968c0..7a27aecb4bcfe 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -14,7 +14,7 @@
throw_speed = 2
block_chance = 0
throwforce = 0
- embedding = null
+ embed_type = null
sword_color_icon = null
active_throwforce = 0
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 51e09f8ab9a2c..ee62a12b3d0e1 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -11,6 +11,9 @@
/turf/open/floor/holofloor/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
return ITEM_INTERACT_BLOCKING // Fuck you
+/turf/open/floor/holofloor/crowbar_act(mob/living/user, obj/item/I)
+ return NONE // Fuck you
+
/turf/open/floor/holofloor/burn_tile()
return //you can't burn a hologram!
@@ -124,6 +127,7 @@
desc = "Space-looking floor. Thankfully, the deadly aspects of space are not emulated here."
icon = 'icons/turf/space.dmi'
icon_state = "space"
+ layer = SPACE_LAYER
plane = PLANE_SPACE
/turf/open/floor/holofloor/hyperspace
@@ -161,7 +165,7 @@
/turf/open/floor/holofloor/carpet/update_icon(updates=ALL)
. = ..()
- if((updates & UPDATE_SMOOTHING) && overfloor_placed && smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if((updates & UPDATE_SMOOTHING) && overfloor_placed && smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
/turf/open/floor/holofloor/wood
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index 8eab962d75118..d5f9f94e1b2df 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -50,7 +50,7 @@
/obj/item/grown/corncob/attackby(obj/item/grown/W, mob/user, params)
if(W.get_sharpness())
to_chat(user, span_notice("You use [W] to fashion a pipe out of the corn cob!"))
- new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
+ new /obj/item/cigarette/pipe/cobpipe (user.loc)
qdel(src)
else
return ..()
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 5c8a7049eb825..5f72806ca3635 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -478,13 +478,18 @@
throwforce = 15
throw_speed = 4
throw_range = 7
- embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
+ embed_type = /datum/embed_data/hatchet
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5)
attack_verb_continuous = list("chops", "tears", "lacerates", "cuts")
attack_verb_simple = list("chop", "tear", "lacerate", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = SHARP_EDGED
+/datum/embed_data/hatchet
+ pain_mult = 4
+ embed_chance = 35
+ fall_chance = 10
+
/obj/item/hatchet/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, \
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index c5861140e4e56..6fc671ccd4c94 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -859,12 +859,15 @@
return
var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
- if(our_seed.get_gene(/datum/plant_gene/trait/stinging))
- our_plant.embedding = EMBED_POINTY
- else
- our_plant.embedding = EMBED_HARMLESS
- our_plant.updateEmbedding()
our_plant.throwforce = (our_seed.potency/20)
+ if (!our_plant.get_embed())
+ return
+
+ if(our_seed.get_gene(/datum/plant_gene/trait/stinging))
+ our_plant.set_embed(our_plant.get_embed().generate_with_values(ignore_throwspeed_threshold = TRUE))
+ return
+
+ our_plant.set_embed(our_plant.get_embed().generate_with_values(ignore_throwspeed_threshold = TRUE, pain_mult = 0, jostle_pain_mult = 0))
/**
* This trait automatically heats up the plant's chemical contents when harvested.
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 13e358bdcd528..5b82c9adb7116 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -35,7 +35,7 @@
family_heirlooms = list(/obj/item/reagent_containers/cup/glass/flask/gold, /obj/item/toy/captainsaid/collector)
mail_goodies = list(
- /obj/item/clothing/mask/cigarette/cigar/havana = 20,
+ /obj/item/cigarette/cigar/havana = 20,
/obj/item/storage/fancy/cigarettes/cigars/havana = 15,
/obj/item/reagent_containers/cup/glass/bottle/champagne = 5,
/obj/item/reagent_containers/cup/glass/bottle/champagne/cursed = 5,
diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm
index 8bcfaefcfc67a..435e4ce7b3303 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain.dm
@@ -78,8 +78,8 @@
else
holy_bible.deity_name = pick("Gay Space Jesus", "Gandalf", "Dumbledore")
human_spawned.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // starts off brain damaged as fuck
- if("lol", "wtf", "poo", "badmin", "shitmin", "deadmin", "meme", "memes")
- new_bible = pick("Woody's Got Wood: The Aftermath", "Sweet Bro and Hella Jeff: Expanded Edition","F.A.T.A.L. Rulebook")
+ if("lol", "wtf", "poo", "badmin", "shitmin", "deadmin", "meme", "memes", "skibidi")
+ new_bible = pick("Woody's Got Wood: The Aftermath", "Sweet Bro and Hella Jeff: Expanded Edition","F.A.T.A.L. Rulebook", "Toilet Humor")
switch(new_bible)
if("Woody's Got Wood: The Aftermath")
holy_bible.deity_name = pick("Woody", "Andy", "Cherry Flavored Lube")
@@ -87,6 +87,8 @@
holy_bible.deity_name = pick("Sweet Bro", "Hella Jeff", "Stairs", "AH")
if("F.A.T.A.L. Rulebook")
holy_bible.deity_name = "Twenty Ten-Sided Dice"
+ if("Toilet Humor")
+ holy_bible.deity_name = pick("Skibidi Toilet", "Skibidi Wizard", "Skibidi Bathtub", "John Skibidi", "Skibidi Skibidi", "G-Toilet 1.0", "John Freeman")
human_spawned.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100) // also starts off brain damaged as fuck
if("servicianism", "partying")
holy_bible.desc = "Happy, Full, Clean. Live it and give it."
diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
index 25fde2745854f..7d1946366a9c9 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
@@ -48,6 +48,7 @@
Allows you to behead targets for empowered strikes. \
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."
AddComponent(/datum/component/subtype_picker, rods, CALLBACK(src, PROC_REF(on_holy_weapon_picked)))
/obj/item/nullrod/proc/on_holy_weapon_picked(obj/item/nullrod/holy_weapon_type)
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index fd568464bb676..7ac1b6e29af9b 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -71,7 +71,7 @@
belt = /obj/item/storage/belt/utility/chief/full
ears = /obj/item/radio/headset/heads/ce
gloves = /obj/item/clothing/gloves/color/black
- head = /obj/item/clothing/head/utility/hardhat/white
+ head = /obj/item/clothing/head/utility/hardhat/welding/white/up
shoes = /obj/item/clothing/shoes/sneakers/brown
l_pocket = /obj/item/modular_computer/pda/heads/ce
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index e9b40d43e05e6..12f30a9de1b88 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -26,6 +26,7 @@
mail_goodies = list(
/obj/item/food/grown/banana = 100,
/obj/item/food/pie/cream = 50,
+ /obj/item/spess_knife = 20, // As a joke for clumsy clown from engineering department
/obj/item/clothing/shoes/clown_shoes/combat = 10,
/obj/item/reagent_containers/spray/waterflower/lube = 20, // lube
/obj/item/reagent_containers/spray/waterflower/superlube = 1 // Superlube, good lord.
diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm
index b6984e24b4220..00bd8790d9bd0 100644
--- a/code/modules/jobs/job_types/detective.dm
+++ b/code/modules/jobs/job_types/detective.dm
@@ -61,7 +61,7 @@
ears = /obj/item/radio/headset/headset_sec/alt
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/fedora/det_hat
- mask = /obj/item/clothing/mask/cigarette
+ mask = /obj/item/cigarette
neck = /obj/item/clothing/neck/tie/detective
shoes = /obj/item/clothing/shoes/sneakers/brown
l_pocket = /obj/item/toy/crayon/white
@@ -73,15 +73,17 @@
)
implants = list(/obj/item/implant/mindshield)
+ skillchips = list(/obj/item/skillchip/job/detectives_taste)
+
/datum/outfit/job/detective/pre_equip(mob/living/carbon/human/human, visualsOnly = FALSE)
. = ..()
if (human.age < AGE_MINOR)
- mask = /obj/item/clothing/mask/cigarette/candy
+ mask = /obj/item/cigarette/candy
head = /obj/item/clothing/head/fedora/det_hat/minor
/datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
- var/obj/item/clothing/mask/cigarette/cig = H.wear_mask
+ var/obj/item/cigarette/cig = H.wear_mask
if(istype(cig)) //Some species specfic changes can mess this up (plasmamen)
cig.light("")
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index bcf34c372285d..5d3c620322759 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -58,7 +58,7 @@
id = /obj/item/card/id/advanced/silver
id_trim = /datum/id_trim/job/research_director
uniform = /obj/item/clothing/under/rank/rnd/research_director/turtleneck
- suit = /obj/item/clothing/suit/jacket/research_director
+ suit = /obj/item/clothing/suit/toggle/labcoat/research_director
backpack_contents = list(
/obj/item/melee/baton/telescopic = 1,
)
diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm
index 7a14898f364d0..64d1a3b0bff19 100644
--- a/code/modules/jobs/job_types/shaft_miner.dm
+++ b/code/modules/jobs/job_types/shaft_miner.dm
@@ -112,8 +112,8 @@
var/obj/item/stack/sheet/animalhide/goliath_hide/plating = new()
explorer_suit.hood.attackby(plating)
for(var/obj/item/gun/energy/recharge/kinetic_accelerator/accelerator in miner_contents)
- var/obj/item/knife/combat/survival/knife = new(accelerator)
- accelerator.bayonet = knife
+ var/datum/component/bayonet_attachable/bayonet = accelerator.GetComponent(/datum/component/bayonet_attachable)
+ bayonet.add_bayonet(new /obj/item/knife/combat/survival(accelerator))
var/obj/item/flashlight/seclite/flashlight = new()
var/datum/component/seclite_attachable/light_component = accelerator.GetComponent(/datum/component/seclite_attachable)
light_component.add_light(flashlight)
diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm
index 8738389ab41d0..3000e4a037a59 100644
--- a/code/modules/jobs/job_types/station_engineer.dm
+++ b/code/modules/jobs/job_types/station_engineer.dm
@@ -31,6 +31,7 @@
mail_goodies = list(
/obj/item/storage/box/lights/mixed = 20,
/obj/item/lightreplacer = 10,
+ /obj/item/spess_knife = 10,
/obj/item/holosign_creator/engineering = 8,
/obj/item/wrench/bolter = 8,
/obj/item/clothing/head/utility/hardhat/red/upgraded = 1
@@ -47,7 +48,7 @@
uniform = /obj/item/clothing/under/rank/engineering/engineer
belt = /obj/item/storage/belt/utility/full/engi
ears = /obj/item/radio/headset/headset_eng
- head = /obj/item/clothing/head/utility/hardhat
+ head = /obj/item/clothing/head/utility/hardhat/welding/up
shoes = /obj/item/clothing/shoes/workboots
l_pocket = /obj/item/modular_computer/pda/engineering
r_pocket = /obj/item/t_scanner
diff --git a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
index 87ad65c2c7a71..6fcb8d94707f5 100644
--- a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
+++ b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
@@ -63,7 +63,7 @@
uniform = /obj/item/clothing/under/rank/security/officer/formal
head = /obj/item/clothing/head/soft/veteran
- mask = /obj/item/clothing/mask/cigarette/cigar
+ mask = /obj/item/cigarette/cigar
suit = /obj/item/clothing/suit/jacket/trenchcoat
belt = /obj/item/storage/belt/holster/detective/full/ert //M1911 pistol
ears = /obj/item/radio/headset/heads/hos/advisor
diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm
index 8c2ad28feadf8..39abe7baa509b 100644
--- a/code/modules/library/bibles.dm
+++ b/code/modules/library/bibles.dm
@@ -310,25 +310,12 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
if(.)
return .
- if(istype(bible_smacked, /obj/item/cult_bastard) && !IS_CULTIST(user))
- var/obj/item/cult_bastard/sword = bible_smacked
- bible_smacked.balloon_alert(user, "exorcising...")
+ if(istype(bible_smacked, /obj/item/melee/cultblade/haunted) && !IS_CULTIST(user))
+ var/obj/item/melee/cultblade/haunted/sword = bible_smacked
+ sword.balloon_alert(user, "exorcising...")
playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
if(do_after(user, 4 SECONDS, target = sword))
playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE)
- for(var/obj/item/soulstone/stone in sword.contents)
- stone.required_role = null
- for(var/mob/living/basic/shade/shade in stone)
- var/datum/antagonist/cult/cultist = shade.mind.has_antag_datum(/datum/antagonist/cult)
- if(cultist)
- cultist.silent = TRUE
- cultist.on_removal()
- SSblackbox.record_feedback("tally", "cult_shade_purified", 1)
- shade.theme = THEME_HOLY
- shade.name = "Purified [shade.real_name]"
- shade.update_appearance(UPDATE_ICON_STATE)
- stone.release_shades(user)
- qdel(stone)
new /obj/item/nullrod/claymore(get_turf(sword))
user.visible_message(span_notice("[user] exorcises [sword]!"))
qdel(sword)
diff --git a/code/modules/library/skill_learning/job_skillchips/detective.dm b/code/modules/library/skill_learning/job_skillchips/detective.dm
new file mode 100644
index 0000000000000..427b8566e7e1f
--- /dev/null
+++ b/code/modules/library/skill_learning/job_skillchips/detective.dm
@@ -0,0 +1,9 @@
+/obj/item/skillchip/job/detectives_taste
+ name = "DET.ekt skillchip"
+ desc = "Detective \"Encyclopedic Knowledge of Tastes\" v1.21"
+ auto_traits = list(TRAIT_DETECTIVES_TASTE)
+ skill_name = "Detective's Taste"
+ skill_description = "Deduce the minute chemical compositions of any liquid substance just by swishing it around your mouth for a bit."
+ skill_icon = "vial"
+ activate_message = span_notice("An explosion of flavors hit your mouth as you remember the secret tastebuds long forgotten.")
+ deactivate_message = span_notice("Your mouth dulls to the hidden tastes of the world.")
diff --git a/code/modules/loadout/categories/accessories.dm b/code/modules/loadout/categories/accessories.dm
index a7769426a1f70..1569131a0f077 100644
--- a/code/modules/loadout/categories/accessories.dm
+++ b/code/modules/loadout/categories/accessories.dm
@@ -87,6 +87,6 @@
additional_displayed_text = list("Contains pens")
/datum/loadout_item/accessory/pride
- name = "Patriotic Pin" //MASSMETA EDIT - ORIGINAL - "Pride Pin"
+ name = "Patriotic Pin" //MASSMETA EDIT CHANGE - ORIGINAL: "Pride Pin"
item_path = /obj/item/clothing/accessory/pride
can_be_reskinned = TRUE
diff --git a/code/modules/lootpanel/contents.dm b/code/modules/lootpanel/contents.dm
index 4bb255b15611b..44f4acd47f24c 100644
--- a/code/modules/lootpanel/contents.dm
+++ b/code/modules/lootpanel/contents.dm
@@ -18,6 +18,9 @@
for(var/atom/thing as anything in source_turf.contents)
// validate
+ if(!istype(thing))
+ stack_trace("Non-atom in the contents of [source_turf]!")
+ continue
if(thing.mouse_opacity == MOUSE_OPACITY_TRANSPARENT)
continue
if(thing.IsObscured())
diff --git a/code/modules/lootpanel/search_object.dm b/code/modules/lootpanel/search_object.dm
index 4de60b04a678a..149be76e71064 100644
--- a/code/modules/lootpanel/search_object.dm
+++ b/code/modules/lootpanel/search_object.dm
@@ -26,6 +26,9 @@
if(isturf(item))
RegisterSignal(item, COMSIG_TURF_CHANGE, PROC_REF(on_turf_change))
else
+ // Lest we find ourselves here again, this is intentionally stupid.
+ // It tracks items going out and user actions, otherwise they can refresh the lootpanel.
+ // If this is to be made to track everything, we'll need to make a new signal to specifically create/delete a search object
RegisterSignals(item, list(
COMSIG_ITEM_PICKUP,
COMSIG_MOVABLE_MOVED,
diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm
index 5c6450adb90d2..3b805bd92f9c0 100644
--- a/code/modules/mafia/outfits.dm
+++ b/code/modules/mafia/outfits.dm
@@ -64,7 +64,7 @@
suit = /obj/item/clothing/suit/jacket/det_suit
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/fedora/det_hat
- mask = /obj/item/clothing/mask/cigarette
+ mask = /obj/item/cigarette
/datum/outfit/mafia/psychologist
name = "Mafia Psychologist"
diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/lavaland_incursion.dm b/code/modules/mapfluff/ruins/icemoonruin_code/lavaland_incursion.dm
new file mode 100644
index 0000000000000..6674123c4089a
--- /dev/null
+++ b/code/modules/mapfluff/ruins/icemoonruin_code/lavaland_incursion.dm
@@ -0,0 +1,20 @@
+/mob/living/basic/mining/legion/cult_skeleton
+ corpse_type = /obj/effect/mob_spawn/corpse/human/skeleton/cultist
+
+/obj/effect/mob_spawn/corpse/human/skeleton/cultist
+ name = "skeleton cultist"
+ outfit = /datum/outfit/skeleton_cultist
+
+/datum/outfit/skeleton_cultist
+ name = "Skeleton Cultist"
+ uniform = /obj/item/clothing/under/rank/civilian/chaplain
+ suit = /obj/item/clothing/suit/hooded/cultrobes
+ shoes = /obj/item/clothing/shoes/cult
+
+/obj/item/paper/crumpled/bloody/ruins/lavaland_incursion
+ name = "blood-written note"
+ default_raw_text = "
Here, far above Indecipheres, shrouded in snow and ice, I sign the death warrant of the last of a species. The Dragons kneel beneath us."
+
+/obj/item/paper/crumpled/bloody/ruins/lavaland_incursion/last
+ name = "blood-written note"
+ default_raw_text = "
SHE WAS WRONG. KILL IT? WE COULD BARELY CONTAIN IT. AND NOW, INDECIPHERES WANTS IT TO COME HOME"
diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
index 3bb1fb48e599a..4aecd64aa1699 100644
--- a/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
+++ b/code/modules/mapfluff/ruins/lavalandruin_code/elephantgraveyard.dm
@@ -209,7 +209,7 @@
new /obj/item/clothing/glasses/science(src)
if(7)
new /obj/item/clothing/glasses/sunglasses/big(src)
- new /obj/item/clothing/mask/cigarette/rollie(src)
+ new /obj/item/cigarette/rollie(src)
else
//empty grave
return
@@ -289,7 +289,7 @@
deconstruct(TRUE)
return TRUE
-/obj/structure/closet/crate/grave/container_resist_act(mob/living/user)
+/obj/structure/closet/crate/grave/container_resist_act(mob/living/user, loc_required = TRUE)
if(opened)
return
// The player is trying to dig themselves out of an early grave
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm
index 1c0a5392fb9b2..57f20abb1aa19 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm
@@ -78,15 +78,15 @@
desc = /obj/machinery/atmospherics/components/unary/vent_scrubber::desc
icon = /obj/machinery/atmospherics/components/unary/vent_scrubber::icon
layer = /obj/machinery/atmospherics/components/unary/vent_scrubber::layer
- plane = FLOOR_PLANE
+ plane = /obj/machinery/atmospherics/components/unary/vent_scrubber::plane
icon_state = "scrub_on"
/obj/structure/fluff/fake_vent
name = /obj/machinery/atmospherics/components/unary/vent_pump::name
desc = /obj/machinery/atmospherics/components/unary/vent_pump::desc
icon = /obj/machinery/atmospherics/components/unary/vent_pump::icon
- layer = /obj/machinery/atmospherics/components/unary/vent_scrubber::layer
- plane = FLOOR_PLANE
+ layer = /obj/machinery/atmospherics/components/unary/vent_pump::layer
+ plane = /obj/machinery/atmospherics/components/unary/vent_pump::plane
icon_state = "vent_out"
/turf/open/mirage
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index f30074326fdf8..e830718e12ed6 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -107,6 +107,12 @@
return
return ..(ceiling)
+///Used for marking mapping errors. These should only be created by cases explicitly caught by unit tests, and should NEVER actually appear in production.
+/obj/effect/mapping_error
+ name = "I AM ERROR"
+ desc = "IF YOU SEE ME, YELL AT A MAPPER!!!"
+ icon = 'icons/effects/mapping_helpers.dmi'
+ icon_state = "mapping_error"
/obj/effect/mapping_helpers
icon = 'icons/effects/mapping_helpers.dmi'
@@ -563,17 +569,17 @@
if(!mapload)
log_mapping("[src] spawned outside of mapload!")
return INITIALIZE_HINT_QDEL
- check_validity()
- return INITIALIZE_HINT_QDEL
+ return INITIALIZE_HINT_LATELOAD
-/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch/proc/check_validity()
+/obj/effect/mapping_helpers/turn_off_lights_with_lightswitch/LateInitialize()
var/area/needed_area = get_area(src)
if(!needed_area.lightswitch)
stack_trace("[src] at [AREACOORD(src)] [(needed_area.type)] tried to turn lights off but they are already off!")
var/obj/machinery/light_switch/light_switch = locate(/obj/machinery/light_switch) in needed_area
if(!light_switch)
- stack_trace("Trying to turn off lights with lightswitch in area without lightswitches. In [(needed_area.type)] to be precise.")
- needed_area.lightswitch = FALSE
+ CRASH("Trying to turn off lights with lightswitch in area without lightswitches. In [(needed_area.type)] to be precise.")
+ light_switch.set_lights(FALSE)
+ qdel(src)
//needs to do its thing before spawn_rivers() is called
INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
@@ -1183,7 +1189,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_atoms_ontop)
if(response.errored || response.status_code != 200)
query_in_progress = FALSE
CRASH("Failed to fetch mapped custom json from url [json_url], code: [response.status_code], error: [response.error]")
- var/json_data = response["body"]
+ var/json_data = response.body
json_cache[json_url] = json_data
query_in_progress = FALSE
return json_data
diff --git a/code/modules/meteors/meteor_changeling.dm b/code/modules/meteors/meteor_changeling.dm
index 5733e2dbe93e2..9c25f8b6776a6 100644
--- a/code/modules/meteors/meteor_changeling.dm
+++ b/code/modules/meteors/meteor_changeling.dm
@@ -30,7 +30,7 @@
return TRUE
//If the meteor misses the station and deletes itself, we make absolutely sure the changeling reaches the station.
-/obj/effect/meteor/meaty/changeling/handle_stopping()
+/obj/effect/meteor/meaty/changeling/moved_off_z()
if(!landing_target)
//If our destination turf is gone for some reason, we chuck them at the observer_start landmark (usually at the center of the station) as a last resort.
landing_target = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list
diff --git a/code/modules/meteors/meteor_dark_matteor.dm b/code/modules/meteors/meteor_dark_matteor.dm
index f965605048204..f72bbcff6fa13 100644
--- a/code/modules/meteors/meteor_dark_matteor.dm
+++ b/code/modules/meteors/meteor_dark_matteor.dm
@@ -60,7 +60,7 @@
qdel(defender)
return FALSE
-/obj/effect/meteor/dark_matteor/handle_stopping()
+/obj/effect/meteor/dark_matteor/moved_off_z()
. = ..()
if(previous_security_level && SSsecurity_level.get_current_level_as_number() != SEC_LEVEL_DELTA)
SSsecurity_level.set_level(previous_security_level)
diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm
index 9096ab24afec8..199f6517abb1e 100644
--- a/code/modules/meteors/meteor_types.dm
+++ b/code/modules/meteors/meteor_types.dm
@@ -60,8 +60,7 @@
get_hit()
if(z != z_original || loc == get_turf(dest))
- qdel(src)
- return
+ moved_off_z()
/obj/effect/meteor/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return TRUE //Keeps us from drifting for no reason
@@ -80,13 +79,9 @@
if(!new_loop)
return
- RegisterSignal(new_loop, COMSIG_QDELETING, PROC_REF(handle_stopping))
-
///Deals with what happens when we stop moving, IE we die
-/obj/effect/meteor/proc/handle_stopping()
- SIGNAL_HANDLER
- if(!QDELETED(src))
- qdel(src)
+/obj/effect/meteor/proc/moved_off_z()
+ qdel(src)
/obj/effect/meteor/proc/ram_turf(turf/T)
//first yell at mobs about them dying horribly
@@ -459,8 +454,8 @@
/obj/effect/meteor/pumpkin
name = "PUMPKING"
desc = "THE PUMPKING'S COMING!"
- icon = 'icons/obj/meteor_spooky.dmi'
- icon_state = "pumpkin"
+ icon = 'icons/obj/meteor.dmi'
+ icon_state = "spooky"
hits = 10
heavy = TRUE
dropamt = 1
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index fa15060d282a9..40cb967d3a0ab 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -141,7 +141,7 @@
new /obj/item/lighter(src)
new /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium(src)
for(var/i in 1 to 3)
- new /obj/item/clothing/mask/cigarette/rollie(src)
+ new /obj/item/cigarette/rollie(src)
if(6 to 10)
new /obj/item/melee/skateboard/pro(src)
if(11 to 15)
diff --git a/code/modules/mining/boulder_processing/boulder_types.dm b/code/modules/mining/boulder_processing/boulder_types.dm
index 1ffce8737bdd4..8f6889b7c8470 100644
--- a/code/modules/mining/boulder_processing/boulder_types.dm
+++ b/code/modules/mining/boulder_processing/boulder_types.dm
@@ -4,7 +4,7 @@
desc = "This boulder is brimming with strange energy. Cracking it open could contain something unusual for science."
icon_state = "boulder_artifact"
/// This is the type of item that will be inside the boulder. Default is a strange object.
- var/artifact_type = /obj/item/relic
+ var/artifact_type = /obj/item/relic/lavaland
/// References to the relic inside the boulder, if any.
var/obj/item/artifact_inside
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index 56b65c456197b..649acabfcae4a 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -97,13 +97,10 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
if(uses_left <= 0)
user.transferItemToLoc(src, thing, TRUE)
- var/mutable_appearance/balloon
- var/mutable_appearance/balloon2
- var/mutable_appearance/balloon3
-
if(isliving(thing))
var/mob/living/creature = thing
creature.Paralyze(32 SECONDS) // Keep them from moving during the duration of the extraction
+ ADD_TRAIT(creature, TRAIT_FORCED_STANDING, FULTON_PACK_TRAIT) // Prevents animation jank from happening
if(creature.buckled)
creature.buckled.unbuckle_mob(creature, TRUE) // Unbuckle them to prevent anchoring problems
else
@@ -113,14 +110,15 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
var/obj/effect/extraction_holder/holder_obj = new(get_turf(thing))
holder_obj.appearance = thing.appearance
thing.forceMove(holder_obj)
- balloon2 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_expand")
+ var/mutable_appearance/balloon2 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_expand", layer = VEHICLE_LAYER)
balloon2.pixel_y = 10
balloon2.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.add_overlay(balloon2)
+ addtimer(CALLBACK(src, PROC_REF(create_balloon), thing, user, holder_obj, balloon2), 0.4 SECONDS)
+ return ITEM_INTERACT_SUCCESS
- sleep(0.4 SECONDS)
-
- balloon = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_balloon")
+/obj/item/extraction_pack/proc/create_balloon(atom/movable/thing, mob/living/user, obj/effect/extraction_holder/holder_obj, mutable_appearance/balloon2)
+ var/mutable_appearance/balloon = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_balloon", layer = VEHICLE_LAYER)
balloon.pixel_y = 10
balloon.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.cut_overlay(balloon2)
@@ -132,6 +130,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
animate(pixel_z = -5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = 5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = -5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
+
sleep(6 SECONDS)
playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', vol = 50, vary = TRUE, extrarange = -3)
@@ -146,7 +145,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
sleep(3 SECONDS)
var/turf/flooring_near_beacon = list()
- var/turf/beacon_turf = get_turf(beacon)
+ var/turf/beacon_turf = get_turf(beacon_ref.resolve())
for(var/turf/floor as anything in RANGE_TURFS(1, beacon_turf))
if(!floor.is_blocked_turf())
flooring_near_beacon += floor
@@ -159,26 +158,28 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
animate(holder_obj, pixel_z = -990, time = 5 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = 5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
animate(pixel_z = -5, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
+
sleep(7 SECONDS)
- balloon3 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_retract")
+ var/mutable_appearance/balloon3 = mutable_appearance('icons/effects/fulton_balloon.dmi', "fulton_retract", layer = VEHICLE_LAYER)
balloon3.pixel_y = 10
balloon3.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.cut_overlay(balloon)
holder_obj.add_overlay(balloon3)
+
sleep(0.4 SECONDS)
holder_obj.cut_overlay(balloon3)
+ if (isliving(thing))
+ REMOVE_TRAIT(thing, TRAIT_FORCED_STANDING, FULTON_PACK_TRAIT)
thing.set_anchored(FALSE) // An item has to be unanchored to be extracted in the first place.
thing.set_density(initial(thing.density))
animate(holder_obj, pixel_z = -10, time = 0.5 SECONDS, flags = ANIMATION_RELATIVE)
sleep(0.5 SECONDS)
-
thing.forceMove(holder_obj.loc)
qdel(holder_obj)
if(uses_left <= 0)
qdel(src)
- return ITEM_INTERACT_SUCCESS
/obj/item/fulton_core
name = "extraction beacon assembly kit"
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index 9cbc516697808..1e4e444861155 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -311,7 +311,7 @@
product = /obj/item/food/grown/ash_flora/shavings
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/service/hydroponics/growing_mushrooms.dmi'
- reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/consumable/mintextract = 0.02)
+ reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/consumable/mintextract = 0.02)
/obj/item/seeds/lavaland/porcini
name = "pack of porcini mycelium"
@@ -322,7 +322,7 @@
product = /obj/item/food/grown/ash_flora/mushroom_leaf
genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance)
growing_icon = 'icons/obj/service/hydroponics/growing_mushrooms.dmi'
- reagents_add = list(/datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/vitfro = 0.04, /datum/reagent/drug/nicotine = 0.04)
+ reagents_add = list(/datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/vitfro = 0.04, /datum/reagent/drug/nicotine = 0.04)
/obj/item/seeds/lavaland/inocybe
name = "pack of inocybe mycelium"
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index a52107ce8b260..385afb0f81f3e 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -31,13 +31,10 @@
machine = null
return ..()
-/obj/machinery/mineral/stacking_unit_console/multitool_act(mob/living/user, obj/item/I)
- if(!multitool_check_buffer(user, I))
- return
- var/obj/item/multitool/M = I
+/obj/machinery/mineral/stacking_unit_console/multitool_act(mob/living/user, obj/item/multitool/M)
M.set_buffer(src)
balloon_alert(user, "saved to multitool buffer")
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/mineral/stacking_unit_console/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 3c02de4707317..c1a81b9d33847 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -359,6 +359,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
abstract_move(destination) // move like the wind
return TRUE
+/mob/dead/observer/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+ var/area/new_area = get_area(src)
+ if(new_area != ambience_tracked_area)
+ update_ambience_area(new_area)
+
/mob/dead/observer/verb/reenter_corpse()
set category = "Ghost"
set name = "Re-enter Corpse"
@@ -693,8 +699,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
//this is called when a ghost is drag clicked to something.
/mob/dead/observer/mouse_drop_dragged(atom/over, mob/user)
if (isobserver(user) && user.client.holder && (isliving(over) || iscameramob(over)))
- if (user.client.holder.cmd_ghost_drag(src,over))
- return
+ user.client.holder.cmd_ghost_drag(src, over)
/mob/dead/observer/Topic(href, href_list)
..()
@@ -983,6 +988,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
game = create_mafia_game()
game.ui_interact(usr)
+/mob/dead/observer/AltClickOn(atom/target)
+ client.loot_panel.open(get_turf(target))
+
+/mob/dead/observer/AltClickSecondaryOn(atom/target)
+ if(client && check_rights_for(client, R_DEBUG))
+ client.toggle_tag_datum(src)
+
/mob/dead/observer/CtrlShiftClickOn(atom/target)
if(isobserver(target) && check_rights(R_SPAWN))
var/mob/dead/observer/target_ghost = target
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 50ab6e82faa4d..2d22c11ee71f8 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -290,8 +290,12 @@
/mob/proc/is_holding_items()
return !!locate(/obj/item) in held_items
+/**
+ * Returns a list of all dropped held items.
+ * If none were dropped, returns an empty list.
+ */
/mob/proc/drop_all_held_items()
- . = FALSE
+ . = list()
for(var/obj/item/I in held_items)
. |= dropItemToGround(I)
@@ -319,24 +323,25 @@
/**
* Used to drop an item (if it exists) to the ground.
- * * Will pass as TRUE is successfully dropped, or if there is no item to drop.
- * * Will pass FALSE if the item can not be dropped due to TRAIT_NODROP via doUnEquip()
+ * * Will return null if the item wasn't dropped.
+ * * If it was, returns the item.
* If the item can be dropped, it will be forceMove()'d to the ground and the turf's Entered() will be called.
*/
/mob/proc/dropItemToGround(obj/item/I, force = FALSE, silent = FALSE, invdrop = TRUE)
if (isnull(I))
- return TRUE
+ return
SEND_SIGNAL(src, COMSIG_MOB_DROPPING_ITEM)
- . = doUnEquip(I, force, drop_location(), FALSE, invdrop = invdrop, silent = silent)
+ var/try_uneqip = doUnEquip(I, force, drop_location(), FALSE, invdrop = invdrop, silent = silent)
- if(!. || !I) //ensure the item exists and that it was dropped properly.
+ if(!try_uneqip || !I) //ensure the item exists and that it was dropped properly.
return
if(!(I.item_flags & NO_PIXEL_RANDOM_DROP))
I.pixel_x = I.base_pixel_x + rand(-6, 6)
I.pixel_y = I.base_pixel_y + rand(-6, 6)
I.do_drop_animation(src)
+ return I
//for when the item will be immediately placed in a loc other than the ground
/mob/proc/transferItemToLoc(obj/item/I, newloc = null, force = FALSE, silent = TRUE)
@@ -401,59 +406,105 @@
return items
/**
- * Used to return a list of equipped items on a human mob; does not by default include held items, see include_flags
- *
- * Argument(s):
- * * Optional - include_flags, (see obj.flags.dm) describes which optional things to include or not (pockets, accessories, held items)
+ * Returns the items that were succesfully unequipped.
*/
-
-/mob/living/carbon/human/get_equipped_items(include_flags = NONE)
- var/list/items = ..()
- if(!(include_flags & INCLUDE_POCKETS))
- items -= list(l_store, r_store, s_store)
- if((include_flags & INCLUDE_ACCESSORIES) && w_uniform)
- var/obj/item/clothing/under/worn_under = w_uniform
- items += worn_under.attached_accessories
- return items
-
/mob/living/proc/unequip_everything()
var/list/items = list()
items |= get_equipped_items(INCLUDE_POCKETS)
+ // In case something isn't actually unequipped somehow
+ var/list/dropped_items = list()
for(var/I in items)
- dropItemToGround(I)
- drop_all_held_items()
-
-
-/mob/living/carbon/proc/check_obscured_slots(transparent_protection)
- var/obscured = NONE
- var/hidden_slots = NONE
-
- for(var/obj/item/equipped_item in get_equipped_items())
- hidden_slots |= equipped_item.flags_inv
- if(transparent_protection)
- hidden_slots |= equipped_item.transparent_protection
-
- if(hidden_slots & HIDENECK)
- obscured |= ITEM_SLOT_NECK
- if(hidden_slots & HIDEMASK)
- obscured |= ITEM_SLOT_MASK
- if(hidden_slots & HIDEEYES)
- obscured |= ITEM_SLOT_EYES
- if(hidden_slots & HIDEEARS)
- obscured |= ITEM_SLOT_EARS
- if(hidden_slots & HIDEGLOVES)
- obscured |= ITEM_SLOT_GLOVES
- if(hidden_slots & HIDEJUMPSUIT)
- obscured |= ITEM_SLOT_ICLOTHING
- if(hidden_slots & HIDESHOES)
- obscured |= ITEM_SLOT_FEET
- if(hidden_slots & HIDESUITSTORAGE)
- obscured |= ITEM_SLOT_SUITSTORE
- if(hidden_slots & HIDEHEADGEAR)
- obscured |= ITEM_SLOT_HEAD
-
- return obscured
+ var/return_val = dropItemToGround(I)
+ if(!isitem(return_val))
+ continue
+ dropped_items |= return_val
+ var/return_val = drop_all_held_items()
+ if(islist(return_val))
+ dropped_items |= return_val
+ return dropped_items
+/**
+ * Try to equip an item to a slot on the mob
+ *
+ * This is a SAFE proc. Use this instead of equip_to_slot()!
+ *
+ * set qdel_on_fail to have it delete W if it fails to equip
+ *
+ * set disable_warning to disable the 'you are unable to equip that' warning.
+ *
+ * unset redraw_mob to prevent the mob icons from being redrawn at the end.
+ *
+ * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
+ *
+ * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
+ */
+/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE, initial = FALSE, indirect_action = FALSE)
+ if(!istype(W) || QDELETED(W)) //This qdeleted is to prevent stupid behavior with things that qdel during init, like say stacks
+ return FALSE
+ if(!W.mob_can_equip(src, slot, disable_warning, bypass_equip_delay_self, indirect_action = indirect_action))
+ if(qdel_on_fail)
+ qdel(W)
+ else if(!disable_warning)
+ to_chat(src, span_warning("You are unable to equip that!"))
+ return FALSE
+ equip_to_slot(W, slot, initial, redraw_mob, indirect_action = indirect_action) //This proc should not ever fail.
+ return TRUE
+
+/**
+ * Actually equips an item to a slot (UNSAFE)
+ *
+ * This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on
+ * whether you can or can't equip need to be done before! Use mob_can_equip() for that task.
+ *
+ *In most cases you will want to use equip_to_slot_if_possible()
+ */
+/mob/proc/equip_to_slot(obj/item/equipping, slot, initial = FALSE, redraw_mob = FALSE, indirect_action = FALSE)
+ return
+
+/**
+ * Equip an item to the slot or delete
+ *
+ * This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to
+ * equip people when the round starts and when events happen and such.
+ *
+ * Also bypasses equip delay checks, since the mob isn't actually putting it on.
+ * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
+ * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
+ */
+/mob/proc/equip_to_slot_or_del(obj/item/W, slot, initial = FALSE, indirect_action = FALSE)
+ return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE, initial, indirect_action)
+
+/**
+ * Auto equip the passed in item the appropriate slot based on equipment priority
+ *
+ * puts the item "W" into an appropriate slot in a human's inventory
+ *
+ * returns 0 if it cannot, 1 if successful
+ */
+/mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE)
+ if(!istype(W))
+ return FALSE
+ var/slot_priority = W.slot_equipment_priority
+
+ if(!slot_priority)
+ slot_priority = list( \
+ ITEM_SLOT_BACK, ITEM_SLOT_ID,\
+ ITEM_SLOT_ICLOTHING, ITEM_SLOT_OCLOTHING,\
+ ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_NECK,\
+ ITEM_SLOT_FEET, ITEM_SLOT_GLOVES,\
+ ITEM_SLOT_EARS, ITEM_SLOT_EYES,\
+ ITEM_SLOT_BELT, ITEM_SLOT_SUITSTORE,\
+ ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET,\
+ ITEM_SLOT_DEX_STORAGE\
+ )
+
+ for(var/slot in slot_priority)
+ if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action))
+ return TRUE
+
+ if(qdel_on_fail)
+ qdel(W)
+ return FALSE
/// Tries to equip an item, store it in open storage, or in next best storage
/obj/item/proc/equip_to_best_slot(mob/user)
@@ -534,27 +585,6 @@
if(hud_used)
hud_used.build_hand_slots()
-/mob/living/carbon/human/change_number_of_hands(amt)
- var/old_limbs = held_items.len
- if(amt < old_limbs)
- for(var/i in hand_bodyparts.len to amt step -1)
- var/obj/item/bodypart/BP = hand_bodyparts[i]
- BP.dismember()
- hand_bodyparts[i] = null
- hand_bodyparts.len = amt
- else if(amt > old_limbs)
- hand_bodyparts.len = amt
- for(var/i in old_limbs+1 to amt)
- var/path = /obj/item/bodypart/arm/left
- if(!(i % 2))
- path = /obj/item/bodypart/arm/right
-
- var/obj/item/bodypart/BP = new path ()
- BP.held_index = i
- BP.try_attach_limb(src, TRUE)
- hand_bodyparts[i] = BP
- ..() //Don't redraw hands until we have organs for them
-
//GetAllContents that is reasonable and not stupid
/mob/living/proc/get_all_gear()
var/list/processing_list = get_equipped_items(INCLUDE_POCKETS | INCLUDE_ACCESSORIES | INCLUDE_HELD)
diff --git a/code/modules/mob/living/basic/bots/bot_ai.dm b/code/modules/mob/living/basic/bots/bot_ai.dm
index 93d53d6e52183..b7cd5dcabd394 100644
--- a/code/modules/mob/living/basic/bots/bot_ai.dm
+++ b/code/modules/mob/living/basic/bots/bot_ai.dm
@@ -276,3 +276,17 @@
/datum/ai_behavior/bot_search/proc/valid_target(datum/ai_controller/basic_controller/bot/controller, atom/my_target)
return TRUE
+
+///behavior to make our bot talk
+/datum/ai_behavior/bot_speech
+ action_cooldown = 5 SECONDS
+ behavior_flags = AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
+
+/datum/ai_behavior/bot_speech/perform(seconds_per_tick, datum/ai_controller/controller, list/list_to_pick_from, announce_key)
+ var/datum/action/cooldown/bot_announcement/announcement = controller.blackboard[announce_key]
+
+ if(isnull(announcement) || !length(list_to_pick_from))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+
+ announcement.announce(pick(list_to_pick_from))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
diff --git a/code/modules/mob/living/basic/bots/firebot/firebot.dm b/code/modules/mob/living/basic/bots/firebot/firebot.dm
new file mode 100644
index 0000000000000..31fa969fa5983
--- /dev/null
+++ b/code/modules/mob/living/basic/bots/firebot/firebot.dm
@@ -0,0 +1,169 @@
+#define FOAM_INTERVAL 5 SECONDS
+
+/mob/living/basic/bot/firebot
+ name = "\improper Firebot"
+ desc = "A little fire extinguishing bot. He looks rather anxious."
+ icon = 'icons/mob/silicon/aibots.dmi'
+ icon_state = "firebot1"
+ light_color = "#8cffc9"
+ light_power = 0.8
+
+ req_one_access = list(ACCESS_ROBOTICS, ACCESS_CONSTRUCTION)
+ radio_key = /obj/item/encryptionkey/headset_eng
+ radio_channel = RADIO_CHANNEL_ENGINEERING
+ bot_type = FIRE_BOT
+ additional_access = /datum/id_trim/job/station_engineer
+ hackables = "fire safety protocols"
+ path_image_color = "#FFA500"
+ possessed_message = "You are a firebot! Protect the station from fires to the best of your ability!"
+ ai_controller = /datum/ai_controller/basic_controller/bot/firebot
+ ///our inbuilt fire extinguisher
+ var/obj/item/extinguisher/internal_ext
+
+ ///Flags firebots use to decide how they function.
+ var/firebot_mode_flags = FIREBOT_EXTINGUISH_PEOPLE | FIREBOT_EXTINGUISH_FLAMES
+ //Selections: FIREBOT_STATIONARY_MODE | FIREBOT_EXTINGUISH_PEOPLE | FIREBOT_EXTINGUISH_FLAMES
+ ///cooldown before we release foam all over
+ COOLDOWN_DECLARE(foam_cooldown)
+
+
+/mob/living/basic/bot/firebot/generate_speak_list()
+ var/static/list/idle_lines = list(
+ FIREBOT_VOICED_NO_FIRES = 'sound/voice/firebot/nofires.ogg',
+ FIREBOT_VOICED_ONLY_YOU = 'sound/voice/firebot/onlyyou.ogg',
+ FIREBOT_VOICED_TEMPERATURE_NOMINAL = 'sound/voice/firebot/tempnominal.ogg',
+ FIREBOT_VOICED_KEEP_COOL = 'sound/voice/firebot/keepitcool.ogg',
+ )
+ var/static/list/fire_detected_lines = list(
+ FIREBOT_VOICED_FIRE_DETECTED = 'sound/voice/firebot/detected.ogg',
+ FIREBOT_VOICED_STOP_DROP = 'sound/voice/firebot/stopdropnroll.ogg',
+ FIREBOT_VOICED_EXTINGUISHING = 'sound/voice/firebot/extinguishing.ogg',
+ )
+ var/static/list/emagged_lines = list(
+ FIREBOT_VOICED_CANDLE_TIP = 'sound/voice/firebot/candle_tip.ogg',
+ FIREBOT_VOICED_ELECTRIC_FIRE = 'sound/voice/firebot/electric_fire_tip.ogg',
+ FIREBOT_VOICED_FUEL_TIP = 'sound/voice/firebot/gasoline_tip.ogg'
+ )
+ ai_controller.set_blackboard_key(BB_FIREBOT_EMAGGED_LINES, emagged_lines)
+ ai_controller.set_blackboard_key(BB_FIREBOT_IDLE_LINES, idle_lines)
+ ai_controller.set_blackboard_key(BB_FIREBOT_FIRE_DETECTED_LINES, fire_detected_lines)
+ return idle_lines + fire_detected_lines
+
+/mob/living/basic/bot/firebot/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
+ update_appearance(UPDATE_ICON)
+ var/static/list/things_to_extinguish = typecacheof(list(/mob/living/carbon))
+ ai_controller.set_blackboard_key(BB_FIREBOT_CAN_EXTINGUISH, things_to_extinguish)
+ create_extinguisher()
+ AddElement(/datum/element/atmos_sensitive, mapload)
+
+/mob/living/basic/bot/firebot/Destroy()
+ QDEL_NULL(internal_ext)
+ return ..()
+
+/mob/living/basic/bot/firebot/bot_reset(bypass_ai_reset)
+ . = ..()
+ create_extinguisher()
+
+/mob/living/basic/bot/firebot/proc/create_extinguisher()
+ internal_ext = new /obj/item/extinguisher(src)
+ internal_ext.safety = FALSE
+ internal_ext.precision = TRUE
+ internal_ext.max_water = INFINITY
+ internal_ext.refill()
+
+/mob/living/basic/bot/firebot/melee_attack(atom/attacked_atom, list/modifiers, ignore_cooldown = FALSE)
+ use_extinguisher(attacked_atom)
+
+/mob/living/basic/bot/firebot/RangedAttack(atom/attacked_atom, list/modifiers)
+ use_extinguisher(attacked_atom)
+
+/mob/living/basic/bot/firebot/proc/use_extinguisher(atom/attacked_atom)
+ if(!(bot_mode_flags & BOT_MODE_ON))
+ return
+ spray_water(attacked_atom)
+
+/mob/living/basic/bot/firebot/emag_act(mob/user, obj/item/card/emag/emag_card)
+ . = ..()
+ if(!(bot_access_flags & BOT_COVER_EMAGGED))
+ return
+
+ to_chat(user, span_warning("You enable the very ironically named \"fighting with fire\" mode, and disable the targeting safeties.")) // heheehe. funny
+
+ audible_message(span_danger("[src] buzzes oddly!"))
+ playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+
+ internal_ext.chem = /datum/reagent/clf3 //Refill the internal extinguisher with liquid fire
+ internal_ext.power = 3
+ internal_ext.safety = FALSE
+ internal_ext.precision = FALSE
+ internal_ext.max_water = INFINITY
+ internal_ext.refill()
+ return TRUE
+
+// Variables sent to TGUI
+/mob/living/basic/bot/firebot/ui_data(mob/user)
+ var/list/data = ..()
+ if(!(bot_access_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user))
+ data["custom_controls"]["extinguish_fires"] = firebot_mode_flags & FIREBOT_EXTINGUISH_FLAMES
+ data["custom_controls"]["extinguish_people"] = firebot_mode_flags & FIREBOT_EXTINGUISH_PEOPLE
+ data["custom_controls"]["stationary_mode"] = firebot_mode_flags & FIREBOT_STATIONARY_MODE
+ return data
+
+// Actions received from TGUI
+/mob/living/basic/bot/firebot/ui_act(action, params)
+ . = ..()
+ if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr)))
+ return
+
+ switch(action)
+ if("extinguish_fires")
+ firebot_mode_flags ^= FIREBOT_EXTINGUISH_FLAMES
+ if("extinguish_people")
+ firebot_mode_flags ^= FIREBOT_EXTINGUISH_PEOPLE
+ if("stationary_mode")
+ firebot_mode_flags ^= FIREBOT_STATIONARY_MODE
+ update_appearance()
+
+/mob/living/basic/bot/firebot/should_atmos_process(datum/gas_mixture/air, exposed_temperature)
+ return (exposed_temperature > T0C + 200 || exposed_temperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+
+/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()
+ COOLDOWN_START(src, foam_cooldown, FOAM_INTERVAL)
+
+/mob/living/basic/bot/firebot/proc/spray_water(atom/attacked_atom)
+ if(firebot_mode_flags & FIREBOT_STATIONARY_MODE)
+ flick("firebots_use", src)
+ else
+ flick("firebot1_use", src)
+ internal_ext?.melee_attack_chain(src, attacked_atom)
+
+/mob/living/basic/bot/firebot/update_icon_state()
+ . = ..()
+ if(!(bot_mode_flags & BOT_MODE_ON))
+ icon_state = "firebot0"
+ return
+ if(IsStun() || IsParalyzed() || (firebot_mode_flags & FIREBOT_STATIONARY_MODE)) //Bot has yellow light to indicate stationary mode.
+ icon_state = "firebots1"
+ return
+ icon_state = "firebot1"
+
+/mob/living/basic/bot/firebot/explode()
+ var/turf/my_turf = drop_location()
+
+ new /obj/item/assembly/prox_sensor(my_turf)
+ new /obj/item/clothing/head/utility/hardhat/red(my_turf)
+
+ if(isopenturf(my_turf))
+ var/turf/open/open_turf = my_turf
+ open_turf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
+
+ return ..()
+
+#undef FOAM_INTERVAL
diff --git a/code/modules/mob/living/basic/bots/firebot/firebot_ai.dm b/code/modules/mob/living/basic/bots/firebot/firebot_ai.dm
new file mode 100644
index 0000000000000..31127ecdfb4e7
--- /dev/null
+++ b/code/modules/mob/living/basic/bots/firebot/firebot_ai.dm
@@ -0,0 +1,132 @@
+#define ANNOUNCEMENT_TIMER 10 SECONDS
+
+/datum/ai_controller/basic_controller/bot/firebot
+ blackboard = list(
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_turfs,
+ BB_UNREACHABLE_LIST_COOLDOWN = 45 SECONDS,
+ )
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/respond_to_summon,
+ /datum/ai_planning_subtree/manage_unreachable_list,
+ /datum/ai_planning_subtree/extinguishing_people,
+ /datum/ai_planning_subtree/extinguishing_turfs,
+ /datum/ai_planning_subtree/salute_authority,
+ /datum/ai_planning_subtree/firebot_speech,
+ /datum/ai_planning_subtree/find_patrol_beacon,
+ )
+ reset_keys = list(
+ BB_FIREBOT_EXTINGUISH_TARGET,
+ BB_BEACON_TARGET,
+ BB_PREVIOUS_BEACON_TARGET,
+ BB_BOT_SUMMON_TARGET,
+ )
+ ///cooldown until we announce a fire again
+ COOLDOWN_DECLARE(announcement_cooldown)
+
+/datum/ai_controller/basic_controller/bot/firebot/TryPossessPawn(atom/new_pawn)
+ . = ..()
+ if(. & AI_CONTROLLER_INCOMPATIBLE)
+ return
+ RegisterSignal(new_pawn, COMSIG_AI_BLACKBOARD_KEY_SET(BB_FIREBOT_EXTINGUISH_TARGET), PROC_REF(on_target_found))
+
+///say a silly line whenever we find someone on fire
+/datum/ai_controller/basic_controller/bot/firebot/proc/on_target_found()
+ SIGNAL_HANDLER
+ if(!COOLDOWN_FINISHED(src, announcement_cooldown))
+ return
+
+ var/datum/action/cooldown/bot_announcement/announcement = blackboard[BB_ANNOUNCE_ABILITY]
+ if(isnull(announcement))
+ return
+
+ var/list/lines = blackboard[BB_FIREBOT_FIRE_DETECTED_LINES]
+ if(!length(lines))
+ return
+ INVOKE_ASYNC(announcement, TYPE_PROC_REF(/datum/action/cooldown/bot_announcement, announce), pick(lines))
+ COOLDOWN_START(src, announcement_cooldown, ANNOUNCEMENT_TIMER)
+
+
+///subtree for extinguishing people
+/datum/ai_planning_subtree/extinguishing_people
+
+/datum/ai_planning_subtree/extinguishing_people/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick)
+ if(controller.blackboard_key_exists(BB_FIREBOT_EXTINGUISH_TARGET))
+ controller.queue_behavior(/datum/ai_behavior/basic_melee_attack/interact_once/extinguish, BB_FIREBOT_EXTINGUISH_TARGET, BB_TARGETING_STRATEGY)
+ return SUBTREE_RETURN_FINISH_PLANNING
+
+ var/mob/living/basic/bot/firebot/living_bot = controller.pawn
+ var/range = living_bot.firebot_mode_flags & FIREBOT_STATIONARY_MODE ? 1 : 5
+
+ if(living_bot.firebot_mode_flags & FIREBOT_EXTINGUISH_PEOPLE)
+ controller.queue_behavior(/datum/ai_behavior/bot_search/people_on_fire, BB_FIREBOT_EXTINGUISH_TARGET, controller.blackboard[BB_FIREBOT_CAN_EXTINGUISH], range)
+
+///behavior for finding people on fire
+/datum/ai_behavior/bot_search/people_on_fire
+
+/datum/ai_behavior/bot_search/people_on_fire/valid_target(datum/ai_controller/basic_controller/bot/controller, mob/living/my_target)
+ var/mob/living/basic/bot/living_bot = controller.pawn
+ return (my_target.on_fire || (living_bot.bot_access_flags & BOT_COVER_EMAGGED))
+
+///subtree for finding turfs to extinguish
+/datum/ai_planning_subtree/extinguishing_turfs
+
+/datum/ai_planning_subtree/extinguishing_turfs/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick)
+ if(controller.blackboard_key_exists(BB_FIREBOT_EXTINGUISH_TARGET))
+ return
+
+ var/mob/living/basic/bot/firebot/living_bot = controller.pawn
+ var/should_bypass_blacklist = living_bot.firebot_mode_flags & FIREBOT_STATIONARY_MODE
+
+ if(living_bot.firebot_mode_flags & FIREBOT_EXTINGUISH_FLAMES)
+ controller.queue_behavior(/datum/ai_behavior/search_burning_turfs, BB_FIREBOT_EXTINGUISH_TARGET, should_bypass_blacklist)
+
+///behavior to find burning turfs
+/datum/ai_behavior/search_burning_turfs
+ action_cooldown = 2 SECONDS
+ behavior_flags = AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
+
+/datum/ai_behavior/search_burning_turfs/perform(seconds_per_tick, datum/ai_controller/basic_controller/bot/controller, target_key, bypass_add_blacklist = FALSE)
+ var/mob/living/living_pawn = controller.pawn
+ var/list/ignore_list = controller.blackboard[BB_TEMPORARY_IGNORE_LIST]
+
+ for(var/turf/possible_turf as anything in RANGE_TURFS(5, living_pawn))
+ if(QDELETED(living_pawn))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+ if(!isopenturf(possible_turf))
+ continue
+ var/turf/open/open_turf = possible_turf
+ if(!open_turf.active_hotspot)
+ continue
+ if(LAZYACCESS(ignore_list, possible_turf))
+ continue
+ if(controller.set_if_can_reach(target_key, possible_turf, bypass_add_to_blacklist = bypass_add_blacklist))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
+
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+
+///behavior to extinguish mobs or turfs
+/datum/ai_behavior/basic_melee_attack/interact_once/extinguish
+
+/datum/ai_behavior/basic_melee_attack/interact_once/extinguish/finish_action(datum/ai_controller/basic_controller/bot/controller, succeeded, target_key, targeting_strategy_key, hiding_location_key)
+ var/atom/target = controller.blackboard[BB_FIREBOT_EXTINGUISH_TARGET]
+ var/mob/living/basic/bot/living_bot = controller.pawn
+
+ //if we couldnt path, or we successfully burnt someone, ignore them for a bit!
+ if(!succeeded || (isliving(target) && (living_bot.bot_access_flags & BOT_COVER_EMAGGED)))
+ controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+
+ return ..()
+
+///subtree to make us say funny idle lines
+/datum/ai_planning_subtree/firebot_speech
+ ///chance we spout lines
+ var/speech_prob = 3
+
+/datum/ai_planning_subtree/firebot_speech/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick)
+ if(controller.blackboard[BB_FIREBOT_EXTINGUISH_TARGET] || !SPT_PROB(speech_prob, seconds_per_tick))
+ return
+ var/mob/living/basic/bot/living_bot = controller.pawn
+ var/list/idle_lines = (living_bot.bot_access_flags & BOT_COVER_EMAGGED) ? controller.blackboard[BB_FIREBOT_EMAGGED_LINES] : controller.blackboard[BB_FIREBOT_IDLE_LINES]
+ controller.queue_behavior(/datum/ai_behavior/bot_speech, idle_lines, BB_ANNOUNCE_ABILITY)
+
+#undef ANNOUNCEMENT_TIMER
diff --git a/code/modules/mob/living/basic/cult/constructs/_construct.dm b/code/modules/mob/living/basic/cult/constructs/_construct.dm
index 2583b3a88a6b8..79e6e7487721b 100644
--- a/code/modules/mob/living/basic/cult/constructs/_construct.dm
+++ b/code/modules/mob/living/basic/cult/constructs/_construct.dm
@@ -51,10 +51,12 @@
THEME_CULT = list(/obj/item/ectoplasm/construct),
THEME_HOLY = list(/obj/item/ectoplasm/angelic),
THEME_WIZARD = list(/obj/item/ectoplasm/mystic),
+ THEME_HERETIC = list(/obj/item/ectoplasm/construct),
)
/mob/living/basic/construct/Initialize(mapload)
. = ..()
+ throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
AddElement(/datum/element/simple_flying)
var/list/remains = string_list(remains_by_theme[theme])
if(length(remains))
diff --git a/code/modules/mob/living/basic/cult/constructs/harvester.dm b/code/modules/mob/living/basic/cult/constructs/harvester.dm
index da8dad827b05c..6d41bb43f26a1 100644
--- a/code/modules/mob/living/basic/cult/constructs/harvester.dm
+++ b/code/modules/mob/living/basic/cult/constructs/harvester.dm
@@ -26,13 +26,16 @@
/mob/living/basic/construct/harvester/Initialize(mapload)
. = ..()
- AddElement(\
- /datum/element/amputating_limbs,\
+ grant_abilities()
+
+/mob/living/basic/construct/harvester/proc/grant_abilities()
+ AddElement(/datum/element/wall_walker, /turf/closed/wall/mineral/cult)
+ AddComponent(\
+ /datum/component/amputating_limbs,\
surgery_time = 0,\
surgery_verb = "slicing",\
minimum_stat = CONSCIOUS,\
)
- AddElement(/datum/element/wall_walker, /turf/closed/wall/mineral/cult)
var/datum/action/innate/seek_prey/seek = new(src)
seek.Grant(src)
seek.Activate()
@@ -59,7 +62,7 @@
overlay_icon_state = "bg_demon_border"
buttontooltipstyle = "cult"
- button_icon = "icons/mob/actions/actions_cult.dmi"
+ button_icon = 'icons/mob/actions/actions_cult.dmi'
button_icon_state = "cult_mark"
/// Where is nar nar? Are we even looking?
var/tracking = FALSE
@@ -93,7 +96,6 @@
the_construct.seeking = TRUE
to_chat(the_construct, span_cult_italic("You are now tracking your master."))
-
/datum/action/innate/seek_prey
name = "Seek the Harvest"
desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!"
@@ -126,3 +128,115 @@
desc = "Activate to track Nar'Sie!"
button_icon_state = "sintouch"
the_construct.seeking = TRUE
+
+/mob/living/basic/construct/harvester/heretic
+ name = "Rusted Harvester"
+ real_name = "Rusted Harvester"
+ desc = "A long, thin, decrepit construct originally built to herald Nar'Sie's rise, corrupted and rusted by the forces of the Mansus to spread its will instead."
+ icon_state = "harvester"
+ icon_living = "harvester"
+ construct_spells = list(
+ /datum/action/cooldown/spell/aoe/rust_conversion,
+ /datum/action/cooldown/spell/pointed/rust_construction,
+ )
+ can_repair = FALSE
+ slowed_by_drag = FALSE
+ faction = list(FACTION_HERETIC)
+ maxHealth = 35
+ health = 35
+ melee_damage_lower = 20
+ melee_damage_upper = 25
+ // Dim green
+ lighting_cutoff_red = 10
+ lighting_cutoff_green = 20
+ lighting_cutoff_blue = 5
+ playstyle_string = "You are a Rusted Harvester, built to serve the Sanguine Apostate, twisted to work the will of the Mansus. You are fragile and weak, but you rend cultists (only) apart on each attack. Follow your Master's orders!"
+ theme = THEME_HERETIC
+
+/mob/living/basic/construct/harvester/heretic/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_MANSUS_TOUCHED, REF(src))
+ add_filter("rusted_harvester", 3, list("type" = "outline", "color" = COLOR_GREEN, "size" = 2, "alpha" = 40))
+
+
+/**
+ * Somewhat janky proc called when a heretic monster's master dies
+ * Used to kill any living Rusted Harvester
+ */
+/mob/living/proc/on_master_death()
+ return
+
+/mob/living/basic/construct/harvester/heretic/attack_animal(mob/living/simple_animal/user, list/modifiers)
+ // They're pretty fragile so this is probably necessary to prevent bullshit deaths.
+ if(user == src)
+ return
+ return ..()
+
+/mob/living/basic/construct/harvester/heretic/on_master_death()
+ to_chat(src, span_userdanger("Your link to the mansus suddenly snaps as your master perishes! Without its support, your body crumbles..."))
+ visible_message(span_alert("[src] suddenly crumbles to dust!"))
+ death()
+
+/mob/living/basic/construct/harvester/heretic/grant_abilities()
+ AddElement(/datum/element/wall_walker, or_trait = TRAIT_RUSTY)
+ AddElement(/datum/element/leeching_walk)
+ AddComponent(\
+ /datum/component/amputating_limbs,\
+ surgery_time = 1.5 SECONDS,\
+ surgery_verb = "slicing",\
+ minimum_stat = CONSCIOUS,\
+ pre_hit_callback = CALLBACK(src, PROC_REF(is_cultist_handler)),\
+ )
+ AddComponent(/datum/component/damage_aura,\
+ range = 3,\
+ brute_damage = 0.5,\
+ burn_damage = 0.5,\
+ toxin_damage = 0.5,\
+ stamina_damage = 4,\
+ simple_damage = 1.5,\
+ immune_factions = list(FACTION_HERETIC),\
+ damage_message = span_boldwarning("Your body wilts and withers as it comes near [src]'s aura."),\
+ message_probability = 7,\
+ current_owner = src,\
+ )
+ var/datum/action/innate/seek_master/heretic/seek = new(src)
+ seek.Grant(src)
+ seek.Activate()
+
+// These aren't friends they're assholes
+// Don't let them be near you!
+/mob/living/basic/construct/harvester/heretic/Life(seconds_per_tick, times_fired)
+ . = ..()
+ if(!SPT_PROB(7, seconds_per_tick))
+ return
+
+ var/turf/adjacent = get_step(src, pick(GLOB.alldirs))
+ // 90% chance to be directional, otherwise what we're on top of
+ var/turf/open/land = (isopenturf(adjacent) && prob(90)) ? adjacent : get_turf(src)
+ do_rust_heretic_act(land)
+
+ if(prob(7))
+ to_chat(src, span_notice("Eldritch energies emanate from your body."))
+
+/mob/living/basic/construct/harvester/heretic/proc/is_cultist_handler(mob/victim)
+ return IS_CULTIST(victim)
+
+/datum/action/innate/seek_master/heretic
+ name = "Seek your Master"
+ desc = "Use your direct link to the Mansus to sense where your master is located via the arrow on the top-right of your HUD."
+ button_icon = 'icons/mob/actions/actions_cult.dmi'
+ background_icon_state = "bg_heretic"
+ overlay_icon_state = "bg_heretic_border"
+ tracking = TRUE
+
+/datum/action/innate/seek_master/heretic/New(Target)
+ . = ..()
+ the_construct = Target
+ the_construct.seeking = TRUE
+ var/datum/antagonist/heretic_monster/antag = IS_HERETIC_MONSTER(the_construct)
+ if(antag)
+ the_construct.master = antag.master
+
+// no real reason for most of this weird oldcode
+/datum/action/innate/seek_master/Activate()
+ return
diff --git a/code/modules/mob/living/basic/farm_animals/gorilla/gorilla.dm b/code/modules/mob/living/basic/farm_animals/gorilla/gorilla.dm
index ce363af236465..d1b1aebf9eb00 100644
--- a/code/modules/mob/living/basic/farm_animals/gorilla/gorilla.dm
+++ b/code/modules/mob/living/basic/farm_animals/gorilla/gorilla.dm
@@ -60,8 +60,8 @@
AddElement(/datum/element/dextrous)
AddElement(/datum/element/footstep, FOOTSTEP_MOB_BAREFOOT)
AddElement(/datum/element/basic_eating, heal_amt = 10, food_types = gorilla_food)
- AddElement(
- /datum/element/amputating_limbs, \
+ AddComponent(
+ /datum/component/amputating_limbs, \
surgery_time = 0 SECONDS, \
surgery_verb = "punches",\
)
diff --git a/code/modules/mob/living/basic/farm_animals/sheep.dm b/code/modules/mob/living/basic/farm_animals/sheep.dm
index 2fdaeda657d5c..5617da83a53a5 100644
--- a/code/modules/mob/living/basic/farm_animals/sheep.dm
+++ b/code/modules/mob/living/basic/farm_animals/sheep.dm
@@ -59,7 +59,7 @@
if(cult_converted)
for(var/mob/living/cultist as anything in invokers)
to_chat(cultist, span_cult_italic("[src] has already been sacrificed!"))
- return STOP_SACRIFICE
+ return STOP_SACRIFICE|SILENCE_SACRIFICE_MESSAGE
for(var/mob/living/cultist as anything in invokers)
to_chat(cultist, span_cult_italic("This feels a bit too cliché, don't you think?"))
diff --git a/code/modules/mob/living/basic/guardian/guardian_types/support.dm b/code/modules/mob/living/basic/guardian/guardian_types/support.dm
index 3b5574db7f37a..8ab24b7e9b7d1 100644
--- a/code/modules/mob/living/basic/guardian/guardian_types/support.dm
+++ b/code/modules/mob/living/basic/guardian/guardian_types/support.dm
@@ -103,10 +103,12 @@
/// Try and teleport something to our beacon
/datum/action/cooldown/mob_cooldown/guardian_bluespace_beacon/proc/try_teleporting(mob/living/source, atom/target)
SIGNAL_HANDLER
+
if (!can_teleport(source, target))
return
+
INVOKE_ASYNC(src, PROC_REF(perform_teleport), source, target)
- return COMPONENT_CANCEL_ATTACK_CHAIN
+ return COMSIG_MOB_CANCEL_CLICKON
/// Validate whether we can teleport this object
/datum/action/cooldown/mob_cooldown/guardian_bluespace_beacon/proc/can_teleport(mob/living/source, atom/movable/target)
@@ -118,7 +120,7 @@
if (!guardian_mob.is_deployed())
source.balloon_alert(source, "manifest yourself!")
return FALSE
- if (!source.Adjacent(target))
+ if (!source.can_perform_action(target))
target.balloon_alert(source, "too far!")
return FALSE
if (target.anchored)
diff --git a/code/modules/mob/living/basic/heretic/flesh_worm.dm b/code/modules/mob/living/basic/heretic/flesh_worm.dm
index 3c60a9b653c32..92b910c717fae 100644
--- a/code/modules/mob/living/basic/heretic/flesh_worm.dm
+++ b/code/modules/mob/living/basic/heretic/flesh_worm.dm
@@ -35,8 +35,8 @@
/mob/living/basic/heretic_summon/armsy/Initialize(mapload, spawn_bodyparts = TRUE, worm_length = 6)
. = ..()
AddElement(/datum/element/wall_smasher, ENVIRONMENT_SMASH_RWALLS)
- AddElement(\
- /datum/element/amputating_limbs,\
+ AddComponent(\
+ /datum/component/amputating_limbs,\
surgery_time = 0 SECONDS,\
surgery_verb = "tears",\
minimum_stat = CONSCIOUS,\
diff --git a/code/modules/mob/living/basic/heretic/rust_walker.dm b/code/modules/mob/living/basic/heretic/rust_walker.dm
index 24b77d4d0b8e0..230747efa5a3b 100644
--- a/code/modules/mob/living/basic/heretic/rust_walker.dm
+++ b/code/modules/mob/living/basic/heretic/rust_walker.dm
@@ -19,7 +19,7 @@
AddElement(/datum/element/footstep, FOOTSTEP_MOB_RUST)
var/static/list/grantable_spells = list(
- /datum/action/cooldown/spell/aoe/rust_conversion/small = BB_GENERIC_ACTION,
+ /datum/action/cooldown/spell/aoe/rust_conversion = BB_GENERIC_ACTION,
/datum/action/cooldown/spell/basic_projectile/rust_wave/short = BB_TARGETED_ACTION,
)
grant_actions_by_list(grantable_spells)
diff --git a/code/modules/mob/living/basic/jungle/seedling/seedling.dm b/code/modules/mob/living/basic/jungle/seedling/seedling.dm
index 5a958d3ca7c18..7a853b8a9d086 100644
--- a/code/modules/mob/living/basic/jungle/seedling/seedling.dm
+++ b/code/modules/mob/living/basic/jungle/seedling/seedling.dm
@@ -30,6 +30,7 @@
lighting_cutoff_green = 20
lighting_cutoff_blue = 25
mob_size = MOB_SIZE_LARGE
+ faction = list(FACTION_PLANTS)
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
ai_controller = /datum/ai_controller/basic_controller/seedling
@@ -206,7 +207,7 @@
/mob/living/basic/seedling/meanie
maxHealth = 400
health = 400
- faction = list(FACTION_JUNGLE)
+ faction = list(FACTION_JUNGLE, FACTION_PLANTS)
ai_controller = /datum/ai_controller/basic_controller/seedling/meanie
seedling_commands = list(
/datum/pet_command/idle,
diff --git a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
index 030ae6d64b837..ba6346ea19159 100644
--- a/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
+++ b/code/modules/mob/living/basic/lavaland/goliath/tentacle.dm
@@ -20,7 +20,7 @@
if (ismineralturf(loc))
var/turf/closed/mineral/floor = loc
floor.gets_drilled()
- if (!isopenturf(loc) || isspaceturf(loc) || isopenspaceturf(loc))
+ if (!isopenturf(loc) || is_space_or_openspace(loc))
return INITIALIZE_HINT_QDEL
for (var/obj/effect/goliath_tentacle/tentacle in loc)
if (tentacle != src)
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
index ccab4d3c0317e..ad10e30acecd7 100644
--- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
+++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
@@ -43,8 +43,8 @@
AddElement(/datum/element/mob_grabber)
AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
AddElement(/datum/element/basic_eating, food_types = target_foods)
- AddElement(\
- /datum/element/amputating_limbs,\
+ AddComponent(\
+ /datum/component/amputating_limbs,\
surgery_verb = "begins snipping",\
target_zones = GLOB.arm_zones,\
)
diff --git a/code/modules/mob/living/basic/lavaland/mining.dm b/code/modules/mob/living/basic/lavaland/mining.dm
index 3bcdd1ceaa64b..38591dfb39c06 100644
--- a/code/modules/mob/living/basic/lavaland/mining.dm
+++ b/code/modules/mob/living/basic/lavaland/mining.dm
@@ -5,7 +5,7 @@
status_flags = NONE //don't inherit standard basicmob flags
mob_size = MOB_SIZE_LARGE
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- faction = list(FACTION_MINING)
+ faction = list(FACTION_MINING, FACTION_ASHWALKER)
unsuitable_atmos_damage = 0
minimum_survivable_temperature = 0
maximum_survivable_temperature = INFINITY
@@ -42,3 +42,11 @@
drop_mod = crusher_drop_chance,\
drop_immediately = basic_mob_flags & DEL_ON_DEATH,\
)
+ RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(check_ashwalker_peace_violation))
+
+/mob/living/basic/mining/proc/check_ashwalker_peace_violation(datum/source, mob/living/carbon/human/possible_ashwalker)
+ SIGNAL_HANDLER
+
+ if(!isashwalker(possible_ashwalker) || !(FACTION_ASHWALKER in faction))
+ return
+ faction.Remove(FACTION_ASHWALKER)
diff --git a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
index 8cd3c567a7d2d..784f5dd369907 100644
--- a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
+++ b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
@@ -309,4 +309,8 @@ GLOBAL_LIST_EMPTY(raptor_population)
animated = FALSE
insert_on_attack = FALSE
+/datum/storage/raptor_storage/on_mousedropped_onto(datum/source, obj/item/dropping, mob/user)
+ ..()
+ return NONE
+
#undef HAPPINESS_BOOST_DAMPENER
diff --git a/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm b/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm
index 541a4ed9e1c7e..a61ea0743f9a4 100644
--- a/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm
+++ b/code/modules/mob/living/basic/lavaland/watcher/watcher_overwatch.dm
@@ -76,7 +76,7 @@
COMSIG_MOB_ITEM_ATTACK,
COMSIG_MOB_THROW,
COMSIG_MOB_USED_MECH_EQUIPMENT,
- COMSIG_MOB_USED_MECH_MELEE,
+ COMSIG_MOB_USED_CLICK_MECH_MELEE,
COMSIG_MOVABLE_MOVED,
)
diff --git a/code/modules/mob/living/basic/pets/parrot/parrot_ai/parrot_hoarding.dm b/code/modules/mob/living/basic/pets/parrot/parrot_ai/parrot_hoarding.dm
index 7484cbfe6751c..ad9a56b3acfdd 100644
--- a/code/modules/mob/living/basic/pets/parrot/parrot_ai/parrot_hoarding.dm
+++ b/code/modules/mob/living/basic/pets/parrot/parrot_ai/parrot_hoarding.dm
@@ -29,7 +29,7 @@
/datum/ai_behavior/find_and_set/hoard_location/search_tactic(datum/ai_controller/controller, locate_path, search_range)
for(var/turf/open/candidate in oview(search_range, controller.pawn))
- if(isspaceturf(candidate) || isopenspaceturf(candidate))
+ if(is_space_or_openspace(candidate))
continue
if(candidate.is_blocked_turf(source_atom = controller.pawn))
continue
diff --git a/code/modules/mob/living/basic/ruin_defender/living_floor.dm b/code/modules/mob/living/basic/ruin_defender/living_floor.dm
index 851a0873657a0..105838f0c55dd 100644
--- a/code/modules/mob/living/basic/ruin_defender/living_floor.dm
+++ b/code/modules/mob/living/basic/ruin_defender/living_floor.dm
@@ -35,7 +35,7 @@
move_resist = INFINITY
density = FALSE
combat_mode = TRUE
- layer = TURF_LAYER
+ layer = LOW_FLOOR_LAYER
plane = FLOOR_PLANE
faction = list(FACTION_HOSTILE)
melee_damage_lower = 20
diff --git a/code/modules/mob/living/basic/slime/defense.dm b/code/modules/mob/living/basic/slime/defense.dm
index b747c24201971..a3242525170c7 100644
--- a/code/modules/mob/living/basic/slime/defense.dm
+++ b/code/modules/mob/living/basic/slime/defense.dm
@@ -19,7 +19,7 @@
return
attacker.visible_message(span_warning("[attacker] manages to wrestle \the [defender_slime.name] off!"), span_notice("You manage to wrestle \the [defender_slime.name] off!"))
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+ playsound(loc, 'sound/weapons/shove.ogg', 50, TRUE, -1)
defender_slime.discipline_slime()
diff --git a/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm b/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm
index 44775ea7217ce..0318b044a21ce 100644
--- a/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm
+++ b/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm
@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(meteor_eyeballs)
desc = "An eyeball growing out of the ground, gross."
icon_state = "eyeball"
max_integrity = 15
- layer = LOW_OBJ_LAYER
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
/obj/structure/meateor_fluff/eyeball/Initialize(mapload)
diff --git a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm
index 4ba903d99285f..a154ba9da0c65 100644
--- a/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm
+++ b/code/modules/mob/living/basic/space_fauna/revenant/_revenant.dm
@@ -150,6 +150,10 @@
update_appearance(UPDATE_ICON)
update_health_hud()
+/mob/living/basic/revenant/AltClickOn(atom/target)
+ if(CAN_I_SEE(target))
+ client.loot_panel.open(get_turf(target))
+
/mob/living/basic/revenant/get_status_tab_items()
. = ..()
. += "Current Essence: [essence >= max_essence ? essence : "[essence] / [max_essence]"] E"
diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm
index 3cce5e3481784..724833af16f2a 100644
--- a/code/modules/mob/living/basic/vermin/mouse.dm
+++ b/code/modules/mob/living/basic/vermin/mouse.dm
@@ -117,11 +117,19 @@
. = ..(TRUE)
// Now if we were't ACTUALLY gibbed, spawn the dead mouse
if(!gibbed)
- var/obj/item/food/deadmouse/mouse = new(loc)
- mouse.copy_corpse(src)
- if(HAS_TRAIT(src, TRAIT_BEING_SHOCKED))
- mouse.desc = "They're toast."
- mouse.add_atom_colour("#3A3A3A", FIXED_COLOUR_PRIORITY)
+ var/make_a_corpse = TRUE
+ var/place_to_make_corpse = loc
+ if(istype(loc, /obj/item/clothing/head/mob_holder))//If our mouse is dying in place holder we want to put the dead mouse where the place holder was
+ var/obj/item/clothing/head/mob_holder/found_holder = loc
+ place_to_make_corpse = found_holder.loc
+ if(istype(found_holder.loc, /obj/machinery/microwave))//Microwaves gib things that die when cooked, so we don't need to make a dead body too
+ make_a_corpse = FALSE
+ if(make_a_corpse)
+ var/obj/item/food/deadmouse/mouse = new(place_to_make_corpse)
+ mouse.copy_corpse(src)
+ if(HAS_TRAIT(src, TRAIT_BEING_SHOCKED))
+ mouse.desc = "They're toast."
+ mouse.add_atom_colour("#3A3A3A", FIXED_COLOUR_PRIORITY)
qdel(src)
/mob/living/basic/mouse/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 349f14d83a3cb..5ac120fcee3f3 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -25,42 +25,12 @@
adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR * seconds_per_tick)
blood_volume = min(blood_volume + (BLOOD_REGEN_FACTOR * nutrition_ratio * seconds_per_tick), BLOOD_VOLUME_NORMAL)
- //Effects of bloodloss
- if(!(sigreturn & HANDLE_BLOOD_NO_EFFECTS))
- var/word = pick("dizzy","woozy","faint")
- switch(blood_volume)
- if(BLOOD_VOLUME_MAX_LETHAL to INFINITY)
- if(SPT_PROB(7.5, seconds_per_tick))
- to_chat(src, span_userdanger("Blood starts to tear your skin apart. You're going to burst!"))
- investigate_log("has been gibbed by having too much blood.", INVESTIGATE_DEATHS)
- inflate_gib()
- if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL)
- if(SPT_PROB(5, seconds_per_tick))
- to_chat(src, span_warning("You feel your skin swelling."))
- if(BLOOD_VOLUME_MAXIMUM to BLOOD_VOLUME_EXCESS)
- if(SPT_PROB(5, seconds_per_tick))
- to_chat(src, span_warning("You feel terribly bloated."))
- if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
- if(SPT_PROB(2.5, seconds_per_tick))
- to_chat(src, span_warning("You feel [word]."))
- adjustOxyLoss(round(0.005 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1))
- if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
- adjustOxyLoss(round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume) * seconds_per_tick, 1))
- if(SPT_PROB(2.5, seconds_per_tick))
- set_eye_blur_if_lower(12 SECONDS)
- to_chat(src, span_warning("You feel very [word]."))
- if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
- adjustOxyLoss(2.5 * seconds_per_tick)
- if(SPT_PROB(7.5, seconds_per_tick))
- Unconscious(rand(20,60))
- to_chat(src, span_warning("You feel extremely [word]."))
- if(-INFINITY to BLOOD_VOLUME_SURVIVE)
- if(!HAS_TRAIT(src, TRAIT_NODEATH))
- investigate_log("has died of bloodloss.", INVESTIGATE_DEATHS)
- death()
+ // Some effects are halved mid-combat.
+ var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0
+
+ //Bloodloss from wounds
var/temp_bleed = 0
- //Bleeding out
for(var/obj/item/bodypart/iter_part as anything in bodyparts)
var/iter_bleed_rate = iter_part.get_modified_bleed_rate()
temp_bleed += iter_bleed_rate * seconds_per_tick
@@ -72,6 +42,78 @@
bleed(temp_bleed)
bleed_warn(temp_bleed)
+ //Effects of bloodloss
+ if(sigreturn & HANDLE_BLOOD_NO_OXYLOSS)
+ return
+ var/word = pick("dizzy","woozy","faint")
+ switch(blood_volume)
+ if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL)
+ if(SPT_PROB(7.5, seconds_per_tick))
+ to_chat(src, span_userdanger("Blood starts to tear your skin apart. You're going to burst!"))
+ investigate_log("has been gibbed by having too much blood.", INVESTIGATE_DEATHS)
+ inflate_gib()
+ // Way too much blood!
+ if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL)
+ if(SPT_PROB(5, seconds_per_tick))
+ to_chat(src, span_warning("You feel your skin swelling."))
+ // Too much blood
+ if(BLOOD_VOLUME_MAXIMUM to BLOOD_VOLUME_EXCESS)
+ if(SPT_PROB(5, seconds_per_tick))
+ to_chat(src, span_warning("You feel terribly bloated."))
+ // Low blood but not a big deal in the immediate
+ if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
+ if(SPT_PROB(2.5, seconds_per_tick))
+ set_eye_blur_if_lower(2 SECONDS * determined_mod)
+ if(prob(50))
+ to_chat(src, span_danger("You feel [word]. It's getting a bit hard to breathe."))
+ losebreath += 0.5 * determined_mod * seconds_per_tick
+ else if(getStaminaLoss() < 25 * determined_mod)
+ to_chat(src, span_danger("You feel [word]. It's getting a bit hard to focus."))
+ adjustStaminaLoss(10 * determined_mod * REM * seconds_per_tick)
+ // Pretty low blood, getting dangerous!
+ if(BLOOD_VOLUME_RISKY to BLOOD_VOLUME_OKAY)
+ if(SPT_PROB(5, seconds_per_tick))
+ set_eye_blur_if_lower(2 SECONDS * determined_mod)
+ set_dizzy_if_lower(2 SECONDS * determined_mod)
+ if(prob(50))
+ to_chat(src, span_bolddanger("You feel very [word]. It's getting hard to breathe!"))
+ losebreath += 1 * determined_mod * seconds_per_tick
+ else if(getStaminaLoss() < 40 * determined_mod)
+ to_chat(src, span_bolddanger("You feel very [word]. It's getting hard to stay awake!"))
+ adjustStaminaLoss(15 * determined_mod * REM * seconds_per_tick)
+ // Very low blood, danger!!
+ if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_RISKY)
+ if(SPT_PROB(5, seconds_per_tick))
+ set_eye_blur_if_lower(4 SECONDS * determined_mod)
+ set_dizzy_if_lower(4 SECONDS * determined_mod)
+ if(prob(50))
+ to_chat(src, span_userdanger("You feel extremely [word]! It's getting very hard to breathe!"))
+ losebreath += 1.5 * determined_mod * seconds_per_tick
+ else if(getStaminaLoss() < 80 * determined_mod)
+ to_chat(src, span_userdanger("You feel extremely [word]! It's getting very hard to stay awake!"))
+ adjustStaminaLoss(20 * determined_mod * REM * seconds_per_tick)
+ // Critically low blood, death is near! Adrenaline won't help you here.
+ if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
+ if(SPT_PROB(7.5, seconds_per_tick))
+ Unconscious(rand(1 SECONDS, 2 SECONDS))
+ to_chat(src, span_userdanger("You black out for a moment!"))
+ // Instantly die upon this threshold
+ if(-INFINITY to BLOOD_VOLUME_SURVIVE)
+ if(!HAS_TRAIT(src, TRAIT_NODEATH))
+ investigate_log("has died of bloodloss.", INVESTIGATE_DEATHS)
+ death()
+
+ // Blood ratio! if you have 280 blood, this equals 0.5 as that's half of the current value, 560.
+ var/effective_blood_ratio = blood_volume / BLOOD_VOLUME_NORMAL
+
+ // If your ratio is less than one (you're missing any blood) and your oxyloss is under missing blood %, start getting oxy damage.
+ // This damage accrues faster the less blood you have.
+ // If KO or in hardcrit, the damage accrues even then to prevent being perma-KO.
+ if(((effective_blood_ratio < 1) && (getOxyLoss() < ((1 - effective_blood_ratio) * 100))) || (stat in list(UNCONSCIOUS, HARD_CRIT)))
+ // At roughly half blood this equals to 3 oxyloss per tick. At 90% blood it's close to 0.5
+ var/rounded_oxyloss = round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume), 0.25) * seconds_per_tick
+ adjustOxyLoss(rounded_oxyloss, updating_health = TRUE)
+
/// Has each bodypart update its bleed/wound overlay icon states
/mob/living/carbon/proc/update_bodypart_bleed_overlays()
for(var/obj/item/bodypart/iter_part as anything in bodyparts)
@@ -185,7 +227,7 @@
****************************************************/
//Gets blood from mob to a container or other mob, preserving all data in it.
-/mob/living/proc/transfer_blood_to(atom/movable/AM, amount, forced)
+/mob/living/proc/transfer_blood_to(atom/movable/AM, amount, forced, ignore_incompatibility)
if(!blood_volume || !AM.reagents)
return FALSE
if(blood_volume < BLOOD_VOLUME_BAD && !forced)
@@ -212,7 +254,7 @@
if((D.spread_flags & DISEASE_SPREAD_SPECIAL) || (D.spread_flags & DISEASE_SPREAD_NON_CONTAGIOUS))
continue
C.ForceContractDisease(D)
- if(!(blood_data["blood_type"] in get_safe_blood(C.dna.blood_type)))
+ if(!(blood_data["blood_type"] in get_safe_blood(C.dna.blood_type)) && !(ignore_incompatibility))
C.reagents.add_reagent(/datum/reagent/toxin, amount * 0.5)
return TRUE
@@ -307,6 +349,15 @@
if(safe)
. = safe
+/**
+ * Returns TRUE if src is compatible with donor's blood, otherwise FALSE.
+ * * donor: Carbon mob, the one that is donating blood.
+ */
+/mob/living/carbon/proc/get_blood_compatibility(mob/living/carbon/donor)
+ var/patient_blood_data = get_blood_data(get_blood_id())
+ var/donor_blood_data = donor.get_blood_data(donor.get_blood_id())
+ return donor_blood_data["blood_type"] in get_safe_blood(patient_blood_data["blood_type"])
+
//to add a splatter of blood or other mob liquid.
/mob/living/proc/add_splatter_floor(turf/T, small_drip)
if(get_blood_id() != /datum/reagent/blood)
diff --git a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
index f3cfbfda8a9ee..999ec07f41a65 100644
--- a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
@@ -251,7 +251,8 @@ Doesn't work on other aliens/AI.*/
plasma_cost = 50
/datum/action/cooldown/alien/acid/neurotoxin/IsAvailable(feedback = FALSE)
- if(owner.is_muzzled())
+ var/mob/living/carbon/as_carbon = owner
+ if(istype(as_carbon) && as_carbon.is_mouth_covered(ITEM_SLOT_MASK))
return FALSE
if(!isturf(owner.loc))
return FALSE
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index f8210c77368cc..a995eafbb3ac0 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -76,6 +76,7 @@
return pick (list("xltrails_1", "xltrails2"))
else
return pick (list("xttrails_1", "xttrails2"))
+
/*----------------------------------------
Proc: AddInfectionImages()
Des: Gives the client of the alien an image on each infected mob.
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index d068610b28f7a..d1ec6d7e88038 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -24,6 +24,7 @@
layer = MOB_LAYER
max_integrity = 100
item_flags = XENOMORPH_HOLDABLE
+ slowdown = 2
var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
var/sterile = FALSE
@@ -39,6 +40,7 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
AddElement(/datum/element/atmos_sensitive, mapload)
+ AddElement(/datum/element/muffles_speech)
RegisterSignal(src, COMSIG_LIVING_TRYING_TO_PULL, PROC_REF(react_to_mob))
@@ -122,7 +124,7 @@
/obj/item/clothing/mask/facehugger/proc/valid_to_attach(mob/living/hit_mob)
// valid targets: carbons except aliens and devils
- // facehugger state early exit checks
+ // facehugger state early exit checks (Note: Melbert does not want dead people to be huggable)
if(stat != CONSCIOUS)
return FALSE
if(attached)
@@ -171,9 +173,12 @@
log_combat(target, src, "was facehugged by")
return TRUE // time for a smoke
-/obj/item/clothing/mask/facehugger/proc/Attach(mob/living/M)
- if(!valid_to_attach(M))
+/obj/item/clothing/mask/facehugger/proc/Attach(mob/living/victim)
+ if(!valid_to_attach(victim))
return
+
+ if(victim.stat < UNCONSCIOUS) //sorry bro you gotta be awake
+ victim.say("AAAA!!") //triggers muffled speech and also visual feedback i guess
// early returns and validity checks done: attach.
attached++
//ensure we detach once we no longer need to be attached
@@ -181,12 +186,12 @@
if(!sterile)
- M.take_bodypart_damage(strength,0) //done here so that humans in helmets take damage
- M.Unconscious(MAX_IMPREGNATION_TIME/0.3) //something like 25 ticks = 20 seconds with the default settings
-
+ victim.take_bodypart_damage(strength,0) //done here so that humans in helmets take damage
+ if(real && !sterile)
+ victim.Knockdown(5 SECONDS)
GoIdle() //so it doesn't jump the people that tear it off
- addtimer(CALLBACK(src, PROC_REF(Impregnate), M), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME))
+ addtimer(CALLBACK(src, PROC_REF(Impregnate), victim), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME))
/obj/item/clothing/mask/facehugger/proc/detach()
attached = 0
@@ -249,6 +254,29 @@
visible_message(span_danger("[src] curls up into a ball!"))
+ // chest maybe because getting slammed in the chest would knock it off your face while dead
+ AddComponent(/datum/component/knockoff, knockoff_chance = 40, target_zones = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST), slots_knockoffable = slot_flags)
+
+/obj/item/clothing/mask/facehugger/allow_attack_hand_drop(mob/living/carbon/human/user)
+ if(!real || sterile || user.get_organ_by_type(/obj/item/organ/internal/body_egg/alien_embryo))
+ return ..()
+ if(istype(user) && ishuman(loc) && stat != DEAD)
+ if(user == loc && user.get_item_by_slot(slot_flags) == src)
+ to_chat(user, span_userdanger("[src] is latched on too tight! Get help or wait for it to let go!"))
+ return FALSE
+ return ..()
+
+/obj/item/clothing/mask/facehugger/mouse_drop_dragged(atom/over, mob/user, src_location, over_location, params)
+ var/mob/living/carbon/human/wearer = loc
+ if(!istype(wearer) || user != wearer)
+ return
+ if(!real || sterile || user.get_organ_by_type(/obj/item/organ/internal/body_egg/alien_embryo))
+ return ..()
+ if(wearer.get_item_by_slot(slot_flags) == src && stat != DEAD)
+ to_chat(user, span_userdanger("[src] is latched on too tight! Get help or wait for it to let go!"))
+ return
+ return ..()
+
/proc/CanHug(mob/living/M)
if(!istype(M))
return FALSE
@@ -268,6 +296,7 @@
name = "Lamarr"
desc = "The Research Director's pet, a domesticated and debeaked xenomorph facehugger. Friendly, but may still try to couple with your head."
sterile = TRUE
+ slowdown = 1.5 //lamarr is too fat after being fed in captivity to effectively slow people down or something
/obj/item/clothing/mask/facehugger/dead
icon_state = "facehugger_dead"
@@ -287,6 +316,7 @@
real = FALSE
sterile = TRUE
tint = 3 //Makes it feel more authentic when it latches on
+ slowdown = 0
/obj/item/clothing/mask/facehugger/toy/Die()
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 539dfd64ce353..8965bccd0007c 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -6,6 +6,7 @@
GLOB.carbon_list += src
ADD_TRAIT(src, TRAIT_CAN_HOLD_ITEMS, INNATE_TRAIT) // Carbons are assumed to be innately capable of having arms, we check their arms count instead
+ breathing_loop = new(src)
/mob/living/carbon/Destroy()
//This must be done first, so the mob ghosts correctly before DNA etc is nulled
@@ -21,6 +22,7 @@
qdel(scar)
remove_from_all_data_huds()
QDEL_NULL(dna)
+ QDEL_NULL(breathing_loop)
GLOB.carbon_list -= src
/mob/living/carbon/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
@@ -228,13 +230,6 @@
. = ..()
loc.handle_fall(src)//it's loc so it doesn't call the mob's handle_fall which does nothing
-/mob/living/carbon/is_muzzled()
- for (var/obj/item/clothing/clothing in get_equipped_items())
- if(clothing.clothing_flags & BLOCKS_SPEECH)
- return TRUE
- return FALSE
-
-
/mob/living/carbon/resist_buckle()
if(!HAS_TRAIT(src, TRAIT_RESTRAINED))
buckled.user_unbuckle_mob(src, src)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 20164d27b425a..8ef981b189da4 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -415,7 +415,7 @@
// this way, we only visibly try to examine ourselves if we have something embedded, otherwise we'll still hug ourselves :)
visible_message(span_notice("[src] examines [p_them()]self."), \
span_notice("You check yourself for shrapnel."))
- if(I.isEmbedHarmless())
+ if(I.is_embed_harmless())
to_chat(src, "\t There is \a [I] stuck to your [LB.name]!")
else
to_chat(src, "\t There is \a [I] embedded in your [LB.name]!")
@@ -696,7 +696,9 @@
/mob/living/carbon/get_shove_flags(mob/living/shover, obj/item/weapon)
. = ..()
. |= SHOVE_CAN_STAGGER
- if(IsKnockdown() && !IsParalyzed())
+ if(IsKnockdown() && !IsParalyzed() && HAS_TRAIT(src, TRAIT_STUN_ON_NEXT_SHOVE))
. |= SHOVE_CAN_KICK_SIDE
+ if(HAS_TRAIT(src, TRAIT_NO_SIDE_KICK)) // added as an extra check, just in case
+ . &= ~SHOVE_CAN_KICK_SIDE
#undef SHAKE_ANIMATION_OFFSET
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 85fdeed5d887a..dbfa3849b25ad 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -11,6 +11,7 @@
usable_hands = 0 //Populated on init through list/bodyparts
mobility_flags = MOBILITY_FLAGS_CARBON_DEFAULT
blocks_emissive = EMISSIVE_BLOCK_NONE
+ living_flags = ALWAYS_DEATHGASP
///List of [/obj/item/organ]s in the mob. They don't go in the contents for some reason I don't want to know.
var/list/obj/item/organ/organs = list()
///Same as [above][/mob/living/carbon/var/organs], but stores "slot ID" - "organ" pairs for easy access.
@@ -52,6 +53,8 @@
///This is used to determine if the mob failed a breath. If they did fail a breath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
var/failed_last_breath = FALSE
+ ///Sound loop for breathing when using internals
+ var/datum/looping_sound/breathing/breathing_loop
/// Used in [carbon/proc/check_breath] and [lungs/proc/check_breath]]
var/co2overloadtime = null
@@ -122,4 +125,3 @@
var/bodyshape = BODYSHAPE_HUMANOID
COOLDOWN_DECLARE(bleeding_message_cd)
-
diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index 41a958518c597..8d4e66bccda6e 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -3,9 +3,8 @@
return
losebreath = 0
-
+ breathing_loop.stop() //This would've happened eventually but it's nice to make it stop immediatelly in this case
if(!gibbed)
- INVOKE_ASYNC(src, PROC_REF(emote), "deathgasp")
add_memory_in_range(src, 7, /datum/memory/witnessed_death, protagonist = src)
reagents.end_metabolization(src)
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 856622203927a..00699196ae9b6 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -20,7 +20,6 @@
key = "clap"
key_third_person = "claps"
message = "claps."
- muzzle_ignore = TRUE
hands_use_check = TRUE
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
audio_cooldown = 5 SECONDS
@@ -185,7 +184,6 @@
message_param = "snaps their fingers at %t."
emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
hands_use_check = TRUE
- muzzle_ignore = TRUE
/datum/emote/living/carbon/snap/get_sound(mob/living/user)
if(ishuman(user))
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index e37048ca32fee..6d6d7ada73ceb 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -36,7 +36,7 @@
var/list/msg = list("")
for(var/obj/item/bodypart/bodypart as anything in bodyparts)
for(var/obj/item/embedded_item as anything in bodypart.embedded_objects)
- if(embedded_item.isEmbedHarmless())
+ if(embedded_item.is_embed_harmless())
msg += "[t_He] [t_has] [icon2html(embedded_item, user)] \a [embedded_item] stuck to [t_his] [bodypart.name]!\n"
else
msg += "[t_He] [t_has] [icon2html(embedded_item, user)] \a [embedded_item] embedded in [t_his] [bodypart.name]!\n"
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index 277c6916ae243..cf9b765aa90c2 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
///Replaces default appendix with a different organ.
var/obj/item/organ/internal/appendix/mutantappendix = /obj/item/organ/internal/appendix
///Replaces default butt with a different organ
- var/obj/item/organ/internal/butt/mutantbutt = /obj/item/organ/internal/butt // massmeta edit
+ var/obj/item/organ/internal/butt/mutantbutt = /obj/item/organ/internal/butt //MASSMETA EDIT ADDITION (butts)
/// Store body marking defines. See mobs.dm for bitflags
var/list/body_markings = list()
@@ -284,8 +284,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
return mutantliver
if(ORGAN_SLOT_STOMACH)
return mutantstomach
- if(ORGAN_SLOT_BUTT) //massmeta edit
+ //MASSMETA EDIT ADDITION BEGIN (butts)
+ if(ORGAN_SLOT_BUTT)
return mutantbutt
+ //MASSMETA EDIT ADDITION END (butts)
else
CRASH("Invalid organ slot [slot]")
@@ -314,7 +316,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
ORGAN_SLOT_TONGUE,
ORGAN_SLOT_LIVER,
ORGAN_SLOT_STOMACH,
- ORGAN_SLOT_BUTT, //massmeta edit
+ ORGAN_SLOT_BUTT, //MASSMETA EDIT ADDITION (butts)
)
for(var/slot in organ_slots)
@@ -1546,7 +1548,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
to_store += mutantliver
to_store += mutantstomach
to_store += mutantappendix
- to_store += mutantbutt //massmeta edit
+ to_store += mutantbutt //MASSMETA EDIT ADDITION (butts)
//We don't cache mutant hands because it's not constrained enough, too high a potential for failure
return to_store
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index 3340e34064052..f13e90719c1dc 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -76,7 +76,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
cut_overlays(TRUE)
/mob/living/carbon/human/dummy/setup_human_dna()
- randomize_human(src, randomize_mutations = FALSE)
+ randomize_human_normie(src, randomize_mutations = FALSE)
/mob/living/carbon/human/dummy/log_mob_tag(text)
return
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 4fe60084c0e93..0c50e881635f6 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -138,7 +138,7 @@
disabled += body_part
missing -= body_part.body_zone
for(var/obj/item/I in body_part.embedded_objects)
- if(I.isEmbedHarmless())
+ if(I.is_embed_harmless())
msg += "[t_He] [t_has] [icon2html(I, user)] \a [I] stuck to [t_his] [body_part.name]!\n"
else
msg += "[t_He] [t_has] [icon2html(I, user)] \a [I] embedded in [t_his] [body_part.name]!\n"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 9d3d8c2d5a81b..1dd47f8060426 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -56,7 +56,7 @@
ADD_TRAIT(src, TRAIT_AGEUSIA, NO_TONGUE_TRAIT)
/mob/living/carbon/human/proc/setup_human_dna()
- randomize_human(src, randomize_mutations = TRUE)
+ randomize_human_normie(src, randomize_mutations = TRUE)
/mob/living/carbon/human/Destroy()
QDEL_NULL(physiology)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index f11ba74e04d1c..380d255fc0ed4 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -151,8 +151,10 @@
return
if(!(shove_flags & SHOVE_KNOCKDOWN_BLOCKED))
target.Knockdown(SHOVE_KNOCKDOWN_HUMAN)
+ target.apply_status_effect(/datum/status_effect/next_shove_stuns)
if(!HAS_TRAIT(src, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED))
Knockdown(SHOVE_KNOCKDOWN_COLLATERAL)
+ apply_status_effect(/datum/status_effect/next_shove_stuns)
target.visible_message(span_danger("[shover] shoves [target.name] into [name]!"),
span_userdanger("You're shoved into [name] by [shover]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, src)
to_chat(src, span_danger("You shove [target.name] into [name]!"))
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 14003b86da496..fda6d7a9142ea 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -26,8 +26,9 @@
/mob/living/carbon/human/Move(NewLoc, direct)
. = ..()
- if(shoes && body_position == STANDING_UP && loc == NewLoc && has_gravity(loc))
- SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION)
+ if(shoes && body_position == STANDING_UP && has_gravity(loc))
+ if((. && !moving_diagonally) || (!. && moving_diagonally == SECOND_DIAG_STEP))
+ SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION)
/mob/living/carbon/human/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
if(movement_type & FLYING || HAS_TRAIT(src, TRAIT_FREE_FLOAT_MOVEMENT))
diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm
index 8bf21e3c809a6..0ce34ffa27205 100644
--- a/code/modules/mob/living/carbon/human/human_say.dm
+++ b/code/modules/mob/living/carbon/human/human_say.dm
@@ -70,6 +70,9 @@
var/obj/item/radio/headset/dongle = ears
if(!istype(dongle))
return FALSE
+ var/area/our_area = get_area(src)
+ if(our_area.area_flags & BINARY_JAMMING)
+ return FALSE
return dongle.translate_binary
/mob/living/carbon/human/radio(message, list/message_mods = list(), list/spans, language) //Poly has a copy of this, lazy bastard
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index b1efa734321c5..a24e9cd070d86 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -1,3 +1,20 @@
+
+/**
+ * Used to return a list of equipped items on a human mob; does not by default include held items, see include_flags
+ *
+ * Argument(s):
+ * * Optional - include_flags, (see obj.flags.dm) describes which optional things to include or not (pockets, accessories, held items)
+ */
+
+/mob/living/carbon/human/get_equipped_items(include_flags = NONE)
+ var/list/items = ..()
+ if(!(include_flags & INCLUDE_POCKETS))
+ items -= list(l_store, r_store, s_store)
+ if((include_flags & INCLUDE_ACCESSORIES) && w_uniform)
+ var/obj/item/clothing/under/worn_under = w_uniform
+ items += worn_under.attached_accessories
+ return items
+
/mob/living/carbon/human/can_equip(obj/item/equip_target, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE, ignore_equipped = FALSE, indirect_action = FALSE)
if(SEND_SIGNAL(src, COMSIG_HUMAN_EQUIPPING_ITEM, equip_target, slot) == COMPONENT_BLOCK_EQUIP)
return FALSE
@@ -139,8 +156,6 @@
if(glasses)
return
glasses = equipping
- if(glasses.glass_colour_type)
- update_glasses_color(glasses, 1)
if(glasses.vision_flags || glasses.invis_override || glasses.invis_view || !isnull(glasses.lighting_cutoff))
update_sight()
update_worn_glasses()
@@ -233,10 +248,8 @@
update_worn_gloves()
else if(I == glasses)
glasses = null
- var/obj/item/clothing/glasses/G = I
- if(G.glass_colour_type)
- update_glasses_color(G, 0)
- if(G.vision_flags || G.invis_override || G.invis_view || !isnull(G.lighting_cutoff))
+ var/obj/item/clothing/glasses/old_glasses = I
+ if(old_glasses.vision_flags || old_glasses.invis_override || old_glasses.invis_view || !isnull(old_glasses.lighting_cutoff))
update_sight()
if(!QDELETED(src))
update_worn_glasses()
@@ -390,3 +403,24 @@
return
stored.attack_hand(src) // take out thing from item in storage slot
return
+
+/mob/living/carbon/human/change_number_of_hands(amt)
+ var/old_limbs = held_items.len
+ if(amt < old_limbs)
+ for(var/i in hand_bodyparts.len to amt step -1)
+ var/obj/item/bodypart/BP = hand_bodyparts[i]
+ BP.dismember()
+ hand_bodyparts[i] = null
+ hand_bodyparts.len = amt
+ else if(amt > old_limbs)
+ hand_bodyparts.len = amt
+ for(var/i in old_limbs+1 to amt)
+ var/path = /obj/item/bodypart/arm/left
+ if(!(i % 2))
+ path = /obj/item/bodypart/arm/right
+
+ var/obj/item/bodypart/BP = new path ()
+ BP.held_index = i
+ BP.try_attach_limb(src, TRUE)
+ hand_bodyparts[i] = BP
+ ..() //Don't redraw hands until we have organs for them
diff --git a/code/modules/mob/living/carbon/human/species_types/android.dm b/code/modules/mob/living/carbon/human/species_types/android.dm
index 8be379060e7f8..d0e5fcb22ca35 100644
--- a/code/modules/mob/living/carbon/human/species_types/android.dm
+++ b/code/modules/mob/living/carbon/human/species_types/android.dm
@@ -35,7 +35,7 @@
mutantlungs = null
mutanteyes = /obj/item/organ/internal/eyes/robotic
mutantears = /obj/item/organ/internal/ears/cybernetic
- mutantbutt = /obj/item/organ/internal/butt/cyber //massmeta edit
+ mutantbutt = /obj/item/organ/internal/butt/cyber //MASSMETA EDIT ADDITION (butts)
species_language_holder = /datum/language_holder/synthetic
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index c4aad8a0806d5..276d4a0fa7a5f 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -83,7 +83,7 @@
Cannibalize_Body(slime)
regenerate_limbs?.build_all_button_icons(UPDATE_BUTTON_STATUS)
- return HANDLE_BLOOD_NO_NUTRITION_DRAIN|HANDLE_BLOOD_NO_EFFECTS
+ return HANDLE_BLOOD_NO_NUTRITION_DRAIN|HANDLE_BLOOD_NO_OXYLOSS
/datum/species/jelly/proc/Cannibalize_Body(mob/living/carbon/human/H)
var/list/limbs_to_consume = list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) - H.get_missing_limbs()
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 71a5c4c026193..2a83efbda3e7e 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -158,6 +158,7 @@ Lizard subspecies: ASHWALKERS
TRAIT_MUTANT_COLORS,
TRAIT_VIRUSIMMUNE,
)
+ inherent_factions = list(FACTION_ASHWALKER)
species_language_holder = /datum/language_holder/lizard/ash
digitigrade_customization = DIGITIGRADE_FORCED
examine_limb_id = SPECIES_LIZARD
diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm
index 053953e2a835f..741e40bed6b33 100644
--- a/code/modules/mob/living/carbon/human/species_types/snail.dm
+++ b/code/modules/mob/living/carbon/human/species_types/snail.dm
@@ -89,8 +89,7 @@
. = ..()
var/obj/item/storage/backpack/bag = new_snailperson.get_item_by_slot(ITEM_SLOT_BACK)
if(!istype(bag, /obj/item/storage/backpack/snail))
- if(new_snailperson.dropItemToGround(bag)) //returns TRUE even if its null
- new_snailperson.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(new_snailperson), ITEM_SLOT_BACK)
+ new_snailperson.equip_to_slot_or_del(new /obj/item/storage/backpack/snail(new_snailperson), ITEM_SLOT_BACK)
new_snailperson.AddElement(/datum/element/lube_walking, require_resting = TRUE)
new_snailperson.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/snail, multiplicative_slowdown = snail_speed_mod)
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index de6a2692c9b6f..e59a6328aa72e 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -1,3 +1,33 @@
+/mob/living/carbon/proc/check_obscured_slots(transparent_protection)
+ var/obscured = NONE
+ var/hidden_slots = NONE
+
+ for(var/obj/item/equipped_item in get_equipped_items())
+ hidden_slots |= equipped_item.flags_inv
+ if(transparent_protection)
+ hidden_slots |= equipped_item.transparent_protection
+
+ if(hidden_slots & HIDENECK)
+ obscured |= ITEM_SLOT_NECK
+ if(hidden_slots & HIDEMASK)
+ obscured |= ITEM_SLOT_MASK
+ if(hidden_slots & HIDEEYES)
+ obscured |= ITEM_SLOT_EYES
+ if(hidden_slots & HIDEEARS)
+ obscured |= ITEM_SLOT_EARS
+ if(hidden_slots & HIDEGLOVES)
+ obscured |= ITEM_SLOT_GLOVES
+ if(hidden_slots & HIDEJUMPSUIT)
+ obscured |= ITEM_SLOT_ICLOTHING
+ if(hidden_slots & HIDESHOES)
+ obscured |= ITEM_SLOT_FEET
+ if(hidden_slots & HIDESUITSTORAGE)
+ obscured |= ITEM_SLOT_SUITSTORE
+ if(hidden_slots & HIDEHEADGEAR)
+ obscured |= ITEM_SLOT_HEAD
+
+ return obscured
+
/mob/living/carbon/get_item_by_slot(slot_id)
switch(slot_id)
if(ITEM_SLOT_BACK)
@@ -280,6 +310,8 @@
internal = null
target_tank.after_internals_closed(src)
update_mob_action_buttons()
+ //To make sure it stops at a timely manner when you turn off internals
+ breathing_loop.stop()
return TRUE
/// Close the the currently open external (that's EX-ternal) air tank. Returns TRUE if successful.
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 7fb92c26e6183..01531b77d63a9 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -64,6 +64,7 @@
// Second link in a breath chain, calls [carbon/proc/check_breath()]
/mob/living/carbon/proc/breathe(seconds_per_tick, times_fired)
var/obj/item/organ/internal/lungs = get_organ_slot(ORGAN_SLOT_LUNGS)
+ var/is_on_internals = FALSE
if(SEND_SIGNAL(src, COMSIG_CARBON_ATTEMPT_BREATHE, seconds_per_tick, times_fired) & COMSIG_CARBON_BLOCK_BREATH)
return
@@ -108,15 +109,26 @@
breath = loc.remove_air(breath_moles)
else //Breathe from loc as obj again
+ is_on_internals = TRUE
+
if(isobj(loc))
var/obj/loc_as_obj = loc
loc_as_obj.handle_internal_lifeform(src,0)
- check_breath(breath)
+ if(check_breath(breath) && is_on_internals)
+ try_breathing_sound(breath)
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)
+ breathing_loop.start()
+ else if(!should_be_on && breathing_loop.timer_id)
+ 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/death.dm b/code/modules/mob/living/death.dm
index 53b08719f6a70..03a29762f6dc3 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -104,7 +104,7 @@
if(stat == DEAD)
return FALSE
- if(!gibbed && (death_sound || death_message))
+ if(!gibbed && (death_sound || death_message || (living_flags & ALWAYS_DEATHGASP)))
INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, emote), "deathgasp")
set_stat(DEAD)
@@ -116,8 +116,9 @@
var/player_mob_check = mind && mind.name && mind.active
// and, display a death message if the area allows it (or if they're in nullspace)
var/valid_area_check = !death_area || !(death_area.area_flags & NO_DEATH_MESSAGE)
- if(player_mob_check && valid_area_check)
- deadchat_broadcast(" has died at [get_area_name(death_turf)].", "[mind.name]", follow_target = src, turf_target = death_turf, message_type=DEADCHAT_DEATHRATTLE)
+ if(player_mob_check)
+ if(valid_area_check)
+ deadchat_broadcast(" has died at [get_area_name(death_turf)].", "[mind.name]", follow_target = src, turf_target = death_turf, message_type=DEADCHAT_DEATHRATTLE)
if(SSlag_switch.measures[DISABLE_DEAD_KEYLOOP] && !client?.holder)
to_chat(src, span_deadsay(span_big("Observer freelook is disabled.\nPlease use Orbit, Teleport, and Jump to look around.")))
ghostize(TRUE)
diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm
index 064a0573353eb..4bf0407c4670a 100644
--- a/code/modules/mob/living/init_signals.dm
+++ b/code/modules/mob/living/init_signals.dm
@@ -38,6 +38,9 @@
RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_RESTRAINED), PROC_REF(on_restrained_trait_gain))
RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_RESTRAINED), PROC_REF(on_restrained_trait_loss))
+ RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEAF), PROC_REF(on_hearing_loss))
+ RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEAF), PROC_REF(on_hearing_regain))
+
RegisterSignals(src, list(
SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION),
SIGNAL_REMOVETRAIT(TRAIT_CRITICAL_CONDITION),
@@ -272,3 +275,14 @@
/mob/living/proc/undense_changed(datum/source)
SIGNAL_HANDLER
update_density()
+
+///Called when [TRAIT_DEAF] is added to the mob.
+/mob/living/proc/on_hearing_loss()
+ SIGNAL_HANDLER
+ refresh_looping_ambience()
+ stop_sound_channel(CHANNEL_AMBIENCE)
+
+///Called when [TRAIT_DEAF] is added to the mob.
+/mob/living/proc/on_hearing_regain()
+ SIGNAL_HANDLER
+ refresh_looping_ambience()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 54fce885a8056..c7a0c034ac5aa 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1345,7 +1345,7 @@
to_chat(src, span_warning("You don't have the hands for this action!"))
return FALSE
- if(!(action_bitflags & BYPASS_ADJACENCY) && !recursive_loc_check(src, target) && !CanReach(target))
+ if(!(action_bitflags & BYPASS_ADJACENCY) && ((action_bitflags & NOT_INSIDE_TARGET) || !recursive_loc_check(src, target)) && !CanReach(target))
if(HAS_SILICON_ACCESS(src) && !ispAI(src))
if(!(action_bitflags & ALLOW_SILICON_REACH)) // silicons can ignore range checks (except pAIs)
if(!(action_bitflags & SILENT_ADJACENCY))
@@ -2277,6 +2277,10 @@ GLOBAL_LIST_EMPTY(fire_appearances)
REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT)
remove_from_alive_mob_list()
add_to_dead_mob_list()
+ if(!can_hear())
+ stop_sound_channel(CHANNEL_AMBIENCE)
+ refresh_looping_ambience()
+
///Reports the event of the change in value of the buckled variable.
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3ee43801a7621..d3dfa7e55f605 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -411,7 +411,7 @@
if(!user.get_bodypart(BODY_ZONE_HEAD))
return FALSE
- if(user.is_muzzled() || user.is_mouth_covered(ITEM_SLOT_MASK))
+ if(user.is_mouth_covered(ITEM_SLOT_MASK))
to_chat(user, span_warning("You can't bite with your mouth covered!"))
return FALSE
@@ -659,7 +659,7 @@
playsound(target, 'sound/effects/glassbash.ogg', 50, TRUE, -1)
else
do_attack_animation(target, ATTACK_EFFECT_DISARM)
- playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+ playsound(target, 'sound/weapons/shove.ogg', 50, TRUE, -1)
if (ishuman(target) && isnull(weapon))
var/mob/living/carbon/human/human_target = target
human_target.w_uniform?.add_fingerprint(src)
@@ -700,6 +700,7 @@
return
if((shove_flags & SHOVE_BLOCKED) && !(shove_flags & (SHOVE_KNOCKDOWN_BLOCKED|SHOVE_CAN_KICK_SIDE)))
target.Knockdown(SHOVE_KNOCKDOWN_SOLID)
+ target.apply_status_effect(/datum/status_effect/next_shove_stuns)
target.visible_message(span_danger("[name] shoves [target.name], knocking [target.p_them()] down!"),
span_userdanger("You're knocked down from a shove by [name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, src)
to_chat(src, span_danger("You shove [target.name], knocking [target.p_them()] down!"))
@@ -708,6 +709,7 @@
if(shove_flags & SHOVE_CAN_KICK_SIDE) //KICK HIM IN THE NUTS
target.Paralyze(SHOVE_CHAIN_PARALYZE)
+ target.apply_status_effect(/datum/status_effect/no_side_kick)
target.visible_message(span_danger("[name] kicks [target.name] onto [target.p_their()] side!"),
span_userdanger("You're kicked onto your side by [name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, src)
to_chat(src, span_danger("You kick [target.name] onto [target.p_their()] side!"))
@@ -720,10 +722,8 @@
//Take their lunch money
var/target_held_item = target.get_active_held_item()
var/append_message = weapon ? " with [weapon]" : ""
- if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types)) //It's too expensive we'll get caught
- target_held_item = null
-
- if(target_held_item && target.get_timed_status_effect_duration(/datum/status_effect/staggered))
+ // If it's in our typecache, they're staggered and it exists, disarm. If they're knocked down, disarm too.
+ if(target_held_item && target.get_timed_status_effect_duration(/datum/status_effect/staggered) && is_type_in_typecache(target_held_item, GLOB.shove_disarming_types) || target_held_item && target.body_position == LYING_DOWN)
target.dropItemToGround(target_held_item)
append_message = "causing [target.p_them()] to drop [target_held_item]"
target.visible_message(span_danger("[target.name] drops \the [target_held_item]!"),
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 0b844a2362afb..6ec18d0d5392c 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -3,6 +3,7 @@
hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD)
pressure_resistance = 10
hud_type = /datum/hud/living
+ interaction_flags_click = ALLOW_RESTING
interaction_flags_mouse_drop = ALLOW_RESTING
///Tracks the current size of the mob in relation to its original size. Use update_transform(resize) to change it.
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index bbcf77986ac79..58e13951ebc4f 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -454,11 +454,12 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
message = unintelligize(message)
tts_filter = list()
- var/list/data = list(message, tts_message, tts_filter)
+ var/list/data = list(message, tts_message, tts_filter, capitalize_message)
SEND_SIGNAL(src, COMSIG_LIVING_TREAT_MESSAGE, data)
message = data[TREAT_MESSAGE_ARG]
tts_message = data[TREAT_TTS_MESSAGE_ARG]
tts_filter = data[TREAT_TTS_FILTER_ARG]
+ capitalize_message = data[TREAT_CAPITALIZE_MESSAGE]
if(!tts_message)
tts_message = message
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index c6d6b6a5e9d70..b9f2fec61ff2c 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -14,9 +14,7 @@
update_z(T.z)
//Vents
- var/ventcrawler = HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE)
- if(ventcrawler)
- to_chat(src, span_notice("You can ventcrawl! Use alt+click on vents to quickly travel about the station."))
+ notify_ventcrawler_on_login()
med_hud_set_status()
diff --git a/code/modules/mob/living/navigation.dm b/code/modules/mob/living/navigation.dm
index 98f1080c79192..3096efb3a7c47 100644
--- a/code/modules/mob/living/navigation.dm
+++ b/code/modules/mob/living/navigation.dm
@@ -132,7 +132,7 @@
if(!target)
target = lad
continue
- if(get_dist_euclidian(lad, src) > get_dist_euclidian(target, src))
+ if(get_dist_euclidean(lad, src) > get_dist_euclidean(target, src))
continue
target = lad
@@ -144,7 +144,7 @@
if(!target)
target = stairs_bro.z == z ? stairs_bro : get_step_multiz(stairs_bro, UP) //if the stairs aren't on our z level, get the turf above them (on our zlevel) to path to instead
continue
- if(get_dist_euclidian(stairs_bro, src) > get_dist_euclidian(target, src))
+ if(get_dist_euclidean(stairs_bro, src) > get_dist_euclidean(target, src))
continue
target = stairs_bro.z == z ? stairs_bro : get_step_multiz(stairs_bro, UP)
diff --git a/code/modules/mob/living/silicon/ai/vox_sounds.dm b/code/modules/mob/living/silicon/ai/vox_sounds.dm
index dacb1eeb8131c..d69bb2e1cc3b8 100644
--- a/code/modules/mob/living/silicon/ai/vox_sounds.dm
+++ b/code/modules/mob/living/silicon/ai/vox_sounds.dm
@@ -8,12 +8,15 @@
// For vim
// :%s/\(\(.*\)\.ogg\)/"\2" = 'sound\/vox_fem\/\1',/g
GLOBAL_LIST_INIT(vox_sounds, list(
- "abduction" = 'sound/vox_fem/abduction.ogg',
"," = 'sound/vox_fem/,.ogg',
"." = 'sound/vox_fem/..ogg',
"a" = 'sound/vox_fem/a.ogg',
+ "abduction" = 'sound/vox_fem/abduction.ogg',
"abortions" = 'sound/vox_fem/abortions.ogg',
"above" = 'sound/vox_fem/above.ogg',
+ "absorb" = 'sound/vox_fem/absorb.ogg',
+ "absorbed" = 'sound/vox_fem/absorbed.ogg',
+ "absorbing" = 'sound/vox_fem/absorbing.ogg',
"abstain" = 'sound/vox_fem/abstain.ogg',
"accelerating" = 'sound/vox_fem/accelerating.ogg',
"accelerator" = 'sound/vox_fem/accelerator.ogg',
@@ -26,11 +29,17 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"across" = 'sound/vox_fem/across.ogg',
"activate" = 'sound/vox_fem/activate.ogg',
"activated" = 'sound/vox_fem/activated.ogg',
+ "activating" = 'sound/vox_fem/activating.ogg',
+ "activation" = 'sound/vox_fem/activation.ogg',
+ "active" = 'sound/vox_fem/active.ogg',
"activity" = 'sound/vox_fem/activity.ogg',
"adios" = 'sound/vox_fem/adios.ogg',
"administration" = 'sound/vox_fem/administration.ogg',
"advanced" = 'sound/vox_fem/advanced.ogg',
"advised" = 'sound/vox_fem/advised.ogg',
+ "affect" = 'sound/vox_fem/affect.ogg',
+ "affected" = 'sound/vox_fem/affected.ogg',
+ "affecting" = 'sound/vox_fem/affecting.ogg',
"aft" = 'sound/vox_fem/aft.ogg',
"after" = 'sound/vox_fem/after.ogg',
"agent" = 'sound/vox_fem/agent.ogg',
@@ -40,44 +49,59 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"alarm" = 'sound/vox_fem/alarm.ogg',
"alarmed" = 'sound/vox_fem/alarmed.ogg',
"alarming" = 'sound/vox_fem/alarming.ogg',
+ "alcohol" = 'sound/vox_fem/alcohol.ogg',
"alert" = 'sound/vox_fem/alert.ogg',
"alerted" = 'sound/vox_fem/alerted.ogg',
"alerting" = 'sound/vox_fem/alerting.ogg',
"alien" = 'sound/vox_fem/alien.ogg',
+ "align" = 'sound/vox_fem/align.ogg',
"aligned" = 'sound/vox_fem/aligned.ogg',
"all" = 'sound/vox_fem/all.ogg',
+ "allow" = 'sound/vox_fem/allow.ogg',
+ "alongside" = 'sound/vox_fem/alongside.ogg',
"alpha" = 'sound/vox_fem/alpha.ogg',
"also" = 'sound/vox_fem/also.ogg',
"am" = 'sound/vox_fem/am.ogg',
"amigo" = 'sound/vox_fem/amigo.ogg',
"ammunition" = 'sound/vox_fem/ammunition.ogg',
+ "amount" = 'sound/vox_fem/amount.ogg',
"an" = 'sound/vox_fem/an.ogg',
"and" = 'sound/vox_fem/and.ogg',
"animal" = 'sound/vox_fem/animal.ogg',
+ "annihilate" = 'sound/vox_fem/annihilate.ogg',
+ "annihilated" = 'sound/vox_fem/annihilated.ogg',
+ "annihilating" = 'sound/vox_fem/annihilating.ogg',
+ "annihilation" = 'sound/vox_fem/annihilation.ogg',
"announcement" = 'sound/vox_fem/announcement.ogg',
"anomalous" = 'sound/vox_fem/anomalous.ogg',
"answer" = 'sound/vox_fem/answer.ogg',
"antenna" = 'sound/vox_fem/antenna.ogg',
+ "anti-noblium" = 'sound/vox_fem/anti-noblium.ogg',
"any" = 'sound/vox_fem/any.ogg',
"apc" = 'sound/vox_fem/apc.ogg',
"apprehend" = 'sound/vox_fem/apprehend.ogg',
"approach" = 'sound/vox_fem/approach.ogg',
+ "arc" = 'sound/vox_fem/arc.ogg',
+ "arcs" = 'sound/vox_fem/arcs.ogg',
"are" = 'sound/vox_fem/are.ogg',
"area" = 'sound/vox_fem/area.ogg',
"arm" = 'sound/vox_fem/arm.ogg',
"armed" = 'sound/vox_fem/armed.ogg',
"armor" = 'sound/vox_fem/armor.ogg',
"armory" = 'sound/vox_fem/armory.ogg',
+ "around" = 'sound/vox_fem/around.ogg',
"array" = 'sound/vox_fem/array.ogg',
"arrest" = 'sound/vox_fem/arrest.ogg',
"artillery" = 'sound/vox_fem/artillery.ogg',
"asimov" = 'sound/vox_fem/asimov.ogg',
+ "ask" = 'sound/vox_fem/ask.ogg',
"ass" = 'sound/vox_fem/ass.ogg',
"asshole" = 'sound/vox_fem/asshole.ogg',
"assholes" = 'sound/vox_fem/assholes.ogg',
"assistance" = 'sound/vox_fem/assistance.ogg',
"assistant" = 'sound/vox_fem/assistant.ogg',
"at" = 'sound/vox_fem/at.ogg',
+ "ate" = 'sound/vox_fem/ate.ogg',
"atmosphere" = 'sound/vox_fem/atmosphere.ogg',
"atmospheric" = 'sound/vox_fem/atmospheric.ogg',
"atmospherics" = 'sound/vox_fem/atmospherics.ogg',
@@ -101,10 +125,14 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"base" = 'sound/vox_fem/base.ogg',
"bay" = 'sound/vox_fem/bay.ogg',
"be" = 'sound/vox_fem/be.ogg',
+ "beaker" = 'sound/vox_fem/beaker.ogg',
"beam" = 'sound/vox_fem/beam.ogg',
"been" = 'sound/vox_fem/been.ogg',
"beep" = 'sound/vox_fem/beep.ogg',
"before" = 'sound/vox_fem/before.ogg',
+ "began" = 'sound/vox_fem/began.ogg',
+ "begin" = 'sound/vox_fem/begin.ogg',
+ "begins" = 'sound/vox_fem/begins.ogg',
"below" = 'sound/vox_fem/below.ogg',
"beside" = 'sound/vox_fem/beside.ogg',
"beware" = 'sound/vox_fem/beware.ogg',
@@ -133,6 +161,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"bone" = 'sound/vox_fem/bone.ogg',
"botanist" = 'sound/vox_fem/botanist.ogg',
"botany" = 'sound/vox_fem/botany.ogg',
+ "bottle" = 'sound/vox_fem/bottle.ogg',
"bottom" = 'sound/vox_fem/bottom.ogg',
"bravo" = 'sound/vox_fem/bravo.ogg',
"breach" = 'sound/vox_fem/breach.ogg',
@@ -140,6 +169,11 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"break" = 'sound/vox_fem/break.ogg',
"bridge" = 'sound/vox_fem/bridge.ogg',
"brig" = 'sound/vox_fem/brig.ogg',
+ "broke" = 'sound/vox_fem/broke.ogg',
+ "broken" = 'sound/vox_fem/broken.ogg',
+ "bump" = 'sound/vox_fem/bump.ogg',
+ "bumped" = 'sound/vox_fem/bumped.ogg',
+ "bumps" = 'sound/vox_fem/bumps.ogg',
"bust" = 'sound/vox_fem/bust.ogg',
"but" = 'sound/vox_fem/but.ogg',
"button" = 'sound/vox_fem/button.ogg',
@@ -148,6 +182,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"cable" = 'sound/vox_fem/cable.ogg',
"call" = 'sound/vox_fem/call.ogg',
"called" = 'sound/vox_fem/called.ogg',
+ "can" = 'sound/vox_fem/can.ogg',
"canal" = 'sound/vox_fem/canal.ogg',
"canister" = 'sound/vox_fem/canister.ogg',
"cap" = 'sound/vox_fem/cap.ogg',
@@ -155,7 +190,12 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"capture" = 'sound/vox_fem/capture.ogg',
"carbon" = 'sound/vox_fem/carbon.ogg',
"cargo" = 'sound/vox_fem/cargo.ogg',
+ "cascade" = 'sound/vox_fem/cascade.ogg',
"cat" = 'sound/vox_fem/cat.ogg',
+ "cause" = 'sound/vox_fem/cause.ogg',
+ "caused" = 'sound/vox_fem/caused.ogg',
+ "causes" = 'sound/vox_fem/causes.ogg',
+ "causing" = 'sound/vox_fem/causing.ogg',
"ce" = 'sound/vox_fem/ce.ogg',
"cease" = 'sound/vox_fem/cease.ogg',
"ceiling" = 'sound/vox_fem/ceiling.ogg',
@@ -171,6 +211,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"changeling" = 'sound/vox_fem/changeling.ogg',
"chapel" = 'sound/vox_fem/chapel.ogg',
"chaplain" = 'sound/vox_fem/chaplain.ogg',
+ "charge" = 'sound/vox_fem/charge.ogg',
"charlie" = 'sound/vox_fem/charlie.ogg',
"check" = 'sound/vox_fem/check.ogg',
"checkpoint" = 'sound/vox_fem/checkpoint.ogg',
@@ -185,35 +226,51 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"clear" = 'sound/vox_fem/clear.ogg',
"clearance" = 'sound/vox_fem/clearance.ogg',
"clockwork" = 'sound/vox_fem/clockwork.ogg',
+ "clog" = 'sound/vox_fem/clog.ogg',
"close" = 'sound/vox_fem/close.ogg',
"closed" = 'sound/vox_fem/closed.ogg',
"closing" = 'sound/vox_fem/closing.ogg',
+ "clothing" = 'sound/vox_fem/clothing.ogg',
"clown" = 'sound/vox_fem/clown.ogg',
"clowning" = 'sound/vox_fem/clowning.ogg',
"cmo" = 'sound/vox_fem/cmo.ogg',
"code" = 'sound/vox_fem/code.ogg',
"coded" = 'sound/vox_fem/coded.ogg',
+ "coil" = 'sound/vox_fem/coil.ogg',
+ "coils" = 'sound/vox_fem/coils.ogg',
"cold" = 'sound/vox_fem/cold.ogg',
"collider" = 'sound/vox_fem/collider.ogg',
+ "combat" = 'sound/vox_fem/combat.ogg',
+ "combatant" = 'sound/vox_fem/combatant.ogg',
"come" = 'sound/vox_fem/come.ogg',
"command" = 'sound/vox_fem/command.ogg',
"communication" = 'sound/vox_fem/communication.ogg',
+ "complete" = 'sound/vox_fem/complete.ogg',
+ "completed" = 'sound/vox_fem/completed.ogg',
+ "completion" = 'sound/vox_fem/completion.ogg',
"complex" = 'sound/vox_fem/complex.ogg',
"comply" = 'sound/vox_fem/comply.ogg',
"computer" = 'sound/vox_fem/computer.ogg',
"condition" = 'sound/vox_fem/condition.ogg',
+ "conditions" = 'sound/vox_fem/conditions.ogg',
"condom" = 'sound/vox_fem/condom.ogg',
+ "configure" = 'sound/vox_fem/configure.ogg',
+ "configured" = 'sound/vox_fem/configured.ogg',
+ "configuring" = 'sound/vox_fem/configuring.ogg',
"confirmed" = 'sound/vox_fem/confirmed.ogg',
"connor" = 'sound/vox_fem/connor.ogg',
"console" = 'sound/vox_fem/console.ogg',
"console2" = 'sound/vox_fem/console2.ogg',
"construct" = 'sound/vox_fem/construct.ogg',
+ "container" = 'sound/vox_fem/container.ogg',
"containment" = 'sound/vox_fem/containment.ogg',
"contamination" = 'sound/vox_fem/contamination.ogg',
"contraband" = 'sound/vox_fem/contraband.ogg',
"control" = 'sound/vox_fem/control.ogg',
"cook" = 'sound/vox_fem/cook.ogg',
+ "cool" = 'sound/vox_fem/cool.ogg',
"coolant" = 'sound/vox_fem/coolant.ogg',
+ "cooling" = 'sound/vox_fem/cooling.ogg',
"coomer" = 'sound/vox_fem/coomer.ogg',
"core" = 'sound/vox_fem/core.ogg',
"corgi" = 'sound/vox_fem/corgi.ogg',
@@ -221,10 +278,15 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"correct" = 'sound/vox_fem/correct.ogg',
"corridor" = 'sound/vox_fem/corridor.ogg',
"corridors" = 'sound/vox_fem/corridors.ogg',
+ "could" = 'sound/vox_fem/could.ogg',
+ "couldnt" = 'sound/vox_fem/couldnt.ogg',
+ "countdown" = 'sound/vox_fem/countdown.ogg',
"coward" = 'sound/vox_fem/coward.ogg',
"cowards" = 'sound/vox_fem/cowards.ogg',
"crate" = 'sound/vox_fem/crate.ogg',
+ "create" = 'sound/vox_fem/create.ogg',
"created" = 'sound/vox_fem/created.ogg',
+ "creating" = 'sound/vox_fem/creating.ogg',
"creature" = 'sound/vox_fem/creature.ogg',
"crew" = 'sound/vox_fem/crew.ogg',
"critical" = 'sound/vox_fem/critical.ogg',
@@ -251,9 +313,12 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"deeoo" = 'sound/vox_fem/deeoo.ogg',
"defense" = 'sound/vox_fem/defense.ogg',
"degrees" = 'sound/vox_fem/degrees.ogg',
+ "delaminating" = 'sound/vox_fem/delaminating.ogg',
+ "delamination" = 'sound/vox_fem/delamination.ogg',
"delta" = 'sound/vox_fem/delta.ogg',
"demon" = 'sound/vox_fem/demon.ogg',
"denied" = 'sound/vox_fem/denied.ogg',
+ "deny" = 'sound/vox_fem/deny.ogg',
"departures" = 'sound/vox_fem/departures.ogg',
"deploy" = 'sound/vox_fem/deploy.ogg',
"deployed" = 'sound/vox_fem/deployed.ogg',
@@ -263,7 +328,9 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"destroyed" = 'sound/vox_fem/destroyed.ogg',
"destruction" = 'sound/vox_fem/destruction.ogg',
"detain" = 'sound/vox_fem/detain.ogg',
+ "detect" = 'sound/vox_fem/detect.ogg',
"detected" = 'sound/vox_fem/detected.ogg',
+ "detecting" = 'sound/vox_fem/detecting.ogg',
"detective" = 'sound/vox_fem/detective.ogg',
"detonation" = 'sound/vox_fem/detonation.ogg',
"device" = 'sound/vox_fem/device.ogg',
@@ -271,8 +338,10 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"did" = 'sound/vox_fem/did.ogg',
"die" = 'sound/vox_fem/die.ogg',
"died" = 'sound/vox_fem/died.ogg',
+ "different" = 'sound/vox_fem/different.ogg',
"dimensional" = 'sound/vox_fem/dimensional.ogg',
"dioxide" = 'sound/vox_fem/dioxide.ogg',
+ "direct" = 'sound/vox_fem/direct.ogg',
"director" = 'sound/vox_fem/director.ogg',
"dirt" = 'sound/vox_fem/dirt.ogg',
"disabled" = 'sound/vox_fem/disabled.ogg',
@@ -286,31 +355,47 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"do" = 'sound/vox_fem/do.ogg',
"doctor" = 'sound/vox_fem/doctor.ogg',
"dog" = 'sound/vox_fem/dog.ogg',
+ "dont" = 'sound/vox_fem/dont.ogg',
"doomsday" = 'sound/vox_fem/doomsday.ogg',
"doop" = 'sound/vox_fem/doop.ogg',
"door" = 'sound/vox_fem/door.ogg',
"dormitory" = 'sound/vox_fem/dormitory.ogg',
"dot" = 'sound/vox_fem/dot.ogg',
+ "double" = 'sound/vox_fem/double.ogg',
"down" = 'sound/vox_fem/down.ogg',
+ "dress" = 'sound/vox_fem/dress.ogg',
+ "dressed" = 'sound/vox_fem/dressed.ogg',
+ "dressing" = 'sound/vox_fem/dressing.ogg',
"drone" = 'sound/vox_fem/drone.ogg',
"dual" = 'sound/vox_fem/dual.ogg',
"duct" = 'sound/vox_fem/duct.ogg',
"e" = 'sound/vox_fem/e.ogg',
+ "easily" = 'sound/vox_fem/easily.ogg',
"east" = 'sound/vox_fem/east.ogg',
+ "eat" = 'sound/vox_fem/eat.ogg',
+ "eaten" = 'sound/vox_fem/eaten.ogg',
"echo" = 'sound/vox_fem/echo.ogg',
"ed" = 'sound/vox_fem/ed.ogg',
+ "education" = 'sound/vox_fem/education.ogg',
"effect" = 'sound/vox_fem/effect.ogg',
+ "effects" = 'sound/vox_fem/effects.ogg',
"egress" = 'sound/vox_fem/egress.ogg',
"eight" = 'sound/vox_fem/eight.ogg',
"eighteen" = 'sound/vox_fem/eighteen.ogg',
"eighty" = 'sound/vox_fem/eighty.ogg',
"electric" = 'sound/vox_fem/electric.ogg',
+ "electrical" = 'sound/vox_fem/electrical.ogg',
"electromagnetic" = 'sound/vox_fem/electromagnetic.ogg',
"elevator" = 'sound/vox_fem/elevator.ogg',
"eleven" = 'sound/vox_fem/eleven.ogg',
"eliminate" = 'sound/vox_fem/eliminate.ogg',
"emergency" = 'sound/vox_fem/emergency.ogg',
+ "emitted" = 'sound/vox_fem/emitted.ogg',
+ "emitter" = 'sound/vox_fem/emitter.ogg',
+ "emitting" = 'sound/vox_fem/emitting.ogg',
"enabled" = 'sound/vox_fem/enabled.ogg',
+ "end" = 'sound/vox_fem/end.ogg',
+ "ends" = 'sound/vox_fem/ends.ogg',
"energy" = 'sound/vox_fem/energy.ogg',
"engage" = 'sound/vox_fem/engage.ogg',
"engaged" = 'sound/vox_fem/engaged.ogg',
@@ -318,6 +403,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"engineer" = 'sound/vox_fem/engineer.ogg',
"engineering" = 'sound/vox_fem/engineering.ogg',
"enormous" = 'sound/vox_fem/enormous.ogg',
+ "enough" = 'sound/vox_fem/enough.ogg',
"enter" = 'sound/vox_fem/enter.ogg',
"entity" = 'sound/vox_fem/entity.ogg',
"entry" = 'sound/vox_fem/entry.ogg',
@@ -329,7 +415,11 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"ethereal" = 'sound/vox_fem/ethereal.ogg',
"eva" = 'sound/vox_fem/eva.ogg',
"evacuate" = 'sound/vox_fem/evacuate.ogg',
+ "even" = 'sound/vox_fem/even.ogg',
"ever" = 'sound/vox_fem/ever.ogg',
+ "every" = 'sound/vox_fem/every.ogg',
+ "everybody" = 'sound/vox_fem/everybody.ogg',
+ "everyone" = 'sound/vox_fem/everyone.ogg',
"exchange" = 'sound/vox_fem/exchange.ogg',
"execute" = 'sound/vox_fem/execute.ogg',
"exit" = 'sound/vox_fem/exit.ogg',
@@ -337,12 +427,16 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"experiment" = 'sound/vox_fem/experiment.ogg',
"experimental" = 'sound/vox_fem/experimental.ogg',
"explode" = 'sound/vox_fem/explode.ogg',
+ "exploded" = 'sound/vox_fem/exploded.ogg',
+ "exploding" = 'sound/vox_fem/exploding.ogg',
"explosion" = 'sound/vox_fem/explosion.ogg',
"explosive" = 'sound/vox_fem/explosive.ogg',
"exposure" = 'sound/vox_fem/exposure.ogg',
"exterminate" = 'sound/vox_fem/exterminate.ogg',
+ "external" = 'sound/vox_fem/external.ogg',
"extinguish" = 'sound/vox_fem/extinguish.ogg',
"extinguisher" = 'sound/vox_fem/extinguisher.ogg',
+ "extra" = 'sound/vox_fem/extra.ogg',
"extreme" = 'sound/vox_fem/extreme.ogg',
"f" = 'sound/vox_fem/f.ogg',
"facility" = 'sound/vox_fem/facility.ogg',
@@ -354,12 +448,19 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"farthest" = 'sound/vox_fem/farthest.ogg',
"fast" = 'sound/vox_fem/fast.ogg',
"fauna" = 'sound/vox_fem/fauna.ogg',
+ "feature" = 'sound/vox_fem/feature.ogg',
+ "featured" = 'sound/vox_fem/featured.ogg',
+ "features" = 'sound/vox_fem/features.ogg',
+ "featuring" = 'sound/vox_fem/featuring.ogg',
"feet" = 'sound/vox_fem/feet.ogg',
"felinid" = 'sound/vox_fem/felinid.ogg',
+ "few" = 'sound/vox_fem/few.ogg',
"field" = 'sound/vox_fem/field.ogg',
"fifteen" = 'sound/vox_fem/fifteen.ogg',
"fifth" = 'sound/vox_fem/fifth.ogg',
"fifty" = 'sound/vox_fem/fifty.ogg',
+ "filter" = 'sound/vox_fem/filter.ogg',
+ "filters" = 'sound/vox_fem/filters.ogg',
"final" = 'sound/vox_fem/final.ogg',
"fine" = 'sound/vox_fem/fine.ogg',
"fire" = 'sound/vox_fem/fire.ogg',
@@ -370,6 +471,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"floor" = 'sound/vox_fem/floor.ogg',
"flyman" = 'sound/vox_fem/flyman.ogg',
"fool" = 'sound/vox_fem/fool.ogg',
+ "foolish" = 'sound/vox_fem/foolish.ogg',
"for" = 'sound/vox_fem/for.ogg',
"forbidden" = 'sound/vox_fem/forbidden.ogg',
"force" = 'sound/vox_fem/force.ogg',
@@ -389,6 +491,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"freeze" = 'sound/vox_fem/freeze.ogg',
"freezer" = 'sound/vox_fem/freezer.ogg',
"freezing" = 'sound/vox_fem/freezing.ogg',
+ "freon" = 'sound/vox_fem/freon.ogg',
"from" = 'sound/vox_fem/from.ogg',
"front" = 'sound/vox_fem/front.ogg',
"froze" = 'sound/vox_fem/froze.ogg',
@@ -399,9 +502,19 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"fuel" = 'sound/vox_fem/fuel.ogg',
"g" = 'sound/vox_fem/g.ogg',
"gas" = 'sound/vox_fem/gas.ogg',
+ "gases" = 'sound/vox_fem/gases.ogg',
+ "gave" = 'sound/vox_fem/gave.ogg',
+ "gear" = 'sound/vox_fem/gear.ogg',
+ "geared" = 'sound/vox_fem/geared.ogg',
+ "gearing" = 'sound/vox_fem/gearing.ogg',
+ "generate" = 'sound/vox_fem/generate.ogg',
+ "generated" = 'sound/vox_fem/generated.ogg',
+ "generating" = 'sound/vox_fem/generating.ogg',
"generator" = 'sound/vox_fem/generator.ogg',
"geneticist" = 'sound/vox_fem/geneticist.ogg',
"get" = 'sound/vox_fem/get.ogg',
+ "give" = 'sound/vox_fem/give.ogg',
+ "given" = 'sound/vox_fem/given.ogg',
"glory" = 'sound/vox_fem/glory.ogg',
"go" = 'sound/vox_fem/go.ogg',
"god" = 'sound/vox_fem/god.ogg',
@@ -428,17 +541,29 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"had" = 'sound/vox_fem/had.ogg',
"hall" = 'sound/vox_fem/hall.ogg',
"hallway" = 'sound/vox_fem/hallway.ogg',
+ "halon" = 'sound/vox_fem/halon.ogg',
"handling" = 'sound/vox_fem/handling.ogg',
"hangar" = 'sound/vox_fem/hangar.ogg',
+ "hard" = 'sound/vox_fem/hard.ogg',
+ "hardly" = 'sound/vox_fem/hardly.ogg',
"harm" = 'sound/vox_fem/harm.ogg',
"harmful" = 'sound/vox_fem/harmful.ogg',
+ "harness" = 'sound/vox_fem/harness.ogg',
+ "harnessed" = 'sound/vox_fem/harnessed.ogg',
+ "harnessing" = 'sound/vox_fem/harnessing.ogg',
"has" = 'sound/vox_fem/has.ogg',
"have" = 'sound/vox_fem/have.ogg',
"hazard" = 'sound/vox_fem/hazard.ogg',
"he" = 'sound/vox_fem/he.ogg',
"head" = 'sound/vox_fem/head.ogg',
+ "heal" = 'sound/vox_fem/heal.ogg',
+ "healed" = 'sound/vox_fem/healed.ogg',
+ "healing" = 'sound/vox_fem/healing.ogg',
+ "healium" = 'sound/vox_fem/healium.ogg',
"health" = 'sound/vox_fem/health.ogg',
"heat" = 'sound/vox_fem/heat.ogg',
+ "heated" = 'sound/vox_fem/heated.ogg',
+ "heating" = 'sound/vox_fem/heating.ogg',
"helicopter" = 'sound/vox_fem/helicopter.ogg',
"helium" = 'sound/vox_fem/helium.ogg',
"hello" = 'sound/vox_fem/hello.ogg',
@@ -468,7 +593,9 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"hunger" = 'sound/vox_fem/hunger.ogg',
"hurt" = 'sound/vox_fem/hurt.ogg',
"hydro" = 'sound/vox_fem/hydro.ogg',
+ "hydrogen" = 'sound/vox_fem/hydrogen.ogg',
"hydroponics" = 'sound/vox_fem/hydroponics.ogg',
+ "hyper-noblium" = 'sound/vox_fem/hyper-noblium.ogg',
"i" = 'sound/vox_fem/i.ogg',
"ian" = 'sound/vox_fem/ian.ogg',
"idiot" = 'sound/vox_fem/idiot.ogg',
@@ -482,26 +609,33 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"in" = 'sound/vox_fem/in.ogg',
"inches" = 'sound/vox_fem/inches.ogg',
"india" = 'sound/vox_fem/india.ogg',
+ "inert" = 'sound/vox_fem/inert.ogg',
"ing" = 'sound/vox_fem/ing.ogg',
"inoperative" = 'sound/vox_fem/inoperative.ogg',
"inside" = 'sound/vox_fem/inside.ogg',
"inspection" = 'sound/vox_fem/inspection.ogg',
"inspector" = 'sound/vox_fem/inspector.ogg',
"interchange" = 'sound/vox_fem/interchange.ogg',
+ "internal" = 'sound/vox_fem/internal.ogg',
"internals" = 'sound/vox_fem/internals.ogg',
"intruder" = 'sound/vox_fem/intruder.ogg',
"invalid" = 'sound/vox_fem/invalid.ogg',
"invalidate" = 'sound/vox_fem/invalidate.ogg',
"invasion" = 'sound/vox_fem/invasion.ogg',
+ "irradiate" = 'sound/vox_fem/irradiate.ogg',
"is" = 'sound/vox_fem/is.ogg',
"it" = 'sound/vox_fem/it.ogg',
+ "its" = 'sound/vox_fem/its.ogg',
"j" = 'sound/vox_fem/j.ogg',
"janitor" = 'sound/vox_fem/janitor.ogg',
"jesus" = 'sound/vox_fem/jesus.ogg',
+ "job" = 'sound/vox_fem/job.ogg',
+ "jobs" = 'sound/vox_fem/jobs.ogg',
"johnson" = 'sound/vox_fem/johnson.ogg',
"jolly" = 'sound/vox_fem/jolly.ogg',
"juliet" = 'sound/vox_fem/juliet.ogg',
"k" = 'sound/vox_fem/k.ogg',
+ "kelvin" = 'sound/vox_fem/kelvin.ogg',
"key" = 'sound/vox_fem/key.ogg',
"kidnapped" = 'sound/vox_fem/kidnapped.ogg',
"kidnapping" = 'sound/vox_fem/kidnapping.ogg',
@@ -536,7 +670,10 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"light" = 'sound/vox_fem/light.ogg',
"lightbulb" = 'sound/vox_fem/lightbulb.ogg',
"lima" = 'sound/vox_fem/lima.ogg',
+ "limit" = 'sound/vox_fem/limit.ogg',
+ "limited" = 'sound/vox_fem/limited.ogg',
"liquid" = 'sound/vox_fem/liquid.ogg',
+ "list" = 'sound/vox_fem/list.ogg',
"live" = 'sound/vox_fem/live.ogg',
"live2" = 'sound/vox_fem/live2.ogg',
"lizard" = 'sound/vox_fem/lizard.ogg',
@@ -559,12 +696,14 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"lusty" = 'sound/vox_fem/lusty.ogg',
"m" = 'sound/vox_fem/m.ogg',
"machine" = 'sound/vox_fem/machine.ogg',
+ "made" = 'sound/vox_fem/made.ogg',
"magic" = 'sound/vox_fem/magic.ogg',
"magnetic" = 'sound/vox_fem/magnetic.ogg',
"main" = 'sound/vox_fem/main.ogg',
"maintainer" = 'sound/vox_fem/maintainer.ogg',
"maintenance" = 'sound/vox_fem/maintenance.ogg',
"major" = 'sound/vox_fem/major.ogg',
+ "making" = 'sound/vox_fem/making.ogg',
"malfunction" = 'sound/vox_fem/malfunction.ogg',
"man" = 'sound/vox_fem/man.ogg',
"many" = 'sound/vox_fem/many.ogg',
@@ -573,15 +712,21 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"maximum" = 'sound/vox_fem/maximum.ogg',
"may" = 'sound/vox_fem/may.ogg',
"me" = 'sound/vox_fem/me.ogg',
+ "mean" = 'sound/vox_fem/mean.ogg',
+ "means" = 'sound/vox_fem/means.ogg',
"meat" = 'sound/vox_fem/meat.ogg',
"medbay" = 'sound/vox_fem/medbay.ogg',
"medical" = 'sound/vox_fem/medical.ogg',
+ "medium" = 'sound/vox_fem/medium.ogg',
"megafauna" = 'sound/vox_fem/megafauna.ogg',
"men" = 'sound/vox_fem/men.ogg',
"mercy" = 'sound/vox_fem/mercy.ogg',
"mesa" = 'sound/vox_fem/mesa.ogg',
+ "meson" = 'sound/vox_fem/meson.ogg',
"message" = 'sound/vox_fem/message.ogg',
"meter" = 'sound/vox_fem/meter.ogg',
+ "method" = 'sound/vox_fem/method.ogg',
+ "miasma" = 'sound/vox_fem/miasma.ogg',
"micro" = 'sound/vox_fem/micro.ogg',
"middle" = 'sound/vox_fem/middle.ogg',
"mike" = 'sound/vox_fem/mike.ogg',
@@ -594,17 +739,22 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"miner" = 'sound/vox_fem/miner.ogg',
"minimum" = 'sound/vox_fem/minimum.ogg',
"minor" = 'sound/vox_fem/minor.ogg',
+ "minute" = 'sound/vox_fem/minute.ogg',
"minutes" = 'sound/vox_fem/minutes.ogg',
"mister" = 'sound/vox_fem/mister.ogg',
+ "mixture" = 'sound/vox_fem/mixture.ogg',
"mode" = 'sound/vox_fem/mode.ogg',
"modification" = 'sound/vox_fem/modification.ogg',
"money" = 'sound/vox_fem/money.ogg',
"monkey" = 'sound/vox_fem/monkey.ogg',
+ "most" = 'sound/vox_fem/most.ogg',
"moth" = 'sound/vox_fem/moth.ogg',
"mothperson" = 'sound/vox_fem/mothperson.ogg',
"motor" = 'sound/vox_fem/motor.ogg',
"motorpool" = 'sound/vox_fem/motorpool.ogg',
"move" = 'sound/vox_fem/move.ogg',
+ "moved" = 'sound/vox_fem/moved.ogg',
+ "moving" = 'sound/vox_fem/moving.ogg',
"multitude" = 'sound/vox_fem/multitude.ogg',
"murder" = 'sound/vox_fem/murder.ogg',
"murderer" = 'sound/vox_fem/murderer.ogg',
@@ -613,7 +763,9 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"mythic" = 'sound/vox_fem/mythic.ogg',
"n" = 'sound/vox_fem/n.ogg',
"nanotrasen" = 'sound/vox_fem/nanotrasen.ogg',
+ "near" = 'sound/vox_fem/near.ogg',
"nearest" = 'sound/vox_fem/nearest.ogg',
+ "nearly" = 'sound/vox_fem/nearly.ogg',
"need" = 'sound/vox_fem/need.ogg',
"never" = 'sound/vox_fem/never.ogg',
"nice" = 'sound/vox_fem/nice.ogg',
@@ -624,16 +776,21 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"nitrogen" = 'sound/vox_fem/nitrogen.ogg',
"no" = 'sound/vox_fem/no.ogg',
"nominal" = 'sound/vox_fem/nominal.ogg',
+ "none" = 'sound/vox_fem/none.ogg',
+ "normal" = 'sound/vox_fem/normal.ogg',
+ "normally" = 'sound/vox_fem/normally.ogg',
"north" = 'sound/vox_fem/north.ogg',
"northeast" = 'sound/vox_fem/northeast.ogg',
"northwest" = 'sound/vox_fem/northwest.ogg',
"not" = 'sound/vox_fem/not.ogg',
+ "notably" = 'sound/vox_fem/notably.ogg',
"november" = 'sound/vox_fem/november.ogg',
"now" = 'sound/vox_fem/now.ogg',
"nuclear" = 'sound/vox_fem/nuclear.ogg',
"nuke" = 'sound/vox_fem/nuke.ogg',
"number" = 'sound/vox_fem/number.ogg',
"o" = 'sound/vox_fem/o.ogg',
+ "object" = 'sound/vox_fem/object.ogg',
"objective" = 'sound/vox_fem/objective.ogg',
"obliterate" = 'sound/vox_fem/obliterate.ogg',
"obliterated" = 'sound/vox_fem/obliterated.ogg',
@@ -660,13 +817,17 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"option" = 'sound/vox_fem/option.ogg',
"or" = 'sound/vox_fem/or.ogg',
"order" = 'sound/vox_fem/order.ogg',
+ "ordered" = 'sound/vox_fem/ordered.ogg',
+ "ordering" = 'sound/vox_fem/ordering.ogg',
"organic" = 'sound/vox_fem/organic.ogg',
"oscar" = 'sound/vox_fem/oscar.ogg',
"out" = 'sound/vox_fem/out.ogg',
+ "output" = 'sound/vox_fem/output.ogg',
"outside" = 'sound/vox_fem/outside.ogg',
"over" = 'sound/vox_fem/over.ogg',
"overload" = 'sound/vox_fem/overload.ogg',
"override" = 'sound/vox_fem/override.ogg',
+ "own" = 'sound/vox_fem/own.ogg',
"oxygen" = 'sound/vox_fem/oxygen.ogg',
"p" = 'sound/vox_fem/p.ogg',
"pacification" = 'sound/vox_fem/pacification.ogg',
@@ -676,6 +837,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"panel" = 'sound/vox_fem/panel.ogg',
"panting" = 'sound/vox_fem/panting.ogg',
"pathetic" = 'sound/vox_fem/pathetic.ogg',
+ "pda" = 'sound/vox_fem/pda.ogg',
"percent" = 'sound/vox_fem/percent.ogg',
"perfect" = 'sound/vox_fem/perfect.ogg',
"perhaps" = 'sound/vox_fem/perhaps.ogg',
@@ -690,28 +852,46 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"plasma" = 'sound/vox_fem/plasma.ogg',
"plasmaman" = 'sound/vox_fem/plasmaman.ogg',
"platform" = 'sound/vox_fem/platform.ogg',
+ "plating" = 'sound/vox_fem/plating.ogg',
"plausible" = 'sound/vox_fem/plausible.ogg',
"please" = 'sound/vox_fem/please.ogg',
+ "pluoxium" = 'sound/vox_fem/pluoxium.ogg',
"point" = 'sound/vox_fem/point.ogg',
"port" = 'sound/vox_fem/port.ogg',
"portal" = 'sound/vox_fem/portal.ogg',
+ "portion" = 'sound/vox_fem/portion.ogg',
"possible" = 'sound/vox_fem/possible.ogg',
"power" = 'sound/vox_fem/power.ogg',
+ "powered" = 'sound/vox_fem/powered.ogg',
+ "powering" = 'sound/vox_fem/powering.ogg',
+ "premature" = 'sound/vox_fem/premature.ogg',
+ "prematurely" = 'sound/vox_fem/prematurely.ogg',
"presence" = 'sound/vox_fem/presence.ogg',
"present" = 'sound/vox_fem/present.ogg',
"presents" = 'sound/vox_fem/presents.ogg',
"press" = 'sound/vox_fem/press.ogg',
"pressure" = 'sound/vox_fem/pressure.ogg',
"primary" = 'sound/vox_fem/primary.ogg',
+ "priority" = 'sound/vox_fem/priority.ogg',
"prison" = 'sound/vox_fem/prison.ogg',
"prisoner" = 'sound/vox_fem/prisoner.ogg',
"proceed" = 'sound/vox_fem/proceed.ogg',
"processing" = 'sound/vox_fem/processing.ogg',
"progress" = 'sound/vox_fem/progress.ogg',
+ "projectile" = 'sound/vox_fem/projectile.ogg',
"proper" = 'sound/vox_fem/proper.ogg',
"propulsion" = 'sound/vox_fem/propulsion.ogg',
"prosecute" = 'sound/vox_fem/prosecute.ogg',
+ "protect" = 'sound/vox_fem/protect.ogg',
+ "protected" = 'sound/vox_fem/protected.ogg',
+ "protection" = 'sound/vox_fem/protection.ogg',
"protective" = 'sound/vox_fem/protective.ogg',
+ "proto-nitrate" = 'sound/vox_fem/proto-nitrate.ogg',
+ "pull" = 'sound/vox_fem/pull.ogg',
+ "pulled" = 'sound/vox_fem/pulled.ogg',
+ "pulling" = 'sound/vox_fem/pulling.ogg',
+ "pump" = 'sound/vox_fem/pump.ogg',
+ "pumps" = 'sound/vox_fem/pumps.ogg',
"push" = 'sound/vox_fem/push.ogg',
"put" = 'sound/vox_fem/put.ogg',
"q" = 'sound/vox_fem/q.ogg',
@@ -737,9 +917,14 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"reactor" = 'sound/vox_fem/reactor.ogg',
"red" = 'sound/vox_fem/red.ogg',
"relay" = 'sound/vox_fem/relay.ogg',
+ "release" = 'sound/vox_fem/release.ogg',
"released" = 'sound/vox_fem/released.ogg',
+ "releasing" = 'sound/vox_fem/releasing.ogg',
"remaining" = 'sound/vox_fem/remaining.ogg',
"removal" = 'sound/vox_fem/removal.ogg',
+ "remove" = 'sound/vox_fem/remove.ogg',
+ "removed" = 'sound/vox_fem/removed.ogg',
+ "removing" = 'sound/vox_fem/removing.ogg',
"renegade" = 'sound/vox_fem/renegade.ogg',
"repair" = 'sound/vox_fem/repair.ogg',
"report" = 'sound/vox_fem/report.ogg',
@@ -752,6 +937,9 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"research" = 'sound/vox_fem/research.ogg',
"resevoir" = 'sound/vox_fem/resevoir.ogg',
"resistance" = 'sound/vox_fem/resistance.ogg',
+ "resistant" = 'sound/vox_fem/resistant.ogg',
+ "resisting" = 'sound/vox_fem/resisting.ogg',
+ "resonance" = 'sound/vox_fem/resonance.ogg',
"rest" = 'sound/vox_fem/rest.ogg',
"restoration" = 'sound/vox_fem/restoration.ogg',
"revolution" = 'sound/vox_fem/revolution.ogg',
@@ -770,18 +958,28 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"runtime" = 'sound/vox_fem/runtime.ogg',
"s" = 'sound/vox_fem/s.ogg',
"sabotage" = 'sound/vox_fem/sabotage.ogg',
+ "sabotaged" = 'sound/vox_fem/sabotaged.ogg',
+ "sabotaging" = 'sound/vox_fem/sabotaging.ogg',
"safe" = 'sound/vox_fem/safe.ogg',
"safety" = 'sound/vox_fem/safety.ogg',
"sairhorn" = 'sound/vox_fem/sairhorn.ogg',
+ "same" = 'sound/vox_fem/same.ogg',
"sarah" = 'sound/vox_fem/sarah.ogg',
"sargeant" = 'sound/vox_fem/sargeant.ogg',
"satellite" = 'sound/vox_fem/satellite.ogg',
"save" = 'sound/vox_fem/save.ogg',
+ "saw" = 'sound/vox_fem/saw.ogg',
+ "scan" = 'sound/vox_fem/scan.ogg',
+ "scanned" = 'sound/vox_fem/scanned.ogg',
+ "scanner" = 'sound/vox_fem/scanner.ogg',
+ "scanners" = 'sound/vox_fem/scanners.ogg',
+ "scanning" = 'sound/vox_fem/scanning.ogg',
"scensor" = 'sound/vox_fem/scensor.ogg',
"science" = 'sound/vox_fem/science.ogg',
"scientist" = 'sound/vox_fem/scientist.ogg',
"scream" = 'sound/vox_fem/scream.ogg',
"screen" = 'sound/vox_fem/screen.ogg',
+ "screw" = 'sound/vox_fem/screw.ogg',
"search" = 'sound/vox_fem/search.ogg',
"second" = 'sound/vox_fem/second.ogg',
"secondary" = 'sound/vox_fem/secondary.ogg',
@@ -791,21 +989,32 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"secure" = 'sound/vox_fem/secure.ogg',
"secured" = 'sound/vox_fem/secured.ogg',
"security" = 'sound/vox_fem/security.ogg',
+ "seen" = 'sound/vox_fem/seen.ogg',
"select" = 'sound/vox_fem/select.ogg',
"selected" = 'sound/vox_fem/selected.ogg',
"self" = 'sound/vox_fem/self.ogg',
"sensors" = 'sound/vox_fem/sensors.ogg',
"server" = 'sound/vox_fem/server.ogg',
"service" = 'sound/vox_fem/service.ogg',
+ "set" = 'sound/vox_fem/set.ogg',
"seven" = 'sound/vox_fem/seven.ogg',
"seventeen" = 'sound/vox_fem/seventeen.ogg',
"seventy" = 'sound/vox_fem/seventy.ogg',
+ "sever" = 'sound/vox_fem/sever.ogg',
"severe" = 'sound/vox_fem/severe.ogg',
+ "severed" = 'sound/vox_fem/severed.ogg',
+ "severing" = 'sound/vox_fem/severing.ogg',
"sewage" = 'sound/vox_fem/sewage.ogg',
"sewer" = 'sound/vox_fem/sewer.ogg',
"shaft" = 'sound/vox_fem/shaft.ogg',
+ "shame" = 'sound/vox_fem/shame.ogg',
+ "shameful" = 'sound/vox_fem/shameful.ogg',
+ "shameless" = 'sound/vox_fem/shameless.ogg',
+ "shard" = 'sound/vox_fem/shard.ogg',
"she" = 'sound/vox_fem/she.ogg',
"shield" = 'sound/vox_fem/shield.ogg',
+ "shift" = 'sound/vox_fem/shift.ogg',
+ "shifts" = 'sound/vox_fem/shifts.ogg',
"shipment" = 'sound/vox_fem/shipment.ogg',
"shirt" = 'sound/vox_fem/shirt.ogg',
"shit" = 'sound/vox_fem/shit.ogg',
@@ -820,11 +1029,15 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"shuttle" = 'sound/vox_fem/shuttle.ogg',
"sick" = 'sound/vox_fem/sick.ogg',
"side" = 'sound/vox_fem/side.ogg',
+ "sides" = 'sound/vox_fem/sides.ogg',
"sierra" = 'sound/vox_fem/sierra.ogg',
"sight" = 'sound/vox_fem/sight.ogg',
"silicon" = 'sound/vox_fem/silicon.ogg',
"silo" = 'sound/vox_fem/silo.ogg',
+ "single" = 'sound/vox_fem/single.ogg',
"singularity" = 'sound/vox_fem/singularity.ogg',
+ "siphon" = 'sound/vox_fem/siphon.ogg',
+ "siphoning" = 'sound/vox_fem/siphoning.ogg',
"six" = 'sound/vox_fem/six.ogg',
"sixteen" = 'sound/vox_fem/sixteen.ogg',
"sixty" = 'sound/vox_fem/sixty.ogg',
@@ -837,6 +1050,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"sm" = 'sound/vox_fem/sm.ogg',
"small" = 'sound/vox_fem/small.ogg',
"sockmuncher" = 'sound/vox_fem/sockmuncher.ogg',
+ "soft" = 'sound/vox_fem/soft.ogg',
"solar" = 'sound/vox_fem/solar.ogg',
"solars" = 'sound/vox_fem/solars.ogg',
"soldier" = 'sound/vox_fem/soldier.ogg',
@@ -845,16 +1059,23 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"something" = 'sound/vox_fem/something.ogg',
"son" = 'sound/vox_fem/son.ogg',
"sorry" = 'sound/vox_fem/sorry.ogg',
+ "source" = 'sound/vox_fem/source.ogg',
"south" = 'sound/vox_fem/south.ogg',
"southeast" = 'sound/vox_fem/southeast.ogg',
"southwest" = 'sound/vox_fem/southwest.ogg',
"space" = 'sound/vox_fem/space.ogg',
+ "special" = 'sound/vox_fem/special.ogg',
+ "spew" = 'sound/vox_fem/spew.ogg',
"squad" = 'sound/vox_fem/squad.ogg',
"square" = 'sound/vox_fem/square.ogg',
"ss13" = 'sound/vox_fem/ss13.ogg',
"stairway" = 'sound/vox_fem/stairway.ogg',
"starboard" = 'sound/vox_fem/starboard.ogg',
+ "start" = 'sound/vox_fem/start.ogg',
+ "starts" = 'sound/vox_fem/starts.ogg',
"station" = 'sound/vox_fem/station.ogg',
+ "stations" = 'sound/vox_fem/stations.ogg',
+ "stationwide" = 'sound/vox_fem/stationwide.ogg',
"status" = 'sound/vox_fem/status.ogg',
"stay" = 'sound/vox_fem/stay.ogg',
"sterile" = 'sound/vox_fem/sterile.ogg',
@@ -865,9 +1086,12 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"stuck" = 'sound/vox_fem/stuck.ogg',
"sub" = 'sound/vox_fem/sub.ogg',
"subsurface" = 'sound/vox_fem/subsurface.ogg',
+ "such" = 'sound/vox_fem/such.ogg',
"sudden" = 'sound/vox_fem/sudden.ogg',
"suffer" = 'sound/vox_fem/suffer.ogg',
"suit" = 'sound/vox_fem/suit.ogg',
+ "suited" = 'sound/vox_fem/suited.ogg',
+ "super" = 'sound/vox_fem/super.ogg',
"superconducting" = 'sound/vox_fem/superconducting.ogg',
"supercooled" = 'sound/vox_fem/supercooled.ogg',
"supermatter" = 'sound/vox_fem/supermatter.ogg',
@@ -904,6 +1128,7 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"terminate" = 'sound/vox_fem/terminate.ogg',
"terminated" = 'sound/vox_fem/terminated.ogg',
"termination" = 'sound/vox_fem/termination.ogg',
+ "tesla" = 'sound/vox_fem/tesla.ogg',
"test" = 'sound/vox_fem/test.ogg',
"text" = 'sound/vox_fem/text.ogg',
"thank" = 'sound/vox_fem/thank.ogg',
@@ -924,23 +1149,33 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"threat" = 'sound/vox_fem/threat.ogg',
"three" = 'sound/vox_fem/three.ogg',
"through" = 'sound/vox_fem/through.ogg',
+ "tick" = 'sound/vox_fem/tick.ogg',
"tide" = 'sound/vox_fem/tide.ogg',
+ "tile" = 'sound/vox_fem/tile.ogg',
"time" = 'sound/vox_fem/time.ogg',
"tiny" = 'sound/vox_fem/tiny.ogg',
"to" = 'sound/vox_fem/to.ogg',
"top" = 'sound/vox_fem/top.ogg',
"topside" = 'sound/vox_fem/topside.ogg',
"touch" = 'sound/vox_fem/touch.ogg',
+ "touched" = 'sound/vox_fem/touched.ogg',
+ "touching" = 'sound/vox_fem/touching.ogg',
"towards" = 'sound/vox_fem/towards.ogg',
"toxins" = 'sound/vox_fem/toxins.ogg',
"track" = 'sound/vox_fem/track.ogg',
"train" = 'sound/vox_fem/train.ogg',
"traitor" = 'sound/vox_fem/traitor.ogg',
"transportation" = 'sound/vox_fem/transportation.ogg',
+ "trigger" = 'sound/vox_fem/trigger.ogg',
+ "triggered" = 'sound/vox_fem/triggered.ogg',
+ "triggering" = 'sound/vox_fem/triggering.ogg',
+ "triple" = 'sound/vox_fem/triple.ogg',
+ "tritium" = 'sound/vox_fem/tritium.ogg',
"truck" = 'sound/vox_fem/truck.ogg',
"true" = 'sound/vox_fem/true.ogg',
"tunnel" = 'sound/vox_fem/tunnel.ogg',
"turn" = 'sound/vox_fem/turn.ogg',
+ "turned" = 'sound/vox_fem/turned.ogg',
"turret" = 'sound/vox_fem/turret.ogg',
"twelve" = 'sound/vox_fem/twelve.ogg',
"twenty" = 'sound/vox_fem/twenty.ogg',
@@ -952,10 +1187,13 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"unauthorized" = 'sound/vox_fem/unauthorized.ogg',
"under" = 'sound/vox_fem/under.ogg',
"uniform" = 'sound/vox_fem/uniform.ogg',
+ "unique" = 'sound/vox_fem/unique.ogg',
"unknown" = 'sound/vox_fem/unknown.ogg',
"unlocked" = 'sound/vox_fem/unlocked.ogg',
"unsafe" = 'sound/vox_fem/unsafe.ogg',
"until" = 'sound/vox_fem/until.ogg',
+ "unwrench" = 'sound/vox_fem/unwrench.ogg',
+ "unwrenching" = 'sound/vox_fem/unwrenching.ogg',
"up" = 'sound/vox_fem/up.ogg',
"update" = 'sound/vox_fem/update.ogg',
"updated" = 'sound/vox_fem/updated.ogg',
@@ -967,6 +1205,8 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"usa" = 'sound/vox_fem/usa.ogg',
"use" = 'sound/vox_fem/use.ogg',
"used" = 'sound/vox_fem/used.ogg',
+ "useful" = 'sound/vox_fem/useful.ogg',
+ "useless" = 'sound/vox_fem/useless.ogg',
"user" = 'sound/vox_fem/user.ogg',
"v" = 'sound/vox_fem/v.ogg',
"vacate" = 'sound/vox_fem/vacate.ogg',
@@ -987,8 +1227,8 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"vitals" = 'sound/vox_fem/vitals.ogg',
"voltage" = 'sound/vox_fem/voltage.ogg',
"vox" = 'sound/vox_fem/vox.ogg',
- "vox_login" = 'sound/vox_fem/vox_login.ogg',
"voxtest" = 'sound/vox_fem/voxtest.ogg',
+ "vox_login" = 'sound/vox_fem/vox_login.ogg',
"w" = 'sound/vox_fem/w.ogg',
"walk" = 'sound/vox_fem/walk.ogg',
"wall" = 'sound/vox_fem/wall.ogg',
@@ -1002,15 +1242,19 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"was" = 'sound/vox_fem/was.ogg',
"waste" = 'sound/vox_fem/waste.ogg',
"water" = 'sound/vox_fem/water.ogg',
+ "way" = 'sound/vox_fem/way.ogg',
+ "ways" = 'sound/vox_fem/ways.ogg',
"we" = 'sound/vox_fem/we.ogg',
"weak" = 'sound/vox_fem/weak.ogg',
"weapon" = 'sound/vox_fem/weapon.ogg',
"welcome" = 'sound/vox_fem/welcome.ogg',
+ "weld" = 'sound/vox_fem/weld.ogg',
"west" = 'sound/vox_fem/west.ogg',
"wew" = 'sound/vox_fem/wew.ogg',
"what" = 'sound/vox_fem/what.ogg',
"when" = 'sound/vox_fem/when.ogg',
"where" = 'sound/vox_fem/where.ogg',
+ "which" = 'sound/vox_fem/which.ogg',
"while" = 'sound/vox_fem/while.ogg',
"whiskey" = 'sound/vox_fem/whiskey.ogg',
"white" = 'sound/vox_fem/white.ogg',
@@ -1025,7 +1269,15 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"wood" = 'sound/vox_fem/wood.ogg',
"woody" = 'sound/vox_fem/woody.ogg',
"woop" = 'sound/vox_fem/woop.ogg',
+ "work" = 'sound/vox_fem/work.ogg',
+ "worked" = 'sound/vox_fem/worked.ogg',
+ "working" = 'sound/vox_fem/working.ogg',
+ "works" = 'sound/vox_fem/works.ogg',
+ "would" = 'sound/vox_fem/would.ogg',
+ "wouldnt" = 'sound/vox_fem/wouldnt.ogg',
"wow" = 'sound/vox_fem/wow.ogg',
+ "wrench" = 'sound/vox_fem/wrench.ogg',
+ "wrenching" = 'sound/vox_fem/wrenching.ogg',
"x" = 'sound/vox_fem/x.ogg',
"xeno" = 'sound/vox_fem/xeno.ogg',
"xenobiology" = 'sound/vox_fem/xenobiology.ogg',
@@ -1041,6 +1293,8 @@ GLOBAL_LIST_INIT(vox_sounds, list(
"your" = 'sound/vox_fem/your.ogg',
"yourself" = 'sound/vox_fem/yourself.ogg',
"z" = 'sound/vox_fem/z.ogg',
+ "zap" = 'sound/vox_fem/zap.ogg',
+ "zauker" = 'sound/vox_fem/zauker.ogg',
"zero" = 'sound/vox_fem/zero.ogg',
"zombie" = 'sound/vox_fem/zombie.ogg',
"zone" = 'sound/vox_fem/zone.ogg',
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index 4fc4bd5d8c15d..1721d6ec2c102 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -53,17 +53,9 @@
var/list/ride_offset_y = list("north" = 4, "south" = 4, "east" = 3, "west" = 3)
///List of skins the borg can be reskinned to, optional
var/list/borg_skins
- ///Omnitoolbox, holder of certain borg tools. Not all models have one
- var/obj/item/cyborg_omnitoolbox/toolbox
- ///Path to toolbox, if a model gets one
- var/toolbox_path
/obj/item/robot_model/Initialize(mapload)
. = ..()
-
- if(toolbox_path)
- toolbox = new toolbox_path(src)
-
for(var/path in basic_modules)
var/obj/item/new_module = new path(src)
basic_modules += new_module
@@ -406,7 +398,6 @@
model_select_icon = "engineer"
model_traits = list(TRAIT_NEGATES_GRAVITY)
hat_offset = -4
- toolbox_path = /obj/item/cyborg_omnitoolbox/engineering
/obj/item/robot_model/janitor
name = "Janitor"
@@ -687,7 +678,6 @@
/obj/item/reagent_containers/syringe,
/obj/item/borg/cyborg_omnitool/medical,
/obj/item/borg/cyborg_omnitool/medical,
- /obj/item/surgical_drapes/cyborg,
/obj/item/blood_filter,
/obj/item/extinguisher/mini,
/obj/item/emergency_bed/silicon,
@@ -705,7 +695,6 @@
model_select_icon = "medical"
model_traits = list(TRAIT_PUSHIMMUNE)
hat_offset = 3
- toolbox_path = /obj/item/cyborg_omnitoolbox/medical
borg_skins = list(
"Machinified Doctor" = list(SKIN_ICON_STATE = "medical"),
"Qualified Doctor" = list(SKIN_ICON_STATE = "qualified_doctor"),
@@ -888,7 +877,6 @@
/obj/item/healthanalyzer,
/obj/item/borg/cyborg_omnitool/medical,
/obj/item/borg/cyborg_omnitool/medical,
- /obj/item/surgical_drapes/cyborg,
/obj/item/blood_filter,
/obj/item/melee/energy/sword/cyborg/saw,
/obj/item/emergency_bed/silicon,
@@ -904,7 +892,6 @@
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE)
hat_offset = 3
- toolbox_path = /obj/item/cyborg_omnitoolbox/medical
/obj/item/robot_model/saboteur
name = "Syndicate Saboteur"
@@ -934,7 +921,6 @@
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE, TRAIT_NEGATES_GRAVITY)
hat_offset = -4
- toolbox_path = /obj/item/cyborg_omnitoolbox/engineering
canDispose = TRUE
/obj/item/robot_model/syndicate/kiltborg
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 6d94c2c5be978..9ca655740cd08 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -76,6 +76,7 @@
TRAIT_MARTIAL_ARTS_IMMUNE,
TRAIT_NOFIRE_SPREAD,
TRAIT_BRAWLING_KNOCKDOWN_BLOCKED,
+ TRAIT_FENCE_CLIMBER,
)
add_traits(traits_to_apply, ROUNDSTART_TRAIT)
diff --git a/code/modules/mob/living/silicon/silicon_say.dm b/code/modules/mob/living/silicon/silicon_say.dm
index 1468b9c736591..9310211aa0e6d 100644
--- a/code/modules/mob/living/silicon/silicon_say.dm
+++ b/code/modules/mob/living/silicon/silicon_say.dm
@@ -70,6 +70,9 @@
)
/mob/living/silicon/binarycheck()
+ var/area/our_area = get_area(src)
+ if(our_area.area_flags & BINARY_JAMMING)
+ return FALSE
return TRUE
/mob/living/silicon/radio(message, list/message_mods = list(), list/spans, language)
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index a349ca6499598..80e2b8c0c8343 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -494,8 +494,8 @@
if(!can_finish_build(I, user))
return
to_chat(user, span_notice("You add the [I] to [src]! Beep Boop!"))
- var/mob/living/simple_animal/bot/firebot/F = new(drop_location())
- F.name = created_name
+ var/mob/living/basic/bot/firebot/firebot = new(drop_location())
+ firebot.name = created_name
qdel(I)
qdel(src)
diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm
deleted file mode 100644
index db883e9141b1f..0000000000000
--- a/code/modules/mob/living/simple_animal/bot/firebot.dm
+++ /dev/null
@@ -1,320 +0,0 @@
-//Firebot
-
-#define SPEECH_INTERVAL 300 // Time between idle speeches
-#define DETECTED_VOICE_INTERVAL 300 // Time between fire detected callouts
-#define FOAM_INTERVAL 50 // Time between deployment of fire fighting foam
-
-/mob/living/simple_animal/bot/firebot
- name = "\improper Firebot"
- desc = "A little fire extinguishing bot. He looks rather anxious."
- icon = 'icons/mob/silicon/aibots.dmi'
- icon_state = "firebot1"
- light_color = "#8cffc9"
- light_power = 0.8
- density = FALSE
- anchored = FALSE
- health = 25
- maxHealth = 25
-
- req_one_access = list(ACCESS_ROBOTICS, ACCESS_CONSTRUCTION)
- radio_key = /obj/item/encryptionkey/headset_eng
- radio_channel = RADIO_CHANNEL_ENGINEERING
- bot_type = FIRE_BOT
- hackables = "fire safety protocols"
- path_image_color = "#FFA500"
- possessed_message = "You are a firebot! Protect the station from fires to the best of your ability!"
-
- automated_announcements = list(
- FIREBOT_VOICED_FIRE_DETECTED = 'sound/voice/firebot/detected.ogg',
- FIREBOT_VOICED_STOP_DROP = 'sound/voice/firebot/stopdropnroll.ogg',
- FIREBOT_VOICED_EXTINGUISHING = 'sound/voice/firebot/extinguishing.ogg',
- FIREBOT_VOICED_NO_FIRES = 'sound/voice/firebot/nofires.ogg',
- FIREBOT_VOICED_ONLY_YOU = 'sound/voice/firebot/onlyyou.ogg',
- FIREBOT_VOICED_TEMPERATURE_NOMINAL = 'sound/voice/firebot/tempnominal.ogg',
- FIREBOT_VOICED_KEEP_COOL = 'sound/voice/firebot/keepitcool.ogg',
- )
-
- var/atom/target_fire
- var/atom/old_target_fire
-
- var/obj/item/extinguisher/internal_ext
-
- var/last_found = 0
-
- var/speech_cooldown = 0
- var/detected_cooldown = 0
- COOLDOWN_DECLARE(foam_cooldown)
-
- var/extinguish_people = TRUE
- var/extinguish_fires = TRUE
- var/stationary_mode = FALSE
-
-/mob/living/simple_animal/bot/firebot/Initialize(mapload)
- . = ..()
- ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
- update_appearance(UPDATE_ICON)
-
- // Doing this hurts my soul, but simplebot access reworks are for another day.
- var/datum/id_trim/job/engi_trim = SSid_access.trim_singletons_by_path[/datum/id_trim/job/station_engineer]
- access_card.add_access(engi_trim.access + engi_trim.wildcard_access)
- prev_access = access_card.access.Copy()
-
- create_extinguisher()
- AddElement(/datum/element/atmos_sensitive, mapload)
-
-/mob/living/simple_animal/bot/firebot/Destroy()
- QDEL_NULL(internal_ext)
- return ..()
-
-/mob/living/simple_animal/bot/firebot/bot_reset()
- create_extinguisher()
-
-/mob/living/simple_animal/bot/firebot/proc/create_extinguisher()
- internal_ext = new /obj/item/extinguisher(src)
- internal_ext.safety = FALSE
- internal_ext.precision = TRUE
- internal_ext.max_water = INFINITY
- internal_ext.refill()
-
-/mob/living/simple_animal/bot/firebot/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
- if(!(bot_mode_flags & BOT_MODE_ON))
- return
- if(!can_unarmed_attack())
- return
- if(internal_ext)
- internal_ext.interact_with_atom(A, src, modifiers)
- else
- return ..()
-
-/mob/living/simple_animal/bot/firebot/RangedAttack(atom/A, proximity_flag, list/modifiers)
- if(!(bot_mode_flags & BOT_MODE_ON))
- return
- if(internal_ext)
- internal_ext.interact_with_atom(A, src, modifiers)
- else
- return ..()
-
-/mob/living/simple_animal/bot/firebot/turn_on()
- . = ..()
- update_appearance()
-
-/mob/living/simple_animal/bot/firebot/turn_off()
- ..()
- update_appearance()
-
-/mob/living/simple_animal/bot/firebot/bot_reset()
- ..()
- target_fire = null
- old_target_fire = null
- set_anchored(FALSE)
- update_appearance()
-
-/mob/living/simple_animal/bot/firebot/proc/soft_reset()
- path = list()
- target_fire = null
- mode = BOT_IDLE
- last_found = world.time
- update_appearance()
-
-/mob/living/simple_animal/bot/firebot/emag_act(mob/user, obj/item/card/emag/emag_card)
- . = ..()
- if(!(bot_cover_flags & BOT_COVER_EMAGGED))
- return
-
- to_chat(user, span_warning("You enable the very ironically named \"fighting with fire\" mode, and disable the targeting safeties.")) // heheehe. funny
-
- audible_message(span_danger("[src] buzzes oddly!"))
- playsound(src, SFX_SPARKS, 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(user)
- old_target_fire = user
- extinguish_fires = FALSE
- extinguish_people = TRUE
-
- internal_ext = new /obj/item/extinguisher(src)
- internal_ext.chem = /datum/reagent/clf3 //Refill the internal extinguisher with liquid fire
- internal_ext.power = 3
- internal_ext.safety = FALSE
- internal_ext.precision = FALSE
- internal_ext.max_water = INFINITY
- internal_ext.refill()
- return TRUE
-
-// Variables sent to TGUI
-/mob/living/simple_animal/bot/firebot/ui_data(mob/user)
- var/list/data = ..()
- if(!(bot_cover_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user))
- data["custom_controls"]["extinguish_fires"] = extinguish_fires
- data["custom_controls"]["extinguish_people"] = extinguish_people
- data["custom_controls"]["stationary_mode"] = stationary_mode
- return data
-
-// Actions received from TGUI
-/mob/living/simple_animal/bot/firebot/ui_act(action, params)
- . = ..()
- if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr)))
- return
-
- switch(action)
- if("extinguish_fires")
- extinguish_fires = !extinguish_fires
- if("extinguish_people")
- extinguish_people = !extinguish_people
- if("stationary_mode")
- stationary_mode = !stationary_mode
- update_appearance()
-
-/mob/living/simple_animal/bot/firebot/proc/is_burning(atom/target)
- if(ismob(target))
- var/mob/living/M = target
- if(M.on_fire || (bot_cover_flags & BOT_COVER_EMAGGED && !M.on_fire))
- return TRUE
-
- else if(isturf(target))
- var/turf/open/T = target
- if(T.active_hotspot)
- return TRUE
-
- return FALSE
-
-/mob/living/simple_animal/bot/firebot/handle_automated_action()
- if(!..())
- return
-
- if(IsStun() || IsParalyzed())
- old_target_fire = target_fire
- target_fire = null
- mode = BOT_IDLE
- return
-
- if(prob(1) && target_fire == null)
- var/static/list/idle_line = list(
- FIREBOT_VOICED_NO_FIRES,
- FIREBOT_VOICED_ONLY_YOU,
- FIREBOT_VOICED_TEMPERATURE_NOMINAL,
- FIREBOT_VOICED_KEEP_COOL,
- )
- speak(pick(idle_line))
-
- // Couldn't reach the target, reset and try again ignoring the old one
- if(frustration > 8)
- old_target_fire = target_fire
- soft_reset()
-
- // We extinguished our target or it was deleted
- if(QDELETED(target_fire) || !is_burning(target_fire) || isdead(target_fire))
- target_fire = null
- var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE)
-
- var/list/things_to_extinguish = list()
- if(extinguish_people)
- things_to_extinguish += list(/mob/living)
-
- if(target_fire == null && extinguish_fires)
- things_to_extinguish += list(/turf/open)
-
- target_fire = scan(things_to_extinguish, old_target_fire, scan_range) // Scan for burning turfs second
- old_target_fire = target_fire
-
- // Target reached ENGAGE WATER CANNON
- if(target_fire && (get_dist(src, target_fire) <= (bot_cover_flags & BOT_COVER_EMAGGED ? 1 : 2))) // Make the bot spray water from afar when not emagged
- if((speech_cooldown + SPEECH_INTERVAL) < world.time)
- if(ishuman(target_fire))
- speak(FIREBOT_VOICED_STOP_DROP)
- else
- speak(FIREBOT_VOICED_EXTINGUISHING)
- speech_cooldown = world.time
-
- flick("firebot1_use", src)
- spray_water(target_fire, src)
-
- soft_reset()
-
- // Target ran away
- else if(target_fire && path.len && (get_dist(target_fire,path[path.len]) > 2))
- path = list()
- mode = BOT_IDLE
- last_found = world.time
-
- else if(target_fire && stationary_mode)
- soft_reset()
- return
-
- if(target_fire && (get_dist(src, target_fire) > 2))
-
- path = get_path_to(src, target_fire, max_distance=30, mintargetdist=1, access=access_card.GetAccess())
- mode = BOT_MOVING
- if(!path.len)
- soft_reset()
-
- if(path.len > 0 && target_fire)
- if(!bot_move(path[path.len]))
- old_target_fire = target_fire
- soft_reset()
- return
-
- // We got a target but it's too far away from us
- if(path.len > 8 && target_fire)
- frustration++
-
- if(bot_mode_flags & BOT_MODE_AUTOPATROL && !target_fire)
- switch(mode)
- if(BOT_IDLE, BOT_START_PATROL)
- start_patrol()
- if(BOT_PATROL)
- bot_patrol()
-
-
-//Look for burning people or turfs around the bot
-/mob/living/simple_animal/bot/firebot/process_scan(atom/scan_target)
- if(!is_burning(scan_target))
- return null
-
- if((detected_cooldown + DETECTED_VOICE_INTERVAL) < world.time)
- speak(FIREBOT_VOICED_FIRE_DETECTED)
- detected_cooldown = world.time
- return scan_target
-
-/mob/living/simple_animal/bot/firebot/should_atmos_process(datum/gas_mixture/air, exposed_temperature)
- return (exposed_temperature > T0C + 200 || exposed_temperature < BODYTEMP_COLD_DAMAGE_LIMIT)
-
-/mob/living/simple_animal/bot/firebot/atmos_expose(datum/gas_mixture/air, exposed_temperature)
- if(COOLDOWN_FINISHED(src, foam_cooldown))
- var/datum/effect_system/fluid_spread/foam/firefighting/foam = new
- foam.set_up(3, holder = src, location = loc)
- foam.start()
- COOLDOWN_START(src, foam_cooldown, FOAM_INTERVAL)
-
-/mob/living/simple_animal/bot/firebot/proc/spray_water(atom/target, mob/user)
- if(stationary_mode)
- flick("firebots_use", user)
- else
- flick("firebot1_use", user)
- internal_ext.interact_with_atom(target, src)
-
-/mob/living/simple_animal/bot/firebot/update_icon_state()
- . = ..()
- if(!(bot_mode_flags & BOT_MODE_ON))
- icon_state = "firebot0"
- return
- if(IsStun() || IsParalyzed() || stationary_mode) //Bot has yellow light to indicate stationary mode.
- icon_state = "firebots1"
- return
- icon_state = "firebot1"
-
-
-/mob/living/simple_animal/bot/firebot/explode()
- var/atom/Tsec = drop_location()
-
- new /obj/item/assembly/prox_sensor(Tsec)
- new /obj/item/clothing/head/utility/hardhat/red(Tsec)
-
- var/turf/T = get_turf(Tsec)
-
- if(isopenturf(T))
- var/turf/open/theturf = T
- theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
- return ..()
-
-#undef SPEECH_INTERVAL
-#undef DETECTED_VOICE_INTERVAL
-#undef FOAM_INTERVAL
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 b4cafdb6d538d..4156d9678bca0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -538,12 +538,12 @@ Difficulty: Hard
/obj/effect/temp_visual/hierophant/wall/Initialize(mapload, new_caster)
. = ..()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
QUEUE_SMOOTH(src)
/obj/effect/temp_visual/hierophant/wall/Destroy()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index 8fc667df5a876..464636cbb204d 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -187,11 +187,14 @@ Difficulty: Hard
if(!true_spawn)
return ..()
+ create_portal()
+ return ..()
+
+/mob/living/simple_animal/hostile/megafauna/wendigo/proc/create_portal()
var/obj/effect/portal/permanent/one_way/exit = new /obj/effect/portal/permanent/one_way(starting)
exit.id = "wendigo arena exit"
exit.add_atom_colour(COLOR_RED_LIGHT, ADMIN_COLOUR_PRIORITY)
exit.set_light(20, 1, COLOR_SOFT_RED)
- return ..()
/obj/projectile/colossus/wendigo_shockwave
name = "wendigo shockwave"
@@ -265,4 +268,7 @@ Difficulty: Hard
w_class = WEIGHT_CLASS_TINY
throwforce = 0
+/mob/living/simple_animal/hostile/megafauna/wendigo/noportal/create_portal()
+ return
+
#undef WENDIGO_ENRAGED
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index 7139f6a92bfcd..ae0011f998a68 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -7,7 +7,7 @@
name = "elite"
desc = "An elite monster, found in one of the strange tumors on lavaland."
icon = 'icons/mob/simple/lavaland/lavaland_elites.dmi'
- faction = list(FACTION_BOSS)
+ faction = list(FACTION_MINING, FACTION_BOSS)
robust_searching = TRUE
ranged_ignores_vision = TRUE
ranged = TRUE
@@ -272,8 +272,8 @@ While using this makes the system rely on OnFire, it still gives options for tim
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(mychild))
H.color = COLOR_RED
-/obj/structure/elite_tumor/attackby(obj/item/attacking_item, mob/user, params)
- . = ..()
+/obj/structure/elite_tumor/item_interaction(mob/living/user, obj/item/attacking_item, list/modifiers)
+ . = NONE
if(istype(attacking_item, /obj/item/organ/internal/monster_core/regenerative_core) && activity == TUMOR_INACTIVE && !boosted)
var/obj/item/organ/internal/monster_core/regenerative_core/core = attacking_item
visible_message(span_boldwarning("As [user] drops the core into [src], [src] appears to swell."))
@@ -282,7 +282,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
set_light_range(6)
desc = "[desc] This one seems to glow with a strong intensity."
qdel(core)
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/structure/elite_tumor/proc/arena_checks()
if(activity != TUMOR_ACTIVE || QDELETED(src))
@@ -408,12 +408,12 @@ While using this makes the system rely on OnFire, it still gives options for tim
/obj/effect/temp_visual/elite_tumor_wall/Initialize(mapload, new_caster)
. = ..()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
QUEUE_SMOOTH(src)
/obj/effect/temp_visual/elite_tumor_wall/Destroy()
- if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm
index e20ecc2337a4d..f69c010ac6bfb 100644
--- a/code/modules/mob/living/simple_animal/hostile/ooze.dm
+++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm
@@ -375,7 +375,7 @@
name = "mending globule"
icon_state = "glob_projectile"
shrapnel_type = /obj/item/mending_globule
- embedding = list("embed_chance" = 100, ignore_throwspeed_threshold = TRUE, "pain_mult" = 0, "jostle_pain_mult" = 0, "fall_chance" = 0.5)
+ embed_type = /datum/embed_data/mending_globule
damage = 0
///This item is what is embedded into the mob, and actually handles healing of mending globules
@@ -384,10 +384,17 @@
desc = "It somehow heals those who touch it."
icon = 'icons/obj/science/vatgrowing.dmi'
icon_state = "globule"
- embedding = list("embed_chance" = 100, ignore_throwspeed_threshold = TRUE, "pain_mult" = 0, "jostle_pain_mult" = 0, "fall_chance" = 0.5)
+ embed_type = /datum/embed_data/mending_globule
var/obj/item/bodypart/bodypart
var/heals_left = 35
+/datum/embed_data/mending_globule
+ embed_chance = 100
+ ignore_throwspeed_threshold = TRUE
+ pain_mult = 0
+ jostle_pain_mult = 0
+ fall_chance = 0.5
+
/obj/item/mending_globule/Destroy()
. = ..()
bodypart = null
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index e25a6f9b16e27..2fa18caf7bc20 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -1,4 +1,19 @@
// VENTCRAWLING
+
+/mob/living/proc/notify_ventcrawler_on_login()
+ var/ventcrawler = HAS_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(src, TRAIT_VENTCRAWLER_NUDE)
+ if(!ventcrawler)
+ return
+ to_chat(src, span_notice("You can ventcrawl! Use alt+click on vents to quickly travel about the station."))
+
+/mob/living/carbon/human/notify_ventcrawler_on_login()
+ if(!ismonkey(src))
+ return ..()
+ if(!istype(head, /obj/item/clothing/head/helmet/monkey_sentience)) //don't notify them about ventcrawling if they're wearing the sentience helmet, because they can't ventcrawl with it on, and if they take it off they'll no longer be in control of the mob.
+ return ..()
+
+
+
/// Checks if the mob is able to enter the vent, and provides feedback if they are unable to.
/mob/living/proc/can_enter_vent(obj/machinery/atmospherics/components/ventcrawl_target, provide_feedback = TRUE)
// Being able to always ventcrawl trumps being only able to ventcrawl when wearing nothing
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 2f013f855b855..a4964add6c865 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -99,7 +99,10 @@
update_client_colour()
update_mouse_pointer()
- refresh_looping_ambience()
+ update_ambience_area(get_area(src))
+
+ if(!can_hear())
+ stop_sound_channel(CHANNEL_AMBIENCE)
if(client)
if(client.view_size)
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index cf937e42bb74f..09d50c8436c71 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -3,6 +3,7 @@
log_message("[key_name(src)] is no longer owning mob [src]([src.type])", LOG_OWNERSHIP)
SStgui.on_logout(src)
remove_from_player_list()
+ update_ambience_area(null) // Unset ambience vars so it plays again on login
..()
if(loc)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 7dd1cf0d2880f..6ec820bc469c9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -6,7 +6,6 @@
* * GLOB.dead_mob_list
* * GLOB.alive_mob_list
* * GLOB.all_clockwork_mobs
- * * GLOB.mob_directory
*
* Unsets the focus var
*
@@ -67,7 +66,6 @@
*
* Adds to global lists
* * GLOB.mob_list
- * * GLOB.mob_directory (by tag)
* * GLOB.dead_mob_list - if mob is dead
* * GLOB.alive_mob_list - if the mob is alive
*
@@ -441,88 +439,6 @@
return FALSE
-/**
- * Try to equip an item to a slot on the mob
- *
- * This is a SAFE proc. Use this instead of equip_to_slot()!
- *
- * set qdel_on_fail to have it delete W if it fails to equip
- *
- * set disable_warning to disable the 'you are unable to equip that' warning.
- *
- * unset redraw_mob to prevent the mob icons from being redrawn at the end.
- *
- * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
- *
- * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
- */
-/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE, initial = FALSE, indirect_action = FALSE)
- if(!istype(W) || QDELETED(W)) //This qdeleted is to prevent stupid behavior with things that qdel during init, like say stacks
- return FALSE
- if(!W.mob_can_equip(src, slot, disable_warning, bypass_equip_delay_self, indirect_action = indirect_action))
- if(qdel_on_fail)
- qdel(W)
- else if(!disable_warning)
- to_chat(src, span_warning("You are unable to equip that!"))
- return FALSE
- equip_to_slot(W, slot, initial, redraw_mob, indirect_action = indirect_action) //This proc should not ever fail.
- return TRUE
-
-/**
- * Actually equips an item to a slot (UNSAFE)
- *
- * This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on
- * whether you can or can't equip need to be done before! Use mob_can_equip() for that task.
- *
- *In most cases you will want to use equip_to_slot_if_possible()
- */
-/mob/proc/equip_to_slot(obj/item/equipping, slot, initial = FALSE, redraw_mob = FALSE, indirect_action = FALSE)
- return
-
-/**
- * Equip an item to the slot or delete
- *
- * This is just a commonly used configuration for the equip_to_slot_if_possible() proc, used to
- * equip people when the round starts and when events happen and such.
- *
- * Also bypasses equip delay checks, since the mob isn't actually putting it on.
- * Initial is used to indicate whether or not this is the initial equipment (job datums etc) or just a player doing it
- * set indirect_action to allow insertions into "soft" locked objects, things that are easily opened by the owning mob
- */
-/mob/proc/equip_to_slot_or_del(obj/item/W, slot, initial = FALSE, indirect_action = FALSE)
- return equip_to_slot_if_possible(W, slot, TRUE, TRUE, FALSE, TRUE, initial, indirect_action)
-
-/**
- * Auto equip the passed in item the appropriate slot based on equipment priority
- *
- * puts the item "W" into an appropriate slot in a human's inventory
- *
- * returns 0 if it cannot, 1 if successful
- */
-/mob/proc/equip_to_appropriate_slot(obj/item/W, qdel_on_fail = FALSE, indirect_action = FALSE)
- if(!istype(W))
- return FALSE
- var/slot_priority = W.slot_equipment_priority
-
- if(!slot_priority)
- slot_priority = list( \
- ITEM_SLOT_BACK, ITEM_SLOT_ID,\
- ITEM_SLOT_ICLOTHING, ITEM_SLOT_OCLOTHING,\
- ITEM_SLOT_MASK, ITEM_SLOT_HEAD, ITEM_SLOT_NECK,\
- ITEM_SLOT_FEET, ITEM_SLOT_GLOVES,\
- ITEM_SLOT_EARS, ITEM_SLOT_EYES,\
- ITEM_SLOT_BELT, ITEM_SLOT_SUITSTORE,\
- ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET,\
- ITEM_SLOT_DEX_STORAGE\
- )
-
- for(var/slot in slot_priority)
- if(equip_to_slot_if_possible(W, slot, disable_warning = TRUE, redraw_mob = TRUE, indirect_action = indirect_action))
- return TRUE
-
- if(qdel_on_fail)
- qdel(W)
- return FALSE
/**
* Reset the attached clients perspective (viewpoint)
*
@@ -889,10 +805,6 @@
set category = null
return
-///Is the mob muzzled (default false)
-/mob/proc/is_muzzled()
- return FALSE
-
/// Adds this list to the output to the stat browser
/mob/proc/get_status_tab_items()
. = list("") //we want to offset unique stuff from standard stuff
@@ -1160,6 +1072,7 @@
* * ALLOW_VENTCRAWL - Mobs with ventcrawl traits can alt-click this to vent
* * BYPASS_ADJACENCY - The target does not have to be adjacent
* * SILENT_ADJACENCY - Adjacency is required but errors are not printed
+ * * NOT_INSIDE_TARGET - The target maybe adjacent but the mob should not be inside the target
*
* silence_adjacency: Sometimes we want to use this proc to check interaction without allowing it to throw errors for base case adjacency
* Alt click uses this, as otherwise you can detect what is interactable from a distance via the error message
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index a0658c3a02b38..2206efd0e13ce 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -191,3 +191,6 @@
var/active_typing_indicator
///the icon currently used for the thinking indicator's bubble
var/active_thinking_indicator
+
+ /// A ref of the area we're taking our ambient loop from.
+ var/area/ambience_tracked_area
diff --git a/code/modules/mob/mob_lists.dm b/code/modules/mob/mob_lists.dm
index 9fd097a1fd6a4..f43f82ac24609 100644
--- a/code/modules/mob/mob_lists.dm
+++ b/code/modules/mob/mob_lists.dm
@@ -1,12 +1,10 @@
///Adds the mob reference to the list and directory of all mobs. Called on Initialize().
/mob/proc/add_to_mob_list()
GLOB.mob_list |= src
- GLOB.mob_directory[tag] = src
///Removes the mob reference from the list and directory of all mobs. Called on Destroy().
/mob/proc/remove_from_mob_list()
GLOB.mob_list -= src
- GLOB.mob_directory -= tag
///Adds the mob reference to the list of all mobs alive. If mob is cliented, it adds it to the list of all living player-mobs.
/mob/proc/add_to_alive_mob_list()
diff --git a/code/modules/mob/mob_say.dm b/code/modules/mob/mob_say.dm
index 568aee6690292..6b8c8f9aa6b2a 100644
--- a/code/modules/mob/mob_say.dm
+++ b/code/modules/mob/mob_say.dm
@@ -106,9 +106,6 @@
if(!allow_mimes && HAS_MIND_TRAIT(src, TRAIT_MIMING))
return FALSE
- if(is_muzzled())
- return FALSE
-
return ..()
///Speak as a dead person (ghost etc)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index d186661d87fae..5d46f3c0dc06a 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -67,6 +67,7 @@
transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_humanize), species), TRANSFORMATION_DURATION, TIMER_UNIQUE)
+
/mob/living/carbon/proc/finish_humanize(species = /datum/species/human)
transformation_timer = null
to_chat(src, span_boldnotice("You are now a human."))
@@ -77,6 +78,12 @@
SEND_SIGNAL(src, COMSIG_MONKEY_HUMANIZE)
return src
+/mob/living/carbon/human/finish_humanize(species = /datum/species/human, instant = FALSE)
+ underwear = "Nude"
+ undershirt = "Nude"
+ socks = "Nude"
+ return ..()
+
/mob/proc/AIize(client/preference_source, move = TRUE)
var/list/turf/landmark_loc = list()
diff --git a/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm b/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm
index 0940815f1fc56..0ed30e5a5215d 100644
--- a/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm
+++ b/code/modules/mob_spawn/corpses/nanotrasen_corpses.dm
@@ -25,7 +25,7 @@
suit = /obj/item/clothing/suit/armor/bulletproof
ears = /obj/item/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/eyepatch
- mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
+ mask = /obj/item/cigarette/cigar/cohiba
head = /obj/item/clothing/head/hats/centhat
gloves = /obj/item/clothing/gloves/tackler/combat
shoes = /obj/item/clothing/shoes/combat/swat
diff --git a/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm b/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm
index 5b9e043349ea0..0165b27f21a1a 100644
--- a/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/fugitive_hunter_roles.dm
@@ -96,3 +96,18 @@
if I assisted them with my 'flesh-gaze'. They're a bunch of freaks, but at least they leave me be after I'm done helping them..."
back_story = HUNTER_PACK_PSYKER
outfit = /datum/outfit/psyker_seer
+
+/obj/effect/mob_spawn/ghost_role/human/fugitive/mi13
+ name = "top-secret pod"
+ desc = "You don't have the classification to know what this pod contains or what its purpose is."
+ icon = 'icons/obj/machines/sleeper.dmi'
+ icon_state = "sleeper_s"
+ prompt_name = "a MI13 agent"
+ you_are_text = "I am an agent sent by MI13."
+ flavour_text = "Your mission is to infiltrate the space around SS13 and capture the fugitives on board, dead or alive. Your shuttle has been disguised as an ordinary food truck to help you remain undetected. \
+ This is a stealth mission in enemy territory. Reinforcements will not be sent to save you. Microbombs have been implanted in case of capture. Do not disappoint."
+ back_story = HUNTER_PACK_MI13
+ outfit = /datum/outfit/mi13_hunter
+
+/obj/effect/mob_spawn/ghost_role/human/fugitive/mi13/chef
+ outfit = /datum/outfit/mi13_hunter/chef
diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm
index 764d20c9a76c1..79d028bdbcb27 100644
--- a/code/modules/mob_spawn/ghost_roles/space_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm
@@ -181,6 +181,6 @@
ears = /obj/item/radio/headset/syndicate/alt/leader
glasses = /obj/item/clothing/glasses/thermal/eyepatch
head = /obj/item/clothing/head/hats/hos/cap/syndicate
- mask = /obj/item/clothing/mask/cigarette/cigar/havana
+ mask = /obj/item/cigarette/cigar/havana
l_pocket = /obj/item/melee/energy/sword/saber/red
r_pocket = /obj/item/melee/baton/telescopic
diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm
index d9cdd699ade70..80f584d52c2b6 100644
--- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm
@@ -308,7 +308,7 @@
/datum/outfit/syndicatespace/syndicrew
name = "Syndicate Ship Crew Member"
- glasses = /obj/item/clothing/glasses/night
+ glasses = /obj/item/clothing/glasses/night/colorless
mask = /obj/item/clothing/mask/gas/syndicate
l_pocket = /obj/item/gun/ballistic/automatic/pistol
r_pocket = /obj/item/knife/combat/survival
diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm
index c9130fb706e1b..3337a15b441c5 100644
--- a/code/modules/mob_spawn/mob_spawn.dm
+++ b/code/modules/mob_spawn/mob_spawn.dm
@@ -59,26 +59,15 @@
spawned_human.underwear = "Nude"
spawned_human.undershirt = "Nude"
spawned_human.socks = "Nude"
+ randomize_human_normie(spawned_human)
if(hairstyle)
- spawned_human.hairstyle = hairstyle
- else
- spawned_human.hairstyle = random_hairstyle(spawned_human.gender)
+ spawned_human.set_hairstyle(hairstyle, update = FALSE)
if(facial_hairstyle)
- spawned_human.facial_hairstyle = facial_hairstyle
- else
- spawned_human.facial_hairstyle = random_facial_hairstyle(spawned_human.gender)
+ spawned_human.set_facial_hairstyle(facial_hairstyle, update = FALSE)
if(haircolor)
- spawned_human.hair_color = haircolor
- else
- spawned_human.hair_color = "#[random_color()]"
+ spawned_human.set_haircolor(haircolor, update = FALSE)
if(facial_haircolor)
- spawned_human.facial_hair_color = facial_haircolor
- else
- spawned_human.facial_hair_color = "#[random_color()]"
- if(skin_tone)
- spawned_human.skin_tone = skin_tone
- else
- spawned_human.skin_tone = pick(GLOB.skin_tones)
+ spawned_human.set_facial_haircolor(facial_haircolor, update = FALSE)
spawned_human.update_body(is_creating = TRUE)
/obj/effect/mob_spawn/proc/name_mob(mob/living/spawned_mob, forced_name)
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 734cc6ba2510d..350c2fabc3069 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -144,9 +144,6 @@
if(active)
. += span_notice("Charge: [core ? "[get_charge_percent()]%" : "No core"].")
. += span_notice("Selected module: [selected_module || "None"].")
- if(atom_storage)
- . += span_notice("While the suit's panel is open, \
- being on combat mode will prevent you from inserting items into it when clicking on it.")
if(!open && !active)
if(!wearer)
. += span_notice("You could equip it to turn it on.")
@@ -278,7 +275,6 @@
return ITEM_INTERACT_SUCCESS
/obj/item/mod/control/crowbar_act(mob/living/user, obj/item/crowbar)
- . = ..()
if(!open)
balloon_alert(user, "open the cover first!")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
@@ -309,32 +305,32 @@
return ITEM_INTERACT_BLOCKING
/obj/item/mod/control/storage_insert_on_interacted_with(datum/storage, obj/item/inserted, mob/living/user)
- if(user.combat_mode)
- // Block all item-click-inserts when we're open
- // Other form of insertion will still function (mousedrop, hotkey)
- if(open)
- return FALSE
- // ...You have to open it up somehow though
- if(inserted.tool_behaviour == TOOL_SCREWDRIVER)
- return FALSE
+ // Hack. revisit later
+ if(istype(inserted, /obj/item/aicard))
+ var/obj/item/aicard/ai_card = inserted
+ if(ai_card.AI)
+ return FALSE // we want to get an AI assistant, try uploading instead of insertion
+ if(ai_assistant)
+ return FALSE // we already have an AI assistant, try withdrawing instead of insertion
return TRUE
-/obj/item/mod/control/item_interaction(mob/living/user, obj/item/attacking_item, list/modifiers)
- if(istype(attacking_item, /obj/item/pai_card))
+// Makes use of tool act to prevent shoving stuff into our internal storage
+/obj/item/mod/control/tool_act(mob/living/user, obj/item/tool, list/modifiers)
+ if(istype(tool, /obj/item/pai_card))
if(!open)
balloon_alert(user, "open the cover first!")
return ITEM_INTERACT_BLOCKING
- insert_pai(user, attacking_item)
+ insert_pai(user, tool)
return ITEM_INTERACT_SUCCESS
- if(istype(attacking_item, /obj/item/mod/module))
+ if(istype(tool, /obj/item/mod/module))
if(!open)
balloon_alert(user, "open the cover first!")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
return ITEM_INTERACT_BLOCKING
- install(attacking_item, user)
+ install(tool, user)
SEND_SIGNAL(src, COMSIG_MOD_MODULE_ADDED, user)
return ITEM_INTERACT_SUCCESS
- if(istype(attacking_item, /obj/item/mod/core))
+ if(istype(tool, /obj/item/mod/core))
if(!open)
balloon_alert(user, "open the cover first!")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
@@ -343,19 +339,20 @@
balloon_alert(user, "core already installed!")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
return ITEM_INTERACT_BLOCKING
- var/obj/item/mod/core/attacking_core = attacking_item
+ var/obj/item/mod/core/attacking_core = tool
attacking_core.install(src)
balloon_alert(user, "core installed")
playsound(src, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
return ITEM_INTERACT_SUCCESS
if(open)
- if(is_wire_tool(attacking_item))
+ if(is_wire_tool(tool))
wires.interact(user)
return ITEM_INTERACT_SUCCESS
- if(attacking_item.GetID())
- update_access(user, attacking_item.GetID())
+ var/obj/item/id = tool.GetID()
+ if(id)
+ update_access(user, id)
return ITEM_INTERACT_SUCCESS
- return NONE
+ return ..()
/obj/item/mod/control/get_cell()
var/obj/item/stock_parts/power_store/cell = get_charge_source()
diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm
index 70f95297b9404..0c13efa1b950c 100644
--- a/code/modules/mod/mod_core.dm
+++ b/code/modules/mod/mod_core.dm
@@ -97,7 +97,8 @@
install_cell(cell)
RegisterSignal(mod, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
RegisterSignal(mod, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
- RegisterSignal(mod, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(mod, COMSIG_ATOM_STORAGE_ITEM_INTERACT_INSERT, PROC_REF(on_mod_storage_insert))
+ RegisterSignal(mod, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_mod_interaction))
RegisterSignal(mod, COMSIG_MOD_WEARER_SET, PROC_REF(on_wearer_set))
if(mod.wearer)
on_wearer_set(mod, mod.wearer)
@@ -105,7 +106,13 @@
/obj/item/mod/core/standard/uninstall()
if(!QDELETED(cell))
cell.forceMove(drop_location())
- UnregisterSignal(mod, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACKBY, COMSIG_MOD_WEARER_SET))
+ UnregisterSignal(mod, list(
+ COMSIG_ATOM_EXAMINE,
+ COMSIG_ATOM_ATTACK_HAND,
+ COMSIG_ATOM_STORAGE_ITEM_INTERACT_INSERT,
+ COMSIG_ATOM_ITEM_INTERACTION,
+ COMSIG_MOD_WEARER_SET,
+ ))
if(mod.wearer)
on_wearer_unset(mod, mod.wearer)
return ..()
@@ -206,23 +213,37 @@
cell_to_move.forceMove(drop_location())
user.put_in_hands(cell_to_move)
-/obj/item/mod/core/standard/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+/obj/item/mod/core/standard/proc/on_mod_storage_insert(datum/source, obj/item/thing, mob/living/user)
SIGNAL_HANDLER
- if(istype(attacking_item, /obj/item/stock_parts/power_store/cell))
- if(!mod.open)
- mod.balloon_alert(user, "open the cover first!")
- playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
- return NONE
- if(cell)
- mod.balloon_alert(user, "cell already installed!")
- playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
- return COMPONENT_NO_AFTERATTACK
- install_cell(attacking_item)
- mod.balloon_alert(user, "cell installed")
- playsound(mod, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
- return COMPONENT_NO_AFTERATTACK
- return NONE
+ return replace_cell(thing, user) ? BLOCK_STORAGE_INSERT : NONE
+
+/obj/item/mod/core/standard/proc/on_mod_interaction(datum/source, mob/living/user, obj/item/thing)
+ SIGNAL_HANDLER
+
+ if(mod.atom_storage) // handled by the storage signal
+ return NONE
+
+ return item_interaction(user, thing)
+
+/obj/item/mod/core/standard/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ return replace_cell(tool, user) ? ITEM_INTERACT_SUCCESS : NONE
+
+/obj/item/mod/core/standard/proc/replace_cell(obj/item/attacking_item, mob/user)
+ if(!istype(attacking_item, /obj/item/stock_parts/power_store/cell))
+ return FALSE
+ if(!mod.open)
+ mod.balloon_alert(user, "open the cover first!")
+ playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ if(cell)
+ mod.balloon_alert(user, "cell already installed!")
+ playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return FALSE
+ install_cell(attacking_item)
+ mod.balloon_alert(user, "cell installed")
+ playsound(mod, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return TRUE
/obj/item/mod/core/standard/proc/on_wearer_set(datum/source, mob/user)
SIGNAL_HANDLER
@@ -303,15 +324,11 @@
/obj/item/mod/core/plasma/install(obj/item/mod/control/mod_unit)
. = ..()
- RegisterSignal(mod, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(mod, COMSIG_ATOM_STORAGE_ITEM_INTERACT_INSERT, PROC_REF(on_mod_storage_insert))
+ RegisterSignal(mod, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_mod_interaction))
/obj/item/mod/core/plasma/uninstall()
- UnregisterSignal(mod, COMSIG_ATOM_ATTACKBY)
- return ..()
-
-/obj/item/mod/core/plasma/attackby(obj/item/attacking_item, mob/user, params)
- if(charge_plasma(attacking_item, user))
- return TRUE
+ UnregisterSignal(mod, list(COMSIG_ATOM_STORAGE_ITEM_INTERACT_INSERT, COMSIG_ATOM_ITEM_INTERACTION))
return ..()
/obj/item/mod/core/plasma/charge_source()
@@ -350,19 +367,28 @@
return "empty"
-/obj/item/mod/core/plasma/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+/obj/item/mod/core/plasma/proc/on_mod_storage_insert(datum/source, obj/item/thing, mob/living/user)
SIGNAL_HANDLER
- if(charge_plasma(attacking_item, user))
- return COMPONENT_NO_AFTERATTACK
- return NONE
+ return charge_plasma(thing, user) ? BLOCK_STORAGE_INSERT : NONE
+
+/obj/item/mod/core/plasma/proc/on_mod_interaction(datum/source, mob/living/user, obj/item/thing)
+ SIGNAL_HANDLER
+
+ if(mod.atom_storage) // handled by the storage signal
+ return NONE
+
+ return item_interaction(thing, user)
+
+/obj/item/mod/core/plasma/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ return charge_plasma(tool, user) ? ITEM_INTERACT_SUCCESS : NONE
/obj/item/mod/core/plasma/proc/charge_plasma(obj/item/stack/plasma, mob/user)
var/charge_given = is_type_in_list(plasma, charger_list, zebra = TRUE)
if(!charge_given)
return FALSE
var/uses_needed = min(plasma.amount, ROUND_UP((max_charge_amount() - charge_amount()) / charge_given))
- if(!plasma.use(uses_needed))
+ if(uses_needed <= 0 || !plasma.use(uses_needed))
return FALSE
add_charge(uses_needed * charge_given)
balloon_alert(user, "core refueled")
diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm
index 5733d48f45f6f..aa5307957f981 100644
--- a/code/modules/mod/mod_link.dm
+++ b/code/modules/mod/mod_link.dm
@@ -16,7 +16,7 @@
/proc/get_link_visual_generic(datum/mod_link/mod_link, atom/movable/visuals, proc_path)
var/mob/living/user = mod_link.get_user_callback.Invoke()
playsound(mod_link.holder, 'sound/machines/terminal_processing.ogg', 50, vary = TRUE)
- visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "static_base", TURF_LAYER))
+ visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "static_base", ABOVE_NORMAL_TURF_LAYER))
visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "modlink", ABOVE_ALL_MOB_LAYER))
visuals.add_filter("crop_square", 1, alpha_mask_filter(icon = icon('icons/effects/effects.dmi', "modlink_filter")))
visuals.maptext_height = 6
@@ -77,29 +77,34 @@
)
/obj/item/mod/control/multitool_act_secondary(mob/living/user, obj/item/multitool/tool)
- if(!multitool_check_buffer(user, tool))
- return
+ . = NONE
+
var/tool_frequency = null
if(istype(tool.buffer, /datum/mod_link))
var/datum/mod_link/buffer_link = tool.buffer
tool_frequency = buffer_link.frequency
balloon_alert(user, "frequency set")
+ . = ITEM_INTERACT_SUCCESS
if(!tool_frequency && mod_link.frequency)
tool.set_buffer(mod_link)
balloon_alert(user, "frequency copied")
+ . = ITEM_INTERACT_SUCCESS
else if(tool_frequency && !mod_link.frequency)
mod_link.frequency = tool_frequency
+ . = ITEM_INTERACT_SUCCESS
else if(tool_frequency && mod_link.frequency)
var/response = tgui_alert(user, "Would you like to copy or imprint the frequency?", "MODlink Frequency", list("Copy", "Imprint"))
if(!user.is_holding(tool))
- return
+ return ITEM_INTERACT_BLOCKING
switch(response)
if("Copy")
tool.set_buffer(mod_link)
balloon_alert(user, "frequency copied")
+ . = ITEM_INTERACT_SUCCESS
if("Imprint")
mod_link.frequency = tool_frequency
balloon_alert(user, "frequency set")
+ . = ITEM_INTERACT_SUCCESS
/obj/item/mod/control/proc/can_call()
return get_charge() && wearer && wearer.stat < DEAD
@@ -227,29 +232,34 @@
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
/obj/item/clothing/neck/link_scryer/multitool_act_secondary(mob/living/user, obj/item/multitool/tool)
- if(!multitool_check_buffer(user, tool))
- return
+ . = NONE
+
var/tool_frequency = null
if(istype(tool.buffer, /datum/mod_link))
var/datum/mod_link/buffer_link = tool.buffer
tool_frequency = buffer_link.frequency
balloon_alert(user, "frequency set")
+ . = ITEM_INTERACT_SUCCESS
if(!tool_frequency && mod_link.frequency)
tool.set_buffer(mod_link)
balloon_alert(user, "frequency copied")
+ . = ITEM_INTERACT_SUCCESS
else if(tool_frequency && !mod_link.frequency)
mod_link.frequency = tool_frequency
+ . = ITEM_INTERACT_SUCCESS
else if(tool_frequency && mod_link.frequency)
var/response = tgui_alert(user, "Would you like to copy or imprint the frequency?", "MODlink Frequency", list("Copy", "Imprint"))
if(!user.is_holding(tool))
- return
+ return ITEM_INTERACT_BLOCKING
switch(response)
if("Copy")
tool.set_buffer(mod_link)
balloon_alert(user, "frequency copied")
+ . = ITEM_INTERACT_SUCCESS
if("Imprint")
mod_link.frequency = tool_frequency
balloon_alert(user, "frequency set")
+ . = ITEM_INTERACT_SUCCESS
/obj/item/clothing/neck/link_scryer/worn_overlays(mutable_appearance/standing, isinhands)
. = ..()
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index d6465960beb28..e751d1e943b16 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -197,13 +197,13 @@
/obj/item/mod/module/storage/large_capacity,
/obj/item/mod/module/hat_stabilizer,
/obj/item/mod/module/magnetic_harness,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/pathfinder,
/obj/item/mod/module/quick_cuff,
/obj/item/mod/module/headprotector,
)
default_pins = list(
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
)
/obj/item/mod/control/pre_equipped/cosmohonk
@@ -245,7 +245,7 @@
/obj/item/mod/module/shock_absorber,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/dna_lock,
@@ -254,7 +254,7 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
@@ -268,7 +268,7 @@
/obj/item/mod/module/shock_absorber,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/hat_stabilizer/syndicate,
@@ -276,14 +276,14 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
/obj/item/mod/control/pre_equipped/nuclear/no_jetpack
/obj/item/mod/control/pre_equipped/nuclear/no_jetpack/Initialize(mapload, new_theme, new_skin, new_core)
- applied_modules -= list(/obj/item/mod/module/jetpack/advanced, /obj/item/mod/module/jump_jet)
+ applied_modules -= list(/obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet)
return ..()
/obj/item/mod/control/pre_equipped/nuclear/plasmaman
@@ -305,7 +305,7 @@
/obj/item/mod/module/shock_absorber,
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/hat_stabilizer/syndicate,
@@ -313,7 +313,7 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
@@ -324,7 +324,7 @@
/obj/item/mod/module/emp_shield,
/obj/item/mod/module/magnetic_harness,
/obj/item/mod/module/thermal_regulator,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/hat_stabilizer/syndicate,
@@ -333,7 +333,7 @@
)
default_pins = list(
/obj/item/mod/module/armor_booster,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flamethrower,
)
@@ -357,7 +357,7 @@
starting_frequency = MODLINK_FREQ_SYNDICATE
applied_cell = /obj/item/stock_parts/power_store/cell/super
applied_modules = list(
- /obj/item/mod/module/organ_thrower,
+ /obj/item/mod/module/organizer,
/obj/item/mod/module/defibrillator/combat,
/obj/item/mod/module/flashlight,
/obj/item/mod/module/health_analyzer,
@@ -426,13 +426,13 @@
applied_modules = list(
/obj/item/mod/module/storage,
/obj/item/mod/module/magnetic_harness,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
/obj/item/mod/module/flashlight,
)
default_pins = list(
/obj/item/mod/module/armor_booster,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/jump_jet,
)
@@ -623,7 +623,7 @@
/obj/item/mod/module/stealth/ninja,
/obj/item/mod/module/quick_carry/advanced,
/obj/item/mod/module/magboot/advanced,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/anomaly_locked/kinesis/admin,
/obj/item/mod/module/shove_blocker,
/obj/item/mod/module/quick_cuff,
@@ -631,7 +631,7 @@
default_pins = list(
/obj/item/mod/module/stealth/ninja,
/obj/item/mod/module/magboot/advanced,
- /obj/item/mod/module/jetpack/advanced,
+ /obj/item/mod/module/jetpack,
/obj/item/mod/module/anomaly_locked/kinesis/admin,
)
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index cac8cfaa26eff..40e1889efd968 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -120,7 +120,7 @@
hitsound = 'sound/weapons/batonextend.ogg'
hitsound_wall = 'sound/weapons/batonextend.ogg'
suppressed = SUPPRESSED_VERY
- hit_threshhold = LATTICE_LAYER
+ hit_threshhold = ABOVE_NORMAL_TURF_LAYER
/// Reference to the beam following the projectile.
var/line
@@ -218,10 +218,10 @@
incompatible_modules = list(/obj/item/mod/module/armor_booster, /obj/item/mod/module/infiltrator)
required_slots = list(ITEM_SLOT_HEAD)
-/obj/item/mod/module/constructor/on_suit_activation()
+/obj/item/mod/module/headprotector/on_suit_activation()
ADD_TRAIT(mod.wearer, TRAIT_HEAD_INJURY_BLOCKED, MOD_TRAIT)
-/obj/item/mod/module/constructor/on_suit_deactivation(deleting = FALSE)
+/obj/item/mod/module/headprotector/on_suit_deactivation(deleting = FALSE)
REMOVE_TRAIT(mod.wearer, TRAIT_HEAD_INJURY_BLOCKED, MOD_TRAIT)
///Mister - Sprays water over an area.
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 3ef6b9558712a..815cfb0a144bc 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -108,8 +108,6 @@
overlay_state_inactive = "module_jetpack"
overlay_state_active = "module_jetpack_on"
required_slots = list(ITEM_SLOT_BACK)
- /// Do we give the wearer a speed buff.
- var/full_speed = FALSE
/// Do we have stabilizers? If yes the user won't move from inertia.
var/stabilize = TRUE
/// Callback to see if we can thrust the user.
@@ -143,14 +141,6 @@
/datum/effect_system/trail_follow/ion/grav_allowed \
)
-/obj/item/mod/module/jetpack/on_activation()
- if(full_speed)
- mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
-
-/obj/item/mod/module/jetpack/on_deactivation(display_message = TRUE, deleting = FALSE)
- if(full_speed)
- mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
-
/obj/item/mod/module/jetpack/get_configuration()
. = ..()
.["stabilizers"] = add_ui_configuration("Stabilizers", "bool", stabilize)
@@ -167,15 +157,6 @@
return FALSE
return TRUE
-/obj/item/mod/module/jetpack/advanced
- name = "MOD advanced ion jetpack module"
- desc = "An improvement on the previous model of electric thrusters. This one achieves higher speeds through \
- mounting of more jets and application of red paint."
- icon_state = "jetpack_advanced"
- overlay_state_inactive = "module_jetpackadv"
- overlay_state_active = "module_jetpackadv_on"
- full_speed = TRUE
-
/// Cooldown to use if we didn't actually launch a jump jet
#define FAILED_ACTIVATION_COOLDOWN 3 SECONDS
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index 3cf1d34a63a83..a0d58d721f3d4 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -119,19 +119,19 @@
volume = 30
inject_flags = INJECT_CHECK_PENETRATE_THICK
-///Organ Thrower - Lets you shoot organs, immediately replacing them if the target has the organ manipulation surgery.
-/obj/item/mod/module/organ_thrower
- name = "MOD organ thrower module"
+///Organizer - Lets you shoot organs, immediately replacing them if the target has the organ manipulation surgery.
+/obj/item/mod/module/organizer
+ name = "MOD organizer module"
desc = "A device recovered from a crashed Interdyne Pharmaceuticals vessel, \
this module has been unearthed for better or for worse. \
- It's an arm-mounted device utilizing technology similar to modern-day part replacers, \
- capable of storing and inserting organs into open patients. \
+ It's an arm-mounted device utilizing technology similar to modern rapid part exchange devices, \
+ capable of instantly replacing up to 5 organs at once in surgery without the need to remove them first, even from range. \
It's recommended by the DeForest Medical Corporation to not inform patients it has been used."
- icon_state = "organ_thrower"
+ icon_state = "organizer"
module_type = MODULE_ACTIVE
complexity = 2
use_energy_cost = DEFAULT_CHARGE_DRAIN
- incompatible_modules = list(/obj/item/mod/module/organ_thrower, /obj/item/mod/module/microwave_beam)
+ incompatible_modules = list(/obj/item/mod/module/organizer, /obj/item/mod/module/microwave_beam)
cooldown_time = 0.5 SECONDS
required_slots = list(ITEM_SLOT_GLOVES)
/// How many organs the module can hold.
@@ -139,7 +139,7 @@
/// A list of all our organs.
var/organ_list = list()
-/obj/item/mod/module/organ_thrower/on_select_use(atom/target)
+/obj/item/mod/module/organizer/on_select_use(atom/target)
. = ..()
if(!.)
return
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index a868eb6205659..0e0de691e030b 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -418,11 +418,7 @@
if(IS_SPACE_NINJA(mod.wearer))
mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type)
to_chat(mod.wearer, span_notice("You have used the adrenaline boost."))
- mod.wearer.SetUnconscious(0)
- mod.wearer.SetStun(0)
- mod.wearer.SetKnockdown(0)
- mod.wearer.SetImmobilized(0)
- mod.wearer.SetParalyzed(0)
+ mod.wearer.SetAllImmobility(0)
mod.wearer.adjustStaminaLoss(-200)
mod.wearer.remove_status_effect(/datum/status_effect/speech/stutter)
mod.wearer.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5)
@@ -430,24 +426,18 @@
addtimer(CALLBACK(src, PROC_REF(boost_aftereffects), mod.wearer), 7 SECONDS)
/obj/item/mod/module/adrenaline_boost/on_install()
- RegisterSignal(mod, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(mod, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(try_boost))
/obj/item/mod/module/adrenaline_boost/on_uninstall(deleting = FALSE)
- UnregisterSignal(mod, COMSIG_ATOM_ATTACKBY)
+ UnregisterSignal(mod, COMSIG_ATOM_ITEM_INTERACTION)
-/obj/item/mod/module/adrenaline_boost/attackby(obj/item/attacking_item, mob/user, params)
- if(charge_boost(attacking_item, user))
- return TRUE
- return ..()
-
-/obj/item/mod/module/adrenaline_boost/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+/obj/item/mod/module/adrenaline_boost/proc/try_boost(source, mob/user, obj/item/attacking_item)
SIGNAL_HANDLER
-
- if(charge_boost(attacking_item, user))
+ if(charge_boost(attacking_item))
return COMPONENT_NO_AFTERATTACK
return NONE
-/obj/item/mod/module/adrenaline_boost/proc/charge_boost(obj/item/attacking_item, mob/user)
+/obj/item/mod/module/adrenaline_boost/proc/charge_boost(obj/item/attacking_item)
if(!attacking_item.is_open_container())
return FALSE
if(reagents.has_reagent(reagent_required, reagent_required_amount))
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 2a317becf18e6..19150b8a4cd67 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -308,6 +308,8 @@
var/field_radius = 2
/// Damage multiplier on projectiles.
var/damage_multiplier = 0.75
+ /// Debuff multiplier on projectiles.
+ var/debuff_multiplier = 0.66
/// Speed multiplier on projectiles, higher means slower.
var/speed_multiplier = 2.5
/// List of all tracked projectiles.
@@ -338,6 +340,9 @@
SIGNAL_HANDLER
projectile.damage *= damage_multiplier
+ projectile.stamina *= damage_multiplier
+ projectile.stun *= debuff_multiplier
+ projectile.knockdown *= debuff_multiplier
projectile.speed *= speed_multiplier
projectile.add_overlay(projectile_effect)
@@ -346,6 +351,9 @@
projectile.damage /= damage_multiplier
projectile.speed /= speed_multiplier
+ projectile.stamina /= damage_multiplier
+ projectile.stun /= debuff_multiplier
+ projectile.knockdown /= debuff_multiplier
projectile.cut_overlay(projectile_effect)
///Active Sonar - Displays a hud circle on the turf of any living creatures in the given radius
diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm
index 044137f0f2d07..4d2650585b1c0 100644
--- a/code/modules/mod/modules/modules_service.dm
+++ b/code/modules/mod/modules/modules_service.dm
@@ -35,7 +35,7 @@
module_type = MODULE_ACTIVE
complexity = 1
use_energy_cost = DEFAULT_CHARGE_DRAIN * 5
- incompatible_modules = list(/obj/item/mod/module/microwave_beam, /obj/item/mod/module/organ_thrower)
+ incompatible_modules = list(/obj/item/mod/module/microwave_beam, /obj/item/mod/module/organizer)
cooldown_time = 10 SECONDS
required_slots = list(ITEM_SLOT_GLOVES)
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
index c86cb182c6b84..0e2bffd0aa6a7 100644
--- a/code/modules/mod/modules/modules_supply.dm
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -559,7 +559,7 @@
light_range = 1
light_power = 1
light_color = COLOR_LIGHT_ORANGE
- embedding = null
+ embed_type = null
/obj/projectile/bullet/mining_bomb/Initialize(mapload)
. = ..()
diff --git a/code/modules/modular_computers/computers/item/computer_files.dm b/code/modules/modular_computers/computers/item/computer_files.dm
index 6b6fbd179f21f..b0ae073bdd69a 100644
--- a/code/modules/modular_computers/computers/item/computer_files.dm
+++ b/code/modules/modular_computers/computers/item/computer_files.dm
@@ -39,7 +39,7 @@
stored_files.Remove(file_removing)
used_capacity -= file_removing.size
SEND_SIGNAL(src, COMSIG_MODULAR_COMPUTER_FILE_DELETE, file_removing)
- SEND_SIGNAL(file_removing, COMSIG_COMPUTER_FILE_DELETE)
+ SEND_SIGNAL(file_removing, COMSIG_COMPUTER_FILE_DELETE, src)
qdel(file_removing)
return TRUE
diff --git a/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm b/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm
index 430c101668de8..0fb2ccc2eef91 100644
--- a/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm
+++ b/code/modules/modular_computers/computers/item/disks/maintenance_disks.dm
@@ -25,3 +25,6 @@
/obj/item/computer_disk/maintenance/theme/Initialize(mapload)
starting_programs = list(pick(subtypesof(/datum/computer_file/program/maintenance/theme)))
return ..()
+
+/obj/item/computer_disk/maintenance/cool_sword
+ starting_programs = list(/datum/computer_file/program/maintenance/cool_sword)
diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
index ca10b6c53ad84..f1fced454e4d3 100644
--- a/code/modules/modular_computers/computers/item/pda.dm
+++ b/code/modules/modular_computers/computers/item/pda.dm
@@ -46,7 +46,7 @@
/obj/item/lipstick,
/obj/item/flashlight/pen,
/obj/item/reagent_containers/hypospray/medipen,
- /obj/item/clothing/mask/cigarette,
+ /obj/item/cigarette,
)
/obj/item/modular_computer/pda/Initialize(mapload)
@@ -149,14 +149,14 @@
if(tool.w_class >= WEIGHT_CLASS_SMALL) // Anything equal to or larger than small won't work
user.balloon_alert(user, "too big!")
return ITEM_INTERACT_BLOCKING
- if(inserted_item)
- balloon_alert(user, "no room!")
- return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(tool, src))
return ITEM_INTERACT_BLOCKING
- balloon_alert(user, "inserted [tool]")
- inserted_item = tool
- playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE)
+ if(inserted_item)
+ swap_pen(user, tool)
+ else
+ balloon_alert(user, "inserted [tool]")
+ inserted_item = tool
+ playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE)
return ITEM_INTERACT_SUCCESS
@@ -185,6 +185,14 @@
update_appearance()
playsound(src, 'sound/machines/pda_button2.ogg', 50, TRUE)
+/obj/item/modular_computer/pda/proc/swap_pen(mob/user, obj/item/tool)
+ if(inserted_item)
+ balloon_alert(user, "swapped pens")
+ user.put_in_hands(inserted_item)
+ inserted_item = tool
+ update_appearance()
+ playsound(src, 'sound/machines/pda_button1.ogg', 50, TRUE)
+
/obj/item/modular_computer/pda/proc/explode(mob/target, mob/bomber, from_message_menu = FALSE)
var/turf/current_turf = get_turf(src)
diff --git a/code/modules/modular_computers/computers/machinery/console_presets.dm b/code/modules/modular_computers/computers/machinery/console_presets.dm
index ad87960603c35..94ff9439e3b11 100644
--- a/code/modules/modular_computers/computers/machinery/console_presets.dm
+++ b/code/modules/modular_computers/computers/machinery/console_presets.dm
@@ -33,6 +33,17 @@
/datum/computer_file/program/scipaper_program,
)
+/obj/machinery/modular_computer/preset/research/away
+ name = "old research console"
+ desc = "An old computer used for writing research papers."
+ starting_programs = list(
+ /datum/computer_file/program/scipaper_program,
+ )
+
+/obj/machinery/modular_computer/preset/research/away/Initialize(mapload)
+ . = ..()
+ cpu.device_theme = PDA_THEME_RETRO
+
// ===== COMMAND CONSOLE =====
/obj/machinery/modular_computer/preset/command
name = "command console"
diff --git a/code/modules/modular_computers/file_system/programs/maintenance/cool_sword.dm b/code/modules/modular_computers/file_system/programs/maintenance/cool_sword.dm
new file mode 100644
index 0000000000000..1a05bf2ceba34
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/maintenance/cool_sword.dm
@@ -0,0 +1,71 @@
+/datum/computer_file/program/maintenance/cool_sword
+ filename = "cool_sword"
+ filedesc = "NtOS Cursor Replacer"
+ power_cell_use = 0
+ downloader_category = PROGRAM_CATEGORY_DEVICE
+ extended_desc = "This program allows you to customize your computer's mouse cursor, \
+ but there's only one option, let's be honest. \
+ Wear your PDA in your ID slot for it to take effect."
+ can_run_on_flags = PROGRAM_PDA
+ tgui_id = "NtosCursor"
+ program_open_overlay = "generic"
+
+ /// What icon to use for the mouse pointer?
+ var/sword_icon = 'icons/effects/mouse_pointers/cool_sword.dmi'
+
+/datum/computer_file/program/maintenance/cool_sword/New()
+ . = ..()
+ RegisterSignal(src, COMSIG_COMPUTER_FILE_DELETE, PROC_REF(on_delete))
+
+/datum/computer_file/program/maintenance/cool_sword/on_install(datum/computer_file/source, obj/item/modular_computer/computer_installing)
+ . = ..()
+ RegisterSignal(computer_installing, COMSIG_ITEM_EQUIPPED, PROC_REF(host_equipped))
+ RegisterSignal(computer_installing, COMSIG_ITEM_DROPPED, PROC_REF(host_dropped))
+
+ if(ismob(computer_installing.loc))
+ var/mob/living/computer_guy = computer_installing.loc
+ var/current_slot = computer_guy.get_slot_by_item(computer_installing)
+ host_equipped(computer_installing, computer_guy, current_slot)
+
+/datum/computer_file/program/maintenance/cool_sword/proc/on_delete(datum/source, obj/item/modular_computer/computer_uninstalling)
+ SIGNAL_HANDLER
+
+ if(ismob(computer_uninstalling.loc))
+ host_dropped(computer_uninstalling, computer_uninstalling.loc)
+
+/datum/computer_file/program/maintenance/cool_sword/proc/host_equipped(datum/source, mob/user, slot)
+ SIGNAL_HANDLER
+
+ if(slot & ITEM_SLOT_ID)
+ user.client?.mouse_override_icon = sword_icon
+ RegisterSignal(user, COMSIG_MOB_LOGIN, PROC_REF(update_mouse), override = TRUE)
+ RegisterSignal(user, COMSIG_MOB_LOGOUT, PROC_REF(stop_mouse), override = TRUE)
+ else
+ // Shouldn't be necessary w/ dropped but just to be safe
+ user.client?.mouse_override_icon = null
+ UnregisterSignal(user, list(COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT))
+ user.update_mouse_pointer()
+
+/datum/computer_file/program/maintenance/cool_sword/proc/host_dropped(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ user.client?.mouse_override_icon = null
+ UnregisterSignal(user, list(COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT))
+ user.update_mouse_pointer()
+
+/datum/computer_file/program/maintenance/cool_sword/proc/update_mouse(mob/source)
+ SIGNAL_HANDLER
+
+ source.client?.mouse_override_icon = sword_icon
+ source.update_mouse_pointer()
+
+/datum/computer_file/program/maintenance/cool_sword/proc/stop_mouse(mob/source)
+ SIGNAL_HANDLER
+
+ source.canon_client?.mouse_override_icon = null
+ source.canon_client?.mob?.update_mouse_pointer()
+
+/datum/computer_file/program/maintenance/cool_sword/ui_static_data(mob/user)
+ var/list/data = list()
+ data["dmi"] = list("icon" = sword_icon, "icon_state" = "")
+ return data
diff --git a/code/modules/modular_computers/file_system/programs/radar.dm b/code/modules/modular_computers/file_system/programs/radar.dm
index 34771cde63b20..33dcd95e86b97 100644
--- a/code/modules/modular_computers/file_system/programs/radar.dm
+++ b/code/modules/modular_computers/file_system/programs/radar.dm
@@ -114,7 +114,7 @@
var/locx = (target_turf.x - here_turf.x) + 24
var/locy = (here_turf.y - target_turf.y) + 24
- if(get_dist_euclidian(here_turf, target_turf) > 24)
+ if(get_dist_euclidean(here_turf, target_turf) > 24)
userot = TRUE
rot = round(get_angle(here_turf, target_turf))
else
@@ -208,7 +208,7 @@
var/here_turf = get_turf(computer)
var/target_turf = get_turf(signal)
- var/trackdistance = get_dist_euclidian(here_turf, target_turf)
+ var/trackdistance = get_dist_euclidean(here_turf, target_turf)
switch(trackdistance)
if(0)
program_open_overlay = "[initial(program_open_overlay)]direct"
@@ -471,7 +471,7 @@
*/
/obj/item/circuit_component/mod_program/radar/proc/can_track(datum/source, atom/signal, signal_turf, computer_turf)
SIGNAL_HANDLER
- if(target.value && get_dist_euclidian(computer_turf, signal_turf) > MAX_RADAR_CIRCUIT_DISTANCE)
+ if(target.value && get_dist_euclidean(computer_turf, signal_turf) > MAX_RADAR_CIRCUIT_DISTANCE)
return COMPONENT_RADAR_DONT_TRACK
return COMPONENT_RADAR_TRACK_ANYWAY
diff --git a/code/modules/movespeed/modifiers/innate.dm b/code/modules/movespeed/modifiers/innate.dm
index 94a3f7a2e791c..83d8b3fb78d98 100644
--- a/code/modules/movespeed/modifiers/innate.dm
+++ b/code/modules/movespeed/modifiers/innate.dm
@@ -7,11 +7,12 @@
flags = IGNORE_NOSLOW
/datum/movespeed_modifier/snail
- movetypes = ~FLYING
+ blacklisted_movetypes = FLYING
variable = TRUE
+// no reason for leg loss (or gain) to affect speed if drifting
/datum/movespeed_modifier/bodypart
- movetypes = ~FLYING
+ blacklisted_movetypes = (FLYING|FLOATING)
variable = TRUE
/datum/movespeed_modifier/dna_vault_speedup
diff --git a/code/modules/movespeed/modifiers/items.dm b/code/modules/movespeed/modifiers/items.dm
index 6bdf2f31760d5..601ecc2289261 100644
--- a/code/modules/movespeed/modifiers/items.dm
+++ b/code/modules/movespeed/modifiers/items.dm
@@ -5,9 +5,6 @@
/datum/movespeed_modifier/jetpack/cybernetic
multiplicative_slowdown = -0.5
-/datum/movespeed_modifier/jetpack/fullspeed
- multiplicative_slowdown = -0.5
-
/datum/movespeed_modifier/die_of_fate
multiplicative_slowdown = 1
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index b72c631253b91..1624ce37bf6d9 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -1,4 +1,5 @@
/datum/movespeed_modifier/obesity
+ // large weight slows even if flying and floating
multiplicative_slowdown = 1.5
/datum/movespeed_modifier/monkey_reagent_speedmod
@@ -11,6 +12,7 @@
variable = TRUE
/datum/movespeed_modifier/hunger
+ movetypes = GROUND|FLYING
variable = TRUE
/datum/movespeed_modifier/golem_hunger
@@ -89,7 +91,7 @@
/datum/movespeed_modifier/limbless
variable = TRUE
movetypes = GROUND
- blacklisted_movetypes = FLOATING
+ blacklisted_movetypes = FLOATING|FLYING
flags = IGNORE_NOSLOW
/datum/movespeed_modifier/simplemob_varspeed
diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm
index 11334f12abc79..4268c040e2bcd 100644
--- a/code/modules/pai/pai.dm
+++ b/code/modules/pai/pai.dm
@@ -164,7 +164,6 @@
QDEL_NULL(signaler)
QDEL_NULL(leash)
card = null
- GLOB.pai_list.Remove(src)
return ..()
// Need to override parent here because the message we dispatch is turf-based, not based on the location of the object because that could be fuckin anywhere
@@ -221,7 +220,6 @@
if(istype(loc, /obj/item/modular_computer))
give_messenger_ability()
START_PROCESSING(SSfastprocess, src)
- GLOB.pai_list += src
make_laws()
for(var/law in laws.inherent)
lawcheck += law
@@ -470,7 +468,7 @@
for(var/mob/living/cultist as anything in invokers)
to_chat(cultist, span_cult_italic("You don't think this is what Nar'Sie had in mind when She asked for blood sacrifices..."))
- return STOP_SACRIFICE
+ return STOP_SACRIFICE|SILENCE_SACRIFICE_MESSAGE
/// Updates the distance we can be from our pai card
/mob/living/silicon/pai/proc/increment_range(increment_amount)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 6043890bebd43..41d24ea9c6da4 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -29,7 +29,7 @@
var/degrees = 0
var/font = PEN_FONT
var/requires_gravity = TRUE // can you use this to write in zero-g
- embedding = list(embed_chance = 50)
+ embed_type = /datum/embed_data/pen
sharpness = SHARP_POINTY
var/dart_insert_icon = 'icons/obj/weapons/guns/toy.dmi'
var/dart_insert_casing_icon_state = "overlay_pen"
@@ -37,6 +37,9 @@
/// If this pen can be clicked in order to retract it
var/can_click = TRUE
+/datum/embed_data/pen
+ embed_chance = 50
+
/obj/item/pen/Initialize(mapload)
. = ..()
AddComponent(/datum/component/dart_insert, \
@@ -60,6 +63,7 @@
/datum/component/transforming, \
sharpness_on = NONE, \
inhand_icon_change = FALSE, \
+ w_class_on = w_class, \
)
/*
@@ -85,7 +89,7 @@
return list(
"damage" = max(5, throwforce),
"speed" = max(0, throw_speed - 3),
- "embedding" = embedding,
+ "embedding" = get_embed(),
"armour_penetration" = armour_penetration,
"wound_bonus" = wound_bonus,
"bare_wound_bonus" = bare_wound_bonus,
@@ -190,7 +194,7 @@
"Black and Silver" = "pen-fountain-b",
"Command Blue" = "pen-fountain-cb"
)
- embedding = list("embed_chance" = 75)
+ embed_type = /datum/embed_data/pen/captain
dart_insert_casing_icon_state = "overlay_fountainpen_gold"
dart_insert_projectile_icon_state = "overlay_fountainpen_gold_proj"
var/list/overlay_reskin = list(
@@ -201,6 +205,9 @@
"Command Blue" = "overlay_fountainpen_gold"
)
+/datum/embed_data/pen/captain
+ embed_chance = 50
+
/obj/item/pen/fountain/captain/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, \
@@ -413,7 +420,7 @@
inhand_icon_state = hidden_icon
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- embedding = list(embed_chance = 100) // Rule of cool
+ set_embed(/datum/embed_data/edagger_active)
else
name = initial(name)
desc = initial(desc)
@@ -421,15 +428,17 @@
inhand_icon_state = initial(inhand_icon_state)
lefthand_file = initial(lefthand_file)
righthand_file = initial(righthand_file)
- embedding = list(embed_chance = EMBED_CHANCE)
+ set_embed(embed_type)
- updateEmbedding()
if(user)
balloon_alert(user, "[hidden_name] [active ? "active" : "concealed"]")
playsound(src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 5, TRUE)
set_light_on(active)
return COMPONENT_NO_DEFAULT_MESSAGE
+/datum/embed_data/edagger_active
+ embed_chance = 100
+
/obj/item/pen/edagger/proc/on_scan(datum/source, mob/user, list/extra_data)
SIGNAL_HANDLER
LAZYADD(extra_data[DETSCAN_CATEGORY_ILLEGAL], "Hard-light generator detected.")
diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm
index 5c849f4a530cd..b4e97615a923a 100644
--- a/code/modules/paperwork/ticketmachine.dm
+++ b/code/modules/paperwork/ticketmachine.dm
@@ -49,13 +49,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/ticket_machine, 32)
. += span_notice("The ticket machine shows that ticket #[current_number] is currently being served.")
. += span_notice("You can take a ticket out with Left-Click to be number [ticket_number + 1] in queue.")
-/obj/machinery/ticket_machine/multitool_act(mob/living/user, obj/item/I)
- if(!multitool_check_buffer(user, I)) //make sure it has a data buffer
- return
- var/obj/item/multitool/M = I
+/obj/machinery/ticket_machine/multitool_act(mob/living/user, obj/item/multitool/M)
M.set_buffer(src)
balloon_alert(user, "saved to multitool buffer")
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/ticket_machine/emag_act(mob/user, obj/item/card/emag/emag_card) //Emag the ticket machine to dispense burning tickets, as well as randomize its number to destroy the HoP's mind.
if(obj_flags & EMAGGED)
diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm
index d928164ff014d..64eeb192a2286 100644
--- a/code/modules/photography/camera/camera_image_capturing.dm
+++ b/code/modules/photography/camera/camera_image_capturing.dm
@@ -10,11 +10,18 @@
step_y = AM.step_y
. = ..()
+#define PHYSICAL_POSITION(atom) ((atom.y * world.icon_size) + (atom.pixel_y))
+
/obj/item/camera/proc/camera_get_icon(list/turfs, turf/center, psize_x = 96, psize_y = 96, datum/turf_reservation/clone_area, size_x, size_y, total_x, total_y)
var/list/atoms = list()
+ var/list/lighting = list()
var/skip_normal = FALSE
var/wipe_atoms = FALSE
+ var/mutable_appearance/backdrop = mutable_appearance('icons/hud/screen_gen.dmi', "flash")
+ backdrop.blend_mode = BLEND_OVERLAY
+ backdrop.color = "#292319"
+
if(istype(clone_area) && total_x == clone_area.width && total_y == clone_area.height && size_x >= 0 && size_y > 0)
var/turf/bottom_left = clone_area.bottom_left_turfs[1]
var/cloned_center_x = round(bottom_left.x + ((total_x - 1) / 2))
@@ -29,6 +36,12 @@
atoms += new /obj/effect/appearance_clone(newT, T)
if(T.loc.icon_state)
atoms += new /obj/effect/appearance_clone(newT, T.loc)
+ if(T.lighting_object)
+ var/obj/effect/appearance_clone/lighting_overlay = new(newT)
+ lighting_overlay.appearance = T.lighting_object.current_underlay
+ lighting_overlay.underlays += backdrop
+ lighting_overlay.blend_mode = BLEND_MULTIPLY
+ lighting += lighting_overlay
for(var/i in T.contents)
var/atom/A = i
if(!A.invisibility || (see_ghosts && isobserver(A)))
@@ -41,6 +54,12 @@
for(var/i in turfs)
var/turf/T = i
atoms += T
+ if(T.lighting_object)
+ var/obj/effect/appearance_clone/lighting_overlay = new(T)
+ lighting_overlay.appearance = T.lighting_object.current_underlay
+ lighting_overlay.underlays += backdrop
+ lighting_overlay.blend_mode = BLEND_MULTIPLY
+ lighting += lighting_overlay
for(var/atom/movable/A in T)
if(A.invisibility)
if(!(see_ghosts && isobserver(A)))
@@ -50,6 +69,7 @@
var/icon/res = icon('icons/blanks/96x96.dmi', "nothing")
res.Scale(psize_x, psize_y)
+ atoms += lighting
var/list/sorted = list()
var/j
@@ -57,7 +77,19 @@
var/atom/c = atoms[i]
for(j = sorted.len, j > 0, --j)
var/atom/c2 = sorted[j]
- if((c2.plane <= c.plane) && (c2.layer <= c.layer))
+ if(c2.plane > c.plane)
+ continue
+ if(c2.plane < c.plane)
+ break
+ var/c_position = PHYSICAL_POSITION(c)
+ var/c2_position = PHYSICAL_POSITION(c2)
+ // If you are above me, I layer above you
+ if(c2_position - 32 >= c_position)
+ break
+ // If I am above you you will always layer above me
+ if(c2_position <= c_position - 32)
+ continue
+ if(c2.layer < c.layer)
break
sorted.Insert(j+1, c)
CHECK_TICK
@@ -80,32 +112,34 @@
for(var/X in sorted) //these are clones
var/obj/effect/appearance_clone/clone = X
var/icon/img = getFlatIcon(clone, no_anim = TRUE)
- if(img)
- // Center of the image in X
- var/xo = (clone.x - center.x) * world.icon_size + clone.pixel_x + xcomp + clone.step_x
- // Center of the image in Y
- var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp + clone.step_y
-
- if(clone.transform) // getFlatIcon doesn't give a snot about transforms.
- var/datum/decompose_matrix/decompose = clone.transform.decompose()
- // Scale in X, Y
- if(decompose.scale_x != 1 || decompose.scale_y != 1)
- var/base_w = img.Width()
- var/base_h = img.Height()
- // scale_x can be negative
- img.Scale(base_w * abs(decompose.scale_x), base_h * decompose.scale_y)
- if(decompose.scale_x < 0)
- img.Flip(EAST)
- xo -= base_w * (decompose.scale_x - SIGN(decompose.scale_x)) / 2 * SIGN(decompose.scale_x)
- yo -= base_h * (decompose.scale_y - 1) / 2
- // Rotation
- if(decompose.rotation != 0)
- img.Turn(decompose.rotation)
- // Shift
- xo += decompose.shift_x
- yo += decompose.shift_y
-
- res.Blend(img, blendMode2iconMode(clone.blend_mode), xo, yo)
+ if(!img)
+ CHECK_TICK
+ continue
+ // Center of the image in X
+ var/xo = (clone.x - center.x) * world.icon_size + clone.pixel_x + xcomp + clone.step_x
+ // Center of the image in Y
+ var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp + clone.step_y
+
+ if(clone.transform) // getFlatIcon doesn't give a snot about transforms.
+ var/datum/decompose_matrix/decompose = clone.transform.decompose()
+ // Scale in X, Y
+ if(decompose.scale_x != 1 || decompose.scale_y != 1)
+ var/base_w = img.Width()
+ var/base_h = img.Height()
+ // scale_x can be negative
+ img.Scale(base_w * abs(decompose.scale_x), base_h * decompose.scale_y)
+ if(decompose.scale_x < 0)
+ img.Flip(EAST)
+ xo -= base_w * (decompose.scale_x - SIGN(decompose.scale_x)) / 2 * SIGN(decompose.scale_x)
+ yo -= base_h * (decompose.scale_y - 1) / 2
+ // Rotation
+ if(decompose.rotation != 0)
+ img.Turn(decompose.rotation)
+ // Shift
+ xo += decompose.shift_x
+ yo += decompose.shift_y
+
+ res.Blend(img, blendMode2iconMode(clone.blend_mode), xo, yo)
CHECK_TICK
if(!silent)
@@ -116,5 +150,9 @@
if(wipe_atoms)
QDEL_LIST(atoms)
+ else
+ QDEL_LIST(lighting)
return res
+
+#undef PHYSICAL_POSITION
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index 2e8eaee9d6dec..1f60a4eefb4cb 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -12,6 +12,7 @@
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 2.75
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
interaction_flags_machine = parent_type::interaction_flags_machine | INTERACT_MACHINE_OFFLINE
+ reagents = /datum/reagents/plumbing
///Plumbing machinery is always gonna need reagents, so we might aswell put it here
var/buffer = 50
@@ -25,6 +26,12 @@
AddComponent(/datum/component/simple_rotation)
register_context()
+/obj/machinery/plumbing/create_reagents(max_vol, flags)
+ if(!ispath(reagents))
+ qdel(reagents)
+ reagents = new reagents(max_vol, flags)
+ reagents.my_atom = src
+
/obj/machinery/plumbing/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = NONE
if(isnull(held_item))
@@ -96,58 +103,94 @@
reagents.expose(get_turf(src), TOUCH) //splash on the floor
reagents.clear_reagents()
-///We can empty beakers in here and everything
-/obj/machinery/plumbing/input
- name = "input gate"
- desc = "Can be manually filled with reagents from containers."
- icon_state = "pipe_input"
- pass_flags_self = PASSMACHINE | LETPASSTHROW // Small
- reagent_flags = TRANSPARENT | REFILLABLE
-
-
-/obj/machinery/plumbing/input/Initialize(mapload, bolt, layer)
- . = ..()
- AddComponent(/datum/component/plumbing/simple_supply, bolt, layer)
-
-///We can fill beakers in here and everything. we dont inheret from input because it has nothing that we need
-/obj/machinery/plumbing/output
- name = "output gate"
- desc = "A manual output for plumbing systems, for taking reagents directly into containers."
- icon_state = "pipe_output"
- pass_flags_self = PASSMACHINE | LETPASSTHROW // Small
- reagent_flags = TRANSPARENT | DRAINABLE
-
-/obj/machinery/plumbing/output/Initialize(mapload, bolt, layer)
- . = ..()
- AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
+/**
+ * Specialized reagent container for plumbing. Uses the round robin approach of transferring reagents
+ * so transfer 5 from 15 water, 15 sugar and 15 plasma becomes 10, 15, 15 instead of 13.3333, 13.3333 13.3333. Good if you hate floating point errors
+ */
+/datum/reagents/plumbing
+
+/datum/reagents/plumbing/trans_to(
+ atom/target,
+ amount = 1,
+ multiplier = 1, //unused for plumbing
+ datum/reagent/target_id,
+ preserve_data = TRUE, //unused for plumbing
+ no_react = FALSE, //unused for plumbing we always want reactions
+ mob/transferred_by, //unused for plumbing logging is not important inside plumbing machines
+ remove_blacklisted = FALSE, //unused for plumbing, we don't care what reagents are inside us
+ methods = NONE, //unused for plumbing
+ show_message = TRUE, //unused for plumbing, used for logging only
+ ignore_stomach = FALSE //unused for plumbing, reagents flow only between machines & is not injected to mobs at any point in time
+)
+ if(QDELETED(target) || !total_volume)
+ return FALSE
+
+ if(!IS_FINITE(amount))
+ stack_trace("non finite amount passed to trans_to [amount] amount of reagents")
+ return FALSE
+
+ if(!isnull(target_id) && !ispath(target_id))
+ stack_trace("invalid target reagent id [target_id] passed to trans_to")
+ return FALSE
+
+ var/datum/reagents/target_holder
+ if(istype(target, /datum/reagents))
+ target_holder = target
+ else
+ target_holder = target.reagents
+
+ var/cached_amount = amount
+
+ // Prevents small amount problems, as well as zero and below zero amounts.
+ amount = round(min(amount, total_volume, target_holder.maximum_volume - target_holder.total_volume), CHEMICAL_QUANTISATION_LEVEL)
+ if(amount <= 0)
+ return FALSE
+
+ //Set up new reagents to inherit the old ongoing reactions
+ transfer_reactions(target_holder)
+
+ var/list/cached_reagents = reagent_list
+ var/list/reagents_to_remove = list()
+ var/transfer_amount
+ var/transfered_amount
+ var/to_transfer = amount
+ var/total_transfered_amount = 0
+
+ //first add reagents to target
+ for(var/datum/reagent/reagent as anything in cached_reagents)
+ if(!to_transfer)
+ break
+
+ if(!isnull(target_id))
+ if(reagent.type == target_id)
+ force_stop_reagent_reacting(reagent)
+ transfer_amount = min(to_transfer, reagent.volume)
+ else
+ continue
+ else
+ transfer_amount = min(to_transfer, reagent.volume)
-/obj/machinery/plumbing/output/tap
- name = "drinking tap"
- desc = "A manual output for plumbing systems, for taking drinks directly into glasses."
- icon_state = "tap_output"
+ if(reagent.intercept_reagents_transfer(target_holder, cached_amount))
+ continue
-/obj/machinery/plumbing/tank
- name = "chemical tank"
- desc = "A massive chemical holding tank."
- icon_state = "tank"
- buffer = 400
+ transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount * multiplier, copy_data(reagent), chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred.
+ if(!transfered_amount)
+ continue
+ reagents_to_remove += list(list("R" = reagent, "T" = transfer_amount))
+ total_transfered_amount += transfered_amount
+ to_transfer -= transfered_amount
-/obj/machinery/plumbing/tank/Initialize(mapload, bolt, layer)
- . = ..()
- AddComponent(/datum/component/plumbing/tank, bolt, layer)
+ if(!isnull(target_id))
+ break
-///Layer manifold machine that connects a bunch of layers
-/obj/machinery/plumbing/layer_manifold
- name = "layer manifold"
- desc = "A plumbing manifold for layers."
- icon_state = "manifold"
- density = FALSE
+ //remove chemicals that were added above
+ for(var/list/data as anything in reagents_to_remove)
+ var/datum/reagent/reagent = data["R"]
+ transfer_amount = data["T"]
+ remove_reagent(reagent.type, transfer_amount)
-/obj/machinery/plumbing/layer_manifold/Initialize(mapload, bolt, layer)
- . = ..()
+ //handle reactions
+ target_holder.handle_reactions()
+ src.handle_reactions()
- AddComponent(/datum/component/plumbing/manifold, bolt, FIRST_DUCT_LAYER)
- AddComponent(/datum/component/plumbing/manifold, bolt, SECOND_DUCT_LAYER)
- AddComponent(/datum/component/plumbing/manifold, bolt, THIRD_DUCT_LAYER)
- AddComponent(/datum/component/plumbing/manifold, bolt, FOURTH_DUCT_LAYER)
- AddComponent(/datum/component/plumbing/manifold, bolt, FIFTH_DUCT_LAYER)
+ return round(total_transfered_amount, CHEMICAL_VOLUME_ROUNDING)
diff --git a/code/modules/plumbing/plumbers/iv_drip.dm b/code/modules/plumbing/plumbers/iv_drip.dm
index 6e2585553849c..45c2ebca27acb 100644
--- a/code/modules/plumbing/plumbers/iv_drip.dm
+++ b/code/modules/plumbing/plumbers/iv_drip.dm
@@ -10,7 +10,7 @@
/obj/machinery/iv_drip/plumbing/Initialize(mapload, bolt, layer)
. = ..()
- AddComponent(/datum/component/plumbing/iv_drip, bolt, layer)
+ AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
AddComponent(/datum/component/simple_rotation)
/obj/machinery/iv_drip/plumbing/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
diff --git a/code/modules/plumbing/plumbers/simple_machines.dm b/code/modules/plumbing/plumbers/simple_machines.dm
new file mode 100644
index 0000000000000..c2ef308297324
--- /dev/null
+++ b/code/modules/plumbing/plumbers/simple_machines.dm
@@ -0,0 +1,57 @@
+///We can empty beakers in here and everything
+/obj/machinery/plumbing/input
+ name = "input gate"
+ desc = "Can be manually filled with reagents from containers."
+ icon_state = "pipe_input"
+ pass_flags_self = PASSMACHINE | LETPASSTHROW // Small
+ reagent_flags = TRANSPARENT | REFILLABLE
+
+/obj/machinery/plumbing/input/Initialize(mapload, bolt, layer)
+ . = ..()
+ AddComponent(/datum/component/plumbing/simple_supply, bolt, layer)
+
+///We can fill beakers in here and everything. we dont inheret from input because it has nothing that we need
+/obj/machinery/plumbing/output
+ name = "output gate"
+ desc = "A manual output for plumbing systems, for taking reagents directly into containers."
+ icon_state = "pipe_output"
+ pass_flags_self = PASSMACHINE | LETPASSTHROW // Small
+ reagent_flags = TRANSPARENT | DRAINABLE
+ reagents = /datum/reagents
+
+/obj/machinery/plumbing/output/Initialize(mapload, bolt, layer)
+ . = ..()
+ AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
+
+///For pouring reagents from ducts directly into cups
+/obj/machinery/plumbing/output/tap
+ name = "drinking tap"
+ desc = "A manual output for plumbing systems, for taking drinks directly into glasses."
+ icon_state = "tap_output"
+
+///For storing large volume of reagents
+/obj/machinery/plumbing/tank
+ name = "chemical tank"
+ desc = "A massive chemical holding tank."
+ icon_state = "tank"
+ buffer = 400
+
+/obj/machinery/plumbing/tank/Initialize(mapload, bolt, layer)
+ . = ..()
+ AddComponent(/datum/component/plumbing/tank, bolt, layer)
+
+///Layer manifold machine that connects a bunch of layers
+/obj/machinery/plumbing/layer_manifold
+ name = "layer manifold"
+ desc = "A plumbing manifold for layers."
+ icon_state = "manifold"
+ density = FALSE
+
+/obj/machinery/plumbing/layer_manifold/Initialize(mapload, bolt, layer)
+ . = ..()
+
+ AddComponent(/datum/component/plumbing/manifold, bolt, FIRST_DUCT_LAYER)
+ AddComponent(/datum/component/plumbing/manifold, bolt, SECOND_DUCT_LAYER)
+ AddComponent(/datum/component/plumbing/manifold, bolt, THIRD_DUCT_LAYER)
+ AddComponent(/datum/component/plumbing/manifold, bolt, FOURTH_DUCT_LAYER)
+ AddComponent(/datum/component/plumbing/manifold, bolt, FIFTH_DUCT_LAYER)
diff --git a/code/modules/plumbing/plumbers/teleporter.dm b/code/modules/plumbing/plumbers/teleporter.dm
index df79220d15a8c..46c46d594f6f6 100644
--- a/code/modules/plumbing/plumbers/teleporter.dm
+++ b/code/modules/plumbing/plumbers/teleporter.dm
@@ -12,15 +12,10 @@
. = ..()
AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
-/obj/machinery/plumbing/sender/multitool_act(mob/living/user, obj/item/I)
- if(!multitool_check_buffer(user, I))
- return
-
- var/obj/item/multitool/M = I
-
+/obj/machinery/plumbing/sender/multitool_act(mob/living/user, obj/item/multitool/M)
if(!istype(M.buffer, /obj/machinery/plumbing/receiver))
to_chat(user, span_warning("Invalid buffer."))
- return
+ return ITEM_INTERACT_BLOCKING
if(target)
lose_teleport_target()
@@ -28,7 +23,7 @@
set_teleport_target(M.buffer)
to_chat(user, span_green("You succesfully link [src] to the [M.buffer]."))
- return TRUE
+ return ITEM_INTERACT_SUCCESS
///Lose our previous target and make our previous target lose us. Seperate proc because I feel like I'll need this again
/obj/machinery/plumbing/sender/proc/lose_teleport_target()
@@ -67,14 +62,10 @@
. = ..()
AddComponent(/datum/component/plumbing/simple_supply, bolt)
-/obj/machinery/plumbing/receiver/multitool_act(mob/living/user, obj/item/I)
- if(!multitool_check_buffer(user, I))
- return
-
- var/obj/item/multitool/M = I
+/obj/machinery/plumbing/receiver/multitool_act(mob/living/user, obj/item/multitool/M)
M.set_buffer(src)
balloon_alert(user, "saved to multitool buffer")
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/plumbing/receiver/process(seconds_per_tick)
if(!is_operational || panel_open)
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 3781944ad0099..013140e399099 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -722,7 +722,7 @@
icon_state = "floor"
brightness = 4
light_angle = 360
- layer = LOW_OBJ_LAYER
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
light_type = /obj/item/light/bulb
fitting = "bulb"
@@ -739,4 +739,6 @@
/obj/machinery/light/floor/transport
name = "transport light"
break_if_moved = FALSE
+ // has to render above tram things (trams are stupid)
layer = BELOW_OPEN_DOOR_LAYER
+ plane = GAME_PLANE
diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm
index 7f1ef8fc2e3a8..4514c89b862e2 100644
--- a/code/modules/power/pipecleaners.dm
+++ b/code/modules/power/pipecleaners.dm
@@ -29,6 +29,7 @@ By design, d1 is the smallest direction and d2 is the highest
icon = 'icons/obj/pipes_n_cables/pipe_cleaner.dmi'
icon_state = "0-1"
layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
+ plane = FLOOR_PLANE
anchored = TRUE
obj_flags = CAN_BE_HIT
color = CABLE_HEX_COLOR_RED
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index b46b29538c608..da3a4e12c5662 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -51,6 +51,8 @@ no power level overlay is currently in the overlays list.
var/list/obj/machinery/field/generator/connected_gens = list()
///Check for asynk cleanups for this and the connected gens
var/clean_up = FALSE
+ /// we warm up and cool down instantly
+ var/instantenous = FALSE
/datum/armor/field_generator
melee = 25
@@ -207,8 +209,11 @@ no power level overlay is currently in the overlays list.
can_atmos_pass = ATMOS_PASS_YES
air_update_turf(TRUE, FALSE)
INVOKE_ASYNC(src, PROC_REF(cleanup))
- addtimer(CALLBACK(src, PROC_REF(cool_down)), 5 SECONDS)
RemoveElement(/datum/element/give_turf_traits, string_list(list(TRAIT_CONTAINMENT_FIELD)))
+ if(instantenous)
+ warming_up = 0
+ return
+ addtimer(CALLBACK(src, PROC_REF(cool_down)), 5 SECONDS)
/obj/machinery/field/generator/proc/cool_down()
if(active || warming_up <= 0)
@@ -219,9 +224,14 @@ no power level overlay is currently in the overlays list.
addtimer(CALLBACK(src, PROC_REF(cool_down)), 5 SECONDS)
/obj/machinery/field/generator/proc/turn_on()
+ AddElement(/datum/element/give_turf_traits, string_list(list(TRAIT_CONTAINMENT_FIELD)))
+ if(instantenous)
+ active = FG_ONLINE
+ warming_up = 3
+ start_fields()
+ return
active = FG_CHARGING
addtimer(CALLBACK(src, PROC_REF(warm_up)), 5 SECONDS)
- AddElement(/datum/element/give_turf_traits, string_list(list(TRAIT_CONTAINMENT_FIELD)))
/obj/machinery/field/generator/proc/warm_up()
if(!active)
@@ -420,9 +430,20 @@ no power level overlay is currently in the overlays list.
state = FG_WELDED
/obj/machinery/field/generator/starts_on/Initialize(mapload)
+ . = ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/field/generator/starts_on/post_machine_initialize()
. = ..()
turn_on()
+/obj/machinery/field/generator/starts_on/magic
+ power_level = 6 //forces the highest level overlay
+ instantenous = TRUE
+
+/obj/machinery/field/generator/starts_on/magic/process()
+ return PROCESS_KILL // this is the only place calc_power is called, and doing it here avoids one unnecessary proc call
+
#undef FG_UNSECURED
#undef FG_SECURED
#undef FG_WELDED
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 1c50f8312d4ae..76951670c9831 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -153,7 +153,10 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
///Stores the time of when the last zap occurred
var/last_power_zap = 0
- var/last_high_energy_zap = 0
+ ///Stores the tick of the machines subsystem of when the last zap occurred. Gives a passage of time in the perspective of SSmachines.
+ var/last_power_zap_perspective_machines = 0
+ ///Same as [last_power_zap_perspective_machines], but based around the high energy zaps found in handle_high_power().
+ var/last_high_energy_zap_perspective_machines = 0
///Do we show this crystal in the CIMS modular program
var/include_in_cims = TRUE
@@ -294,13 +297,11 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
// PART 3: POWER PROCESSING
internal_energy_factors = calculate_internal_energy()
zap_factors = calculate_zap_transmission_rate()
- if(internal_energy && (last_power_zap + (4 - internal_energy * 0.001) SECONDS) < world.time)
+ var/delta_time = (SSmachines.times_fired - last_power_zap_perspective_machines) * SSmachines.wait / (1 SECONDS)
+ if(delta_time && internal_energy && (last_power_zap + (4 - internal_energy * 0.001) SECONDS) < world.time)
playsound(src, 'sound/weapons/emitter2.ogg', 70, TRUE)
hue_angle_shift = clamp(903 * log(10, (internal_energy + 8000)) - 3590, -50, 240)
var/zap_color = color_matrix_rotate_hue(hue_angle_shift)
- //Scale the strength of the zap with the world's time elapsed between zaps in seconds.
- //Capped at 16 seconds to prevent a crazy burst of energy if atmos was halted for a long time.
- var/delta_time = min((world.time - last_power_zap) * 0.1, 16)
supermatter_zap(
zapstart = src,
range = 3,
@@ -311,6 +312,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
color = zap_color,
)
last_power_zap = world.time
+ last_power_zap_perspective_machines = SSmachines.times_fired
// PART 4: DAMAGE PROCESSING
temp_limit_factors = calculate_temp_limit()
@@ -714,6 +716,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
activation_logged = TRUE // so we dont spam the log.
else if(!internal_energy)
last_power_zap = world.time
+ last_power_zap_perspective_machines = SSmachines.times_fired
return additive_power
/** Log when the supermatter is activated for the first time.
diff --git a/code/modules/power/supermatter/supermatter_extra_effects.dm b/code/modules/power/supermatter/supermatter_extra_effects.dm
index efd84c677fafa..35c96d298dd34 100644
--- a/code/modules/power/supermatter/supermatter_extra_effects.dm
+++ b/code/modules/power/supermatter/supermatter_extra_effects.dm
@@ -91,7 +91,7 @@
/obj/machinery/power/supermatter_crystal/proc/handle_high_power()
if(internal_energy <= POWER_PENALTY_THRESHOLD && damage <= danger_point) //If the power is above 5000 or if the damage is above 550
- last_high_energy_zap = world.time //Prevent oddly high initial zap due to high energy zaps not getting triggered via too low energy.
+ last_high_energy_zap_perspective_machines = SSmachines.times_fired //Prevent oddly high initial zap due to high energy zaps not getting triggered via too low energy.
return
var/range = 4
zap_cutoff = 1500
@@ -129,10 +129,10 @@
if(zap_count >= 1)
playsound(loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10)
- var/delta_time = min((world.time - last_high_energy_zap) * 0.1, 16)
+ var/delta_time = (SSmachines.times_fired - last_high_energy_zap_perspective_machines) * SSmachines.wait / (1 SECONDS)
for(var/i in 1 to zap_count)
supermatter_zap(src, range, clamp(internal_energy * 3200, 6.4e6, 3.2e7) * delta_time, flags, zap_cutoff = src.zap_cutoff * delta_time, power_level = internal_energy, zap_icon = src.zap_icon)
- last_high_energy_zap = world.time
+ last_high_energy_zap_perspective_machines = SSmachines.times_fired
if(prob(5))
supermatter_anomaly_gen(src, FLUX_ANOMALY, rand(5, 10))
if(prob(5))
diff --git a/code/modules/power/supermatter/supermatter_gas.dm b/code/modules/power/supermatter/supermatter_gas.dm
index 35b9db0731f92..fe0ed388148b5 100644
--- a/code/modules/power/supermatter/supermatter_gas.dm
+++ b/code/modules/power/supermatter/supermatter_gas.dm
@@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(sm_gas_behavior, init_sm_gas())
desc = "Will generate electrical zaps."
/datum/sm_gas/zauker/extra_effects(obj/machinery/power/supermatter_crystal/sm)
- if(!prob(sm.gas_percentage[/datum/gas/zauker]))
+ if(!prob(sm.gas_percentage[/datum/gas/zauker] * 100))
return
playsound(sm.loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10)
sm.supermatter_zap(
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
index 3a7c3fcb59d36..4c5c24a3eec89 100644
--- a/code/modules/projectiles/ammunition/ballistic/rifle.dm
+++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -20,6 +20,10 @@
/obj/item/ammo_casing/strilka310/enchanted
projectile_type = /obj/projectile/bullet/strilka310/enchanted
+/obj/item/ammo_casing/strilka310/phasic
+ name = ".310 Strilka phasic bullet casing"
+ desc = "A phasic .310 Strika bullet casing. "
+ projectile_type = /obj/projectile/bullet/strilka310/phasic
// .223 (M-90gl Carbine)
/obj/item/ammo_casing/a223
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index b545500420bc1..aeb3b34ed4a64 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -140,8 +140,8 @@
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/meteorslug, /datum/crafting_recipe/pulseslug, /datum/crafting_recipe/dragonsbreath, /datum/crafting_recipe/ionslug)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm
index f9d5ca5d61250..c42bcdc746e45 100644
--- a/code/modules/projectiles/ammunition/energy/special.dm
+++ b/code/modules/projectiles/ammunition/energy/special.dm
@@ -85,3 +85,10 @@
harmful = FALSE
e_cost = LASER_SHOTS(2, STANDARD_CELL_CHARGE * 0.5)
fire_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' // fwip fwip fwip fwip
+
+// Used by /obj/item/gun/energy/photon
+/obj/item/ammo_casing/energy/photon
+ fire_sound = 'sound/weapons/lasercannonfire.ogg'
+ e_cost = LASER_SHOTS(4, STANDARD_CELL_CHARGE)
+ select_name = "flare"
+ projectile_type = /obj/projectile/energy/photon
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index 62f9185d2145c..207190d08f924 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -94,7 +94,7 @@
stack_trace("Tried loading unsupported ammocasing type [load_type] into ammo box [type].")
return
- for(var/i in max(1, stored_ammo.len) to max_ammo)
+ for(var/i in max(1, stored_ammo.len + 1) to max_ammo)
stored_ammo += new round_check(src)
update_appearance()
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index 430ef11b7dd5d..bbd89389eb809 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -130,6 +130,12 @@
name = "stripper clip (.310 Surplus)"
ammo_type = /obj/item/ammo_casing/strilka310/surplus
+/obj/item/ammo_box/strilka310/phasic
+ name = "stripper clip (.310 Phasic)"
+ desc = "A stripper clip filled with phasic bullets, hastily developed after an incident where a misfire resulted in the destruction of Atrakor Silverscale's priceless Vigoxian Fabergé egg. \
+ These fancy bullets pass right though valuables until they end up in a far less expensive human skull."
+ ammo_type = /obj/item/ammo_casing/strilka310/phasic
+
/obj/item/ammo_box/n762
name = "ammo box (7.62x38mmR)"
icon_state = "10mmbox"
diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
index 7d881a11c4dca..e74a192d6900f 100644
--- a/code/modules/projectiles/boxes_magazines/internal/revolver.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -16,7 +16,10 @@
caliber = CALIBER_357
max_ammo = 6
multiload = FALSE
+ start_empty = TRUE
-/obj/item/ammo_box/magazine/internal/rus357/Initialize(mapload)
- stored_ammo += new ammo_type(src)
+/obj/item/ammo_box/magazine/internal/cylinder/rus357/Initialize(mapload)
. = ..()
+ for (var/i in 1 to max_ammo - 1)
+ stored_ammo += new /obj/item/ammo_casing/a357/spent(src)
+ stored_ammo += new /obj/item/ammo_casing/a357(src)
diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
index 8c6abaa0e7798..863f29508dac0 100644
--- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
@@ -9,6 +9,9 @@
/obj/item/ammo_box/magazine/internal/boltaction/surplus
ammo_type = /obj/item/ammo_casing/strilka310/surplus
+/obj/item/ammo_box/magazine/internal/boltaction/phasic
+ ammo_type = /obj/item/ammo_casing/strilka310/phasic
+
/obj/item/ammo_box/magazine/internal/boltaction/pipegun
name = "pipegun internal magazine"
caliber = CALIBER_JUNK
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 198eed66e3c92..f1df323609dd9 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -64,11 +64,6 @@
/// True if a gun dosen't need a pin, mostly used for abstract guns like tentacles and meathooks
var/pinless = FALSE
- var/can_bayonet = FALSE //if a bayonet can be added or removed if it already has one.
- var/obj/item/knife/bayonet
- var/knife_x_offset = 0
- var/knife_y_offset = 0
-
var/ammo_x_offset = 0 //used for positioning ammo count overlay on sprite
var/ammo_y_offset = 0
@@ -83,12 +78,11 @@
pin = new pin(src)
add_seclight_point()
+ add_bayonet_point()
/obj/item/gun/Destroy()
if(isobj(pin)) //Can still be the initial path, then we skip
QDEL_NULL(pin)
- if(bayonet)
- QDEL_NULL(bayonet)
if(chambered) //Not all guns are chambered (EMP'ed energy guns etc)
QDEL_NULL(chambered)
if(isatom(suppressed)) //SUPPRESSED IS USED AS BOTH A TRUE/FALSE AND AS A REF, WHAT THE FUCKKKKKKKKKKKKKKKKK
@@ -111,6 +105,10 @@
/obj/item/gun/proc/add_seclight_point()
return
+/// Similarly to add_seclight_point(), handles [the bayonet attachment component][/datum/component/bayonet_attachable]
+/obj/item/gun/proc/add_bayonet_point()
+ return
+
/obj/item/gun/Exited(atom/movable/gone, direction)
. = ..()
if(gone == pin)
@@ -120,10 +118,6 @@
update_appearance()
if(gone == suppressed)
clear_suppressor()
- if(gone == bayonet)
- bayonet = null
- if(!QDELING(src))
- update_appearance()
///Clears var and updates icon. In the case of ballistic weapons, also updates the gun's weight.
/obj/item/gun/proc/clear_suppressor()
@@ -144,13 +138,6 @@
else
. += "It doesn't have a firing pin installed, and won't fire."
- if(bayonet)
- . += "It has \a [bayonet] [can_bayonet ? "" : "permanently "]affixed to it."
- if(can_bayonet) //if it has a bayonet and this is false, the bayonet is permanent.
- . += span_info("[bayonet] looks like it can be unscrewed from [src].")
- if(can_bayonet)
- . += "It has a bayonet lug on it."
-
//called after the gun has successfully fired its chambered ammo.
/obj/item/gun/proc/process_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
handle_chamber(empty_chamber, from_firing, chamber_next_round)
@@ -248,31 +235,6 @@
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-/obj/item/gun/pre_attack(atom/A, mob/living/user, params)
- . = ..()
- if(.)
- return .
- if(isnull(bayonet) || !user.combat_mode)
- return .
- return bayonet.melee_attack_chain(user, A, params)
-
-/obj/item/gun/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
- if(user.combat_mode)
- return NONE
-
- if(istype(tool, /obj/item/knife))
- var/obj/item/knife/new_stabber = tool
- if(!can_bayonet || !new_stabber.bayonet || !isnull(bayonet)) //ensure the gun has an attachment point available, and that the knife is compatible with it.
- return ITEM_INTERACT_BLOCKING
- if(!user.transferItemToLoc(new_stabber, src))
- return ITEM_INTERACT_BLOCKING
- to_chat(user, span_notice("You attach [new_stabber] to [src]'s bayonet lug."))
- bayonet = new_stabber
- update_appearance()
- return ITEM_INTERACT_SUCCESS
-
- return NONE
-
/obj/item/gun/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(user.combat_mode && isliving(interacting_with))
return ITEM_INTERACT_SKIP_TO_ATTACK // Gun bash / bayonet attack
@@ -508,17 +470,7 @@
return
if(!user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
return
-
- if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed
- I.play_tool_sound(src)
- to_chat(user, span_notice("You unfix [bayonet] from [src]."))
- bayonet.forceMove(drop_location())
-
- if(Adjacent(user) && !issilicon(user))
- user.put_in_hands(bayonet)
- return ITEM_INTERACT_SUCCESS
-
- else if(pin?.pin_removable && user.is_holding(src))
+ if(pin?.pin_removable && user.is_holding(src))
user.visible_message(span_warning("[user] attempts to remove [pin] from [src] with [I]."),
span_notice("You attempt to remove [pin] from [src]. (It will take [DisplayTimeText(FIRING_PIN_REMOVAL_DELAY)].)"), null, 3)
if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
@@ -563,19 +515,6 @@
QDEL_NULL(pin)
return TRUE
-/obj/item/gun/update_overlays()
- . = ..()
- if(bayonet)
- var/mutable_appearance/knife_overlay
- var/state = "bayonet" //Generic state.
- if(bayonet.icon_state in icon_states('icons/obj/weapons/guns/bayonets.dmi')) //Snowflake state?
- state = bayonet.icon_state
- var/icon/bayonet_icons = 'icons/obj/weapons/guns/bayonets.dmi'
- knife_overlay = mutable_appearance(bayonet_icons, state)
- knife_overlay.pixel_x = knife_x_offset
- knife_overlay.pixel_y = knife_y_offset
- . += knife_overlay
-
/obj/item/gun/animate_atom_living(mob/living/owner)
new /mob/living/simple_animal/hostile/mimic/copy/ranged(drop_location(), src, owner)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 6f798eb8908e1..361d68123f5c4 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -638,8 +638,7 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
if(sawn_off)
balloon_alert(user, "it's already shortened!")
return
- if(bayonet)
- balloon_alert(user, "[bayonet.name] must be removed!")
+ if (SEND_SIGNAL(src, COMSIG_GUN_BEING_SAWNOFF, user) & COMPONENT_CANCEL_SAWING_OFF)
return
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message(span_notice("[user] begins to shorten [src]."), span_notice("You begin to shorten [src]..."))
@@ -649,27 +648,30 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
user.visible_message(span_danger("[src] goes off!"), span_danger("[src] goes off in your face!"))
return
- if(do_after(user, 3 SECONDS, target = src))
- if(sawn_off)
- return
- user.visible_message(span_notice("[user] shortens [src]!"), span_notice("You shorten [src]."))
- sawn_off = TRUE
- if(handle_modifications)
- name = "sawn-off [src.name]"
- desc = sawn_desc
- update_weight_class(WEIGHT_CLASS_NORMAL)
- //The file might not have a "gun" icon, let's prepare for this
- lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
- inhand_x_dimension = 32
- inhand_y_dimension = 32
- inhand_icon_state = "gun"
- worn_icon_state = "gun"
- slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
- slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
- recoil = SAWN_OFF_RECOIL
- update_appearance()
+ if(!do_after(user, 3 SECONDS, target = src))
+ return
+ if(sawn_off)
+ return
+ user.visible_message(span_notice("[user] shortens [src]!"), span_notice("You shorten [src]."))
+ sawn_off = TRUE
+ SEND_SIGNAL(src, COMSIG_GUN_SAWN_OFF)
+ if(!handle_modifications)
return TRUE
+ name = "sawn-off [src.name]"
+ desc = sawn_desc
+ update_weight_class(WEIGHT_CLASS_NORMAL)
+ //The file might not have a "gun" icon, let's prepare for this
+ lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ inhand_x_dimension = 32
+ inhand_y_dimension = 32
+ inhand_icon_state = "gun"
+ worn_icon_state = "gun"
+ slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
+ slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+ recoil = SAWN_OFF_RECOIL
+ update_appearance()
+ return TRUE
/obj/item/gun/ballistic/proc/guncleaning(mob/user, obj/item/A)
if(misfire_probability == initial(misfire_probability))
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 30ba65dc94a86..b86e2a9938995 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -41,13 +41,13 @@
fire_delay = 2
burst_size = 3
pin = /obj/item/firing_pin/implant/pindicate
- can_bayonet = TRUE
- knife_x_offset = 26
- knife_y_offset = 12
mag_display = TRUE
mag_display_ammo = TRUE
empty_indicator = TRUE
+/obj/item/gun/ballistic/automatic/c20r/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 26, offset_y = 12)
+
/obj/item/gun/ballistic/automatic/c20r/update_overlays()
. = ..()
if(!chambered && empty_indicator) //this is duplicated due to a layering issue with the select fire icon.
@@ -75,9 +75,6 @@
can_suppress = FALSE
burst_size = 1
actions_types = list()
- can_bayonet = TRUE
- knife_x_offset = 25
- knife_y_offset = 12
mag_display = TRUE
mag_display_ammo = TRUE
empty_indicator = TRUE
@@ -86,6 +83,9 @@
. = ..()
AddComponent(/datum/component/automatic_fire, 0.3 SECONDS)
+/obj/item/gun/ballistic/automatic/wt550/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 25, offset_y = 12)
+
/obj/item/gun/ballistic/automatic/plastikov
name = "\improper PP-95 SMG"
desc = "An ancient 9mm submachine gun pattern updated and simplified to lower costs, though perhaps simplified too much."
diff --git a/code/modules/projectiles/guns/ballistic/bows/_bow.dm b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
index 15c89ddb8553d..c0ce0b1ef2c9d 100644
--- a/code/modules/projectiles/guns/ballistic/bows/_bow.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
@@ -27,7 +27,12 @@
/obj/item/gun/ballistic/bow/update_icon_state()
. = ..()
- icon_state = chambered ? "[base_icon_state]_[drawn ? "drawn" : "nocked"]" : "[base_icon_state]"
+ icon_state = "[base_icon_state][drawn ? "_drawn" : ""]"
+
+/obj/item/gun/ballistic/bow/update_overlays()
+ . = ..()
+ if(chambered)
+ . += "[chambered.base_icon_state][drawn ? "_drawn" : ""]"
/obj/item/gun/ballistic/bow/click_alt(mob/user)
if(isnull(chambered))
@@ -72,6 +77,11 @@
return FALSE
return ..() //fires, removing the arrow
+/obj/item/gun/ballistic/bow/postfire_empty_checks(last_shot_succeeded)
+ if(!chambered && !get_ammo())
+ drawn = FALSE
+ update_appearance()
+
/obj/item/gun/ballistic/bow/equipped(mob/user, slot, initial)
. = ..()
if(slot != ITEM_SLOT_HANDS && chambered)
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
index 22e441cd56b17..92c4f19e9b333 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
@@ -33,16 +33,17 @@
speed = 1
range = 25
shrapnel_type = null
- embedding = list(
- embed_chance = 90,
- fall_chance = 2,
- jostle_chance = 2,
- ignore_throwspeed_threshold = TRUE,
- pain_stam_pct = 0.5,
- pain_mult = 3,
- jostle_pain_mult = 3,
- rip_time = 1 SECONDS
- )
+ embed_type = /datum/embed_data/arrow
+
+/datum/embed_data/arrow
+ embed_chance = 90
+ fall_chance = 2
+ jostle_chance = 2
+ ignore_throwspeed_threshold = TRUE
+ pain_stam_pct = 0.5
+ pain_mult = 3
+ jostle_pain_mult = 3
+ rip_time = 1 SECONDS
/// holy arrows
/obj/item/ammo_casing/arrow/holy
@@ -58,22 +59,34 @@
name = "holy arrow"
desc = "Here it comes, cultist scum!"
icon_state = "holy_arrow_projectile"
- damage = 20 //still a lot but this is roundstart gear so far less
- embedding = list(
- embed_chance = 50,
- fall_chance = 2,
- jostle_chance = 0,
- ignore_throwspeed_threshold = TRUE,
- pain_stam_pct = 0.5,
- pain_mult = 3,
- rip_time = 1 SECONDS
- )
/obj/projectile/bullet/arrow/holy/Initialize(mapload)
. = ..()
//50 damage to revenants
AddElement(/datum/element/bane, target_type = /mob/living/basic/revenant, damage_multiplier = 0, added_damage = 30)
+/// plastic arrows
+// completely dogshit quality and they break when they hit something.
+/obj/item/ammo_casing/arrow/plastic
+ name = "plastic arrow"
+ desc = "The earliest mining teams within the Spinward Sector were the somewhat stout ancestors of the modern settlers. These teams \
+ found themselves often unable to access the quality materials they were digging up for equipment maintenance, all being sent off-site. \
+ Left with few options, and in need of a way to protect themselves in the hostile work enviroments of the Spinward, they turned \
+ to the one material they had in abundance."
+ icon_state = "plastic_arrow"
+ base_icon_state = "plastic_arrow"
+ projectile_type = /obj/projectile/bullet/arrow/plastic
+ reusable = FALSE //cheap shit
+
+/// plastic arrow projectile
+/obj/projectile/bullet/arrow/plastic
+ name = "plastic arrow"
+ desc = "If this is about to kill you, you should feel genuine shame."
+ damage = 5
+ stamina = 50
+ weak_against_armour = TRUE
+ icon_state = "plastic_arrow_projectile"
+
/// special pyre sect arrow
/// in the future, this needs a special sprite, but bows don't support non-hardcoded arrow sprites
/obj/item/ammo_casing/arrow/holy/blazing
@@ -87,7 +100,7 @@
desc = "THE UNMATCHED POWER OF THE SUN"
icon_state = "holy_arrow_projectile"
damage = 20
- embedding = null
+ embed_type = null
/obj/projectile/bullet/arrow/blazing/on_hit(atom/target, blocked, pierce_hit)
. = ..()
@@ -99,5 +112,5 @@
human_target.adjust_fire_stacks(2)
human_target.ignite_mob()
return
- to_chat(human_target, span_danger("[src] reacts with the flames on y-"))
+ to_chat(human_target, span_danger("[src] reacts with the flames enveloping you! Oh shit!"))
explosion(src, light_impact_range = 1, flame_range = 2) //ow
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm b/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm
index 07d7cc93ce16e..2492f0d4276f5 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_quivers.dm
@@ -8,6 +8,7 @@
worn_icon_state = "harpoon_quiver"
/// type of arrow the quivel should hold
var/arrow_path = /obj/item/ammo_casing/arrow
+ var/max_slots = 40
/obj/item/storage/bag/quiver/Initialize(mapload)
. = ..()
@@ -17,7 +18,10 @@
atom_storage.max_total_storage = 100
atom_storage.set_holdable(/obj/item/ammo_casing/arrow)
-/obj/item/storage/bag/quiver/PopulateContents()
+/obj/item/storage/bag/quiver/lesser
+ max_slots = 10
+
+/obj/item/storage/bag/quiver/full/PopulateContents()
. = ..()
for(var/i in 1 to 10)
new arrow_path(src)
@@ -29,3 +33,8 @@
inhand_icon_state = "holyquiver"
worn_icon_state = "holyquiver"
arrow_path = /obj/item/ammo_casing/arrow/holy
+
+/obj/item/storage/bag/quiver/holy/PopulateContents()
+ . = ..()
+ for(var/i in 1 to 10)
+ new arrow_path(src)
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
index b9ac1af0cca12..83b3bc43dd174 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
@@ -4,6 +4,12 @@
name = "longbow"
desc = "While pretty finely crafted, surely you can find something better to use in the current year."
+/// Shortbow, made via the crafting recipe
+/obj/item/gun/ballistic/bow/shortbow
+ name = "shortbow"
+ desc = "A simple homemade shortbow. Great for LARPing. Or poking out someones eye."
+ projectile_damage_multiplier = 0.36
+
///chaplain's divine archer bow
/obj/item/gun/ballistic/bow/divine
name = "divine bow"
@@ -15,6 +21,7 @@
slot_flags = ITEM_SLOT_BACK
obj_flags = UNIQUE_RENAME
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/bow/holy
+ projectile_damage_multiplier = 0.4
/obj/item/ammo_box/magazine/internal/bow/holy
name = "divine bowstring"
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index a8161ddb39612..8604e21b32503 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -54,9 +54,6 @@
slot_flags = ITEM_SLOT_BACK
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction
- can_bayonet = TRUE
- knife_x_offset = 42
- knife_y_offset = 12
can_be_sawn_off = TRUE
weapon_weight = WEAPON_HEAVY
var/jamming_chance = 20
@@ -67,11 +64,13 @@
SET_BASE_PIXEL(-8, 0)
+/obj/item/gun/ballistic/rifle/boltaction/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 32, offset_y = 12)
+
/obj/item/gun/ballistic/rifle/boltaction/sawoff(mob/user)
. = ..()
if(.)
spread = 36
- can_bayonet = FALSE
SET_BASE_PIXEL(0, 0)
update_appearance()
@@ -160,6 +159,7 @@
You are now probably one of the few people in the universe to ever hold an \"Obrez Moderna\". \
All you had to do was take an allen wrench to the stock to take it off. But no, you just had to \
go for the saw."
+ accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/phasic
/obj/item/gun/ballistic/rifle/boltaction/prime/Initialize(mapload)
. = ..()
@@ -271,14 +271,14 @@
projectile_damage_multiplier = 1.35
obj_flags = UNIQUE_RENAME
- can_bayonet = TRUE
- knife_x_offset = 35
- knife_y_offset = 10
can_be_sawn_off = FALSE
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
SET_BASE_PIXEL(-8, 0)
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 35, offset_y = 10)
+
/obj/item/gun/ballistic/rifle/boltaction/pipegun/handle_chamber()
. = ..()
do_sparks(1, TRUE, src)
@@ -305,11 +305,13 @@
spread = 15 //kinda inaccurate
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_NORMAL
- can_bayonet = FALSE
weapon_weight = WEAPON_MEDIUM
SET_BASE_PIXEL(0, 0)
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/pipepistol/add_bayonet_point()
+ return
+
/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime
name = "regal pipegun"
desc = "To call this 'regal' is a cruel irony. For the only noteworthy quality of nobility is in how it is wielded to kill. \
diff --git a/code/modules/projectiles/guns/energy/crank_guns.dm b/code/modules/projectiles/guns/energy/crank_guns.dm
index 64ffa86f36015..fa56075990ec5 100644
--- a/code/modules/projectiles/guns/energy/crank_guns.dm
+++ b/code/modules/projectiles/guns/energy/crank_guns.dm
@@ -7,9 +7,9 @@
ammo_type = list(/obj/item/ammo_casing/energy/laser/musket)
slot_flags = ITEM_SLOT_BACK
obj_flags = UNIQUE_RENAME
- can_bayonet = TRUE
- knife_x_offset = 22
- knife_y_offset = 11
+
+/obj/item/gun/energy/laser/musket/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 22, offset_y = 11)
/obj/item/gun/energy/laser/musket/Initialize(mapload)
. = ..()
@@ -84,12 +84,12 @@
shaded_charge = TRUE
ammo_x_offset = 1
obj_flags = UNIQUE_RENAME
- can_bayonet = TRUE
- knife_x_offset = 19
- knife_y_offset = 13
w_class = WEIGHT_CLASS_NORMAL
dual_wield_spread = 5 //as intended by the coders
+/obj/item/gun/energy/laser/thermal/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 19, offset_y = 13)
+
/obj/item/gun/energy/laser/thermal/Initialize(mapload)
. = ..()
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_CONTENTS)
diff --git a/code/modules/projectiles/guns/energy/dueling.dm b/code/modules/projectiles/guns/energy/dueling.dm
index f35769e663c71..9a7fa9aa78bea 100644
--- a/code/modules/projectiles/guns/energy/dueling.dm
+++ b/code/modules/projectiles/guns/energy/dueling.dm
@@ -365,6 +365,7 @@
icon_closed = "medalbox"
icon_broken = "medalbox+b"
base_icon_state = "medalbox"
+ icon_open = "medalboxopen"
/obj/item/storage/lockbox/dueling/Initialize(mapload)
. = ..()
@@ -372,16 +373,6 @@
atom_storage.max_slots = 2
atom_storage.set_holdable(/obj/item/gun/energy/dueling)
-/obj/item/storage/lockbox/dueling/update_icon_state()
- if(atom_storage?.locked)
- icon_state = icon_locked
- return ..()
- if(broken)
- icon_state = icon_broken
- return ..()
- icon_state = open ? "[base_icon_state]open" : icon_closed
- return ..()
-
/obj/item/storage/lockbox/dueling/PopulateContents()
. = ..()
var/obj/item/gun/energy/dueling/gun_A = new(src)
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 3ce3338bf8749..e826e1392bf28 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -16,8 +16,8 @@
return
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/advancedegun, /datum/crafting_recipe/tempgun, /datum/crafting_recipe/beam_rifle)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 7237ee0e32747..ab023d38b55ef 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -9,9 +9,6 @@
obj_flags = UNIQUE_RENAME
resistance_flags = FIRE_PROOF
weapon_weight = WEAPON_LIGHT
- can_bayonet = TRUE
- knife_x_offset = 20
- knife_y_offset = 12
gun_flags = NOT_A_REAL_GUN
///List of all mobs that projectiles fired from this gun will ignore.
var/list/ignored_mob_types
@@ -20,6 +17,9 @@
///The max capacity of modkits the PKA can have installed at once.
var/max_mod_capacity = 100
+/obj/item/gun/energy/recharge/kinetic_accelerator/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 20, offset_y = 12)
+
/obj/item/gun/energy/recharge/kinetic_accelerator/Initialize(mapload)
. = ..()
// Only actual KAs can be converted
@@ -27,8 +27,8 @@
return
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/ebow)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 95baca98db80f..90dc0c5717275 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -16,8 +16,8 @@
return
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/xraylaser, /datum/crafting_recipe/hellgun, /datum/crafting_recipe/ioncarbine)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 0635de8037adf..839689144c2f1 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -59,6 +59,9 @@
/obj/item/gun/energy/pulse/carbine/loyalpin
pin = /obj/item/firing_pin/implant/mindshield
+/obj/item/gun/energy/pulse/carbine/taserless
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/laser)
+
/obj/item/gun/energy/pulse/destroyer
name = "pulse destroyer"
desc = "A heavy-duty energy rifle built for pure destruction."
@@ -79,6 +82,9 @@
inhand_icon_state = "gun"
cell_type = /obj/item/stock_parts/power_store/cell/pulse/pistol
+/obj/item/gun/energy/pulse/pistol/taserless
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/laser)
+
/obj/item/gun/energy/pulse/pistol/loyalpin
pin = /obj/item/firing_pin/implant/mindshield
diff --git a/code/modules/projectiles/guns/energy/recharge.dm b/code/modules/projectiles/guns/energy/recharge.dm
index 0aa14b48c32f6..504dc5c9e0f4a 100644
--- a/code/modules/projectiles/guns/energy/recharge.dm
+++ b/code/modules/projectiles/guns/energy/recharge.dm
@@ -111,9 +111,9 @@
recharge_time = 2 SECONDS
holds_charge = TRUE
unique_frequency = TRUE
- can_bayonet = TRUE
- knife_x_offset = 20
- knife_y_offset = 12
+
+/obj/item/gun/energy/recharge/ebow/add_bayonet_point()
+ AddComponent(/datum/component/bayonet_attachable, offset_x = 20, offset_y = 12)
/obj/item/gun/energy/recharge/ebow/halloween
name = "candy corn crossbow"
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 653cffcbeec7d..961d32c96ee8b 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -428,3 +428,21 @@
new_coin.preparePixelProjectile(target_turf, user)
new_coin.fire()
return ITEM_INTERACT_SUCCESS
+
+/obj/item/gun/energy/photon
+ name = "photon cannon"
+ desc = "A competitive design to the tesla cannon, that instead of charging latent electrons, releases energy into photons. Eye protection is recommended."
+ icon_state = "photon"
+ inhand_icon_state = "tesla"
+ fire_sound = 'sound/weapons/lasercannonfire.ogg'
+ ammo_type = list(/obj/item/ammo_casing/energy/photon)
+ shaded_charge = TRUE
+ weapon_weight = WEAPON_HEAVY
+ light_color = LIGHT_COLOR_DEFAULT
+ light_system = OVERLAY_LIGHT
+ light_power = 2
+ light_range = 1
+
+/obj/item/gun/energy/photon/Initialize(mapload)
+ . = ..()
+ set_light_on(TRUE) // The gun quite literally shoots mini-suns.
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index e8f41ef0b48ec..b2fe293eae8c2 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -277,3 +277,78 @@
charges--
user.AddComponent(/datum/component/shrink, -1) // small forever
return ..()
+
+// Wand of debugging
+
+#ifdef TESTING
+
+/obj/item/gun/magic/wand/antag
+ name = "wand of antag"
+ desc = "This wand uses the powers of bullshit to turn anyone it hits into an antag"
+ school = SCHOOL_FORBIDDEN
+ ammo_type = /obj/item/ammo_casing/magic/antag
+ icon_state = "revivewand"
+ base_icon_state = "revivewand"
+ color = COLOR_ADMIN_PINK
+ max_charges = 99999
+
+/obj/item/gun/magic/wand/antag/zap_self(mob/living/user)
+ . = ..()
+ var/obj/item/ammo_casing/magic/antag/casing = new ammo_type()
+ var/obj/projectile/magic/magic_proj = casing.projectile_type
+ magic_proj = new magic_proj(src)
+ magic_proj.on_hit(user)
+ QDEL_NULL(casing)
+
+/obj/item/ammo_casing/magic/antag
+ projectile_type = /obj/projectile/magic/antag
+ harmful = FALSE
+
+/obj/projectile/magic/antag
+ name = "bolt of antag"
+ icon_state = "ion"
+ var/antag = /datum/antagonist/traitor
+
+/obj/projectile/magic/antag/on_hit(atom/target, blocked, pierce_hit)
+ . = ..()
+
+ if(isliving(target))
+ var/mob/living/victim = target
+ if(isnull(victim.mind))
+ victim.mind_initialize()
+ if(victim.mind.has_antag_datum(antag))
+ victim.mind.remove_antag_datum(antag)
+ to_chat(world, "removed")
+ else
+ victim.mind.add_antag_datum(antag)
+ to_chat(world, "added")
+
+/obj/item/gun/magic/wand/antag/heretic
+ name = "wand of antag heretic"
+ desc = "This wand uses the powers of bullshit to turn anyone it hits into an antag heretic"
+ color = COLOR_GREEN
+ ammo_type = /obj/item/ammo_casing/magic/antag/heretic
+
+/obj/item/ammo_casing/magic/antag/heretic
+ projectile_type = /obj/projectile/magic/antag/heretic
+
+/obj/projectile/magic/antag/heretic
+ name = "bolt of antag heretic"
+ icon_state = "ion"
+ antag = /datum/antagonist/heretic
+
+/obj/item/gun/magic/wand/antag/cult
+ name = "wand of antag cultist"
+ desc = "This wand uses the powers of bullshit to turn anyone it hits into an antag cultist"
+ color = COLOR_CULT_RED
+ ammo_type = /obj/item/ammo_casing/magic/antag/cult
+
+/obj/item/ammo_casing/magic/antag/cult
+ projectile_type = /obj/projectile/magic/antag/cult
+
+/obj/projectile/magic/antag/cult
+ name = "bolt of antag cult"
+ icon_state = "ion"
+ antag = /datum/antagonist/cult
+
+#endif
diff --git a/code/modules/projectiles/guns/special/hand_of_midas.dm b/code/modules/projectiles/guns/special/hand_of_midas.dm
index 68b8158c32d9f..e92ffe8d0bf22 100644
--- a/code/modules/projectiles/guns/special/hand_of_midas.dm
+++ b/code/modules/projectiles/guns/special/hand_of_midas.dm
@@ -37,20 +37,26 @@
balloon_alert(user, "not enough gold")
// Siphon gold from a victim, recharging our gun & removing their Midas Blight debuff in the process.
+/obj/item/gun/magic/midas_hand/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!isliving(interacting_with))
+ return ITEM_INTERACT_BLOCKING
+ return suck_gold(interacting_with, user)
+
/obj/item/gun/magic/midas_hand/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(!isliving(interacting_with) || !IN_GIVEN_RANGE(user, interacting_with, gold_suck_range))
return ITEM_INTERACT_BLOCKING
- if(interacting_with == user)
+ return suck_gold(interacting_with, user)
+
+/obj/item/gun/magic/midas_hand/proc/suck_gold(mob/living/victim, mob/living/user)
+ if(victim == user)
balloon_alert(user, "can't siphon from self!")
return ITEM_INTERACT_BLOCKING
- if(!interacting_with.reagents)
+ if(!victim.reagents)
return ITEM_INTERACT_BLOCKING
-
- var/gold_amount = interacting_with.reagents.get_reagent_amount(/datum/reagent/gold, type_check = REAGENT_SUB_TYPE)
+ var/gold_amount = victim.reagents.get_reagent_amount(/datum/reagent/gold, type_check = REAGENT_SUB_TYPE)
if(!gold_amount)
balloon_alert(user, "no gold in bloodstream!")
return ITEM_INTERACT_BLOCKING
- var/mob/living/victim = interacting_with
var/gold_beam = user.Beam(victim, icon_state = "drain_gold")
if(!do_after(
user = user,
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 43e4e160d06a1..90fbbfc6da292 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -191,7 +191,9 @@
///If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets
var/shrapnel_type
///If we have a shrapnel_type defined, these embedding stats will be passed to the spawned shrapnel type, which will roll for embedding on the target
- var/list/embedding
+ var/embed_type
+ ///Saves embedding data
+ var/datum/embed_data/embed_data
///If TRUE, hit mobs, even if they are lying on the floor and are not our target within MAX_RANGE_HIT_PRONE_TARGETS tiles
var/hit_prone_targets = FALSE
///if TRUE, ignores the range of MAX_RANGE_HIT_PRONE_TARGETS tiles of hit_prone_targets
@@ -218,8 +220,8 @@
/obj/projectile/Initialize(mapload)
. = ..()
decayedRange = range
- if(embedding)
- updateEmbedding()
+ if(get_embed())
+ AddElement(/datum/element/embed)
AddElement(/datum/element/connect_loc, projectile_connections)
/obj/projectile/proc/Range()
@@ -227,8 +229,8 @@
if(wound_bonus != CANT_WOUND)
wound_bonus += wound_falloff_tile
bare_wound_bonus = max(0, bare_wound_bonus + wound_falloff_tile)
- if(embedding)
- embedding["embed_chance"] += embed_falloff_tile
+ if(get_embed())
+ set_embed(embed_data.generate_with_values(embed_data.embed_chance + embed_falloff_tile)) // Should be rewritten in projecitle refactor
if(damage_falloff_tile && damage >= 0)
damage += damage_falloff_tile
if(stamina_falloff_tile && stamina >= 0)
@@ -930,6 +932,8 @@
trajectory.increment(trajectory_multiplier)
var/turf/T = trajectory.return_turf()
if(!istype(T))
+ // step back to the last valid turf before we Destroy
+ trajectory.increment(-trajectory_multiplier)
qdel(src)
return
if(T.z != loc.z)
@@ -1128,26 +1132,6 @@
/obj/projectile/experience_pressure_difference()
return
-///Like [/obj/item/proc/updateEmbedding] but for projectiles instead, call this when you want to add embedding or update the stats on the embedding element
-/obj/projectile/proc/updateEmbedding()
- if(!shrapnel_type || !LAZYLEN(embedding))
- return
-
- AddElement(/datum/element/embed,\
- embed_chance = (!isnull(embedding["embed_chance"]) ? embedding["embed_chance"] : EMBED_CHANCE),\
- fall_chance = (!isnull(embedding["fall_chance"]) ? embedding["fall_chance"] : EMBEDDED_ITEM_FALLOUT),\
- pain_chance = (!isnull(embedding["pain_chance"]) ? embedding["pain_chance"] : EMBEDDED_PAIN_CHANCE),\
- pain_mult = (!isnull(embedding["pain_mult"]) ? embedding["pain_mult"] : EMBEDDED_PAIN_MULTIPLIER),\
- remove_pain_mult = (!isnull(embedding["remove_pain_mult"]) ? embedding["remove_pain_mult"] : EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER),\
- rip_time = (!isnull(embedding["rip_time"]) ? embedding["rip_time"] : EMBEDDED_UNSAFE_REMOVAL_TIME),\
- ignore_throwspeed_threshold = (!isnull(embedding["ignore_throwspeed_threshold"]) ? embedding["ignore_throwspeed_threshold"] : FALSE),\
- impact_pain_mult = (!isnull(embedding["impact_pain_mult"]) ? embedding["impact_pain_mult"] : EMBEDDED_IMPACT_PAIN_MULTIPLIER),\
- jostle_chance = (!isnull(embedding["jostle_chance"]) ? embedding["jostle_chance"] : EMBEDDED_JOSTLE_CHANCE),\
- jostle_pain_mult = (!isnull(embedding["jostle_pain_mult"]) ? embedding["jostle_pain_mult"] : EMBEDDED_JOSTLE_PAIN_MULTIPLIER),\
- pain_stam_pct = (!isnull(embedding["pain_stam_pct"]) ? embedding["pain_stam_pct"] : EMBEDDED_PAIN_STAM_PCT),\
- projectile_payload = shrapnel_type)
- return TRUE
-
/**
* Is this projectile considered "hostile"?
*
@@ -1167,7 +1151,7 @@
///Checks if the projectile can embed into someone
/obj/projectile/proc/can_embed_into(atom/hit)
- return embedding && shrapnel_type && iscarbon(hit) && !HAS_TRAIT(hit, TRAIT_PIERCEIMMUNE)
+ return get_embed() && shrapnel_type && iscarbon(hit) && !HAS_TRAIT(hit, TRAIT_PIERCEIMMUNE)
/// Reflects the projectile off of something
/obj/projectile/proc/reflect(atom/hit_atom)
@@ -1210,3 +1194,16 @@
bullet.preparePixelProjectile(target, src)
bullet.fire()
return bullet
+
+/// Fetches embedding data
+/obj/projectile/proc/get_embed()
+ return embed_type ? (embed_data ||= get_embed_by_type(embed_type)) : null
+
+/obj/projectile/proc/set_embed(datum/embed_data/embed)
+ if(embed_data == embed)
+ return
+ // GLOB.embed_by_type stores shared "default" embedding values of datums
+ // Dynamically generated embeds use the base class and thus are not present in there, and should be qdeleted upon being discarded
+ if(!isnull(embed_data) && !GLOB.embed_by_type[embed_data.type])
+ qdel(embed_data)
+ embed_data = ispath(embed) ? get_embed_by_type(armor) : embed
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 5e938c4995390..1d1313d9e5551 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -8,7 +8,7 @@
sharpness = SHARP_POINTY
impact_effect_type = /obj/effect/temp_visual/impact_effect
shrapnel_type = /obj/item/shrapnel/bullet
- embedding = list(embed_chance=20, fall_chance=2, jostle_chance=0, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.5, pain_mult=3, rip_time=10)
+ embed_type = /datum/embed_data/bullet
wound_bonus = 0
wound_falloff_tile = -5
embed_falloff_tile = -3
@@ -16,3 +16,12 @@
/obj/projectile/bullet/smite
name = "divine retribution"
damage = 10
+
+/datum/embed_data/bullet
+ embed_chance=20
+ fall_chance=2
+ jostle_chance=0
+ ignore_throwspeed_threshold=TRUE
+ pain_stam_pct=0.5
+ pain_mult=3
+ rip_time=10
diff --git a/code/modules/projectiles/projectile/bullets/_incendiary.dm b/code/modules/projectiles/projectile/bullets/_incendiary.dm
index 85c2dce80c51a..e151afa294d50 100644
--- a/code/modules/projectiles/projectile/bullets/_incendiary.dm
+++ b/code/modules/projectiles/projectile/bullets/_incendiary.dm
@@ -30,7 +30,7 @@
pass_flags = PASSTABLE | PASSMOB
sharpness = NONE
shrapnel_type = null
- embedding = null
+ embed_type = null
impact_effect_type = null
suppressed = SUPPRESSED_VERY
damage_type = BURN
diff --git a/code/modules/projectiles/projectile/bullets/cannonball.dm b/code/modules/projectiles/projectile/bullets/cannonball.dm
index 1d6108ed33fd2..358a23eb63c90 100644
--- a/code/modules/projectiles/projectile/bullets/cannonball.dm
+++ b/code/modules/projectiles/projectile/bullets/cannonball.dm
@@ -8,7 +8,7 @@
dismemberment = 0
paralyze = 5 SECONDS
stutter = 20 SECONDS
- embedding = null
+ embed_type = null
hitsound = 'sound/effects/meteorimpact.ogg'
hitsound_wall = 'sound/weapons/sonic_jackhammer.ogg'
/// If our cannonball hits something, it reduces the damage by this value.
diff --git a/code/modules/projectiles/projectile/bullets/dart_syringe.dm b/code/modules/projectiles/projectile/bullets/dart_syringe.dm
index 405552a8909c2..1bd88d75fdea0 100644
--- a/code/modules/projectiles/projectile/bullets/dart_syringe.dm
+++ b/code/modules/projectiles/projectile/bullets/dart_syringe.dm
@@ -2,7 +2,7 @@
name = "dart"
icon_state = "cbbolt"
damage = 6
- embedding = null
+ embed_type = null
shrapnel_type = null
var/inject_flags = null
diff --git a/code/modules/projectiles/projectile/bullets/dnainjector.dm b/code/modules/projectiles/projectile/bullets/dnainjector.dm
index fdb051e7f8006..b4029b07f2da6 100644
--- a/code/modules/projectiles/projectile/bullets/dnainjector.dm
+++ b/code/modules/projectiles/projectile/bullets/dnainjector.dm
@@ -4,7 +4,7 @@
var/obj/item/dnainjector/injector
damage = 5
hitsound_wall = SFX_SHATTER
- embedding = null
+ embed_type = null
shrapnel_type = null
/obj/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0, pierce_hit)
diff --git a/code/modules/projectiles/projectile/bullets/foam_dart.dm b/code/modules/projectiles/projectile/bullets/foam_dart.dm
index 3f086166e6a88..7eaa1ce6c8ee4 100644
--- a/code/modules/projectiles/projectile/bullets/foam_dart.dm
+++ b/code/modules/projectiles/projectile/bullets/foam_dart.dm
@@ -8,7 +8,7 @@
base_icon_state = "foamdart"
range = 10
shrapnel_type = null
- embedding = null
+ embed_type = null
var/modified = FALSE
var/obj/item/pen/pen = null
diff --git a/code/modules/projectiles/projectile/bullets/grenade.dm b/code/modules/projectiles/projectile/bullets/grenade.dm
index a99a7b57ff3ec..0814a844be4a7 100644
--- a/code/modules/projectiles/projectile/bullets/grenade.dm
+++ b/code/modules/projectiles/projectile/bullets/grenade.dm
@@ -5,7 +5,7 @@
desc = "USE A WEEL GUN"
icon_state= "bolter"
damage = 60
- embedding = null
+ embed_type = null
shrapnel_type = null
/obj/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0, pierce_hit)
diff --git a/code/modules/projectiles/projectile/bullets/junk.dm b/code/modules/projectiles/projectile/bullets/junk.dm
index 344a732911347..285c3ea281509 100644
--- a/code/modules/projectiles/projectile/bullets/junk.dm
+++ b/code/modules/projectiles/projectile/bullets/junk.dm
@@ -4,11 +4,21 @@
name = "junk bullet"
icon_state = "trashball"
damage = 30
- embedding = list(embed_chance=15, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
+ embed_type = /datum/embed_data/bullet_junk
var/bane_mob_biotypes = MOB_ROBOTIC
var/bane_multiplier = 1.5
var/bane_added_damage = 0
+/datum/embed_data/bullet_junk
+ embed_chance=15
+ fall_chance=3
+ jostle_chance=4
+ ignore_throwspeed_threshold=TRUE
+ pain_stam_pct=0.4
+ pain_mult=5
+ jostle_pain_mult=6
+ rip_time=10
+
/obj/projectile/bullet/junk/Initialize(mapload)
. = ..()
AddElement(/datum/element/bane, mob_biotypes = bane_mob_biotypes, target_type = /mob/living, damage_multiplier = bane_multiplier, added_damage = bane_added_damage, requires_combat_mode = FALSE)
@@ -28,7 +38,7 @@
name = "bundle of live electrical parts"
icon_state = "tesla_projectile"
damage = 15
- embedding = null
+ embed_type = null
shrapnel_type = null
bane_multiplier = 3
@@ -49,10 +59,20 @@
name = "junk ripper bullet"
icon_state = "redtrac"
damage = 10
- embedding = list(embed_chance=100, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
+ embed_type = /datum/embed_data/bullet_junk_ripper
wound_bonus = 10
bare_wound_bonus = 30
+/datum/embed_data/bullet_junk_ripper
+ embed_chance=100
+ fall_chance=3
+ jostle_chance=4
+ ignore_throwspeed_threshold=TRUE
+ pain_stam_pct=0.4
+ pain_mult=5
+ jostle_pain_mult=6
+ rip_time=10
+
/obj/projectile/bullet/junk/reaper
name = "junk reaper bullet"
tracer_type = /obj/effect/projectile/tracer/sniper
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 8fccc510ff8fd..6bd355219f950 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -3,13 +3,23 @@
/obj/projectile/bullet/c9mm
name = "9mm bullet"
damage = 30
- embedding = list(embed_chance=15, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
+ embed_type = /datum/embed_data/bullet_c9mm
+
+/datum/embed_data/bullet_c9mm
+ embed_chance=15
+ fall_chance=3
+ jostle_chance=4
+ ignore_throwspeed_threshold=TRUE
+ pain_stam_pct=0.4
+ pain_mult=5
+ jostle_pain_mult=6
+ rip_time=10
/obj/projectile/bullet/c9mm/ap
name = "9mm armor-piercing bullet"
damage = 27
armour_penetration = 40
- embedding = null
+ embed_type = null
shrapnel_type = null
/obj/projectile/bullet/c9mm/hp
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index 417f61534bcb7..e9d6389c89d0d 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -21,9 +21,19 @@
ricochet_auto_aim_range = 3
wound_bonus = -20
bare_wound_bonus = 10
- embedding = list(embed_chance=25, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=1 SECONDS)
+ embed_type = /datum/embed_data/bullet_c38
embed_falloff_tile = -4
+/datum/embed_data/bullet_c38
+ embed_chance=25
+ fall_chance=2
+ jostle_chance=2
+ ignore_throwspeed_threshold=TRUE
+ pain_stam_pct=0.4
+ pain_mult=3
+ jostle_pain_mult=5
+ rip_time=1 SECONDS
+
/obj/projectile/bullet/c38/match
name = ".38 Match bullet"
ricochets_max = 4
@@ -45,7 +55,7 @@
ricochet_decay_damage = 0.8
shrapnel_type = null
sharpness = NONE
- embedding = null
+ embed_type = null
// premium .38 ammo from cargo, weak against armor, lower base damage, but excellent at embedding and causing slice wounds at close range
/obj/projectile/bullet/c38/dumdum
@@ -56,10 +66,20 @@
sharpness = SHARP_EDGED
wound_bonus = 20
bare_wound_bonus = 20
- embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=1 SECONDS)
+ embed_type = /datum/embed_data/bullet_c38_dumdum
wound_falloff_tile = -5
embed_falloff_tile = -15
+/datum/embed_data/bullet_c38_dumdum
+ embed_chance=75
+ fall_chance=3
+ jostle_chance=4
+ ignore_throwspeed_threshold=TRUE
+ pain_stam_pct=0.4
+ pain_mult=5
+ jostle_pain_mult=6
+ rip_time=1 SECONDS
+
/obj/projectile/bullet/c38/trac
name = ".38 TRAC bullet"
damage = 10
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index 3cbb894b8fb9e..6f14df2f4c8bd 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -35,6 +35,10 @@
damage = 20
stamina = 80
+/obj/projectile/bullet/strilka310/phasic
+ name = "phasic .310 bullet"
+ projectile_phasing = PASSTABLE | PASSGLASS | PASSGRILLE | PASSCLOSEDTURF | PASSMACHINE | PASSSTRUCTURE | PASSDOORS
+
// Harpoons (Harpoon Gun)
/obj/projectile/bullet/harpoon
@@ -44,10 +48,20 @@
armour_penetration = 50
wound_bonus = -20
bare_wound_bonus = 80
- embedding = list(embed_chance=100, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
+ embed_type = /datum/embed_data/harpoon
wound_falloff_tile = -5
shrapnel_type = null
+/datum/embed_data/harpoon
+ embed_chance=100
+ fall_chance=3
+ jostle_chance=4
+ ignore_throwspeed_threshold=TRUE
+ pain_stam_pct=0.4
+ pain_mult=5
+ jostle_pain_mult=6
+ rip_time=10
+
// Rebar (Rebar Crossbow)
/obj/projectile/bullet/rebar
name = "rebar"
@@ -58,11 +72,21 @@
armour_penetration = 10
wound_bonus = -20
bare_wound_bonus = 20
- embedding = list("embed_chance" = 60, "fall_chance" = 2, "jostle_chance" = 2, "ignore_throwspeed_threshold" = TRUE, "pain_stam_pct" = 0.4, "pain_mult" = 4, "jostle_pain_mult" = 2, "rip_time" = 10)
+ embed_type = /datum/embed_data/rebar
embed_falloff_tile = -5
wound_falloff_tile = -2
shrapnel_type = /obj/item/ammo_casing/rebar
+/datum/embed_data/rebar
+ embed_chance = 60
+ fall_chance = 2
+ jostle_chance = 2
+ ignore_throwspeed_threshold = TRUE
+ pain_stam_pct = 0.4
+ pain_mult = 4
+ jostle_pain_mult = 2
+ rip_time = 10
+
/obj/projectile/bullet/rebar/proc/handle_drop(datum/source, obj/item/ammo_casing/rebar/newcasing)
/obj/projectile/bullet/rebar/syndie
@@ -74,10 +98,20 @@
armour_penetration = 20 //A bit better versus armor. Gets past anti laser armor or a vest, but doesnt wound proc on sec armor.
wound_bonus = 10
bare_wound_bonus = 20
- embedding = list("embed_chance" = 80, "fall_chance" = 1, "jostle_chance" = 3, "ignore_throwspeed_threshold" = TRUE, "pain_stam_pct" = 0.4, "pain_mult" = 3, "jostle_pain_mult" = 2, "rip_time" = 14)
embed_falloff_tile = -3
+ embed_type = /datum/embed_data/rebar_syndie
shrapnel_type = /obj/item/ammo_casing/rebar/syndie
+/datum/embed_data/rebar_syndie
+ embed_chance = 80
+ fall_chance = 1
+ jostle_chance = 3
+ ignore_throwspeed_threshold
+ pain_stam_pct = 0.4
+ pain_mult = 3
+ jostle_pain_mult = 2
+ rip_time = 14
+
/obj/projectile/bullet/rebar/zaukerite
name = "zaukerite shard"
icon_state = "rebar_zaukerite"
@@ -89,10 +123,20 @@
armour_penetration = 20 // not nearly as good, as its not as sharp.
wound_bonus = 10
bare_wound_bonus = 40
- embedding = list("embed_chance" =100, "fall_chance" = 0, "jostle_chance" = 5, "ignore_throwspeed_threshold" = TRUE, "pain_stam_pct" = 0.8, "pain_mult" = 6, "jostle_pain_mult" = 2, "rip_time" = 30)
+ embed_type = /datum/embed_data/rebar_zaukerite
embed_falloff_tile = 0 // very spiky.
shrapnel_type = /obj/item/ammo_casing/rebar/zaukerite
+/datum/embed_data/rebar_zaukerite
+ embed_chance = 100
+ fall_chance = 0
+ jostle_chance = 5
+ ignore_throwspeed_threshold = TRUE
+ pain_stam_pct = 0.8
+ pain_mult = 6
+ jostle_pain_mult = 2
+ rip_time = 30
+
/obj/projectile/bullet/rebar/hydrogen
name = "metallic hydrogen bolt"
icon_state = "rebar_hydrogen"
@@ -104,10 +148,20 @@
projectile_piercing = PASSMOB //felt this might have been a nice compromise for the lower damage for the difficulty of getting it
wound_bonus = -15
bare_wound_bonus = 10
- embedding = list("embed_chance" = 50, "fall_chance" = 2, "jostle_chance" = 3, "ignore_throwspeed_threshold" = TRUE, "pain_stam_pct" = 0.6, "pain_mult" = 4, "jostle_pain_mult" = 2, "rip_time" =18)
+ embed_type = /datum/embed_data/rebar_hydrogen
embed_falloff_tile = -3
shrapnel_type = /obj/item/ammo_casing/rebar/hydrogen
+/datum/embed_data/rebar_hydrogen
+ embed_chance = 50
+ fall_chance = 2
+ jostle_chance = 3
+ ignore_throwspeed_threshold = TRUE
+ pain_stam_pct = 0.6
+ pain_mult = 4
+ jostle_pain_mult = 2
+ rip_time =18
+
/obj/projectile/bullet/rebar/healium
name = "healium bolt"
icon_state = "rebar_healium"
@@ -118,7 +172,7 @@
armour_penetration = 100
wound_bonus = -100
bare_wound_bonus = -100
- embedding = list(embed_chance = 0)
+ embed_type = null
embed_falloff_tile = -3
shrapnel_type = /obj/item/ammo_casing/rebar/healium
@@ -135,7 +189,6 @@
return BULLET_ACT_HIT
-
/obj/projectile/bullet/rebar/supermatter
name = "supermatter bolt"
icon_state = "rebar_supermatter"
@@ -143,6 +196,7 @@
speed = 0.4
dismemberment = 0
damage_type = TOX
+ embed_type = null
armour_penetration = 100
shrapnel_type = /obj/item/ammo_casing/rebar/supermatter
@@ -160,7 +214,6 @@
return BULLET_ACT_HIT
-
/obj/projectile/bullet/rebar/supermatter/proc/dust_feedback(atom/target)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 10, TRUE)
visible_message(span_danger("[target] is hit by [src], turning [target.p_them()] to dust in a brilliant flash of light!"))
@@ -170,7 +223,7 @@
damage = 1 // It's a damn toy.
range = 10
shrapnel_type = null
- embedding = null
+ embed_type = null
name = "paper ball"
desc = "doink!"
damage_type = BRUTE
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index b3ddaf9bc9013..a013aaba691d7 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -22,7 +22,7 @@
stamina = 55
wound_bonus = 20
sharpness = NONE
- embedding = null
+ embed_type = null
/obj/projectile/bullet/shotgun_beanbag/a40mm
name = "rubber slug"
@@ -55,7 +55,7 @@
range = 7
icon_state = "spark"
color = COLOR_YELLOW
- embedding = null
+ embed_type = null
/obj/projectile/bullet/shotgun_frag12
name ="frag12 slug"
@@ -84,7 +84,7 @@
damage = 3
stamina = 11
sharpness = NONE
- embedding = null
+ embed_type = null
speed = 1.2
stamina_falloff_tile = -0.25
ricochets_max = 4
@@ -106,7 +106,7 @@
name = "incapacitating pellet"
damage = 1
stamina = 6
- embedding = null
+ embed_type = null
// Mech Scattershot
diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm
index 8befcb690ecfa..ce78abf0662b4 100644
--- a/code/modules/projectiles/projectile/bullets/smg.dm
+++ b/code/modules/projectiles/projectile/bullets/smg.dm
@@ -33,7 +33,7 @@
name = "4.6x30mm armor-piercing bullet"
damage = 15
armour_penetration = 40
- embedding = null
+ embed_type = null
/obj/projectile/bullet/incendiary/c46x30mm
name = "4.6x30mm incendiary bullet"
diff --git a/code/modules/projectiles/projectile/bullets/special.dm b/code/modules/projectiles/projectile/bullets/special.dm
index f595c3e116510..2af0fe7b9cb9d 100644
--- a/code/modules/projectiles/projectile/bullets/special.dm
+++ b/code/modules/projectiles/projectile/bullets/special.dm
@@ -9,7 +9,7 @@
icon = 'icons/obj/service/hydroponics/harvest.dmi'
icon_state = "banana"
range = 200
- embedding = null
+ embed_type = null
shrapnel_type = null
/obj/projectile/bullet/honker/Initialize(mapload)
diff --git a/code/modules/projectiles/projectile/energy/photon.dm b/code/modules/projectiles/projectile/energy/photon.dm
new file mode 100644
index 0000000000000..7caac3e062e01
--- /dev/null
+++ b/code/modules/projectiles/projectile/energy/photon.dm
@@ -0,0 +1,58 @@
+#define MULTIPLY_PIXELSPEED 0.8
+
+/obj/projectile/energy/photon
+ name = "photon bolt"
+ icon_state = "solarflare"
+ damage_type = STAMINA
+ armor_flag = ENERGY
+ impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
+ damage = 5 //It's literally a weaker tesla bolt, which is already weak. Don't worry, we'll fix that.
+ range = 20
+ speed = 1
+ pixel_speed_multiplier = 1
+ projectile_piercing = PASSMOB
+ light_color = LIGHT_COLOR_DEFAULT
+ light_system = OVERLAY_LIGHT
+ light_power = 5
+ light_range = 6
+
+
+/obj/projectile/energy/photon/Initialize(mapload)
+ . = ..()
+ RegisterSignals(src, list(COMSIG_MOVABLE_CROSS, COMSIG_MOVABLE_CROSS_OVER), PROC_REF(blast_touched))
+ RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(scorch_earth))
+ set_light_on(TRUE)
+
+/**
+ * Handle side effects for the phonon bolt.
+ * behaves like a higher power direct flash if hit, and sparks silicons like they're getting microwaved.
+ */
+/obj/projectile/energy/photon/proc/blast_touched(datum/source, atom/flashed)
+ SIGNAL_HANDLER
+ if(isliving(flashed))
+ var/mob/living/flashed_creature = flashed
+ flashed_creature.flash_act(intensity = 3, affect_silicon = TRUE, length = 6)
+ flashed_creature.adjust_confusion(1.5 SECONDS)
+ if(issilicon(flashed))
+ do_sparks(rand(1, 4), FALSE, src)
+
+/**
+ * When traveling to a new turf, throws a probability to generate a hotspot across it's path.
+ */
+/obj/projectile/energy/photon/proc/scorch_earth(turf/open/floor/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+ SIGNAL_HANDLER
+ if(prob(40))
+ new /obj/effect/hotspot(arrived)
+
+/obj/projectile/energy/photon/Range()
+ . = ..()
+ pixel_speed_multiplier *= MULTIPLY_PIXELSPEED
+
+/obj/projectile/energy/photon/on_range()
+ do_sparks(rand(4, 9), FALSE, src)
+ playsound(loc, 'sound/weapons/solarflare.ogg', 100, FALSE, 8, 0.9)
+ for(var/mob/living/flashed_mob in viewers(5, loc))
+ flashed_mob.flash_act()
+ return ..()
+
+#undef MULTIPLY_PIXELSPEED
diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
index db452385c987c..fe04fc7d9865e 100644
--- a/code/modules/projectiles/projectile/special/rocket.dm
+++ b/code/modules/projectiles/projectile/special/rocket.dm
@@ -2,7 +2,7 @@
name ="explosive bolt"
icon_state= "bolter"
damage = 50
- embedding = null
+ embed_type = null
shrapnel_type = null
/obj/projectile/bullet/gyro/on_hit(atom/target, blocked = 0, pierce_hit)
@@ -17,7 +17,7 @@
icon_state= "missile"
damage = 50
sharpness = NONE
- embedding = null
+ embed_type = null
shrapnel_type = null
ricochets_max = 0
/// Whether we do extra damage when hitting a mech or silicon
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 3d88c40fdfb9c..182bb715466d3 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -31,7 +31,7 @@
/obj/projectile/temp/cryo
name = "cryo beam"
- range = 3
+ range = 9
temperature = -240 // Single slow shot reduces temp greatly
/obj/projectile/temp/cryo/on_range()
@@ -40,3 +40,25 @@
var/turf/open/O = T
O.freeze_turf()
return ..()
+
+/obj/projectile/temp/pyro
+ name = "hot beam"
+ icon_state = "firebeam" // sets on fire, diff sprite!
+ range = 9
+ temperature = 240
+
+/obj/projectile/temp/pyro/on_hit(atom/target, blocked, pierce_hit)
+ . = ..()
+ if(!.)
+ return
+ var/mob/living/living_target = target
+ if(!istype(living_target))
+ return
+ living_target.adjust_fire_stacks(2)
+ living_target.ignite_mob()
+
+/obj/projectile/temp/pyro/on_range()
+ var/turf/location = get_turf(src)
+ new /obj/effect/hotspot(location)
+ location.hotspot_expose(700, 50, 1)
+ return ..()
diff --git a/code/modules/reagents/chemistry/holder/holder.dm b/code/modules/reagents/chemistry/holder/holder.dm
index 3fe2e482f3efd..0c300c3896b0e 100644
--- a/code/modules/reagents/chemistry/holder/holder.dm
+++ b/code/modules/reagents/chemistry/holder/holder.dm
@@ -235,6 +235,7 @@
var/total_removed_amount = 0
var/remove_amount = 0
var/list/cached_reagents = reagent_list
+ var/list/removed_reagents = list()
for(var/datum/reagent/cached_reagent as anything in cached_reagents)
//check for specific type or subtypes
if(!include_subtypes)
@@ -243,19 +244,26 @@
else if(!istype(cached_reagent, reagent_type))
continue
+ //reduce the volume
remove_amount = min(cached_reagent.volume, amount)
cached_reagent.volume -= remove_amount
- update_total()
- if(!safety)//So it does not handle reactions when it need not to
- handle_reactions()
- SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, QDELING(cached_reagent) ? reagent_type : cached_reagent, amount)
-
+ //record the changes
+ removed_reagents += cached_reagent
total_removed_amount += remove_amount
//if we reached here means we have found our specific reagent type so break
if(!include_subtypes)
- return total_removed_amount
+ break
+
+ //inform others about our reagents being removed
+ for(var/datum/reagent/removed_reagent as anything in cached_reagents)
+ SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, removed_reagent, amount)
+
+ //update the holder & handle reactions
+ update_total()
+ if(!safety)
+ handle_reactions()
return round(total_removed_amount, CHEMICAL_VOLUME_ROUNDING)
@@ -504,8 +512,6 @@
log_target.add_hiddenprint(transferred_by) //log prints so admins can figure out who touched it last.
log_combat(transferred_by, log_target, "transferred reagents to", my_atom, "which had [get_external_reagent_log_string(transfer_log)]")
- update_total()
- target_holder.update_total()
if(!no_react)
target_holder.handle_reactions()
src.handle_reactions()
diff --git a/code/modules/reagents/chemistry/holder/reactions.dm b/code/modules/reagents/chemistry/holder/reactions.dm
index 80241173deebf..3fbcb57a43424 100644
--- a/code/modules/reagents/chemistry/holder/reactions.dm
+++ b/code/modules/reagents/chemistry/holder/reactions.dm
@@ -339,6 +339,7 @@
my_atom.visible_message(span_notice("[iconhtml] \The [my_atom]'s power is consumed in the reaction."))
extract.name = "used slime extract"
extract.desc = "This extract has been used up."
+ extract.grind_results.Cut()
//finish the reaction
selected_reaction.on_reaction(src, null, multiplier)
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 11947c7060271..576d62585f7a8 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -250,7 +250,9 @@ Primarily used in reagents/reaction_agents
/// Should return a associative list where keys are taste descriptions and values are strength ratios
/datum/reagent/proc/get_taste_description(mob/living/taster)
- return list("[taste_description]" = 1)
+ if(isnull(taster) || !HAS_TRAIT(taster, TRAIT_DETECTIVES_TASTE))
+ return list("[taste_description]" = 1)
+ return list("[LOWER_TEXT(name)]" = 1)
/**
* Used when you want the default reagents purity to be equal to the normal effects
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index b60a5b8028642..c6cee8e91c062 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -503,18 +503,29 @@
var/atom/movable/plane_master_controller/game_plane_master_controller = psychonaut.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ // Info for non-matrix plebs like me!
+
+ // This doesn't change the RGB matrixes directly at all. Instead, it shifts all the colors' Hue by 33%,
+ // Shifting them up the color wheel, turning R to G, G to B, B to R, making a psychedelic effect.
+ // The second moves them two colors up instead, turning R to B, G to R, B to G.
+ // The third does a full spin, or resets it back to normal.
+ // Imagine a triangle on the color wheel with the points located at the color peaks, rotating by 90 degrees each time.
+ // The value with decimals is the Hue. The rest are Saturation, Luminosity, and Alpha, though they're unused here.
+
+ // The filters were initially named _green, _blue, _red, despite every filter changing all the colors. It caused me a 2-years-long headache.
+
var/list/col_filter_identity = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.000,0,0,0)
- var/list/col_filter_green = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.333,0,0,0)
- var/list/col_filter_blue = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.666,0,0,0)
- var/list/col_filter_red = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 1.000,0,0,0) //visually this is identical to the identity
+ var/list/col_filter_shift_once = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.333,0,0,0)
+ var/list/col_filter_shift_twice = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.666,0,0,0)
+ var/list/col_filter_reset = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 1.000,0,0,0) //visually this is identical to the identity
- game_plane_master_controller.add_filter("rainbow", 10, color_matrix_filter(col_filter_red, FILTER_COLOR_HSL))
+ game_plane_master_controller.add_filter("rainbow", 10, color_matrix_filter(col_filter_reset, FILTER_COLOR_HSL))
for(var/filter in game_plane_master_controller.get_filters("rainbow"))
animate(filter, color = col_filter_identity, time = 0 SECONDS, loop = -1, flags = ANIMATION_PARALLEL)
- animate(color = col_filter_green, time = 4 SECONDS)
- animate(color = col_filter_blue, time = 4 SECONDS)
- animate(color = col_filter_red, time = 4 SECONDS)
+ animate(color = col_filter_shift_once, time = 4 SECONDS)
+ animate(color = col_filter_shift_twice, time = 4 SECONDS)
+ animate(color = col_filter_reset, time = 4 SECONDS)
game_plane_master_controller.add_filter("psilocybin_wave", 1, list("type" = "wave", "size" = 2, "x" = 32, "y" = 32))
@@ -568,18 +579,18 @@
var/atom/movable/plane_master_controller/game_plane_master_controller = dancer.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
- var/list/col_filter_blue = list(0,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.764,0,0,0) //most blue color
+ var/list/col_filter_shift_twice = list(0,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.764,0,0,0) //most blue color
var/list/col_filter_mid = list(0,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.832,0,0,0) //red/blue mix midpoint
- var/list/col_filter_red = list(0,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.900,0,0,0) //most red color
+ var/list/col_filter_reset = list(0,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.900,0,0,0) //most red color
game_plane_master_controller.add_filter("blastoff_filter", 10, color_matrix_filter(col_filter_mid, FILTER_COLOR_HCY))
game_plane_master_controller.add_filter("blastoff_wave", 1, list("type" = "wave", "x" = 32, "y" = 32))
for(var/filter in game_plane_master_controller.get_filters("blastoff_filter"))
- animate(filter, color = col_filter_blue, time = 3 SECONDS, loop = -1, flags = ANIMATION_PARALLEL)
+ animate(filter, color = col_filter_shift_twice, time = 3 SECONDS, loop = -1, flags = ANIMATION_PARALLEL)
animate(color = col_filter_mid, time = 3 SECONDS)
- animate(color = col_filter_red, time = 3 SECONDS)
+ animate(color = col_filter_reset, time = 3 SECONDS)
animate(color = col_filter_mid, time = 3 SECONDS)
for(var/filter in game_plane_master_controller.get_filters("blastoff_wave"))
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 2e45ecf641bc1..7c9042314458d 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -140,6 +140,7 @@
brute_heal = 0.8 //Rewards the player for eating a balanced diet.
nutriment_factor = 9 //45% as calorie dense as oil.
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ default_container = /obj/item/reagent_containers/condiment/protein
/datum/reagent/consumable/nutriment/fat
name = "Fat"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index d5099d1c62425..202788e28044f 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -127,6 +127,16 @@
if(data["blood_DNA"])
bloodsplatter.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+/datum/reagent/blood/get_taste_description(mob/living/taster)
+ if(isnull(taster))
+ return ..()
+ if(!HAS_TRAIT(taster, TRAIT_DETECTIVES_TASTE))
+ return ..()
+ var/blood_type = data?["blood_type"]
+ if(!blood_type)
+ return ..()
+ return list("[blood_type] type blood" = 1)
+
/datum/reagent/consumable/liquidgibs
name = "Liquid Gibs"
color = "#CC4633"
@@ -889,7 +899,7 @@
return
to_chat(affected_mob, span_warning("You grit your teeth in pain as your body rapidly mutates!"))
affected_mob.visible_message("[affected_mob] suddenly transforms!")
- randomize_human(affected_mob)
+ randomize_human_normie(affected_mob)
/datum/reagent/aslimetoxin
name = "Advanced Mutation Toxin"
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index a60432c078429..13eaffca3a898 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -88,7 +88,7 @@
//Gold
/datum/chemical_reaction/slime/slimemobspawn
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
+ required_reagents = list(/datum/reagent/toxin/plasma = 15)
required_container = /obj/item/slime_extract/gold
deletes_extract = FALSE //we do delete, but we don't do so instantly
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_SLIME | REACTION_TAG_DANGEROUS
@@ -103,7 +103,7 @@
/datum/chemical_reaction/slime/slimemobspawn/proc/summon_mobs(datum/reagents/holder, turf/T)
T.visible_message(span_danger("The slime extract begins to vibrate violently!"))
- addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 5, "Gold Slime", HOSTILE_SPAWN), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 4, "Gold Slime", HOSTILE_SPAWN), 5 SECONDS)
/datum/chemical_reaction/slime/slimemobspawn/lesser
required_reagents = list(/datum/reagent/blood = 1)
@@ -222,7 +222,7 @@
required_container = /obj/item/slime_extract/orange
/datum/chemical_reaction/slime/slimefire
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
+ required_reagents = list(/datum/reagent/toxin/plasma = 15)
required_container = /obj/item/slime_extract/orange
deletes_extract = FALSE
@@ -249,12 +249,12 @@
//Yellow
/datum/chemical_reaction/slime/slimeoverload
- required_reagents = list(/datum/reagent/blood = 1)
+ required_reagents = list(/datum/reagent/blood = 15)
required_container = /obj/item/slime_extract/yellow
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_SLIME | REACTION_TAG_DANGEROUS
/datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
- empulse(get_turf(holder.my_atom), 3, 7)
+ empulse(get_turf(holder.my_atom), 3, 5)
..()
/datum/chemical_reaction/slime/slimecell
@@ -356,7 +356,7 @@
//Oil
/datum/chemical_reaction/slime/slimeexplosion
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
+ required_reagents = list(/datum/reagent/toxin/plasma = 15)
required_container = /obj/item/slime_extract/oil
deletes_extract = FALSE
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_SLIME | REACTION_TAG_DANGEROUS
@@ -380,7 +380,7 @@
/datum/chemical_reaction/slime/slimeexplosion/proc/boom(datum/reagents/holder)
if(holder?.my_atom)
- explosion(holder.my_atom, devastation_range = 1, heavy_impact_range = 3, light_impact_range = 6, explosion_cause = src)
+ explosion(holder.my_atom, devastation_range = 1, heavy_impact_range = 2, light_impact_range = 4, explosion_cause = src)
/datum/chemical_reaction/slime/slimeoil
@@ -408,7 +408,7 @@
//Adamantine
/datum/chemical_reaction/slime/adamantine
- required_reagents = list(/datum/reagent/toxin/plasma = 1)
+ required_reagents = list(/datum/reagent/toxin/plasma = 15)
required_container = /obj/item/slime_extract/adamantine
/datum/chemical_reaction/slime/adamantine/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index e1d78353bca28..e95b5eea82089 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -266,9 +266,6 @@
reagents.expose_temperature(1000)
return ..() | COMPONENT_MICROWAVE_SUCCESS
-/obj/item/reagent_containers/fire_act(temperature, volume)
- reagents.expose_temperature(temperature)
-
/// Updates the icon of the container when the reagents change. Eats signal args
/obj/item/reagent_containers/proc/on_reagent_change(datum/reagents/holder, ...)
SIGNAL_HANDLER
diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm
index ccabc2c410646..c8652afda8f0e 100644
--- a/code/modules/reagents/reagent_containers/condiment.dm
+++ b/code/modules/reagents/reagent_containers/condiment.dm
@@ -368,6 +368,13 @@
list_reagents = list(/datum/reagent/consumable/grounding_solution = 50)
fill_icon_thresholds = null
+/obj/item/reagent_containers/condiment/protein
+ name = "protein powder"
+ desc = "Fuel for your inner Hulk - because you can't spell 'swole' without 'whey'!"
+ icon_state = "protein"
+ list_reagents = list(/datum/reagent/consumable/nutriment/protein = 40)
+ fill_icon_thresholds = null
+
//technically condiment packs but they are non transparent
/obj/item/reagent_containers/condiment/creamer
diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
index 644f0dd96948a..87df7765233ec 100644
--- a/code/modules/reagents/reagent_containers/cups/_cup.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -117,6 +117,7 @@
return ITEM_INTERACT_BLOCKING
var/trans = reagents.trans_to(target, amount_per_transfer_from_this, transferred_by = user)
+ playsound(target.loc, pick('sound/effects/liquid_pour1.ogg', 'sound/effects/liquid_pour2.ogg', 'sound/effects/liquid_pour3.ogg'), 50)
to_chat(user, span_notice("You transfer [trans] unit\s of the solution to [target]."))
SEND_SIGNAL(src, COMSIG_REAGENTS_CUP_TRANSFER_TO, target)
target.update_appearance()
@@ -227,6 +228,8 @@
worn_icon_state = "beaker"
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*5)
fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100)
+ pickup_sound = 'sound/items/handling/beaker_pickup.ogg'
+ drop_sound = 'sound/items/handling/beaker_place.ogg'
/obj/item/reagent_containers/cup/beaker/Initialize(mapload)
. = ..()
diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
index a293aac7aa1b1..b246cc01e07e9 100644
--- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -42,9 +42,8 @@
/obj/item/reagent_containers/cup/glass/bottle/Initialize(mapload, vol)
. = ..()
- AddComponent(/datum/component/slapcrafting,\
- slapcraft_recipes = list(/datum/crafting_recipe/molotov)\
- )
+ var/static/list/recipes = list(/datum/crafting_recipe/molotov)
+ AddElement(/datum/element/slapcrafting, recipes)
/obj/item/reagent_containers/cup/glass/bottle/small
name = "small glass bottle"
diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm
index c90926a94ea8d..226fce45d61d5 100644
--- a/code/modules/reagents/reagent_containers/cups/soda.dm
+++ b/code/modules/reagents/reagent_containers/cups/soda.dm
@@ -23,9 +23,7 @@
/obj/item/reagent_containers/cup/soda_cans/Initialize(mapload, vol)
. = ..()
- AddComponent(/datum/component/slapcrafting,\
- slapcraft_recipes = list(/datum/crafting_recipe/improv_explosive)\
- )
+ AddElement(/datum/element/slapcrafting, string_list(list(/datum/crafting_recipe/improv_explosive)))
/obj/item/reagent_containers/cup/soda_cans/random/Initialize(mapload)
..()
@@ -75,10 +73,10 @@
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(M.loc)
crushed_can.icon_state = icon_state
- // MASSMETA ADDITION (kvass)
+ //MASSMETA EDIT ADDITION BEGIN (kvass)
if(icon_state == "kvass")
crushed_can.icon = 'massmeta/icons/items/janitor.dmi'
- // EDIT END
+ //MASSMETA EDIT ADDITION END
qdel(src)
return TRUE
@@ -92,10 +90,10 @@
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
crushed_can.icon_state = icon_state
- // MASSMETA ADDITION (kvass)
+ //MASSMETA EDIT ADDITION BEGIN (kvass)
if(icon_state == "kvass")
crushed_can.icon = 'massmeta/icons/items/janitor.dmi'
- // EDIT END
+ //MASSMETA EDIT ADDITION END
var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
crushed_can.throw_at(throw_target, rand(1,2), 7)
@@ -155,10 +153,10 @@
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
crushed_can.icon_state = icon_state
- // MASSMETA ADDITION (kvass)
+ //MASSMETA EDIT ADDITION BEGIN (kvass)
if(icon_state == "kvass")
crushed_can.icon = 'massmeta/icons/items/janitor.dmi'
- // EDIT END
+ //MASSMETA EDIT ADDITION END
moveToNullspace()
QDEL_IN(src, 1 SECONDS) // give it a second so it can still be logged for the throw impact
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index b8b3576aa4b1b..f9cf10e1068d9 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -204,6 +204,7 @@
if(leaking && reagents && reagents.total_volume >= amount_to_leak)
reagents.expose(get_turf(src), TOUCH, amount_to_leak / max(amount_to_leak, reagents.total_volume))
reagents.remove_reagent(reagent_id, amount_to_leak)
+ playsound(src, 'sound/effects/glug.ogg', 33, TRUE, SILENCED_SOUND_EXTRARANGE)
return TRUE
return FALSE
@@ -221,7 +222,7 @@
if(!openable)
return FALSE
leaking = !leaking
- balloon_alert(user, "[leaking ? "opened" : "closed"] [src]'s tap")
+ balloon_alert(user, "[leaking ? "opened" : "closed"] tap")
user.log_message("[leaking ? "opened" : "closed"] [src].", LOG_GAME)
tank_leak()
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm
index 903a59a930557..13f43b1f4a419 100644
--- a/code/modules/recycling/disposal/construction.dm
+++ b/code/modules/recycling/disposal/construction.dm
@@ -109,7 +109,7 @@
var/turf/T = get_turf(src)
if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE && isfloorturf(T))
- var/obj/item/crowbar/held_crowbar = user.is_holding_item_of_type(/obj/item/crowbar)
+ var/obj/item/crowbar/held_crowbar = user.is_holding_tool_quality(TOOL_CROWBAR)
if(!held_crowbar || !T.crowbar_act(user, held_crowbar))
to_chat(user, span_warning("You can only attach the [pipename] if the floor plating is removed!"))
return TRUE
diff --git a/code/modules/religion/burdened/psyker.dm b/code/modules/religion/burdened/psyker.dm
index c370424fa7d2c..b256b4f9d4ac3 100644
--- a/code/modules/religion/burdened/psyker.dm
+++ b/code/modules/religion/burdened/psyker.dm
@@ -252,7 +252,7 @@
ricochet_auto_aim_angle = 10
ricochet_auto_aim_range = 3
wound_bonus = -10
- embedding = null
+ embed_type = null
/obj/projectile/bullet/c38/holy/on_hit(atom/target, blocked, pierce_hit)
. = ..()
diff --git a/code/modules/research/designs/autolathe/engineering_designs.dm b/code/modules/research/designs/autolathe/engineering_designs.dm
index dc87b747959ca..c376a1ac1c55a 100644
--- a/code/modules/research/designs/autolathe/engineering_designs.dm
+++ b/code/modules/research/designs/autolathe/engineering_designs.dm
@@ -10,18 +10,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-/datum/design/sparker
- name = "Sparker WallFrame"
- id = "sparker"
- build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
- build_path = /obj/item/wallframe/sparker
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
/datum/design/tracker_electronics
name = "Solar Tracking Electronics"
id = "solar_tracker"
@@ -95,18 +83,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-/datum/design/turret_control_frame
- name = "Turret Control Frame"
- id = "turret_control"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6)
- build_path = /obj/item/wallframe/turret_control
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
/datum/design/large_welding_tool
name = "Industrial Welding Tool"
id = "large_welding_tool"
@@ -119,55 +95,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-/datum/design/camera_assembly
- name = "Camera Assembly"
- id = "camera_assembly"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*4, /datum/material/glass = SMALL_MATERIAL_AMOUNT*2.5)
- build_path = /obj/item/wallframe/camera
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/newscaster_frame
- name = "Newscaster Frame"
- id = "newscaster_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
- build_path = /obj/item/wallframe/newscaster
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/status_display_frame
- name = "Status Display Frame"
- id = "status_display_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
- build_path = /obj/item/wallframe/status_display
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-
-/datum/design/intercom_frame
- name = "Intercom Frame"
- id = "intercom_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25)
- build_path = /obj/item/wallframe/intercom
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
/datum/design/earmuffs
name = "Earmuffs"
id = "earmuffs"
@@ -323,130 +250,3 @@
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ATMOSPHERICS,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/requests_console
- name = "Requests Console Frame"
- id = "requests_console"
- build_type = AUTOLATHE | PROTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7, /datum/material/glass = SHEET_MATERIAL_AMOUNT*4)
- build_path = /obj/item/wallframe/requests_console
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/light_switch_frame
- name = "Light Switch Frame"
- id = "light_switch_frame"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25)
- build_path = /obj/item/wallframe/light_switch
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/telescreen_turbine
- name = "Turbine Telescreen"
- id = "telescreen_turbine"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
- )
- build_path = /obj/item/wallframe/telescreen/turbine
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/telescreen_engine
- name = "Engine Telescreen"
- id = "telescreen_engine"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
- )
- build_path = /obj/item/wallframe/telescreen/engine
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/telescreen_auxbase
- name = "Auxiliary Base Telescreen"
- id = "telescreen_auxbase"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
- )
- build_path = /obj/item/wallframe/telescreen/auxbase
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_controller
- name = "Tram Controller Cabinet"
- id = "tram_controller"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
- /datum/material/gold = SHEET_MATERIAL_AMOUNT * 7,
- /datum/material/silver = SHEET_MATERIAL_AMOUNT * 7,
- /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 4,
- )
- build_path = /obj/item/wallframe/tram/controller
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_display
- name = "Tram Indicator Display"
- id = "tram_display"
- build_type = PROTOLATHE
- materials = list(
- /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1,
- /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2,
- )
- build_path = /obj/item/wallframe/indicator_display
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_floor_dark
- name = "Dark Tram Tile"
- id = "tram_floor_dark"
- build_type = PROTOLATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 0.25)
- build_path = /obj/item/stack/thermoplastic
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-
-/datum/design/tram_floor_light
- name = "Light Tram Tile"
- id = "tram_floor_light"
- build_type = PROTOLATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 0.25)
- build_path = /obj/item/stack/thermoplastic/light
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
diff --git a/code/modules/research/designs/autolathe/multi-department_designs.dm b/code/modules/research/designs/autolathe/multi-department_designs.dm
index ea1c94ff89c27..734dcbc97e084 100644
--- a/code/modules/research/designs/autolathe/multi-department_designs.dm
+++ b/code/modules/research/designs/autolathe/multi-department_designs.dm
@@ -483,43 +483,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-/datum/design/circuit
- name = "Blue Circuit Tile"
- id = "circuit"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
- build_path = /obj/item/stack/tile/circuit
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-
-
-/datum/design/circuitgreen
- name = "Green Circuit Tile"
- id = "circuitgreen"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
- build_path = /obj/item/stack/tile/circuit/green
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-
-/datum/design/circuitred
- name = "Red Circuit Tile"
- id = "circuitred"
- build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT*5, /datum/material/glass =SMALL_MATERIAL_AMOUNT*5)
- build_path = /obj/item/stack/tile/circuit/red
- category = list(
- RND_CATEGORY_INITIAL,
- RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
- )
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
-
/datum/design/conveyor_belt
name = "Conveyor Belt"
id = "conveyor_belt"
diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm
index 8dab08c046d45..7a8242642a13a 100644
--- a/code/modules/research/designs/computer_part_designs.dm
+++ b/code/modules/research/designs/computer_part_designs.dm
@@ -5,10 +5,11 @@
/datum/design/portabledrive/basic
name = "Data Disk"
id = "portadrive_basic"
- build_type = IMPRINTER | AWAY_IMPRINTER
- materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT*8)
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT)
build_path = /obj/item/computer_disk
category = list(
+ RND_CATEGORY_INITIAL,
RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
@@ -16,10 +17,11 @@
/datum/design/portabledrive/advanced
name = "Advanced Data Disk"
id = "portadrive_advanced"
- build_type = IMPRINTER | AWAY_IMPRINTER
- materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*1.5)
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2)
build_path = /obj/item/computer_disk/advanced
category = list(
+ RND_CATEGORY_INITIAL,
RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
@@ -27,10 +29,11 @@
/datum/design/portabledrive/super
name = "Super Data Disk"
id = "portadrive_super"
- build_type = IMPRINTER | AWAY_IMPRINTER
- materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT*1.5)
+ build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 4)
build_path = /obj/item/computer_disk/super
category = list(
+ RND_CATEGORY_INITIAL,
RND_CATEGORY_MODULAR_COMPUTERS + RND_SUBCATEGORY_MODULAR_COMPUTERS_PARTS
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 8f857f77e8286..b8b11e7b44f67 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -582,6 +582,16 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
+/datum/design/board/vatgrower
+ name = "Growing Vat Board"
+ desc = "The circuit board for a growing vat."
+ id = "vatgrower"
+ build_path = /obj/item/circuitboard/machine/vatgrower
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
/datum/design/board/monkey_recycler
name = "Monkey Recycler Board"
desc = "The circuit board for a monkey recycler."
@@ -1178,6 +1188,36 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+/datum/design/board/scrubber
+ name = "Portable Air Scrubber Board"
+ desc = "The circuit board for a portable air scrubber."
+ id = "scrubber"
+ build_path = /obj/item/circuitboard/machine/scrubber
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ATMOS
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/design/board/pump
+ name = "Portable Air Pump Board"
+ desc = "The circuit board for a portable air pump."
+ id = "pump"
+ build_path = /obj/item/circuitboard/machine/pump
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ATMOS
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/design/board/pipe_scrubber
+ name = "Portable Pipe Scrubber Board"
+ desc = "The circuit board for a portable pipe scrubber."
+ id = "pipe_scrubber"
+ build_path = /obj/item/circuitboard/machine/pipe_scrubber
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ATMOS
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
+
/datum/design/board/bookbinder
name = "Book Binder"
desc = "The circuit board for a book binder"
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 0583269f1c6be..cc75ce89c74ec 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -907,6 +907,104 @@
RND_CATEGORY_MECHFAB_SAVANNAH_IVANOV + RND_SUBCATEGORY_MECHFAB_CHASSIS
)
+//Justice (emaged only)
+/datum/design/justice_chassis
+ name = "Exosuit Chassis (\"Justice\")"
+ id = "justice_chassis"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/chassis/justice
+ materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*20)
+ construction_time = 10 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_JUSTICE + RND_SUBCATEGORY_MECHFAB_CHASSIS
+ )
+
+/datum/design/justice_torso
+ name = "Exosuit Torso (\"Justice\")"
+ id = "justice_torso"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/justice_torso
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 50,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 5,
+ )
+ construction_time = 30 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_JUSTICE + RND_SUBCATEGORY_MECHFAB_CHASSIS
+ )
+
+/datum/design/justice_left_arm
+ name = "Exosuit Left Arm (\"Justice\")"
+ id = "justice_left_arm"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/justice_left_arm
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2,
+ )
+ construction_time = 10 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_JUSTICE + RND_SUBCATEGORY_MECHFAB_CHASSIS
+ )
+
+/datum/design/justice_right_arm
+ name = "Exosuit Right Arm (\"Justice\")"
+ id = "justice_right_arm"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/justice_right_arm
+ materials = list(
+ /datum/material/iron=SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/silver=SHEET_MATERIAL_AMOUNT*2,
+ )
+ construction_time = 10 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_JUSTICE + RND_SUBCATEGORY_MECHFAB_CHASSIS
+ )
+
+/datum/design/justice_left_leg
+ name = "Exosuit Left Leg (\"Justice\")"
+ id = "justice_left_leg"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/justice_left_leg
+ materials = list(
+ /datum/material/iron=SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/titanium=SHEET_MATERIAL_AMOUNT*2,
+ )
+ construction_time = 10 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_JUSTICE + RND_SUBCATEGORY_MECHFAB_CHASSIS
+ )
+
+/datum/design/justice_right_leg
+ name = "Exosuit Right Leg (\"Justice\")"
+ id = "justice_right_leg"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/justice_right_leg
+ materials = list(
+ /datum/material/iron=SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/titanium=SHEET_MATERIAL_AMOUNT*2,
+ )
+ construction_time = 10 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_JUSTICE + RND_SUBCATEGORY_MECHFAB_CHASSIS
+ )
+
+/datum/design/justice_armor
+ name = "Exosuit Armor (\"Justice\")"
+ id = "justice_armor"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/part/justice_armor
+ materials = list(
+ /datum/material/silver=SHEET_MATERIAL_AMOUNT*10,
+ /datum/material/titanium=SHEET_MATERIAL_AMOUNT*10,
+ /datum/material/plastic=SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/diamond=SHEET_MATERIAL_AMOUNT*1,
+ )
+ construction_time = 20 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_JUSTICE + RND_SUBCATEGORY_MECHFAB_CHASSIS
+ )
+
//Clarke
/datum/design/clarke_chassis
name = "Exosuit Chassis (\"Clarke\")"
@@ -2338,14 +2436,14 @@
RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_SUPPLY
)
-/datum/design/module/mod_organ_thrower
- name = "Organ Thrower Module"
- id = "mod_organ_thrower"
+/datum/design/module/mod_organizer
+ name = "Organizer Module"
+ id = "mod_organizer"
materials = list(
/datum/material/iron =HALF_SHEET_MATERIAL_AMOUNT,
/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT,
)
- build_path = /obj/item/mod/module/organ_thrower
+ build_path = /obj/item/mod/module/organizer
category = list(
RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_MEDICAL
)
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 4e95e9d4dfda7..cbd05593a3c11 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -811,6 +811,23 @@
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
+/datum/design/cybernetic_heart/anomalock
+ name = "Voltaic combat cyberheart"
+ desc = "A cutting-edge cyberheart, originally designed for Nanotrasen killsquad usage but later declassified for normal research. Voltaic technology allows the heart to keep the body upright in dire circumstances, alongside redirecting anomalous flux energy to fully shield the user from shocks and electro-magnetic pulses. Does nothing without a flux anomaly core."
+ id = "cybernetic_heart_anomalock"
+ construction_time = 5 SECONDS
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/diamond = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/organ/internal/heart/cybernetic/anomalock
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
/datum/design/cybernetic_lungs
name = "Basic Cybernetic Lungs"
desc = "A basic pair of cybernetic lungs."
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 0ea6c41e16448..d9feba5179e08 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -166,18 +166,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
-/datum/design/air_horn
- name = "Air Horn"
- desc = "Damn son, where'd you find this?"
- id = "air_horn"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/bananium =HALF_SHEET_MATERIAL_AMOUNT)
- build_path = /obj/item/bikehorn/airhorn
- category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE
- )
- departmental_flags = DEPARTMENT_BITFLAG_SERVICE
-
/datum/design/clown_firing_pin
name = "Hilarious Firing Pin"
id = "clown_firing_pin"
diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm
index 649d0c5c09dfc..901bc304dc1d7 100644
--- a/code/modules/research/designs/tool_designs.dm
+++ b/code/modules/research/designs/tool_designs.dm
@@ -226,17 +226,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
-/datum/design/plumbing_rcd_sci
- name = "Research Plumbing Constructor"
- id = "plumbing_rcd_sci"
- build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*37.5, /datum/material/glass =SHEET_MATERIAL_AMOUNT*18.75, /datum/material/plastic =HALF_SHEET_MATERIAL_AMOUNT)
- build_path = /obj/item/construction/plumbing/research
- category = list(
- RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_PLUMBING
- )
- departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
-
/datum/design/plumbing_rcd_service
name = "Service Plumbing Constructor"
id = "plumbing_rcd_service"
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 35d95d82d3047..f0e0978a6074a 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -449,3 +449,15 @@
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design/photon_cannon
+ name = "Photon Cannon Part Kit (Nonlethal)"
+ desc = "A kit to reverse-engineer a photon cannon, a weapon that generates a shortly-lived miniature sun. Technically brightens up the room, effectively blinds everyone in it. Requires a flux anomaly core to finish."
+ id = "photon_cannon"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 7, /datum/material/gold = SHEET_MATERIAL_AMOUNT * 5)
+ build_path = /obj/item/weaponcrafting/gunkit/photon
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SECURITY
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index affe82275ab14..2d0ba7017d27b 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -461,9 +461,9 @@
if(exp == SCANTYPE_DISCOVER)
visible_message(span_notice("[src] scans the [exp_on], revealing its true nature!"))
playsound(src, 'sound/effects/supermatter.ogg', 50, 3, -1)
- var/obj/item/relic/R = loaded_item
- R.reveal()
- investigate_log("Experimentor has revealed a relic with [span_danger("[R.realProc]")] effect.", INVESTIGATE_EXPERIMENTOR)
+ var/obj/item/relic/loaded_artifact = loaded_item
+ loaded_artifact.reveal()
+ investigate_log("Experimentor has revealed a relic with [span_danger("[loaded_artifact.hidden_power]")] effect.", INVESTIGATE_EXPERIMENTOR)
ejectItem()
//Global reactions
@@ -553,34 +553,74 @@
#undef FAIL
-//////////////////////////////////SPECIAL ITEMS////////////////////////////////////////
+// Relic \\
/obj/item/relic
name = "strange object"
desc = "What mysteries could this hold? Maybe Research & Development could find out."
- icon = 'icons/obj/devices/assemblies.dmi'
- var/realName = "defined object"
- var/revealed = FALSE
- var/realProc
- var/reset_timer = 60
+ icon = 'icons/obj/devices/artefacts.dmi'
+ icon_state = "debug_artefact"
+ //The name this artefact will have when it's activated.
+ var/real_name = "artefact"
+ //Has this artefact been activated?
+ var/activated = FALSE
+ //What effect this artefact has when used. Randomly determined when activated.
+ var/hidden_power
+ //Minimum possible cooldown.
+ var/min_cooldown = 6 SECONDS
+ //Max possible cooldown.
+ var/max_cooldown = 30 SECONDS
+ //Cooldown length. Randomly determined at activation if it isn't determined here.
+ var/cooldown_timer
COOLDOWN_DECLARE(cooldown)
+ //What visual theme this artefact has. Current possible choices: "prototype", "necrotech"
+ var/artifact_theme = "prototype"
/obj/item/relic/Initialize(mapload)
. = ..()
- icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank")
- realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","illegal tech","weapon")]"
+ random_themed_appearance()
+
+/obj/item/relic/proc/random_themed_appearance()
+ var/themed_name_prefix
+ var/themed_name_suffix
+ if(artifact_theme == "prototype")
+ icon_state = pick("prototype1", "prototype2", "prototype3", "prototype4", "prototype5", "prototype6", "prototype7", "prototype8","prototype9")
+ themed_name_prefix = pick("experimental","prototype","artificial","handcrafted","ramshackle","odd")
+ themed_name_suffix = pick("device","assembly","gadget","gizmo","contraption","machine","widget","object")
+ real_name = "[pick(themed_name_prefix)] [pick(themed_name_suffix)]"
+ name = "strange [pick(themed_name_suffix)]"
+ if(artifact_theme == "necrotech")
+ icon_state = pick("necrotech1", "necrotech2", "necrotech3", "necrotech4", "necrotech5", "necrotech6")
+ themed_name_prefix = pick("dark","bloodied","unholy","archeotechnological","dismal","ruined","thrumming")
+ themed_name_suffix = pick("instrument","shard","fetish","bibelot","trinket","offering","relic")
+ real_name = "[pick(themed_name_prefix)] [pick(themed_name_suffix)]"
+ name = "strange relic"
+ update_appearance()
+/obj/item/relic/lavaland
+ name = "strange relic"
+ artifact_theme = "necrotech"
/obj/item/relic/proc/reveal()
- if(revealed) //Re-rolling your relics seems a bit overpowered, yes?
+ if(activated) //no rerolling
return
- revealed = TRUE
- name = realName
- reset_timer = rand(reset_timer, reset_timer * 5)
- realProc = pick(PROC_REF(teleport), PROC_REF(explode), PROC_REF(rapidDupe), PROC_REF(petSpray), PROC_REF(flash), PROC_REF(clean), PROC_REF(corgicannon))
+ activated = TRUE
+ name = real_name
+ if(!cooldown_timer)
+ cooldown_timer = rand(min_cooldown, max_cooldown)
+ if(!hidden_power)
+ hidden_power = pick(
+ PROC_REF(corgi_cannon),
+ PROC_REF(cleaning_foam),
+ PROC_REF(flashbanger),
+ PROC_REF(summon_animals),
+ PROC_REF(uncontrolled_teleport),
+ PROC_REF(heat_and_explode),
+ PROC_REF(rapid_self_dupe),
+ )
/obj/item/relic/attack_self(mob/user)
- if(!revealed)
+ if(!activated)
to_chat(user, span_notice("You aren't quite sure what this is. Maybe R&D knows what to do with it?"))
return
if(!COOLDOWN_FINISHED(src, cooldown))
@@ -588,40 +628,39 @@
return
if(loc != user)
return
- COOLDOWN_START(src, cooldown, reset_timer)
- call(src,realProc)(user)
-
-//////////////// RELIC PROCS /////////////////////////////
+ COOLDOWN_START(src, cooldown, cooldown_timer)
+ call(src, hidden_power)(user)
-/obj/item/relic/proc/throwSmoke(turf/where)
+/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()
-/obj/item/relic/proc/corgicannon(mob/user)
+// Artefact Powers \\
+
+/obj/item/relic/proc/corgi_cannon(mob/user)
playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
var/mob/living/basic/pet/dog/corgi/sad_corgi = new(get_turf(user))
- sad_corgi.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, PROC_REF(throwSmoke), sad_corgi))
+ sad_corgi.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, PROC_REF(throw_smoke), sad_corgi))
warn_admins(user, "Corgi Cannon", 0)
-/obj/item/relic/proc/clean(mob/user)
+/obj/item/relic/proc/cleaning_foam(mob/user)
playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- var/obj/item/grenade/chem_grenade/cleaner/CL = new/obj/item/grenade/chem_grenade/cleaner(get_turf(user))
- CL.detonate()
- qdel(CL)
+ var/obj/item/grenade/chem_grenade/cleaner/spawned_foamer = new/obj/item/grenade/chem_grenade/cleaner(get_turf(user))
+ spawned_foamer.detonate()
+ qdel(spawned_foamer)
warn_admins(user, "Foam", 0)
-/obj/item/relic/proc/flash(mob/user)
+/obj/item/relic/proc/flashbanger(mob/user)
playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- var/obj/item/grenade/flashbang/CB = new/obj/item/grenade/flashbang(user.loc)
- CB.detonate()
+ var/obj/item/grenade/flashbang/spawned_flashbang = new/obj/item/grenade/flashbang(user.loc)
+ spawned_flashbang.detonate()
warn_admins(user, "Flash")
-/obj/item/relic/proc/petSpray(mob/user)
+/obj/item/relic/proc/summon_animals(mob/user)
var/message = span_danger("[src] begins to shake, and in the distance the sound of rampaging animals arises!")
visible_message(message)
to_chat(user, message)
-
var/static/list/valid_animals = list(
/mob/living/basic/bear,
/mob/living/basic/bee,
@@ -637,42 +676,40 @@
/mob/living/basic/pet/fox,
)
for(var/counter in 1 to rand(1, 25))
- var/mobType = pick(valid_animals)
- new mobType(get_turf(src))
-
+ var/animal_spawn = pick(valid_animals)
+ new animal_spawn(get_turf(src))
warn_admins(user, "Mass Mob Spawn")
if(prob(60))
to_chat(user, span_warning("[src] falls apart!"))
qdel(src)
-/obj/item/relic/proc/rapidDupe(mob/user)
+/obj/item/relic/proc/rapid_self_dupe(mob/user)
audible_message("[src] emits a loud pop!")
- var/list/dupes = list()
+ var/list/dummy_artifacts = list()
for(var/counter in 1 to rand(5,10))
- var/obj/item/relic/R = new type(get_turf(src))
- R.name = name
- R.desc = desc
- R.realName = realName
- R.realProc = realProc
- R.revealed = TRUE
- dupes += R
- R.throw_at(pick(oview(7,get_turf(src))),10,1)
-
- QDEL_LIST_IN(dupes, rand(10, 100))
+ var/obj/item/relic/duped = new type(get_turf(src))
+ duped.name = name
+ duped.desc = desc
+ duped.real_name = real_name
+ duped.hidden_power = hidden_power
+ duped.activated = TRUE
+ dummy_artifacts += duped
+ duped.throw_at(pick(oview(7,get_turf(src))),10,1)
+ QDEL_LIST_IN(dummy_artifacts, rand(1 SECONDS, 10 SECONDS))
warn_admins(user, "Rapid duplicator", 0)
-/obj/item/relic/proc/explode(mob/user)
+/obj/item/relic/proc/heat_and_explode(mob/user)
to_chat(user, span_danger("[src] begins to heat up!"))
- addtimer(CALLBACK(src, PROC_REF(do_explode), user), rand(3.5 SECONDS, 10 SECONDS))
+ addtimer(CALLBACK(src, PROC_REF(blow_up), user), rand(3.5 SECONDS, 10 SECONDS))
-/obj/item/relic/proc/do_explode(mob/user)
+/obj/item/relic/proc/blow_up(mob/user)
if(loc == user)
visible_message(span_notice("\The [src]'s top opens, releasing a powerful blast!"))
explosion(src, heavy_impact_range = rand(1,5), light_impact_range = rand(1,5), flame_range = 2, flash_range = rand(1,5), adminlog = TRUE)
warn_admins(user, "Explosion")
qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
-/obj/item/relic/proc/teleport(mob/user)
+/obj/item/relic/proc/uncontrolled_teleport(mob/user)
to_chat(user, span_notice("[src] begins to vibrate!"))
addtimer(CALLBACK(src, PROC_REF(do_the_teleport), user), rand(1 SECONDS, 3 SECONDS))
@@ -680,16 +717,16 @@
var/turf/userturf = get_turf(user)
if(loc == user && !is_centcom_level(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
visible_message(span_notice("[src] twists and bends, relocating itself!"))
- throwSmoke(userturf)
+ throw_smoke(userturf)
do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- throwSmoke(get_turf(user))
+ throw_smoke(get_turf(user))
warn_admins(user, "Teleport", 0)
//Admin Warning proc for relics
-/obj/item/relic/proc/warn_admins(mob/user, RelicType, priority = 1)
- var/turf/T = get_turf(src)
- var/log_msg = "[RelicType] relic used by [key_name(user)] in [AREACOORD(T)]"
+/obj/item/relic/proc/warn_admins(mob/user, relic_type, priority = 1)
+ var/turf/location = get_turf(src)
+ var/log_msg = "[relic_type] relic used by [key_name(user)] in [AREACOORD(location)]"
if(priority) //For truly dangerous relics that may need an admin's attention. BWOINK!
- message_admins("[RelicType] relic activated by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]")
+ message_admins("[relic_type] relic activated by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(location)]")
log_game(log_msg)
investigate_log(log_msg, "experimentor")
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 295cd05fe9040..c69de9bb2d9c1 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -21,8 +21,11 @@
var/stripe_color = null
///direction we output onto (if 0, on top of us)
var/drop_direction = 0
+ //looping sound for printing items
+ var/datum/looping_sound/lathe_print/print_sound
/obj/machinery/rnd/production/Initialize(mapload)
+ print_sound = new(src, FALSE)
materials = AddComponent(
/datum/component/remote_materials, \
mapload, \
@@ -48,6 +51,7 @@
update_icon(UPDATE_OVERLAYS)
/obj/machinery/rnd/production/Destroy()
+ QDEL_NULL(print_sound)
materials = null
cached_designs = null
return ..()
@@ -74,6 +78,7 @@
return
. += span_notice("Material usage cost at [efficiency_coeff * 100]%")
+ . += span_notice("Build time at [efficiency_coeff * 100]%")
if(drop_direction)
. += span_notice("Currently configured to drop printed objects [dir2text(drop_direction)].")
. += span_notice("[EXAMINE_HINT("Alt-click")] to reset.")
@@ -341,11 +346,12 @@
for(var/material in design.materials)
charge_per_item += design.materials[material]
charge_per_item = ROUND_UP((charge_per_item / (MAX_STACK_SIZE * SHEET_MATERIAL_AMOUNT)) * coefficient * active_power_usage)
- var/build_time_per_item = (design.construction_time * design.lathe_time_factor) ** 0.8
+ var/build_time_per_item = (design.construction_time * design.lathe_time_factor * efficiency_coeff) ** 0.8
//start production
busy = TRUE
SStgui.update_uis(src)
+ print_sound.start()
if(production_animation)
icon_state = production_animation
var/turf/target_location
@@ -447,7 +453,7 @@
/// Called at the end of do_make_item's timer loop
/obj/machinery/rnd/production/proc/finalize_build()
PROTECTED_PROC(TRUE)
-
+ print_sound.stop()
busy = FALSE
SStgui.update_uis(src)
icon_state = initial(icon_state)
diff --git a/code/modules/research/ordnance/scipaper_partner.dm b/code/modules/research/ordnance/scipaper_partner.dm
index 712ec4b4127e9..7120c78cecde9 100644
--- a/code/modules/research/ordnance/scipaper_partner.dm
+++ b/code/modules/research/ordnance/scipaper_partner.dm
@@ -4,12 +4,11 @@
accepted_experiments = list(/datum/experiment/ordnance/explosive/lowyieldbomb)
multipliers = list(SCIPAPER_COOPERATION_INDEX = 0.75, SCIPAPER_FUNDING_INDEX = 0.75)
boostable_nodes = list(
- "bluespace_basic" = 2000,
- "NVGtech" = 1500,
- "practical_bluespace" = 2500,
- "basic_plasma" = 2000,
- "basic_mining" = 2000,
- "adv_mining" = 2000,
+ TECHWEB_NODE_BLUESPACE_THEORY = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_NIGHT_VISION = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_ANOMALY_RESEARCH = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_MINING = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_MINING_ADV = TECHWEB_TIER_2_POINTS,
)
/datum/scientific_partner/baron
@@ -17,8 +16,8 @@
flufftext = "A nearby research station ran by a very wealthy captain seems to be struggling with their scientific output. They might reward us handsomely if we ghostwrite for them."
multipliers = list(SCIPAPER_COOPERATION_INDEX = 0.25, SCIPAPER_FUNDING_INDEX = 2)
boostable_nodes = list(
- "comp_recordkeeping" = 500,
- "computer_data_disks" = 500,
+ TECHWEB_NODE_CONSOLES = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_FUNDIMENTAL_SCI = TECHWEB_TIER_1_POINTS,
)
/datum/scientific_partner/defense
@@ -30,14 +29,11 @@
/datum/experiment/ordnance/explosive/hydrogenbomb,
)
boostable_nodes = list(
- "adv_weaponry" = 5000,
- "weaponry" = 2500,
- "sec_basic" = 1250,
- "explosive_weapons" = 1250,
- "electronic_weapons" = 1250,
- "radioactive_weapons" = 1250,
- "beam_weapons" = 1250,
- "explosive_weapons" = 1250,
+ TECHWEB_NODE_RIOT_SUPRESSION = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_SEC_EQUIP = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_EXPLOSIVES = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_ELECTRIC_WEAPONS = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_BEAM_WEAPONS = TECHWEB_TIER_3_POINTS,
)
/datum/scientific_partner/medical
@@ -48,12 +44,12 @@
/datum/experiment/ordnance/gaseous/bz,
)
boostable_nodes = list(
- "cyber_organs" = 750,
- "cyber_organs_upgraded" = 1000,
- "genetics" = 500,
- "subdermal_implants" = 1250,
- "adv_biotech" = 1000,
- "biotech" = 1000,
+ TECHWEB_NODE_CYBER_ORGANS = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_CYBER_ORGANS_UPGRADED = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_GENE_ENGINEERING = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_PASSIVE_IMPLANTS = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_BIO_SCAN = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_CHEM_SYNTHESIS = TECHWEB_TIER_2_POINTS,
)
/datum/scientific_partner/physics
@@ -64,11 +60,8 @@
/datum/experiment/ordnance/explosive/nobliumbomb,
)
boostable_nodes = list(
- "engineering" = 5000,
- "adv_engi" = 5000,
- "emp_super" = 3000,
- "emp_adv" = 1250,
- "high_efficiency" = 5000,
- "micro_bluespace" = 5000,
- "adv_power" = 1500,
+ TECHWEB_NODE_PARTS_UPG = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_EXP_TOOLS = TECHWEB_TIER_4_POINTS,
+ TECHWEB_NODE_PARTS_BLUESPACE = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_PARTS_ADV = TECHWEB_TIER_1_POINTS,
)
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 069447c6f4539..0cfca236d24c3 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -72,7 +72,7 @@
return CONTEXTUAL_SCREENTIP_SET
else
if(held_item.tool_behaviour == TOOL_MULTITOOL)
- var/obj/item/multitool/tool = held_item
+ var/obj/item/multitool/tool = held_item.get_proxy_attacker_for(src, user)
if(!QDELETED(tool.buffer) && istype(tool.buffer, /datum/techweb))
context[SCREENTIP_CONTEXT_LMB] = "Upload Techweb"
context[SCREENTIP_CONTEXT_RMB] = "Upload Techweb"
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 1bd0d3560beed..79a97b40a6bc5 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -154,16 +154,16 @@
if(HDD_OVERLOADED)
. += "The front panel is dangling open. The hdd inside is destroyed and the wires are all burned."
-/obj/machinery/rnd/server/master/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+/obj/machinery/rnd/server/master/tool_act(mob/living/user, obj/item/tool, list/modifiers)
if(!tool.tool_behaviour)
- return NONE
+ return ..()
// Only antags are given the training and knowledge to disassemble this thing.
if(!is_special_character(user))
if(user.combat_mode)
return ITEM_INTERACT_SKIP_TO_ATTACK
balloon_alert(user, "you can't find an obvious maintenance hatch!")
return ITEM_INTERACT_BLOCKING
- return NONE
+ return ..()
/obj/machinery/rnd/server/master/attackby(obj/item/attacking_item, mob/user, params)
if(istype(attacking_item, /obj/item/computer_disk/hdd_theft))
diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm
index c36eb88627137..7714946a4d290 100644
--- a/code/modules/research/techweb/_techweb_node.dm
+++ b/code/modules/research/techweb/_techweb_node.dm
@@ -40,6 +40,8 @@
var/list/experiments_to_unlock = list()
/// Whether or not this node should show on the wiki
var/show_on_wiki = TRUE
+ /// Hidden Mech nodes unlocked when mech fabricator emaged.
+ var/illegal_mech_node = FALSE
/datum/techweb_node/error_node
id = "ERROR"
diff --git a/code/modules/research/techweb/nodes/alien_nodes.dm b/code/modules/research/techweb/nodes/alien_nodes.dm
index bf19c0c54a47d..c5d21c255cf8e 100644
--- a/code/modules/research/techweb/nodes/alien_nodes.dm
+++ b/code/modules/research/techweb/nodes/alien_nodes.dm
@@ -1,8 +1,8 @@
/datum/techweb_node/alientech //AYYYYYYYYLMAOO tech
- id = "alientech"
+ id = TECHWEB_NODE_ALIENTECH
display_name = "Alien Technology"
description = "Things used by the greys."
- prereq_ids = list("bluespace_travel")
+ prereq_ids = list(TECHWEB_NODE_BLUESPACE_TRAVEL)
required_items_to_unlock = list(
/obj/item/stack/sheet/mineral/abductor,
/obj/item/abductor,
@@ -33,10 +33,10 @@
SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_ALIENTECH] = TRUE
/datum/techweb_node/alien_engi
- id = "alien_engi"
+ id = TECHWEB_NODE_ALIEN_ENGI
display_name = "Alien Engineering"
description = "Alien engineering tools"
- prereq_ids = list("alientech", "exp_tools")
+ prereq_ids = list(TECHWEB_NODE_ALIENTECH, TECHWEB_NODE_EXP_TOOLS)
design_ids = list(
"alien_crowbar",
"alien_multitool",
@@ -61,10 +61,10 @@
hidden = TRUE
/datum/techweb_node/alien_surgery
- id = "alien_surgery"
+ id = TECHWEB_NODE_ALIEN_SURGERY
display_name = "Alien Surgery"
description = "Abductors did nothing wrong."
- prereq_ids = list("alientech", "surgery_tools")
+ prereq_ids = list(TECHWEB_NODE_ALIENTECH, TECHWEB_NODE_SURGERY_TOOLS)
design_ids = list(
"alien_cautery",
"alien_drill",
diff --git a/code/modules/research/techweb/nodes/atmos_nodes.dm b/code/modules/research/techweb/nodes/atmos_nodes.dm
index b97538070beba..ef4fee5ed92a7 100644
--- a/code/modules/research/techweb/nodes/atmos_nodes.dm
+++ b/code/modules/research/techweb/nodes/atmos_nodes.dm
@@ -1,5 +1,5 @@
/datum/techweb_node/atmos
- id = "atmos"
+ id = TECHWEB_NODE_ATMOS
starting_node = TRUE
display_name = "Atmospherics"
description = "Maintaining station air and related life support systems."
@@ -8,6 +8,7 @@
"atmosalerts",
"thermomachine",
"space_heater",
+ "scrubber",
"generic_tank",
"oxygen_tank",
"plasma_tank",
@@ -21,12 +22,13 @@
)
/datum/techweb_node/gas_compression
- id = "gas_compression"
+ id = TECHWEB_NODE_GAS_COMPRESSION
display_name = "Gas Compression"
description = "Highly pressurized gases hold potential for unlocking immense energy capabilities."
- prereq_ids = list("atmos")
+ prereq_ids = list(TECHWEB_NODE_ATMOS)
design_ids = list(
"tank_compressor",
+ "pump",
"emergency_oxygen",
"emergency_oxygen_engi",
"power_turbine_console",
@@ -42,13 +44,13 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/plasma_control
- id = "plasma_control"
+ id = TECHWEB_NODE_PLASMA_CONTROL
display_name = "Controlled Plasma"
description = "Experiments with high-pressure gases and electricity resulting in crystallization and controlled plasma reactions."
- prereq_ids = list("gas_compression", "energy_manipulation")
+ prereq_ids = list(TECHWEB_NODE_GAS_COMPRESSION, TECHWEB_NODE_ENERGY_MANIPULATION)
design_ids = list(
- "crystallizer",
"electrolyzer",
+ "pipe_scrubber",
"pacman",
"mech_generator",
"plasmacutter",
@@ -57,10 +59,10 @@
required_experiments = list(/datum/experiment/ordnance/gaseous/plasma)
/datum/techweb_node/fusion
- id = "fusion"
+ id = TECHWEB_NODE_FUSION
display_name = "Fusion"
description = "Investigating fusion reactor technology to achieve sustainable and efficient energy production through controlled plasma reactions involving noble gases."
- prereq_ids = list("plasma_control")
+ prereq_ids = list(TECHWEB_NODE_PLASMA_CONTROL)
design_ids = list(
"HFR_core",
"HFR_corner",
@@ -68,19 +70,21 @@
"HFR_interface",
"HFR_moderator_input",
"HFR_waste_output",
+ "adv_fire_extinguisher",
"bolter_wrench",
"rpd_loaded",
"engine_goggles",
+ "crystallizer",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
required_experiments = list(/datum/experiment/ordnance/gaseous/bz)
discount_experiments = list(/datum/experiment/ordnance/gaseous/nitrous_oxide = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/exp_tools
- id = "exp_tools"
+ id = TECHWEB_NODE_EXP_TOOLS
display_name = "Experimental Tools"
description = "Enhances the functionality and versatility of station tools."
- prereq_ids = list("fusion")
+ prereq_ids = list(TECHWEB_NODE_FUSION)
design_ids = list(
"flatpacker",
"handdrill",
@@ -88,20 +92,20 @@
"jawsoflife",
"rangedanalyzer",
"rtd_loaded",
+ "mech_rcd",
"rcd_loaded",
"rcd_ammo",
"weldingmask",
"magboots",
- "adv_fire_extinguisher",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
discount_experiments = list(/datum/experiment/ordnance/gaseous/noblium = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/rcd_upgrade
- id = "rcd_upgrade"
- display_name = "Rapid Device Upgrade Designs"
+ id = TECHWEB_NODE_RCD_UPGRADE
+ display_name = "Rapid Construction Device Upgrades"
description = "New designs and enhancements for RCD and RPD."
- prereq_ids = list("exp_tools", "parts_bluespace")
+ prereq_ids = list(TECHWEB_NODE_EXP_TOOLS, TECHWEB_NODE_PARTS_BLUESPACE)
design_ids = list(
"rcd_upgrade_silo_link",
"rcd_upgrade_anti_interrupt",
diff --git a/code/modules/research/techweb/nodes/bepis_nodes.dm b/code/modules/research/techweb/nodes/bepis_nodes.dm
index c051aab526f81..baefd8c11d048 100644
--- a/code/modules/research/techweb/nodes/bepis_nodes.dm
+++ b/code/modules/research/techweb/nodes/bepis_nodes.dm
@@ -1,17 +1,18 @@
/datum/techweb_node/light_apps
- id = "light_apps"
+ id = TECHWEB_NODE_LIGHT_APPS
display_name = "Illumination Applications"
description = "Applications of lighting and vision technology not originally thought to be commercially viable."
design_ids = list(
"bright_helmet",
"rld_mini",
+ "photon_cannon",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
hidden = TRUE
experimental = TRUE
/datum/techweb_node/extreme_office
- id = "extreme_office"
+ id = TECHWEB_NODE_EXTREME_OFFICE
display_name = "Advanced Office Applications"
description = "Some of our smartest lab guys got together on a Friday and improved our office efficiency by 350%. Here's how."
design_ids = list(
@@ -23,7 +24,7 @@
experimental = TRUE
/datum/techweb_node/spec_eng
- id = "spec_eng"
+ id = TECHWEB_NODE_SPEC_ENG
display_name = "Specialized Engineering"
description = "Conventional wisdom has deemed these engineering products 'technically' safe, but far too dangerous to traditionally condone."
design_ids = list(
@@ -35,7 +36,7 @@
experimental = TRUE
/datum/techweb_node/aus_security
- id = "aus_security"
+ id = TECHWEB_NODE_AUS_SECURITY
display_name = "Australicus Security Protocols"
description = "It is said that security in the Australicus sector is tight, so we took some pointers from their equipment. Thankfully, our sector lacks any signs of these, 'dropbears'."
design_ids = list(
@@ -47,7 +48,7 @@
experimental = TRUE
/datum/techweb_node/interrogation
- id = "interrogation"
+ id = TECHWEB_NODE_INTERROGATION
display_name = "Enhanced Interrogation Technology"
description = "By cross-referencing several declassified documents from past dictatorial regimes, we were able to develop an incredibly effective interrogation device. \
Ethical concerns about loss of free will do not apply to criminals, according to galactic law."
@@ -59,7 +60,7 @@
experimental = TRUE
/datum/techweb_node/sticky_advanced
- id = "sticky_advanced"
+ id = TECHWEB_NODE_STICKY_ADVANCED
display_name = "Advanced Sticky Technology"
description = "Taking a good joke too far? Nonsense!"
design_ids = list(
@@ -71,7 +72,7 @@
experimental = TRUE
/datum/techweb_node/tackle_advanced
- id = "tackle_advanced"
+ id = TECHWEB_NODE_TACKLE_ADVANCED
display_name = "Advanced Grapple Technology"
description = "Nanotrasen would like to remind its researching staff that it is never acceptable to \"glomp\" your coworkers, and further \"scientific trials\" on the subject \
will no longer be accepted in its academic journals."
@@ -84,21 +85,7 @@
experimental = TRUE
/datum/techweb_node/mod_experimental
- id = "mod_experimental"
- display_name = "Experimental Modular Suits"
- description = "Applications of experimentality when creating MODsuits have created these..."
- design_ids = list(
- "mod_disposal",
- "mod_joint_torsion",
- "mod_recycler",
- "mod_shooting",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
- hidden = TRUE
- experimental = TRUE
-
-/datum/techweb_node/mod_experimental
- id = "mod_experimental"
+ id = TECHWEB_NODE_MOD_EXPERIMENTAL
display_name = "Experimental Modular Suits"
description = "Applications of experimentality when creating MODsuits have created these..."
design_ids = list(
@@ -112,7 +99,7 @@
experimental = TRUE
/datum/techweb_node/posisphere
- id = "positronic_sphere"
+ id = TECHWEB_NODE_POSITRONIC_SPHERE
display_name = "Experimental Spherical Positronic Brain"
description = "Recent developments on cost-cutting measures have allowed us to cut positronic brain cubes into twice-as-cheap spheres. Unfortunately, it also allows them to move around the lab via rolling maneuvers."
design_ids = list(
diff --git a/code/modules/research/techweb/nodes/biology_nodes.dm b/code/modules/research/techweb/nodes/biology_nodes.dm
index 4adc78691835a..3599dfb9fc5a1 100644
--- a/code/modules/research/techweb/nodes/biology_nodes.dm
+++ b/code/modules/research/techweb/nodes/biology_nodes.dm
@@ -1,8 +1,8 @@
/datum/techweb_node/bio_scan
- id = "bio_scan"
+ id = TECHWEB_NODE_BIO_SCAN
display_name = "Biological Scan"
description = "Advanced technology for analyzing patient health and reagent compositions, ensuring precise diagnostics and treatment in the medical bay."
- prereq_ids = list("medbay_equip")
+ prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP)
design_ids = list(
"healthanalyzer",
"autopsyscanner",
@@ -16,13 +16,14 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/cytology
- id = "cytology"
+ id = TECHWEB_NODE_CYTOLOGY
display_name = "Cytology"
description = "Cellular biology research focused on cultivation of limbs and diverse organisms from cells."
- prereq_ids = list("bio_scan")
+ prereq_ids = list(TECHWEB_NODE_BIO_SCAN)
design_ids = list(
"limbgrower",
"pandemic",
+ "vatgrower",
"petri_dish",
"swab",
"biopsy_tool",
@@ -30,10 +31,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/xenobiology
- id = "xenobiology"
+ id = TECHWEB_NODE_XENOBIOLOGY
display_name = "Xenobiology"
description = "Exploration of non-human biology, unlocking the secrets of extraterrestrial lifeforms and their unique biological processes."
- prereq_ids = list("cytology")
+ prereq_ids = list(TECHWEB_NODE_CYTOLOGY)
design_ids = list(
"xenobioconsole",
"slime_scanner",
@@ -43,13 +44,13 @@
"limbdesign_plasmaman",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
- required_experiments = list(/datum/experiment/scanning/random/cytology)
+ required_experiments = list(/datum/experiment/scanning/cytology/slime)
/datum/techweb_node/gene_engineering
- id = "gene_engineering"
+ id = TECHWEB_NODE_GENE_ENGINEERING
display_name = "Gene Engineering"
description = "Research into sophisticated DNA manipulation techniques, enabling the modification of human genetic traits to unlock specific abilities and enhancements."
- prereq_ids = list("selection", "xenobiology")
+ prereq_ids = list(TECHWEB_NODE_SELECTION, TECHWEB_NODE_XENOBIOLOGY)
design_ids = list(
"dnascanner",
"scan_console",
@@ -58,7 +59,45 @@
"mod_dna_lock",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
- discount_experiments = list(
- /datum/experiment/scanning/random/plants/traits = TECHWEB_TIER_2_POINTS,
- /datum/experiment/scanning/points/slime/hard = TECHWEB_TIER_2_POINTS,
- )
+ discount_experiments = list(/datum/experiment/scanning/people/mutant = TECHWEB_TIER_4_POINTS)
+
+// Botany root node
+/datum/techweb_node/botany_equip
+ id = TECHWEB_NODE_BOTANY_EQUIP
+ starting_node = TRUE
+ display_name = "Botany Equipment"
+ description = "Essential tools for maintaining onboard gardens, supporting plant growth in the unique environment of the space station."
+ design_ids = list(
+ "seed_extractor",
+ "plant_analyzer",
+ "watering_can",
+ "spade",
+ "cultivator",
+ "secateurs",
+ "hatchet",
+ )
+
+/datum/techweb_node/hydroponics
+ id = TECHWEB_NODE_HYDROPONICS
+ display_name = "Hydroponics"
+ description = "Research into advanced hydroponic systems for efficient and sustainable plant cultivation."
+ prereq_ids = list(TECHWEB_NODE_BOTANY_EQUIP, TECHWEB_NODE_CHEM_SYNTHESIS)
+ design_ids = list(
+ "biogenerator",
+ "hydro_tray",
+ "portaseeder",
+ )
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
+
+/datum/techweb_node/selection
+ id = TECHWEB_NODE_SELECTION
+ display_name = "Artificial Selection"
+ description = "Advancement in plant cultivation techniques through artificial selection, enabling precise manipulation of plant DNA."
+ prereq_ids = list(TECHWEB_NODE_HYDROPONICS)
+ design_ids = list(
+ "flora_gun",
+ "gene_shears",
+ )
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
+ required_experiments = list(/datum/experiment/scanning/random/plants/wild)
+ discount_experiments = list(/datum/experiment/scanning/random/plants/traits = TECHWEB_TIER_3_POINTS)
diff --git a/code/modules/research/techweb/nodes/circuit_nodes.dm b/code/modules/research/techweb/nodes/circuit_nodes.dm
index 81f6dad275f0d..e654abbf4dffb 100644
--- a/code/modules/research/techweb/nodes/circuit_nodes.dm
+++ b/code/modules/research/techweb/nodes/circuit_nodes.dm
@@ -1,9 +1,9 @@
/datum/techweb_node/programming
- id = "programming"
+ id = TECHWEB_NODE_PROGRAMMING
starting_node = TRUE
display_name = "Programming"
description = "Dedicate an entire shift to program a fridge to greet you when opened."
- prereq_ids = list("robotics")
+ prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
"component_printer",
"module_duplicator",
@@ -87,10 +87,10 @@
)
/datum/techweb_node/circuit_shells
- id = "circuit_shells"
+ id = TECHWEB_NODE_CIRCUIT_SHELLS
display_name = "Advanced Circuit Shells"
description = "Adding brains to more things."
- prereq_ids = list("programming")
+ prereq_ids = list(TECHWEB_NODE_PROGRAMMING)
design_ids = list(
"assembly_shell",
"bot_shell",
@@ -108,10 +108,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/bci
- id = "bci"
+ id = TECHWEB_NODE_BCI
display_name = "Brain-Computer Interface"
description = "Embedded brain circuits. May occasionally stream Nanotrasen ads in dreams."
- prereq_ids = list("circuit_shells", "passive_implants")
+ prereq_ids = list(TECHWEB_NODE_CIRCUIT_SHELLS, TECHWEB_NODE_PASSIVE_IMPLANTS)
design_ids = list(
"bci_implanter",
"bci_shell",
@@ -129,10 +129,10 @@
discount_experiments = list(/datum/experiment/scanning/people/skillchip = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/programmed_robot
- id = "programmed_robot"
+ id = TECHWEB_NODE_PROGRAMMED_ROBOT
display_name = "Programmed Robot"
description = "Grants access to movable shells, allowing for remote operations and pranks."
- prereq_ids = list("circuit_shells")
+ prereq_ids = list(TECHWEB_NODE_CIRCUIT_SHELLS)
design_ids = list(
"drone_shell",
"comp_pathfind",
@@ -141,10 +141,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/programmed_server
- id = "programmed_server"
+ id = TECHWEB_NODE_PROGRAMMED_SERVER
display_name = "Programmed Server"
description = "Grants access to a server shell that has a very high capacity for components."
- prereq_ids = list("bci")
+ prereq_ids = list(TECHWEB_NODE_BCI)
design_ids = list(
"server_shell",
)
diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm
index a4e0debd6ebb8..447ee2dc7f3b9 100644
--- a/code/modules/research/techweb/nodes/cyborg_nodes.dm
+++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm
@@ -1,9 +1,9 @@
/datum/techweb_node/augmentation
- id = "augmentation"
+ id = TECHWEB_NODE_AUGMENTATION
starting_node = TRUE
display_name = "Augmentation"
description = "For those who prefer shiny metal over squishy flesh."
- prereq_ids = list("robotics")
+ prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
"borg_chest",
"borg_head",
@@ -19,12 +19,15 @@
"cybernetic_liver",
"cybernetic_heart",
)
+ experiments_to_unlock = list(
+ /datum/experiment/scanning/people/android,
+ )
/datum/techweb_node/cybernetics
- id = "cybernetics"
+ id = TECHWEB_NODE_CYBERNETICS
display_name = "Cybernetics"
description = "Sapient robots with preloaded tool modules and programmable laws."
- prereq_ids = list("augmentation")
+ prereq_ids = list(TECHWEB_NODE_AUGMENTATION)
design_ids = list(
"robocontrol",
"borgupload",
@@ -43,10 +46,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/borg_service
- id = "borg_service"
+ id = TECHWEB_NODE_BORG_SERVICES
display_name = "Service Cyborg Upgrades"
description = "Let them do the cookin' by the book."
- prereq_ids = list("cybernetics")
+ prereq_ids = list(TECHWEB_NODE_CYBERNETICS)
design_ids = list(
"borg_upgrade_rolling_table",
"borg_upgrade_condiment_synthesizer",
@@ -58,10 +61,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/borg_mining
- id = "borg_mining"
+ id = TECHWEB_NODE_BORG_MINING
display_name = "Mining Cyborg Upgrades"
description = "To mine places too dangerous for humans."
- prereq_ids = list("cybernetics")
+ prereq_ids = list(TECHWEB_NODE_CYBERNETICS)
design_ids = list(
"borg_upgrade_lavaproof",
"borg_upgrade_holding",
@@ -70,10 +73,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/borg_medical
- id = "borg_medical"
+ id = TECHWEB_NODE_BORG_MEDICAL
display_name = "Medical Cyborg Upgrades"
description = "Let them follow Asimov's First Law."
- prereq_ids = list("borg_service", "surgery_adv")
+ prereq_ids = list(TECHWEB_NODE_BORG_SERVICES, TECHWEB_NODE_SURGERY_ADV)
design_ids = list(
"borg_upgrade_pinpointer",
"borg_upgrade_beakerapp",
@@ -86,10 +89,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/borg_utility
- id = "borg_utility"
+ id = TECHWEB_NODE_BORG_UTILITY
display_name = "Untility Cyborg Upgrades"
description = "Let them wipe our floors for us."
- prereq_ids = list("borg_service", "sanitation")
+ prereq_ids = list(TECHWEB_NODE_BORG_SERVICES, TECHWEB_NODE_SANITATION)
design_ids = list(
"borg_upgrade_advancedmop",
"borg_upgrade_broomer",
@@ -107,10 +110,10 @@
design_ids += "borg_upgrade_disablercooler"
/datum/techweb_node/borg_engi
- id = "borg_engi"
+ id = TECHWEB_NODE_BORG_ENGI
display_name = "Engineering Cyborg Upgrades"
description = "To slack even more."
- prereq_ids = list("borg_mining", "parts_upg")
+ prereq_ids = list(TECHWEB_NODE_BORG_MINING, TECHWEB_NODE_PARTS_UPG)
design_ids = list(
"borg_upgrade_rped",
"borg_upgrade_engineeringomnitool",
@@ -121,10 +124,10 @@
// Implants root node
/datum/techweb_node/passive_implants
- id = "passive_implants"
+ id = TECHWEB_NODE_PASSIVE_IMPLANTS
display_name = "Passive Implants"
description = "Implants designed to operate seamlessly without active user input, enhancing various physiological functions or providing continuous benefits."
- prereq_ids = list("augmentation")
+ prereq_ids = list(TECHWEB_NODE_AUGMENTATION)
design_ids = list(
"skill_station",
"implant_trombone",
@@ -141,10 +144,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/cyber/cyber_implants
- id = "cyber_implants"
+ id = TECHWEB_NODE_CYBER_IMPLANTS
display_name = "Cybernetic Implants"
description = "Advanced technological enhancements integrated into the body, offering improved physical capabilities."
- prereq_ids = list("passive_implants", "cybernetics")
+ prereq_ids = list(TECHWEB_NODE_PASSIVE_IMPLANTS, TECHWEB_NODE_CYBERNETICS)
design_ids = list(
"ci-breather",
"ci-nutriment",
@@ -158,10 +161,10 @@
research_costs[TECHWEB_POINT_TYPE_GENERIC] /= 2
/datum/techweb_node/cyber/combat_implants
- id = "combat_implants"
+ id = TECHWEB_NODE_COMBAT_IMPLANTS
display_name = "Combat Implants"
description = "To make sure that you can wake the f*** up, samurai."
- prereq_ids = list("cyber_implants")
+ prereq_ids = list(TECHWEB_NODE_CYBER_IMPLANTS)
design_ids = list(
"ci-reviver",
"ci-antidrop",
@@ -170,10 +173,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/cyber/integrated_toolsets
- id = "integrated_toolsets"
+ id = TECHWEB_NODE_INTERGRATED_TOOLSETS
display_name = "Integrated Toolsets"
description = "Decades of contraband smuggling by assistants have led to the development of a full toolbox that fits seamlessly into your arm."
- prereq_ids = list("combat_implants", "exp_tools")
+ prereq_ids = list(TECHWEB_NODE_COMBAT_IMPLANTS, TECHWEB_NODE_EXP_TOOLS)
design_ids = list(
"ci-nutrimentplus",
"ci-toolset",
@@ -182,10 +185,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
/datum/techweb_node/cyber/cyber_organs
- id = "cyber_organs"
+ id = TECHWEB_NODE_CYBER_ORGANS
display_name = "Cybernetic Organs"
description = "We have the technology to rebuild him."
- prereq_ids = list("cybernetics")
+ prereq_ids = list(TECHWEB_NODE_CYBERNETICS)
design_ids = list(
"cybernetic_eyes_improved",
"cybernetic_eyes_improved_moth",
@@ -198,10 +201,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/cyber/cyber_organs_upgraded
- id = "cyber_organs_upgraded"
+ id = TECHWEB_NODE_CYBER_ORGANS_UPGRADED
display_name = "Upgraded Cybernetic Organs"
description = "We have the technology to upgrade him."
- prereq_ids = list("cyber_organs")
+ prereq_ids = list(TECHWEB_NODE_CYBER_ORGANS)
design_ids = list(
"ci-gloweyes",
"ci-welding",
@@ -213,14 +216,14 @@
"cybernetic_liver_tier3",
"cybernetic_heart_tier3",
)
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
required_experiments = list(/datum/experiment/scanning/people/augmented_organs)
/datum/techweb_node/cyber/cyber_organs_adv
- id = "cyber_organs_adv"
+ id = TECHWEB_NODE_CYBER_ORGANS_ADV
display_name = "Advanced Cybernetic Organs"
description = "Cutting-edge cybernetic organs offering enhanced sensory capabilities, making it easier than ever to detect ERP."
- prereq_ids = list("cyber_organs_upgraded", "night_vision")
+ prereq_ids = list(TECHWEB_NODE_CYBER_ORGANS_UPGRADED, TECHWEB_NODE_NIGHT_VISION)
design_ids = list(
"cybernetic_ears_xray",
"ci-thermals",
@@ -229,3 +232,4 @@
"ci-xray-moth",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
+ discount_experiments = list(/datum/experiment/scanning/people/android = TECHWEB_TIER_5_POINTS)
diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm
index 02d20fef5fcd4..626dd6981d0ce 100644
--- a/code/modules/research/techweb/nodes/engi_nodes.dm
+++ b/code/modules/research/techweb/nodes/engi_nodes.dm
@@ -1,6 +1,6 @@
// Parts root node
/datum/techweb_node/parts
- id = "parts"
+ id = TECHWEB_NODE_PARTS
starting_node = TRUE
display_name = "Essential Stock Parts"
description = "Foundational components that form the backbone of station operations, encompassing a range of essential equipment necessary for day-to-day functionality."
@@ -27,10 +27,10 @@
)
/datum/techweb_node/parts_upg
- id = "parts_upg"
+ id = TECHWEB_NODE_PARTS_UPG
display_name = "Upgraded Parts"
description = "Offering enhanced capabilities beyond their basic counterparts."
- prereq_ids = list("parts", "energy_manipulation")
+ prereq_ids = list(TECHWEB_NODE_PARTS, TECHWEB_NODE_ENERGY_MANIPULATION)
design_ids = list(
"rped",
"high_micro_laser",
@@ -44,10 +44,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/parts_adv
- id = "parts_adv"
+ id = TECHWEB_NODE_PARTS_ADV
display_name = "Advanced Parts"
description = "The most finely tuned and accurate stock parts."
- prereq_ids = list("parts_upg")
+ prereq_ids = list(TECHWEB_NODE_PARTS_UPG)
design_ids = list(
"ultra_micro_laser",
"super_capacitor",
@@ -62,10 +62,10 @@
/datum/techweb_node/parts_bluespace
- id = "parts_bluespace"
+ id = TECHWEB_NODE_PARTS_BLUESPACE
display_name = "Bluespace Parts"
description = "Integrating the latest in bluespace technology, these advanced components not only enhance functionality but also open up new possibilities for the station's technological capabilities."
- prereq_ids = list("parts_adv", "bluespace_travel")
+ prereq_ids = list(TECHWEB_NODE_PARTS_ADV, TECHWEB_NODE_BLUESPACE_TRAVEL)
design_ids = list(
"bs_rped",
"quadultra_micro_laser",
@@ -80,14 +80,15 @@
discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier3_any = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/telecomms
- id = "telecomms"
+ id = TECHWEB_NODE_TELECOMS
display_name = "Telecommunications Technology"
description = "A comprehensive suite of machinery for station-wide communication setups, ensuring seamless connectivity and operational coordination."
- prereq_ids = list("parts_bluespace")
+ prereq_ids = list(TECHWEB_NODE_PARTS_BLUESPACE)
design_ids = list(
"comm_monitor",
"comm_server",
"message_monitor",
+ "ntnet_relay",
"s_hub",
"s_messaging",
"s_server",
@@ -109,7 +110,7 @@
// Engineering root node
/datum/techweb_node/construction
- id = "construction"
+ id = TECHWEB_NODE_CONSTRUCTION
starting_node = TRUE
display_name = "Construction"
description = "Tools and essential machinery used for station maintenance and expansion."
@@ -142,25 +143,15 @@
"wirecutters",
"light_bulb",
"light_tube",
- "intercom_frame",
- "newscaster_frame",
- "status_display_frame",
- "circuit",
- "circuitgreen",
- "circuitred",
- "tram_floor_dark",
- "tram_floor_light",
- "tram_controller",
- "tram_display",
"crossing_signal",
"guideway_sensor",
)
/datum/techweb_node/energy_manipulation
- id = "energy_manipulation"
+ id = TECHWEB_NODE_ENERGY_MANIPULATION
display_name = "Energy Manipulation"
description = "Harnessing the raw power of lightning arcs through sophisticated energy control methods."
- prereq_ids = list("construction")
+ prereq_ids = list(TECHWEB_NODE_CONSTRUCTION)
design_ids = list(
"apc_control",
"powermonitor",
@@ -178,10 +169,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/holographics
- id = "holographics"
+ id = TECHWEB_NODE_HOLOGRAPHICS
display_name = "Holographics"
description = "Use of holographic technology for signage and barriers."
- prereq_ids = list("energy_manipulation")
+ prereq_ids = list(TECHWEB_NODE_ENERGY_MANIPULATION)
design_ids = list(
"forcefield_projector",
"holosign",
@@ -204,10 +195,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/hud
- id = "hud"
+ id = TECHWEB_NODE_HUD
display_name = "Integrated HUDs"
description = "Initially developed for assistants to learn the nuances of different professions through augmented reality."
- prereq_ids = list("holographics", "cyber_implants")
+ prereq_ids = list(TECHWEB_NODE_HOLOGRAPHICS, TECHWEB_NODE_CYBER_IMPLANTS)
design_ids = list(
"health_hud",
"diagnostic_hud",
@@ -222,10 +213,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/night_vision
- id = "night_vision"
+ id = TECHWEB_NODE_NIGHT_VISION
display_name = "Night Vision Technology"
description = "There are whispers that Nanotrasen pushed for this technology to extend shift durations, ensuring productivity around the clock."
- prereq_ids = list("hud")
+ prereq_ids = list(TECHWEB_NODE_HUD)
design_ids = list(
"diagnostic_hud_night",
"health_hud_night",
diff --git a/code/modules/research/techweb/nodes/mech_nodes.dm b/code/modules/research/techweb/nodes/mech_nodes.dm
index 4f58ed25c8955..6b7a9803ae495 100644
--- a/code/modules/research/techweb/nodes/mech_nodes.dm
+++ b/code/modules/research/techweb/nodes/mech_nodes.dm
@@ -1,9 +1,9 @@
/datum/techweb_node/mech_assembly
- id = "mech_assembly"
+ id = TECHWEB_NODE_MECH_ASSEMBLY
starting_node = TRUE
display_name = "Mech Assembly"
description = "Development of mech designed to contend with artificial gravity while transporting cargo."
- prereq_ids = list("robotics")
+ prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
"mechapower",
"mech_recharger",
@@ -19,10 +19,10 @@
)
/datum/techweb_node/mech_equipment
- id = "mech_equipment"
+ id = TECHWEB_NODE_MECH_EQUIPMENT
display_name = "Expedition Equipment"
description = "Specialized mech gear tailored for navigating space and celestial bodies, ensuring durability and functionality in the harshest conditions."
- prereq_ids = list("mech_assembly")
+ prereq_ids = list(TECHWEB_NODE_MECH_ASSEMBLY)
design_ids = list(
"mechacontrol",
"botpad",
@@ -38,10 +38,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/mech_clown
- id = "mech_clown"
+ id = TECHWEB_NODE_MECH_CLOWN
display_name = "Funny Robots"
description = "Fueled by laughter."
- prereq_ids = list("mech_assembly")
+ prereq_ids = list(TECHWEB_NODE_MECH_ASSEMBLY)
design_ids = list(
"honk_chassis",
"honk_torso",
@@ -62,10 +62,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/mech_medical
- id = "mech_medical"
+ id = TECHWEB_NODE_MECH_MEDICAL
display_name = "Medical Mech"
description = "Advanced robotic unit equipped with syringe guns and healing beams, revolutionizing medical assistance in hazardous environments."
- prereq_ids = list("mech_assembly", "chem_synthesis")
+ prereq_ids = list(TECHWEB_NODE_MECH_ASSEMBLY, TECHWEB_NODE_CHEM_SYNTHESIS)
design_ids = list(
"odysseus_chassis",
"odysseus_torso",
@@ -82,10 +82,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/mech_mining
- id = "mech_mining"
+ id = TECHWEB_NODE_MECH_MINING
display_name = "Mining Mech"
description = "Robust mech engineered to withstand lava and storms for continuous off-station mining operations."
- prereq_ids = list("mech_equipment", "mining")
+ prereq_ids = list(TECHWEB_NODE_MECH_EQUIPMENT, TECHWEB_NODE_MINING)
design_ids = list(
"clarke_chassis",
"clarke_torso",
@@ -98,10 +98,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/mech_combat
- id = "mech_combat"
+ id = TECHWEB_NODE_MECH_COMBAT
display_name = "Combat Mechs"
description = "Modular armor upgrades and specialized equipment for security mechs."
- prereq_ids = list("mech_equipment")
+ prereq_ids = list(TECHWEB_NODE_MECH_EQUIPMENT)
design_ids = list(
"mech_ccw_armor",
"mech_proj_armor",
@@ -112,13 +112,12 @@
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
required_experiments = list(/datum/experiment/scanning/random/mecha_equipped_scan)
- discount_experiments = list(/datum/experiment/scanning/random/mecha_damage_scan = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/mech_assault
- id = "mech_assault"
+ id = TECHWEB_NODE_MECH_ASSAULT
display_name = "Assault Mech"
description = "Heavy battle mech boasting robust armor but sacrificing speed for enhanced durability."
- prereq_ids = list("mech_combat")
+ prereq_ids = list(TECHWEB_NODE_MECH_COMBAT)
design_ids = list(
"durand_armor",
"durand_chassis",
@@ -135,10 +134,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/mech_light
- id = "mech_light"
+ id = TECHWEB_NODE_MECH_LIGHT
display_name = "Light Combat Mech"
description = "Agile combat mech equipped with overclocking capabilities for temporary speed boosts, prioritizing speed over durability on the battlefield."
- prereq_ids = list("mech_combat")
+ prereq_ids = list(TECHWEB_NODE_MECH_COMBAT)
design_ids = list(
"gygax_armor",
"gygax_chassis",
@@ -155,10 +154,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/mech_heavy
- id = "mech_heavy"
+ id = TECHWEB_NODE_MECH_HEAVY
display_name = "Heavy Mech"
description = "Advanced heavy mechanized unit with dual pilot capability, designed for robust battlefield performance and increased tactical versatility."
- prereq_ids = list("mech_assault")
+ prereq_ids = list(TECHWEB_NODE_MECH_ASSAULT)
design_ids = list(
"savannah_ivanov_armor",
"savannah_ivanov_chassis",
@@ -175,10 +174,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/mech_infiltrator
- id = "mech_infiltrator"
+ id = TECHWEB_NODE_MECH_INFILTRATOR
display_name = "Infiltration Mech"
description = "Advanced mech with phasing capabilities, allowing it to move through walls and obstacles, ideal for covert and special operations."
- prereq_ids = list("mech_light", "anomaly_research")
+ prereq_ids = list(TECHWEB_NODE_MECH_LIGHT, TECHWEB_NODE_ANOMALY_RESEARCH)
design_ids = list(
"phazon_armor",
"phazon_chassis",
@@ -194,11 +193,27 @@
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
+/datum/techweb_node/justice
+ id = "mecha_justice"
+ display_name = "EXOSUIT: Justice"
+ description = "Justice exosuit designs"
+ design_ids = list(
+ "justice_armor",
+ "justice_chassis",
+ "justice_left_arm",
+ "justice_left_leg",
+ "justice_right_arm",
+ "justice_right_leg",
+ "justice_torso",
+ )
+ hidden = TRUE
+ illegal_mech_node = TRUE
+
/datum/techweb_node/mech_energy_guns
- id = "mech_energy_guns"
+ id = TECHWEB_NODE_MECH_ENERGY_GUNS
display_name = "Mech Energy Guns"
description = "Scaled-up versions of electric weapons optimized for mech deployment."
- prereq_ids = list("mech_combat", "electric_weapons")
+ prereq_ids = list(TECHWEB_NODE_MECH_COMBAT, TECHWEB_NODE_ELECTRIC_WEAPONS)
design_ids = list(
"mech_laser",
"mech_laser_heavy",
@@ -206,12 +221,13 @@
"mech_tesla",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
+ discount_experiments = list(/datum/experiment/scanning/random/mecha_damage_scan = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/mech_firearms
- id = "mech_firearms"
+ id = TECHWEB_NODE_MECH_FIREARMS
display_name = "Mech Firearms"
description = "Mounted ballistic weaponry, enhancing combat capabilities for mechanized units."
- prereq_ids = list("mech_energy_guns", "exotic_ammo")
+ prereq_ids = list(TECHWEB_NODE_MECH_ENERGY_GUNS, TECHWEB_NODE_EXOTIC_AMMO)
design_ids = list(
"mech_lmg",
"mech_lmg_ammo",
@@ -223,10 +239,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
/datum/techweb_node/mech_heavy_arms
- id = "mech_heavy_arms"
+ id = TECHWEB_NODE_MECH_HEAVY_ARMS
display_name = "Heavy Mech Firearms"
description = "High-impact weaponry integrated into mechs, optimized for maximum firepower."
- prereq_ids = list("mech_heavy", "exotic_ammo")
+ prereq_ids = list(TECHWEB_NODE_MECH_HEAVY, TECHWEB_NODE_EXOTIC_AMMO)
design_ids = list(
"clusterbang_launcher",
"clusterbang_launcher_ammo",
@@ -238,14 +254,13 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
/datum/techweb_node/mech_equip_bluespace
- id = "mech_equip_bluespace"
+ id = TECHWEB_NODE_BLUESPACE
display_name = "Bluespace Mech Equipment"
description = "An array of equipment empowered by bluespace, providing unmatched mobility and utility."
- prereq_ids = list("mech_infiltrator", "bluespace_travel")
+ prereq_ids = list(TECHWEB_NODE_MECH_INFILTRATOR, TECHWEB_NODE_BLUESPACE_TRAVEL)
design_ids = list(
"mech_gravcatapult",
"mech_teleporter",
"mech_wormhole_gen",
- "mech_rcd",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm
index ca884f1ebd566..7d6db08f584e7 100644
--- a/code/modules/research/techweb/nodes/medbay_nodes.dm
+++ b/code/modules/research/techweb/nodes/medbay_nodes.dm
@@ -1,5 +1,5 @@
/datum/techweb_node/medbay_equip
- id = "medbay_equip"
+ id = TECHWEB_NODE_MEDBAY_EQUIP
starting_node = TRUE
display_name = "Medbay Equipment"
description = "Essential medical tools to patch you up while medbay is still intact."
@@ -23,6 +23,8 @@
"stethoscope",
"beaker",
"large_beaker",
+ "chem_pack",
+ "blood_pack",
"syringe",
"dropper",
"pillbottle",
@@ -31,17 +33,17 @@
/datum/experiment/autopsy/human,
/datum/experiment/autopsy/nonhuman,
/datum/experiment/autopsy/xenomorph,
+ /datum/experiment/scanning/reagent/haloperidol,
+ /datum/experiment/scanning/reagent/cryostylane,
)
/datum/techweb_node/chem_synthesis
- id = "chem_synthesis"
+ id = TECHWEB_NODE_CHEM_SYNTHESIS
display_name = "Chemical Synthesis"
description = "Synthesizing complex chemicals from electricity and thin air... Don't ask how..."
- prereq_ids = list("medbay_equip")
+ prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP)
design_ids = list(
"xlarge_beaker",
- "blood_pack",
- "chem_pack",
"med_spray_bottle",
"medigel",
"medipen_refiller",
@@ -55,14 +57,13 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/plumbing
- id = "plumbing"
+ id = TECHWEB_NODE_PLUMBING
display_name = "Plumbing"
description = "Essential infrastructure for building chemical factories. To scale up the production of happy pills to an industrial level."
- prereq_ids = list("chem_synthesis")
+ prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS)
design_ids = list(
"plumbing_rcd",
"plumbing_rcd_service",
- "plumbing_rcd_sci",
"plunger",
"fluid_ducts",
"meta_beaker",
@@ -70,27 +71,13 @@
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
-/datum/techweb_node/cryostasis
- id = "cryostasis"
- display_name = "Cryostasis"
- description = "The result of clown accidentally drinking a chemical, now repurposed for safely preserving crew members in suspended animation."
- prereq_ids = list("plumbing", "plasma_control")
- design_ids = list(
- "cryotube",
- "mech_sleeper",
- "stasis",
- "cryo_grenade",
- "splitbeaker",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
- required_experiments = list(/datum/experiment/scanning/reagent/cryostylane)
-
/datum/techweb_node/medbay_equip_adv
- id = "medbay_equip_adv"
+ id = TECHWEB_NODE_MEDBAY_EQUIP_ADV
display_name = "Advanced Medbay Equipment"
description = "State-of-the-art medical gear for keeping the crew in one piece — mostly."
- prereq_ids = list("cryostasis")
+ prereq_ids = list(TECHWEB_NODE_PLUMBING)
design_ids = list(
+ "smoke_machine",
"chem_mass_spec",
"healthanalyzer_advanced",
"mod_health_analyzer",
@@ -99,4 +86,20 @@
"defibmount",
"medicalbed_emergency",
)
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
+ required_experiments = list(/datum/experiment/scanning/reagent/haloperidol)
+
+/datum/techweb_node/cryostasis
+ id = TECHWEB_NODE_CRYOSTASIS
+ display_name = "Cryostasis"
+ description = "The result of clown accidentally drinking a chemical, now repurposed for safely preserving crew members in suspended animation."
+ prereq_ids = list(TECHWEB_NODE_FUSION)
+ design_ids = list(
+ "cryotube",
+ "mech_sleeper",
+ "stasis",
+ "cryo_grenade",
+ "splitbeaker",
+ )
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
+ discount_experiments = list(/datum/experiment/scanning/reagent/cryostylane = TECHWEB_TIER_4_POINTS)
diff --git a/code/modules/research/techweb/nodes/mining_nodes.dm b/code/modules/research/techweb/nodes/mining_nodes.dm
index e1caaf57902e2..d8a6539caa3ff 100644
--- a/code/modules/research/techweb/nodes/mining_nodes.dm
+++ b/code/modules/research/techweb/nodes/mining_nodes.dm
@@ -1,5 +1,5 @@
/datum/techweb_node/material_processing
- id = "material_proc"
+ id = TECHWEB_NODE_MATERIAL_PROC
starting_node = TRUE
display_name = "Material Processing"
description = "Refinement and processing of alloys and ores to enhance their utility and value."
@@ -23,10 +23,10 @@
)
/datum/techweb_node/mining
- id = "mining"
+ id = TECHWEB_NODE_MINING
display_name = "Mining Technology"
description = "Development of tools meant to optimize mining operations and resource extraction."
- prereq_ids = list("material_proc")
+ prereq_ids = list(TECHWEB_NODE_MATERIAL_PROC)
design_ids = list(
"cargoexpress",
"brm",
@@ -50,10 +50,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/low_pressure_excavation
- id = "low_pressure_excavation"
+ id = TECHWEB_NODE_LOW_PRESSURE_EXCAVATION
display_name = "Low-Pressure Excavation"
description = "Research of Proto-Kinetic Accelerators (PKAs), pneumatic guns renowned for their exceptional performance in low-pressure environments."
- prereq_ids = list("mining", "gas_compression")
+ prereq_ids = list(TECHWEB_NODE_MINING, TECHWEB_NODE_GAS_COMPRESSION)
design_ids = list(
"mecha_kineticgun",
"damagemod",
@@ -69,10 +69,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/plasma_mining
- id = "plasma_mining"
+ id = TECHWEB_NODE_PLASMA_MINING
display_name = "Plasma Beam Mining"
description = "Engineers' plasma welders have proven highly effective in mining operations. This led to the development of a mech-mounted variant and an enhanced handheld cutter for miners."
- prereq_ids = list("low_pressure_excavation", "plasma_control")
+ prereq_ids = list(TECHWEB_NODE_LOW_PRESSURE_EXCAVATION, TECHWEB_NODE_PLASMA_CONTROL)
design_ids = list(
"mech_plasma_cutter",
"plasmacutter_adv",
@@ -80,10 +80,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/bitrunning
- id = "bitrunning"
+ id = TECHWEB_NODE_BITRUNNING
display_name = "Bitrunning Technology"
description = "Bluespace technology has led to the development of quantum-scale computing, which unlocks the means to materialize atomic structures while executing advanced programs."
- prereq_ids = list("gaming", "applied_bluespace")
+ prereq_ids = list(TECHWEB_NODE_GAMING, TECHWEB_NODE_APPLIED_BLUESPACE)
design_ids = list(
"byteforge",
"quantum_console",
@@ -92,10 +92,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/mining_adv
- id = "mining_adv"
+ id = TECHWEB_NODE_MINING_ADV
display_name = "Advanced Mining Technology"
description = "High-level mining equipment, pushing the boundaries of efficiency and effectiveness in resource extraction."
- prereq_ids = list("plasma_mining")
+ prereq_ids = list(TECHWEB_NODE_PLASMA_MINING)
design_ids = list(
"jackhammer",
"drill_diamond",
diff --git a/code/modules/research/techweb/nodes/modsuit_nodes.dm b/code/modules/research/techweb/nodes/modsuit_nodes.dm
index a5005a66ee794..7fc7342ea410e 100644
--- a/code/modules/research/techweb/nodes/modsuit_nodes.dm
+++ b/code/modules/research/techweb/nodes/modsuit_nodes.dm
@@ -1,9 +1,9 @@
/datum/techweb_node/mod_suit
- id = "mod_suit"
+ id = TECHWEB_NODE_MOD_SUIT
starting_node = TRUE
display_name = "Modular Exosuit"
description = "Specialized back mounted power suits with various different modules."
- prereq_ids = list("robotics")
+ prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
"suit_storage_unit",
"mod_shell",
@@ -19,10 +19,10 @@
)
/datum/techweb_node/mod_equip
- id = "mod_equip"
+ id = TECHWEB_NODE_MOD_EQUIP
display_name = "Modular Suit Equipment"
description = "More advanced modules, to improve modular suits."
- prereq_ids = list("mod_suit")
+ prereq_ids = list(TECHWEB_NODE_MOD_SUIT)
design_ids = list(
"modlink_scryer",
"mod_clamp",
@@ -37,10 +37,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/mod_entertainment
- id = "mod_entertainment"
+ id = TECHWEB_NODE_MOD_ENTERTAINMENT
display_name = "Entertainment Modular Suit"
description = "Powered suits for protection against low-humor environments."
- prereq_ids = list("mod_suit")
+ prereq_ids = list(TECHWEB_NODE_MOD_SUIT)
design_ids = list(
"mod_plating_cosmohonk",
"mod_bikehorn",
@@ -50,24 +50,24 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/mod_medical
- id = "mod_medical"
+ id = TECHWEB_NODE_MOD_MEDICAL
display_name = "Medical Modular Suit"
description = "Medical exosuits for quick rescue purposes."
- prereq_ids = list("mod_suit", "chem_synthesis")
+ prereq_ids = list(TECHWEB_NODE_MOD_SUIT, TECHWEB_NODE_CHEM_SYNTHESIS)
design_ids = list(
"mod_plating_medical",
"mod_quick_carry",
"mod_injector",
- "mod_organ_thrower",
+ "mod_organizer",
"mod_patienttransport",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/mod_engi
- id = "mod_engi"
+ id = TECHWEB_NODE_MOD_ENGI
display_name = "Engineering Modular Suits"
description = "Engineering suits, for powered engineers."
- prereq_ids = list("mod_equip")
+ prereq_ids = list(TECHWEB_NODE_MOD_EQUIP)
design_ids = list(
"mod_plating_engineering",
"mod_t_ray",
@@ -78,10 +78,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/mod_security
- id = "mod_security"
+ id = TECHWEB_NODE_MOD_SECURITY
display_name = "Security Modular Suits"
description = "Security suits for space crime handling."
- prereq_ids = list("mod_equip")
+ prereq_ids = list(TECHWEB_NODE_MOD_EQUIP)
design_ids = list(
"mod_plating_security",
"mod_stealth",
@@ -95,10 +95,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/mod_medical_adv
- id = "mod_medical_adv"
+ id = TECHWEB_NODE_MOD_MEDICAL_ADV
display_name = "Field Surgery Modules"
description = "Medical exosuit equipment designed for conducting surgical operations in field conditions."
- prereq_ids = list("mod_medical", "surgery_adv")
+ prereq_ids = list(TECHWEB_NODE_MOD_MEDICAL, TECHWEB_NODE_SURGERY_ADV)
design_ids = list(
"mod_defib",
"mod_threadripper",
@@ -108,10 +108,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/mod_engi_adv
- id = "mod_engi_adv"
+ id = TECHWEB_NODE_MOD_ENGI_ADV
display_name = "Advanced Engineering Modular Suit"
description = "Advanced Engineering suits, for advanced powered engineers."
- prereq_ids = list("mod_engi")
+ prereq_ids = list(TECHWEB_NODE_MOD_ENGI)
design_ids = list(
"mod_plating_atmospheric",
"mod_jetpack",
@@ -127,10 +127,10 @@
return ..()
/datum/techweb_node/mod_anomaly
- id = "mod_anomaly"
+ id = TECHWEB_NODE_MOD_ANOMALY
display_name = "Anomalock Modular Suit"
description = "Modules for exosuits that require anomaly cores to function."
- prereq_ids = list("mod_engi_adv", "anomaly_research")
+ prereq_ids = list(TECHWEB_NODE_MOD_ENGI_ADV, TECHWEB_NODE_ANOMALY_RESEARCH)
design_ids = list(
"mod_antigrav",
"mod_teleporter",
diff --git a/code/modules/research/techweb/nodes/research_nodes.dm b/code/modules/research/techweb/nodes/research_nodes.dm
index f68086ab5abdd..0a37fb19868a3 100644
--- a/code/modules/research/techweb/nodes/research_nodes.dm
+++ b/code/modules/research/techweb/nodes/research_nodes.dm
@@ -1,5 +1,5 @@
/datum/techweb_node/fundamental_sci
- id = "fundamental_sci"
+ id = TECHWEB_NODE_FUNDIMENTAL_SCI
starting_node = TRUE
display_name = "Fundamental Science"
description = "Establishing the bedrock of scientific understanding, paving the way for deeper exploration and theoretical inquiry."
@@ -13,7 +13,6 @@
"destructive_analyzer",
"destructive_scanner",
"experi_scanner",
- "ntnet_relay",
"laptop",
"portadrive_basic",
"portadrive_advanced",
@@ -21,20 +20,20 @@
)
/datum/techweb_node/bluespace_theory
- id = "bluespace_theory"
+ id = TECHWEB_NODE_BLUESPACE_THEORY
display_name = "Bluespace Theory"
description = "Basic studies into the mysterious alternate dimension known as bluespace."
- prereq_ids = list("fundamental_sci")
+ prereq_ids = list(TECHWEB_NODE_FUNDIMENTAL_SCI)
design_ids = list(
"bluespace_crystal",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/applied_bluespace
- id = "applied_bluespace"
+ id = TECHWEB_NODE_APPLIED_BLUESPACE
display_name = "Applied Bluespace Research"
description = "With a heightened grasp of bluespace dynamics, sophisticated applications and technologies can be devised using data from bluespace crystal analyses."
- prereq_ids = list("bluespace_theory")
+ prereq_ids = list(TECHWEB_NODE_BLUESPACE_THEORY)
design_ids = list(
"ore_silo",
"minerbag_holding",
@@ -51,10 +50,10 @@
required_experiments = list(/datum/experiment/scanning/points/bluespace_crystal)
/datum/techweb_node/bluespace_travel
- id = "bluespace_travel"
+ id = TECHWEB_NODE_BLUESPACE_TRAVEL
display_name = "Bluespace Travel"
description = "Facilitate teleportation methods based on bluespace principles to revolutionize logistical efficiency."
- prereq_ids = list("applied_bluespace")
+ prereq_ids = list(TECHWEB_NODE_APPLIED_BLUESPACE)
design_ids = list(
"teleconsole",
"tele_station",
@@ -69,10 +68,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/anomaly_research
- id = "anomaly_research"
+ id = TECHWEB_NODE_ANOMALY_RESEARCH
display_name = "Anomaly Research"
description = "Delving into the study of mysterious anomalies to investigate methods to refine and harness their unpredictable energies."
- prereq_ids = list("applied_bluespace")
+ prereq_ids = list(TECHWEB_NODE_APPLIED_BLUESPACE)
design_ids = list(
"anomaly_refinery",
"anomaly_neutralizer",
@@ -81,14 +80,16 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/anomaly_shells
- id = "anomaly_shells"
+ id = TECHWEB_NODE_ANOMALY_SHELLS
display_name = "Advanced Anomaly Shells"
description = "New shells designed to utilize anomaly cores, maximizing their potential in innovative ways."
- prereq_ids = list("anomaly_research")
+ prereq_ids = list(TECHWEB_NODE_ANOMALY_RESEARCH)
design_ids = list(
"bag_holding",
+ "cybernetic_heart_anomalock",
"wormholeprojector",
"gravitygun",
"polymorph_belt"
)
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
+ discount_experiments = list(/datum/experiment/scanning/points/anomalies = TECHWEB_TIER_5_POINTS)
diff --git a/code/modules/research/techweb/nodes/robo_nodes.dm b/code/modules/research/techweb/nodes/robo_nodes.dm
index 556fa560daf6b..ff018e85b7c9a 100644
--- a/code/modules/research/techweb/nodes/robo_nodes.dm
+++ b/code/modules/research/techweb/nodes/robo_nodes.dm
@@ -1,5 +1,5 @@
/datum/techweb_node/robotics
- id = "robotics"
+ id = TECHWEB_NODE_ROBOTICS
starting_node = TRUE
display_name = "Robotics"
description = "Programmable machines that make our lives lazier."
@@ -10,10 +10,10 @@
)
/datum/techweb_node/exodrone
- id = "exodrone"
+ id = TECHWEB_NODE_EXODRONE
display_name = "Exploration Drones"
description = "Adapted arcade machines to covertly harness gamers' skills in controlling real drones for practical purposes."
- prereq_ids = list("robotics")
+ prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
"exoscanner_console",
"exoscanner",
@@ -24,10 +24,10 @@
// AI root node
/datum/techweb_node/ai
- id = "ai"
+ id = TECHWEB_NODE_AI
display_name = "Artificial Intelligence"
description = "Exploration of AI systems, more intelligent than the entire crew put together."
- prereq_ids = list("robotics")
+ prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
"aiupload",
"aifixer",
@@ -67,10 +67,10 @@
research_costs[TECHWEB_POINT_TYPE_GENERIC] *= 3
/datum/techweb_node/ai_laws
- id = "ai_laws"
+ id = TECHWEB_NODE_AI_LAWS
display_name = "Advanced AI Laws"
description = "Delving into sophisticated AI directives, with hopes that they won't lead to humanity's extinction."
- prereq_ids = list("ai")
+ prereq_ids = list(TECHWEB_NODE_AI)
design_ids = list(
"asimovpp_module",
"paladin_devotion_module",
diff --git a/code/modules/research/techweb/nodes/security_nodes.dm b/code/modules/research/techweb/nodes/security_nodes.dm
index 8b931fd2273e5..2d3dd63864f25 100644
--- a/code/modules/research/techweb/nodes/security_nodes.dm
+++ b/code/modules/research/techweb/nodes/security_nodes.dm
@@ -1,9 +1,10 @@
/datum/techweb_node/basic_arms
- id = "basic_arms"
+ id = TECHWEB_NODE_BASIC_ARMS
starting_node = TRUE
display_name = "Basic Arms"
description = "Ballistics can be unpredictable in space."
design_ids = list(
+ "toy_armblade",
"toygun",
"c38_rubber",
"sec_38",
@@ -16,12 +17,11 @@
)
/datum/techweb_node/sec_equip
- id = "sec_equip"
+ id = TECHWEB_NODE_SEC_EQUIP
display_name = "Security Equipment"
description = "All the essentials to subdue a mime."
- prereq_ids = list("basic_arms")
+ prereq_ids = list(TECHWEB_NODE_BASIC_ARMS)
design_ids = list(
- "camera_assembly",
"secdata",
"mining",
"prisonmanage",
@@ -30,12 +30,10 @@
"security_photobooth",
"photobooth",
"scanner_gate",
- "turret_control",
"pepperspray",
"dragnet_beacon",
"inspector",
"evidencebag",
- "handcuffs_s",
"zipties",
"seclite",
"electropack",
@@ -43,24 +41,26 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/riot_supression
- id = "riot_supression"
+ id = TECHWEB_NODE_RIOT_SUPRESSION
display_name = "Riot Supression"
description = "When you are on the opposing side of a revolutionary movement."
- prereq_ids = list("sec_equip")
+ prereq_ids = list(TECHWEB_NODE_SEC_EQUIP)
design_ids = list(
+ "clown_firing_pin",
"pin_testing",
"pin_loyalty",
"tele_shield",
"ballistic_shield",
+ "handcuffs_s",
"bola_energy",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/explosives
- id = "explosives"
+ id = TECHWEB_NODE_EXPLOSIVES
display_name = "Explosives"
description = "For once, intentional explosions."
- prereq_ids = list("riot_supression")
+ prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
design_ids = list(
"large_grenade",
"adv_grenade",
@@ -68,25 +68,25 @@
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
required_experiments = list(/datum/experiment/ordnance/explosive/lowyieldbomb)
- discount_experiments = list(/datum/experiment/ordnance/explosive/highyieldbomb = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/exotic_ammo
- id = "exotic_ammo"
+ id = TECHWEB_NODE_EXOTIC_AMMO
display_name = "Exotic Ammunition"
description = "Specialized bullets designed to ignite, freeze, and inflict various other effects on targets, expanding combat capabilities."
- prereq_ids = list("explosives")
+ prereq_ids = list(TECHWEB_NODE_EXPLOSIVES)
design_ids = list(
"c38_hotshot",
"c38_iceblox",
"techshotshell",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
+ discount_experiments = list(/datum/experiment/ordnance/explosive/highyieldbomb = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/electric_weapons
- id = "electric_weapons"
+ id = TECHWEB_NODE_ELECTRIC_WEAPONS
display_name = "Electric Weaponry"
description = "Energy-based weaponry designed for both lethal and non-lethal applications."
- prereq_ids = list("riot_supression")
+ prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
design_ids = list(
"stunrevolver",
"ioncarbine",
@@ -96,12 +96,11 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/beam_weapons
- id = "beam_weapons"
+ id = TECHWEB_NODE_BEAM_WEAPONS
display_name = "Advanced Beam Weaponry"
description = "So advanced, even engineers are baffled by its operational principles."
- prereq_ids = list("electric_weapons")
+ prereq_ids = list(TECHWEB_NODE_ELECTRIC_WEAPONS)
design_ids = list(
- "beamrifle",
"xray_laser",
"nuclear_gun",
)
diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm
index 61c7e2545543b..1553f3a0c20d8 100644
--- a/code/modules/research/techweb/nodes/service_nodes.dm
+++ b/code/modules/research/techweb/nodes/service_nodes.dm
@@ -1,5 +1,5 @@
/datum/techweb_node/office_equip
- id = "office_equip"
+ id = TECHWEB_NODE_OFFICE_EQUIP
starting_node = TRUE
display_name = "Office Equipment"
description = "Nanotrasen's finest in ergonomic office tech, ensuring station admin stays productive and compliant with corporate policies — because even in space, paperwork never stops."
@@ -36,10 +36,10 @@
)
/datum/techweb_node/sanitation
- id = "sanitation"
+ id = TECHWEB_NODE_SANITATION
display_name = "Advanced Sanitation Technology"
description = "Nanotrasen's latest in janitorial tech, making sure the station stays spotless and bear-free."
- prereq_ids = list("office_equip")
+ prereq_ids = list(TECHWEB_NODE_OFFICE_EQUIP)
design_ids = list(
"advmop",
"light_replacer",
@@ -52,24 +52,11 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
discount_experiments = list(/datum/experiment/scanning/random/janitor_trash = TECHWEB_TIER_2_POINTS)
-/datum/techweb_node/toys
- id = "toys"
- display_name = "New Toys"
- description = "For new pranks."
- prereq_ids = list("office_equip")
- design_ids = list(
- "smoke_machine",
- "toy_armblade",
- "air_horn",
- "clown_firing_pin",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
-
/datum/techweb_node/consoles
- id = "consoles"
+ id = TECHWEB_NODE_CONSOLES
display_name = "Civilian Consoles"
description = "User-friendly consoles for non-technical crew members, enhancing communication and access to essential station information."
- prereq_ids = list("office_equip")
+ prereq_ids = list(TECHWEB_NODE_OFFICE_EQUIP)
design_ids = list(
"comconsole",
"automated_announcement",
@@ -93,10 +80,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/gaming
- id = "gaming"
+ id = TECHWEB_NODE_GAMING
display_name = "Gaming"
description = "For the slackers on the station."
- prereq_ids = list("toys", "consoles")
+ prereq_ids = list(TECHWEB_NODE_CONSOLES)
design_ids = list(
"arcade_battle",
"arcade_orion",
@@ -107,7 +94,7 @@
// Kitchen root node
/datum/techweb_node/cafeteria_equip
- id = "cafeteria_equip"
+ id = TECHWEB_NODE_CAFETERIA_EQUIP
starting_node = TRUE
display_name = "Cafeteria Equipment"
description = "When standard-issue tubed food no longer satisfies the station crew's appetite..."
@@ -135,10 +122,10 @@
)
/datum/techweb_node/food_proc
- id = "food_proc"
+ id = TECHWEB_NODE_FOOD_PROC
display_name = "Food Processing"
description = "Top-tier kitchen appliances from Nanotrasen, designed to keep the crew well-fed and happy."
- prereq_ids = list("cafeteria_equip")
+ prereq_ids = list(TECHWEB_NODE_CAFETERIA_EQUIP)
design_ids = list(
"deepfryer",
"oven",
@@ -160,7 +147,7 @@
// Fishing root node
/datum/techweb_node/fishing_equip
- id = "fishing_equip"
+ id = TECHWEB_NODE_FISHING_EQUIP
starting_node = TRUE
display_name = "Fishing Equipment"
description = "Basic fishing gear tailored for space station environments, perfect for extraterrestrial aquatic pursuits."
@@ -171,10 +158,10 @@
)
/datum/techweb_node/fishing_equip_adv
- id = "fishing_equip_adv"
+ id = TECHWEB_NODE_FISHING_EQUIP_ADV
display_name = "Advanced Fishing Tools"
description = "Continuing advancements in fishing technology, incorporating cutting-edge features in space fishing operations. Just don't try this on space carps..."
- prereq_ids = list("fishing_equip")
+ prereq_ids = list(TECHWEB_NODE_FISHING_EQUIP)
design_ids = list(
"fishing_rod_tech",
"stabilized_hook",
@@ -185,54 +172,13 @@
required_experiments = list(/datum/experiment/scanning/fish)
/datum/techweb_node/marine_util
- id = "marine_util"
+ id = TECHWEB_NODE_MARINE_UTIL
display_name = "Marine Utility"
description = "Fish are nice to look at and all, but they can be put to use."
- prereq_ids = list("fishing_equip_adv")
+ prereq_ids = list(TECHWEB_NODE_FISHING_EQUIP_ADV)
design_ids = list(
"bioelec_gen",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
// only available if you've done the first fishing experiment (thus unlocking fishing tech), but not a strict requirement to get the tech
discount_experiments = list(/datum/experiment/scanning/fish/second = TECHWEB_TIER_3_POINTS)
-
-// Botany root node
-/datum/techweb_node/botany_equip
- id = "botany_equip"
- starting_node = TRUE
- display_name = "Botany Equipment"
- description = "Essential tools for maintaining onboard gardens, supporting plant growth in the unique environment of the space station."
- design_ids = list(
- "seed_extractor",
- "plant_analyzer",
- "watering_can",
- "spade",
- "cultivator",
- "secateurs",
- "hatchet",
- )
-
-/datum/techweb_node/hydroponics
- id = "hydroponics"
- display_name = "Hydroponics"
- description = "Research into advanced hydroponic systems for efficient and sustainable plant cultivation."
- prereq_ids = list("botany_equip", "chem_synthesis")
- design_ids = list(
- "biogenerator",
- "hydro_tray",
- "portaseeder",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
-
-/datum/techweb_node/selection
- id = "selection"
- display_name = "Artificial Selection"
- description = "Advancement in plant cultivation techniques through artificial selection, enabling precise manipulation of plant DNA."
- prereq_ids = list("hydroponics")
- design_ids = list(
- "flora_gun",
- "gene_shears",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
- required_experiments = list(/datum/experiment/scanning/random/plants/wild)
- discount_experiments = list(/datum/experiment/scanning/random/plants/traits = TECHWEB_TIER_3_POINTS)
diff --git a/code/modules/research/techweb/nodes/surgery_nodes.dm b/code/modules/research/techweb/nodes/surgery_nodes.dm
index 3cd3d373c0599..0b8812191e2a9 100644
--- a/code/modules/research/techweb/nodes/surgery_nodes.dm
+++ b/code/modules/research/techweb/nodes/surgery_nodes.dm
@@ -1,8 +1,8 @@
/datum/techweb_node/oldstation_surgery
- id = "oldstation_surgery"
+ id = TECHWEB_NODE_OLDSTATION_SURGERY
display_name = "Experimental Dissection"
description = "Grants access to experimental dissections, which allows generation of research points."
- prereq_ids = list("medbay_equip")
+ prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP)
design_ids = list(
"surgery_oldstation_dissection",
)
@@ -11,10 +11,10 @@
show_on_wiki = FALSE
/datum/techweb_node/surgery
- id = "surgery"
+ id = TECHWEB_NODE_SURGERY
display_name = "Improved Wound-Tending"
description = "Who would have known being more gentle with a hemostat decreases patient pain?"
- prereq_ids = list("medbay_equip")
+ prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP)
design_ids = list(
"surgery_heal_brute_upgrade",
"surgery_heal_burn_upgrade",
@@ -22,10 +22,10 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/surgery_adv
- id = "surgery_adv"
+ id = TECHWEB_NODE_SURGERY_ADV
display_name = "Advanced Surgery"
description = "When simple medicine doesn't cut it."
- prereq_ids = list("surgery")
+ prereq_ids = list(TECHWEB_NODE_SURGERY)
design_ids = list(
"harvester",
"surgery_heal_brute_upgrade_femto",
@@ -38,10 +38,10 @@
required_experiments = list(/datum/experiment/autopsy/human)
/datum/techweb_node/surgery_exp
- id = "surgery_exp"
+ id = TECHWEB_NODE_SURGERY_EXP
display_name = "Experimental Surgery"
description = "When evolution isn't fast enough."
- prereq_ids = list("surgery_adv")
+ prereq_ids = list(TECHWEB_NODE_SURGERY_ADV)
design_ids = list(
"surgery_cortex_folding",
"surgery_cortex_imprint",
@@ -56,13 +56,13 @@
"surgery_viral_bond",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
- required_experiments = list(/datum/experiment/autopsy/nonhuman)
+ discount_experiments = list(/datum/experiment/autopsy/nonhuman = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/surgery_tools
- id = "surgery_tools"
+ id = TECHWEB_NODE_SURGERY_TOOLS
display_name = "Advanced Surgery Tools"
description = "Surgical instruments of dual purpose for quick operations."
- prereq_ids = list("surgery_exp")
+ prereq_ids = list(TECHWEB_NODE_SURGERY_EXP)
design_ids = list(
"laserscalpel",
"searingtool",
diff --git a/code/modules/research/techweb/nodes/syndicate_nodes.dm b/code/modules/research/techweb/nodes/syndicate_nodes.dm
index c571551877099..377ac392f938f 100644
--- a/code/modules/research/techweb/nodes/syndicate_nodes.dm
+++ b/code/modules/research/techweb/nodes/syndicate_nodes.dm
@@ -1,8 +1,8 @@
/datum/techweb_node/syndicate_basic
- id = "syndicate_basic"
+ id = TECHWEB_NODE_SYNDICATE_BASIC
display_name = "Illegal Technology"
description = "Dangerous research used to create dangerous objects."
- prereq_ids = list("exp_tools", "exotic_ammo")
+ prereq_ids = list(TECHWEB_NODE_EXP_TOOLS, TECHWEB_NODE_EXOTIC_AMMO)
design_ids = list(
"advanced_camera",
"ai_cam_upgrade",
@@ -38,11 +38,12 @@
required_items_to_unlock |= item.item //allows deconning to unlock.
/datum/techweb_node/unregulated_bluespace
- id = "unregulated_bluespace"
+ id = TECHWEB_NODE_UNREGULATED_BLUESPACE
display_name = "Unregulated Bluespace Research"
description = "Bluespace technology using unstable or unbalanced procedures, prone to damaging the fabric of bluespace. Outlawed by galactic conventions."
- prereq_ids = list("parts_bluespace", "syndicate_basic")
+ prereq_ids = list(TECHWEB_NODE_PARTS_BLUESPACE, TECHWEB_NODE_SYNDICATE_BASIC)
design_ids = list(
"desynchronizer",
+ "beamrifle",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
diff --git a/code/modules/research/techweb/techweb_types.dm b/code/modules/research/techweb/techweb_types.dm
index c01b1226a4c13..f5532e9e53f9d 100644
--- a/code/modules/research/techweb/techweb_types.dm
+++ b/code/modules/research/techweb/techweb_types.dm
@@ -18,7 +18,7 @@
/datum/techweb/oldstation/New()
. = ..()
- research_node_id("oldstation_surgery", TRUE, TRUE, FALSE)
+ research_node_id(TECHWEB_NODE_OLDSTATION_SURGERY, TRUE, TRUE, FALSE)
/**
* Admin techweb that has everything unlocked by default
diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
index c174856a62a31..9bd9e2d881b1c 100644
--- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
@@ -38,8 +38,13 @@ Slimecrossing Armor
icon = 'icons/obj/science/slimecrossing.dmi'
icon_state = "prismglasses"
actions_types = list(/datum/action/item_action/change_prism_colour, /datum/action/item_action/place_light_prism)
+ forced_glass_color = TRUE
var/glasses_color = COLOR_WHITE
+/obj/item/clothing/glasses/prism_glasses/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/wearable_client_colour, /datum/client_colour/glass_colour, ITEM_SLOT_EYES, glasses_color, forced_glass_color)
+
/obj/item/clothing/glasses/prism_glasses/item_action_slot_check(slot)
if(slot & ITEM_SLOT_EYES)
return TRUE
@@ -76,7 +81,9 @@ Slimecrossing Armor
var/new_color = input(owner, "Choose the lens color:", "Color change",glasses.glasses_color) as color|null
if(!new_color)
return
+ RemoveElement(/datum/element/wearable_client_colour, /datum/client_colour/glass_colour, ITEM_SLOT_EYES, glasses.glasses_color, glasses.forced_glass_color)
glasses.glasses_color = new_color
+ AddElement(/datum/element/wearable_client_colour, /datum/client_colour/glass_colour, ITEM_SLOT_EYES, new_color, glasses.forced_glass_color)
/datum/action/item_action/place_light_prism
name = "Fabricate Light Prism"
diff --git a/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm b/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm
index 8b0b007adee40..d04a7f852da3f 100644
--- a/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm
+++ b/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm
@@ -1,7 +1,7 @@
///Tool capable of taking biological samples from mobs
/obj/item/biopsy_tool
name = "biopsy tool"
- desc = "Don't worry, it won't sting."
+ desc = "Used to retrieve cell lines from organisms. Don't worry, it won't sting."
icon = 'icons/obj/science/vatgrowing.dmi'
icon_state = "biopsy"
worn_icon_state = "biopsy"
diff --git a/code/modules/research/xenobiology/vatgrowing/microscope.dm b/code/modules/research/xenobiology/vatgrowing/microscope.dm
index 2e70d20faf07d..c3c7369981e19 100644
--- a/code/modules/research/xenobiology/vatgrowing/microscope.dm
+++ b/code/modules/research/xenobiology/vatgrowing/microscope.dm
@@ -3,17 +3,28 @@
desc = "A simple microscope, allowing you to examine micro-organisms."
icon = 'icons/obj/science/vatgrowing.dmi'
icon_state = "microscope"
+ ///Analyzed dish
var/obj/item/petri_dish/current_dish
-/obj/structure/microscope/attacked_by(obj/item/I, mob/living/user)
- if(!istype(I, /obj/item/petri_dish))
- return ..()
+/obj/structure/microscope/Initialize(mapload)
+ . = ..()
+ var/static/list/hovering_item_typechecks = list(
+ /obj/item/petri_dish = list(
+ SCREENTIP_CONTEXT_LMB = "Add petri dish",
+ ),
+ )
+ AddElement(/datum/element/contextual_screentip_item_typechecks, hovering_item_typechecks)
+ AddElement(/datum/element/contextual_screentip_bare_hands, rmb_text = "Remove petri dish")
+
+/obj/structure/microscope/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ . = ..()
+ if(istype(tool, /obj/item/petri_dish))
+ return add_dish(user, tool)
+
+/obj/structure/microscope/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
if(current_dish)
- to_chat(user, span_warning("There is already a petridish in \the [src]."))
- return
- to_chat(user, span_notice("You put [I] into \the [src]."))
- current_dish = I
- current_dish.forceMove(src)
+ return remove_dish(user)
/obj/structure/microscope/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -21,27 +32,30 @@
ui = new(user, src, "Microscope", name)
ui.open()
-/obj/structure/microscope/ui_data(mob/user)
+/obj/structure/microscope/ui_static_data(mob/user)
var/list/data = list()
data["has_dish"] = current_dish ? TRUE : FALSE
data["cell_lines"] = list()
- data["viruses"] = list()
if(!current_dish)
return data
if(!current_dish.sample)
return data
- for(var/organism in current_dish.sample.micro_organisms) //All the microorganisms in the dish
+ for(var/organism in current_dish.sample.micro_organisms)
if(istype(organism, /datum/micro_organism/cell_line))
var/datum/micro_organism/cell_line/cell_line = organism
+ var/atom/resulting_atom = cell_line.resulting_atom
var/list/organism_data = list(
type = "cell line",
name = cell_line.name,
desc = cell_line.desc,
- growth_rate = cell_line.growth_rate,
- suspectibility = cell_line.virus_suspectibility,
+ icon = resulting_atom ? initial(resulting_atom.icon) : "",
+ icon_state = resulting_atom ? initial(resulting_atom.icon_state) : "",
+ consumption_rate = cell_line.consumption_rate * SSMACHINES_DT,
+ growth_rate = cell_line.growth_rate * SSMACHINES_DT,
+ suspectibility = cell_line.virus_suspectibility * SSMACHINES_DT,
requireds = get_reagent_list(cell_line.required_reagents),
supplementaries = get_reagent_list(cell_line.supplementary_reagents),
suppressives = get_reagent_list(cell_line.suppressive_reagents)
@@ -55,7 +69,7 @@
name = virus.name,
desc = virus.desc
)
- data["viruses"] += list(virus_data)
+ data["cell_lines"] += list(virus_data)
return data
@@ -63,23 +77,49 @@
var/list/reagent_list = list()
for(var/i in reagents) //Convert from assoc to normal. Yeah very shit.
var/datum/reagent/reagent = i
- reagent_list += initial(reagent.name)
- return reagent_list.Join(", ")
-
+ reagent_list["[initial(reagent.name)]"] = reagents[i] * SSMACHINES_DT
+ return reagent_list
-/obj/structure/microscope/ui_act(action, params)
+/obj/structure/microscope/ui_act(action, params, datum/tgui/ui)
. = ..()
if(.)
return
switch(action)
if("eject_petridish")
- if(!current_dish)
- return FALSE
- current_dish.forceMove(get_turf(src))
- current_dish = null
- . = TRUE
+ if(current_dish)
+ remove_dish(ui.user)
+ . = TRUE
update_appearance()
+///Insert a new dish, swapping the inserted one
+/obj/structure/microscope/proc/add_dish(mob/living/user, obj/item/petri_dish/new_dish)
+ var/obj/item/petri_dish/old_dish
+ if(current_dish)
+ old_dish = current_dish
+ if(!user.transferItemToLoc(new_dish, src))
+ balloon_alert(user, "couldn't add!")
+ return ITEM_INTERACT_FAILURE
+ current_dish = new_dish
+ update_static_data_for_all_viewers()
+ if(old_dish)
+ if(!user.put_in_hands(old_dish))
+ old_dish.forceMove(get_turf(src))
+ balloon_alert(user, "dish swapped")
+ else
+ balloon_alert(user, "dish added")
+ return ITEM_INTERACT_SUCCESS
+
+///Take the inserted dish, or drop it on the floor
+/obj/structure/microscope/proc/remove_dish(mob/living/user)
+ if(!current_dish)
+ return SECONDARY_ATTACK_CONTINUE_CHAIN
+ if(!user.put_in_hands(current_dish))
+ current_dish.forceMove(get_turf(src))
+ current_dish = null
+ update_static_data_for_all_viewers()
+ balloon_alert(user, "dish removed")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
/datum/crafting_recipe/microscope
name = "Microscope"
result = /obj/structure/microscope
@@ -88,7 +128,5 @@
reqs = list(
/obj/item/stack/sheet/glass = 1,
/obj/item/stack/sheet/plastic = 1,
- /obj/item/stock_parts/scanning_module = 1,
- /obj/item/flashlight = 1,
)
category = CAT_CHEMISTRY
diff --git a/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm b/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm
index edeeaad05c6a3..46d643aa532a7 100644
--- a/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm
+++ b/code/modules/research/xenobiology/vatgrowing/samples/_micro_organism.dm
@@ -23,11 +23,15 @@
var/virus_suspectibility = 1
///This var defines how much % the organism grows per process(), without modifiers, if you have all required reagents
var/growth_rate = 4
- ///Resulting atoms from growing this cell line. List is assoc atom type || amount
- var/list/resulting_atoms = list()
+ ///This var defines how many units of every reagent is consumed during growth per process()
+ var/consumption_rate = REAGENTS_METABOLISM
+ ///Resulting atom from growing this cell line
+ var/atom/resulting_atom
+ ///The number of resulting atoms
+ var/resulting_atom_count = 1
///Handles growth of the micro_organism. This only runs if the micro organism is in the growing vat. Reagents is the growing vats reagents
-/datum/micro_organism/cell_line/proc/handle_growth(obj/machinery/plumbing/growing_vat/vat)
+/datum/micro_organism/cell_line/proc/handle_growth(obj/machinery/vatgrower/vat)
if(!try_eat(vat.reagents))
return FALSE
growth = max(growth, growth + calculate_growth(vat.reagents, vat.biological_sample)) //Prevent you from having minus growth.
@@ -41,7 +45,7 @@
if(!reagents.has_reagent(i))
return FALSE
for(var/i in required_reagents) //Delete the required reagents if used
- reagents.remove_reagent(i, REAGENTS_METABOLISM)
+ reagents.remove_reagent(i, consumption_rate)
return TRUE
///Apply modifiers on growth_rate based on supplementary and supressive reagents. Reagents is the growing vats reagents
@@ -50,27 +54,27 @@
//Handle growth based on supplementary reagents here.
for(var/i in supplementary_reagents)
- if(!reagents.has_reagent(i, REAGENTS_METABOLISM))
+ if(!reagents.has_reagent(i, consumption_rate))
continue
. += supplementary_reagents[i]
- reagents.remove_reagent(i, REAGENTS_METABOLISM)
+ reagents.remove_reagent(i, consumption_rate)
//Handle degrowth based on supressive reagents here.
for(var/i in suppressive_reagents)
- if(!reagents.has_reagent(i, REAGENTS_METABOLISM))
+ if(!reagents.has_reagent(i, consumption_rate))
continue
. += suppressive_reagents[i]
- reagents.remove_reagent(i, REAGENTS_METABOLISM)
+ reagents.remove_reagent(i, consumption_rate)
//Handle debuffing growth based on viruses here.
for(var/datum/micro_organism/virus/active_virus in biological_sample.micro_organisms)
- if(reagents.has_reagent(/datum/reagent/medicine/spaceacillin, REAGENTS_METABOLISM))
- reagents.remove_reagent(/datum/reagent/medicine/spaceacillin, REAGENTS_METABOLISM)
+ if(reagents.has_reagent(/datum/reagent/medicine/spaceacillin, consumption_rate))
+ reagents.remove_reagent(/datum/reagent/medicine/spaceacillin, consumption_rate)
continue //This virus is stopped, We have antiviral stuff
. -= virus_suspectibility
///Called once a cell line reaches 100 growth. Then we check if any cell_line is too far so we can perform an epic fail roll
-/datum/micro_organism/cell_line/proc/finish_growing(obj/machinery/plumbing/growing_vat/vat)
+/datum/micro_organism/cell_line/proc/finish_growing(obj/machinery/vatgrower/vat)
var/risk = 0 //Penalty for failure, goes up based on how much growth the other cell_lines have
for(var/datum/micro_organism/cell_line/cell_line in vat.biological_sample.micro_organisms)
@@ -86,7 +90,7 @@
succeed_growing(vat)
return TRUE
-/datum/micro_organism/cell_line/proc/fuck_up_growing(obj/machinery/plumbing/growing_vat/vat)
+/datum/micro_organism/cell_line/proc/fuck_up_growing(obj/machinery/vatgrower/vat)
vat.visible_message(span_warning("The biological sample in [vat] seems to have dissipated!"))
if(prob(50))
new /obj/effect/gibspawner/generic(get_turf(vat)) //Spawn some gibs.
@@ -94,33 +98,32 @@
return
QDEL_NULL(vat.biological_sample)
-/datum/micro_organism/cell_line/proc/succeed_growing(obj/machinery/plumbing/growing_vat/vat)
+/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()
- for(var/created_thing in resulting_atoms)
- for(var/x in 1 to resulting_atoms[created_thing])
- var/atom/thing = new created_thing(get_turf(vat))
- ADD_TRAIT(thing, TRAIT_VATGROWN, "vatgrowing")
- vat.visible_message(span_nicegreen("[thing] pops out of [vat]!"))
+ for(var/x in 1 to resulting_atom_count)
+ var/atom/thing = new resulting_atom(get_turf(vat))
+ ADD_TRAIT(thing, TRAIT_VATGROWN, "vatgrowing")
+ vat.visible_message(span_nicegreen("[thing] pops out of [vat]!"))
if(SEND_SIGNAL(vat.biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED) & SPARE_SAMPLE)
return
QDEL_NULL(vat.biological_sample)
///Overriden to show more info like needs, supplementary and supressive reagents and also growth.
/datum/micro_organism/cell_line/get_details(show_details)
- . += "[span_notice("[desc] - growth progress: [growth]%")]\n"
+ . += "[span_notice("[desc] - growth progress: [growth]%")]"
if(show_details)
- . += return_reagent_text("It requires:", required_reagents)
- . += return_reagent_text("It likes:", supplementary_reagents)
- . += return_reagent_text("It hates:", suppressive_reagents)
+ . += "\n- " + return_reagent_text("Requires:", required_reagents)
+ . += "\n- " + return_reagent_text("Likes:", supplementary_reagents)
+ . += "\n- " + return_reagent_text("Hates:", suppressive_reagents)
///Return a nice list of all the reagents in a specific category with a specific prefix. This needs to be reworked because the formatting sucks ass.
/datum/micro_organism/cell_line/proc/return_reagent_text(prefix_text = "It requires:", list/reagentlist)
if(!reagentlist.len)
return
- var/all_reagents_text
+ var/list/reagent_names = list()
for(var/i in reagentlist)
var/datum/reagent/reagent = i
- all_reagents_text += " - [initial(reagent.name)]\n"
- return span_notice("[prefix_text]\n[all_reagents_text]")
+ reagent_names += initial(reagent.name)
+ return span_notice("[prefix_text] [jointext(reagent_names, ", ")]")
diff --git a/code/modules/research/xenobiology/vatgrowing/samples/_sample.dm b/code/modules/research/xenobiology/vatgrowing/samples/_sample.dm
index eda9d2771ebf0..7838977bd4d48 100644
--- a/code/modules/research/xenobiology/vatgrowing/samples/_sample.dm
+++ b/code/modules/research/xenobiology/vatgrowing/samples/_sample.dm
@@ -31,7 +31,7 @@
return TRUE
///Call handle_growth on all our microorganisms.
-/datum/biological_sample/proc/handle_growth(obj/machinery/plumbing/growing_vat/vat)
+/datum/biological_sample/proc/handle_growth(obj/machinery/vatgrower/vat)
for(var/datum/micro_organism/cell_line/organism in micro_organisms) //Types because we don't grow viruses.
organism.handle_growth(vat)
diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
index b170cb19fd784..571440f84427f 100644
--- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
+++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm
@@ -25,7 +25,8 @@
virus_suspectibility = 2
growth_rate = VAT_GROWTH_RATE
- resulting_atoms = list(/mob/living/basic/mouse = 2)
+ resulting_atom = /mob/living/basic/mouse
+ resulting_atom_count = 2
/datum/micro_organism/cell_line/chicken //basic cell line designed as a good source of protein and eggyolk.
desc = "Galliform skin cells."
@@ -43,7 +44,7 @@
virus_suspectibility = 1
growth_rate = VAT_GROWTH_RATE
- resulting_atoms = list(/mob/living/basic/chicken = 1)
+ resulting_atom = /mob/living/basic/chicken
/datum/micro_organism/cell_line/cow
desc = "Bovine stem cells"
@@ -62,7 +63,7 @@
/datum/reagent/toxin/carpotoxin = -5)
virus_suspectibility = 1
- resulting_atoms = list(/mob/living/basic/cow = 1)
+ resulting_atom = /mob/living/basic/cow
/datum/micro_organism/cell_line/moonicorn
desc = "Fairyland Bovine stem cells"
@@ -87,7 +88,7 @@
)
virus_suspectibility = 1
- resulting_atoms = list(/mob/living/basic/cow/moonicorn = 1)
+ resulting_atom = /mob/living/basic/cow/moonicorn
/datum/micro_organism/cell_line/cat
desc = "Feliform cells"
@@ -108,7 +109,7 @@
/datum/reagent/consumable/milk/chocolate_milk = -1)
virus_suspectibility = 1.5
- resulting_atoms = list(/mob/living/basic/pet/cat = 1)
+ resulting_atom = /mob/living/basic/pet/cat
/datum/micro_organism/cell_line/corgi
desc = "Canid cells"
@@ -127,7 +128,7 @@
/datum/reagent/consumable/coco = -2)
virus_suspectibility = 1
- resulting_atoms = list(/mob/living/basic/pet/dog/corgi = 1)
+ resulting_atom = /mob/living/basic/pet/dog/corgi
/datum/micro_organism/cell_line/pug
desc = "Squat canid cells"
@@ -145,7 +146,7 @@
/datum/reagent/consumable/coco = -2)
virus_suspectibility = 3
- resulting_atoms = list(/mob/living/basic/pet/dog/pug = 1)
+ resulting_atom = /mob/living/basic/pet/dog/pug
/datum/micro_organism/cell_line/bear //bears can't really compete directly with more powerful creatures, so i made it possible to grow them real fast.
desc = "Ursine cells"
@@ -166,7 +167,7 @@
/datum/reagent/medicine/insulin = -2) //depletes hunny.
virus_suspectibility = 2
- resulting_atoms = list(/mob/living/basic/bear = 1)
+ resulting_atom = /mob/living/basic/bear
/datum/micro_organism/cell_line/carp
desc = "Cyprinid cells"
@@ -185,7 +186,7 @@
/datum/reagent/oxygen = -3)
virus_suspectibility = 2
- resulting_atoms = list(/mob/living/basic/carp = 1)
+ resulting_atom = /mob/living/basic/carp
/datum/micro_organism/cell_line/megacarp
desc = "Cartilaginous cyprinid cells"
@@ -205,7 +206,7 @@
/datum/reagent/oxygen = -3)
virus_suspectibility = 1
- resulting_atoms = list(/mob/living/basic/carp/mega = 1)
+ resulting_atom = /mob/living/basic/carp/mega
/datum/micro_organism/cell_line/snake
desc = "Ophidic cells"
@@ -223,7 +224,7 @@
/datum/reagent/consumable/corn_syrup = -6,
/datum/reagent/sulfur = -3) //sulfur repels snakes according to professor google.
- resulting_atoms = list(/mob/living/basic/snake = 1)
+ resulting_atom = /mob/living/basic/snake
///////////////////////////////////////////
@@ -246,7 +247,7 @@
/datum/reagent/consumable/ice = -2) //Brrr!
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/slime = 1)
+ resulting_atom = /mob/living/basic/slime
/datum/micro_organism/cell_line/blob_spore //nuisance cell line
desc = "Immature blob spores"
@@ -263,7 +264,8 @@
/datum/reagent/medicine/psicodine = -2) //Blob zombies likely wouldn't appreciate psicodine so why this is here
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/blob_minion/spore = 2) //These are useless so we might as well spawn 2.
+ resulting_atom = /mob/living/basic/blob_minion/spore
+ resulting_atom_count = 2
/datum/micro_organism/cell_line/blobbernaut
desc = "Blobular myocytes"
@@ -282,7 +284,7 @@
suppressive_reagents = list(/datum/reagent/consumable/tinlux = -6)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/blob_minion/blobbernaut = 1)
+ resulting_atom = /mob/living/basic/blob_minion/blobbernaut
/datum/micro_organism/cell_line/gelatinous_cube
desc = "Cubic ooze particles"
@@ -307,7 +309,7 @@
/datum/reagent/consumable/ice = -1)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/simple_animal/hostile/ooze/gelatinous = 1)
+ resulting_atom = /mob/living/simple_animal/hostile/ooze/gelatinous
/datum/micro_organism/cell_line/sholean_grapes
desc = "Globular ooze particles"
@@ -334,7 +336,7 @@
/datum/reagent/consumable/ice = -1)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/simple_animal/hostile/ooze/grapes = 1)
+ resulting_atom = /mob/living/simple_animal/hostile/ooze/grapes
////////////////////
//// MISC ////
@@ -355,7 +357,8 @@
/datum/reagent/consumable/ethanol/bug_spray = -4)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/cockroach = 5)
+ resulting_atom = /mob/living/basic/cockroach
+ resulting_atom_count = 5
/datum/micro_organism/cell_line/glockroach
desc = "Gattodeoid anthropod cells"
@@ -376,7 +379,8 @@
/datum/reagent/consumable/ethanol/bug_spray = -4)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/cockroach/glockroach = 2)
+ resulting_atom = /mob/living/basic/cockroach/glockroach
+ resulting_atom_count = 2
/datum/micro_organism/cell_line/hauberoach
desc = "Hattodeoid anthropod cells"
@@ -397,7 +401,8 @@
/datum/reagent/consumable/ethanol/cognac = -4)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/cockroach/hauberoach = 2)
+ resulting_atom = /mob/living/basic/cockroach/hauberoach
+ resulting_atom_count = 2
/datum/micro_organism/cell_line/pine
desc = "Coniferous plant cells"
@@ -418,7 +423,7 @@
suppressive_reagents = list(/datum/reagent/toxin/plantbgone = -8)
virus_suspectibility = 1
- resulting_atoms = list(/mob/living/basic/tree = 1)
+ resulting_atom = /mob/living/basic/tree
/datum/micro_organism/cell_line/vat_beast
desc = "Hypergenic xenocytes"
@@ -443,9 +448,9 @@
/datum/reagent/medicine/c2/syriniver = -2)
virus_suspectibility = 0.5
- resulting_atoms = list(/mob/living/simple_animal/hostile/vatbeast = 1)
+ resulting_atom = /mob/living/simple_animal/hostile/vatbeast
-/datum/micro_organism/cell_line/vat_beast/succeed_growing(obj/machinery/plumbing/growing_vat/vat)
+/datum/micro_organism/cell_line/vat_beast/succeed_growing(obj/machinery/vatgrower/vat)
. = ..()
qdel(vat)
@@ -470,15 +475,12 @@
/datum/reagent/consumable/liquidgibs = -2)
virus_suspectibility = 0
- resulting_atoms = list()
-/datum/micro_organism/cell_line/netherworld/succeed_growing(obj/machinery/plumbing/growing_vat/vat)
- var/random_result = pick(/mob/living/basic/creature, /mob/living/basic/migo, /mob/living/basic/blankbody) //i looked myself, pretty much all of them are reasonably strong and somewhat on the same level. except migo is the jackpot and the blank body is whiff.
- resulting_atoms = list()
- resulting_atoms[random_result] = 1
+/datum/micro_organism/cell_line/netherworld/succeed_growing(obj/machinery/vatgrower/vat)
+ resulting_atom = pick(/mob/living/basic/creature, /mob/living/basic/migo, /mob/living/basic/blankbody) //i looked myself, pretty much all of them are reasonably strong and somewhat on the same level. except migo is the jackpot and the blank body is whiff.
return ..()
-/datum/micro_organism/cell_line/clown/fuck_up_growing(obj/machinery/plumbing/growing_vat/vat)
+/datum/micro_organism/cell_line/clown/fuck_up_growing(obj/machinery/vatgrower/vat)
vat.visible_message(span_warning("The biological sample in [vat] seems to have created something horrific!"))
var/mob/selected_mob = pick(list(/mob/living/basic/clown/mutant/slow, /mob/living/basic/clown/fleshclown))
@@ -509,7 +511,7 @@
/datum/reagent/consumable/nothing = -2,
/datum/reagent/fuel/oil = -1)
- resulting_atoms = list(/mob/living/basic/clown/banana = 1)
+ resulting_atom = /mob/living/basic/clown/banana
/datum/micro_organism/cell_line/clown/glutton
desc = "hyperadipogenic clown stem cells"
@@ -535,7 +537,7 @@
/datum/reagent/consumable/nothing = -2,
/datum/reagent/toxin/bad_food = -1)
- resulting_atoms = list(/mob/living/basic/clown/mutant/glutton = 1)
+ resulting_atom = /mob/living/basic/clown/mutant/glutton
/datum/micro_organism/cell_line/clown/longclown
desc = "long clown bits"
@@ -558,7 +560,7 @@
/datum/reagent/consumable/nothing = -2,
/datum/reagent/sulfur = -1)
- resulting_atoms = list(/mob/living/basic/clown/longface = 1)
+ resulting_atom = /mob/living/basic/clown/longface
/datum/micro_organism/cell_line/frog
desc = "anura amphibian cells"
@@ -579,7 +581,7 @@
/datum/reagent/toxin = -1)
virus_suspectibility = 0.5
- resulting_atoms = list(/mob/living/basic/frog = 1)
+ resulting_atom = /mob/living/basic/frog
/datum/micro_organism/cell_line/axolotl
desc = "caudata amphibian cells"
@@ -602,7 +604,7 @@
/datum/reagent/toxin = -1)
virus_suspectibility = 0.5
- resulting_atoms = list(/mob/living/basic/axolotl = 1)
+ resulting_atom = /mob/living/basic/axolotl
/datum/micro_organism/cell_line/walking_mushroom
desc = "motile fungal hyphae"
@@ -627,7 +629,7 @@
/datum/reagent/copper = -1)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/mushroom = 1)
+ resulting_atom = /mob/living/basic/mushroom
/datum/micro_organism/cell_line/queen_bee
desc = "aphid cells"
@@ -652,9 +654,9 @@
/datum/reagent/drug/nicotine = -1)
virus_suspectibility = 0
- resulting_atoms = list(/obj/item/queen_bee/bought = 1)
+ resulting_atom = /obj/item/queen_bee/bought
-/datum/micro_organism/cell_line/queen_bee/fuck_up_growing(obj/machinery/plumbing/growing_vat/vat) //we love job hazards
+/datum/micro_organism/cell_line/queen_bee/fuck_up_growing(obj/machinery/vatgrower/vat) //we love job hazards
vat.visible_message(span_warning("You hear angry buzzing coming from the inside of the vat!"))
for(var/i in 1 to 5)
new /mob/living/basic/bee(get_turf(vat))
@@ -682,7 +684,8 @@
)
virus_suspectibility = 0
- resulting_atoms = list(/mob/living/basic/butterfly = 3)
+ resulting_atom = /mob/living/basic/butterfly
+ resulting_atom_count = 3
/datum/micro_organism/cell_line/mega_arachnid
desc = "pseudoarachnoid cells"
@@ -708,6 +711,6 @@
/datum/reagent/drug/nicotine = -1,
/datum/reagent/toxin/pestkiller = -1)
- resulting_atoms = list(/mob/living/basic/mega_arachnid = 1)
+ resulting_atom = /mob/living/basic/mega_arachnid
#undef VAT_GROWTH_RATE
diff --git a/code/modules/plumbing/plumbers/vatgrower.dm b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm
similarity index 56%
rename from code/modules/plumbing/plumbers/vatgrower.dm
rename to code/modules/research/xenobiology/vatgrowing/vatgrower.dm
index 1dcfb08e0cce0..5b35bd10edf5e 100644
--- a/code/modules/plumbing/plumbers/vatgrower.dm
+++ b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm
@@ -1,33 +1,52 @@
///Used to make mobs from microbiological samples. Grow grow grow.
-/obj/machinery/plumbing/growing_vat
+/obj/machinery/vatgrower
name = "growing vat"
desc = "Tastes just like the chef's soup."
+ icon = 'icons/obj/science/vatgrowing.dmi'
icon_state = "growing_vat"
- buffer = 300
-
+ density = TRUE
+ pass_flags_self = PASSMACHINE | LETPASSTHROW
+ circuit = /obj/item/circuitboard/machine/vatgrower
+ use_power = NO_POWER_USE
+ ///Soup container reagents
+ var/reagent_volume = 300
+ var/reagent_flags = OPENCONTAINER | DUNKABLE
///List of all microbiological samples in this soup.
var/datum/biological_sample/biological_sample
///If the vat will restart the sample upon completion
var/resampler_active = FALSE
-///Add that sexy demnand component
-/obj/machinery/plumbing/growing_vat/Initialize(mapload, bolt, layer)
+/obj/machinery/vatgrower/Initialize(mapload, bolt, layer)
. = ..()
- AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
-
-/obj/machinery/plumbing/growing_vat/create_reagents(max_vol, flags)
+ create_reagents(reagent_volume, reagent_flags)
+
+ AddComponent(/datum/component/simple_rotation)
+ AddComponent(/datum/component/plumbing/simple_demand)
+
+ var/static/list/hovering_item_typechecks = list(
+ /obj/item/petri_dish = list(
+ SCREENTIP_CONTEXT_LMB = "Add Sample",
+ ),
+ /obj/item/reagent_containers = list(
+ SCREENTIP_CONTEXT_LMB = "Pour Reagents",
+ ),
+ )
+ AddElement(/datum/element/contextual_screentip_item_typechecks, hovering_item_typechecks)
+ AddElement(/datum/element/contextual_screentip_bare_hands, lmb_text = "Toggle Resampler", rmb_text = "Flush Soup")
+
+/obj/machinery/vatgrower/create_reagents(max_vol, flags)
. = ..()
RegisterSignals(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change))
RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del))
/// Handles properly detaching signal hooks.
-/obj/machinery/plumbing/growing_vat/proc/on_reagents_del(datum/reagents/reagents)
+/obj/machinery/vatgrower/proc/on_reagents_del(datum/reagents/reagents)
SIGNAL_HANDLER
UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_QDELETING))
return NONE
///When we process, we make use of our reagents to try and feed the samples we have.
-/obj/machinery/plumbing/growing_vat/process(seconds_per_tick)
+/obj/machinery/vatgrower/process(seconds_per_tick)
if(!is_operational)
return
if(!biological_sample)
@@ -39,35 +58,71 @@
audible_message(pick(list(span_notice("[src] grumbles!"), span_notice("[src] makes a splashing noise!"), span_notice("[src] sloshes!"))))
use_energy(active_power_usage * seconds_per_tick)
-///Handles the petri dish depositing into the vat.
-/obj/machinery/plumbing/growing_vat/attacked_by(obj/item/I, mob/living/user)
- if(!istype(I, /obj/item/petri_dish))
- return ..()
+/obj/machinery/vatgrower/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ . = ..()
+ if(istype(tool, /obj/item/petri_dish))
+ return deposit_sample(user, tool)
- var/obj/item/petri_dish/petri = I
+/obj/machinery/vatgrower/screwdriver_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
+ return ITEM_INTERACT_SUCCESS
- if(!petri.sample)
- return ..()
+/obj/machinery/vatgrower/crowbar_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(default_deconstruction_crowbar(tool))
+ return ITEM_INTERACT_SUCCESS
- if(biological_sample)
- to_chat(user, span_warning("There is already a sample in the vat!"))
+/obj/machinery/vatgrower/wrench_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(default_unfasten_wrench(user, tool))
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/vatgrower/attack_hand(mob/living/user, list/modifiers)
+ . = ..()
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ if(obj_flags & EMAGGED)
return
- deposit_sample(user, petri)
+ resampler_active = !resampler_active
+ balloon_alert(user, "resampler [resampler_active ? "activated" : "deactivated"]")
+ update_appearance()
+
+/obj/machinery/vatgrower/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(!anchored)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ var/warning = tgui_alert(user, "Are you sure you want to empty the soup container?","Flush soup container?", list("Flush", "Cancel"))
+ if(warning == "Flush" && user.can_perform_action(src))
+ reagents.clear_reagents()
+ if(biological_sample)
+ QDEL_NULL(biological_sample)
+ balloon_alert(user, "container empty")
+ update_appearance()
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
///Creates a clone of the supplied sample and puts it in the vat
-/obj/machinery/plumbing/growing_vat/proc/deposit_sample(mob/user, obj/item/petri_dish/petri)
+/obj/machinery/vatgrower/proc/deposit_sample(mob/user, obj/item/petri_dish/petri)
+ if(!petri.sample)
+ balloon_alert(user, "dish empty")
+ return ITEM_INTERACT_FAILURE
+ if(biological_sample)
+ balloon_alert(user, "already has a sample")
+ return ITEM_INTERACT_FAILURE
biological_sample = new
for(var/datum/micro_organism/m in petri.sample.micro_organisms)
biological_sample.micro_organisms += new m.type()
biological_sample.sample_layers = petri.sample.sample_layers
biological_sample.sample_color = petri.sample.sample_color
- to_chat(user, span_warning("You put some of the sample in the vat!"))
+ balloon_alert(user, "added sample")
playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE)
update_appearance()
RegisterSignal(biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED, PROC_REF(on_sample_growth_completed))
+ return ITEM_INTERACT_SUCCESS
///Adds text for when there is a sample in the vat
-/obj/machinery/plumbing/growing_vat/examine_more(mob/user)
+/obj/machinery/vatgrower/examine(mob/user)
. = ..()
if(!biological_sample)
return
@@ -76,18 +131,14 @@
var/datum/micro_organism/MO = i
. += MO.get_details(HAS_TRAIT(user, TRAIT_RESEARCH_SCANNER))
-/obj/machinery/plumbing/growing_vat/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
- . = ..()
- QDEL_NULL(biological_sample)
-
/// Call update icon when reagents change to update the reagent content icons. Eats signal args.
-/obj/machinery/plumbing/growing_vat/proc/on_reagent_change(datum/reagents/holder, ...)
+/obj/machinery/vatgrower/proc/on_reagent_change(datum/reagents/holder, ...)
SIGNAL_HANDLER
update_appearance()
return NONE
///Adds overlays to show the reagent contents
-/obj/machinery/plumbing/growing_vat/update_overlays()
+/obj/machinery/vatgrower/update_overlays()
. = ..()
var/static/image/on_overlay
var/static/image/off_overlay
@@ -113,16 +164,7 @@
var/mutable_appearance/bubbles_overlay = mutable_appearance(icon, "vat_bubbles")
. += bubbles_overlay
-/obj/machinery/plumbing/growing_vat/attack_hand(mob/living/user, list/modifiers)
- . = ..()
- playsound(src, 'sound/machines/click.ogg', 30, TRUE)
- if(obj_flags & EMAGGED)
- return
- resampler_active = !resampler_active
- balloon_alert_to_viewers("resampler [resampler_active ? "activated" : "deactivated"]")
- update_appearance()
-
-/obj/machinery/plumbing/growing_vat/emag_act(mob/user, obj/item/card/emag/emag_card)
+/obj/machinery/vatgrower/emag_act(mob/user, obj/item/card/emag/emag_card)
if(obj_flags & EMAGGED)
return FALSE
obj_flags |= EMAGGED
@@ -131,7 +173,7 @@
flick("growing_vat_emagged", src)
return TRUE
-/obj/machinery/plumbing/growing_vat/proc/on_sample_growth_completed()
+/obj/machinery/vatgrower/proc/on_sample_growth_completed()
SIGNAL_HANDLER
if(resampler_active)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(src), 'sound/effects/servostep.ogg', 100, 1), 1.5 SECONDS)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index ea4ef0e9b7ed1..68ffe5e9248be 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -91,18 +91,20 @@
eyeobj.icon_state = "generic_camera"
/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user)
- ..()
+ . = ..()
RegisterSignal(user, COMSIG_MOB_CTRL_CLICKED, PROC_REF(XenoClickCtrl))
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt))
+ RegisterSignal(user, COMSIG_MOB_ALTCLICKON, PROC_REF(XenoSlimeClickAlt))
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift))
RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift))
/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user)
- UnregisterSignal(user, COMSIG_MOB_CTRL_CLICKED)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT)
- UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT)
- UnregisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT)
- ..()
+ UnregisterSignal(user, list(
+ COMSIG_MOB_CTRL_CLICKED,
+ COMSIG_MOB_ALTCLICKON,
+ COMSIG_XENO_SLIME_CLICK_SHIFT,
+ COMSIG_XENO_TURF_CLICK_SHIFT,
+ ))
+ return ..()
/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/used_item, mob/user, params)
if(istype(used_item, /obj/item/food/monkeycube))
@@ -355,11 +357,6 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
//
// Alternate clicks for slime, monkey and open turf if using a xenobio console
-
-/mob/living/basic/slime/click_alt(mob/user)
- SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_ALT, src)
- return CLICK_ACTION_SUCCESS
-
/mob/living/basic/slime/ShiftClick(mob/user)
SEND_SIGNAL(user, COMSIG_XENO_SLIME_CLICK_SHIFT, src)
..()
@@ -372,6 +369,10 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/basic/slime/target_slime)
SIGNAL_HANDLER
+ . = COMSIG_MOB_CANCEL_CLICKON
+ if(!isslime(target_slime))
+ return
+
var/mob/camera/ai_eye/remote/xenobio/remote_eye = user.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
@@ -426,13 +427,20 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!isopenturf(target_turf))
return
+ var/cleanup = FALSE
var/mob/camera/ai_eye/remote/xenobio/remote_eye = user.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
if(!xeno_console.validate_area(user, remote_eye, target_turf))
return
- xeno_console.feed_slime(user, target_turf)
+ for(var/mob/monkey in target_turf)
+ if(ismonkey(monkey) && monkey.stat == DEAD)
+ cleanup = TRUE
+ xeno_console.monkey_recycle(user, monkey)
+
+ if(!cleanup)
+ xeno_console.feed_slime(user, target_turf)
///Picks up a dead monkey for recycling
/obj/machinery/computer/camera_advanced/xenobio/proc/XenoMonkeyClickCtrl(mob/living/user, mob/living/carbon/human/target_mob)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 34d7f4d507a46..9f22520d6ab10 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -10,7 +10,7 @@
throwforce = 0
throw_speed = 3
throw_range = 6
- grind_results = list()
+ grind_results = list(/datum/reagent/toxin/slimejelly = 20)
///uses before it goes inert
var/extract_uses = 1
///deletion timer, for delayed reactions
@@ -44,11 +44,6 @@
. = ..()
create_reagents(100, INJECTABLE | DRAWABLE)
-/obj/item/slime_extract/on_grind()
- . = ..()
- if(extract_uses)
- grind_results[/datum/reagent/toxin/slimejelly] = 20
-
/**
* Effect when activated by a Luminescent.
*
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index f8b460a783d0d..d3184cc96c62f 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -20,7 +20,9 @@
// Traits forbided for custom docking
var/list/locked_traits = list(ZTRAIT_RESERVED, ZTRAIT_CENTCOM, ZTRAIT_AWAY)
var/view_range = 0
+ ///x offset for where the camera eye will spawn. Starts from shuttle's docking port
var/x_offset = 0
+ ///y offset for where the camera eye will spawn. Starts from the shuttle's docking port
var/y_offset = 0
var/list/whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/open/openspace)
var/see_hidden = FALSE
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index fbe3e52e5030f..68a0a41a2e092 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -379,6 +379,7 @@
"whiteship_tram",
"whiteship_personalshuttle",
"whiteship_obelisk",
+ "whiteship_birdshot",
)
/// Helper proc that tests to ensure all whiteship templates can spawn at their docking port, and logs their sizes
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index 734e2337df518..cb7cad65b6ba1 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -12,7 +12,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
setDir(angle2dir(rotation+dir2angle(dir)))
//resmooth if need be.
- if(params & ROTATE_SMOOTH && smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
+ if(params & ROTATE_SMOOTH && smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
//rotate the pixel offsets too.
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index e5b4b0eb02439..484fa32ac8777 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -403,7 +403,6 @@
desc = "Communism powerful force."
icon = 'icons/effects/96x96.dmi'
icon_state = "communist"
- layer = ABOVE_OPEN_TURF_LAYER
pixel_x = -32
pixel_y = -32
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index b0b23e9d97d32..a1c056dbe4de0 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -262,7 +262,11 @@
return target // They're just standing around, proceed as normal
if(HAS_TRAIT(cast_loc, TRAIT_CASTABLE_LOC))
- return cast_loc // They're in an atom which allows casting, so redirect the caster to loc
+ if(HAS_TRAIT(cast_loc, TRAIT_SPELLS_TRANSFER_TO_LOC) && ismob(cast_loc.loc))
+ return cast_loc.loc
+ else
+ return cast_loc
+ // They're in an atom which allows casting, so redirect the caster to loc
return null
diff --git a/code/modules/spells/spell_types/conjure_item/_conjure_item.dm b/code/modules/spells/spell_types/conjure_item/_conjure_item.dm
index 7e39f778391d4..3bbdf25fa8444 100644
--- a/code/modules/spells/spell_types/conjure_item/_conjure_item.dm
+++ b/code/modules/spells/spell_types/conjure_item/_conjure_item.dm
@@ -3,7 +3,7 @@
invocation_type = INVOCATION_NONE
/// Typepath of whatever item we summon
- var/obj/item/item_type
+ var/obj/item_type
/// If TRUE, we delete any previously created items when we cast the spell
var/delete_old = TRUE
/// List of weakrefs to items summoned
@@ -57,7 +57,7 @@
var/mob/mob_caster = cast_on
if(istype(mob_caster))
- var/obj/item/existing_item = mob_caster.get_active_held_item()
+ var/obj/existing_item = mob_caster.get_active_held_item()
if(existing_item)
mob_caster.dropItemToGround(existing_item)
@@ -65,6 +65,10 @@
if(QDELETED(created))
CRASH("[type] tried to create an item, but failed. It's item type is [item_type].")
+ if(!isitem(created))
+ created.forceMove(cast_on.drop_location())
+ return
+
if(istype(mob_caster))
mob_caster.put_in_hands(created, del_on_fail = delete_on_failure)
diff --git a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm
index 00327111e8915..f61e48e889672 100644
--- a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm
+++ b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm
@@ -164,6 +164,10 @@
var/consume_sound = 'sound/magic/demon_consume.ogg'
/// consume count (statistics and stuff)
var/consume_count = 0
+ /// Apply damage every 20 seconds if we bloodcrawling
+ var/jaunt_damage_timer
+ /// When demon first appears, it does not take damage while in Jaunt. He also doesn't take damage while he's eating someone.
+ var/resist_jaunt_damage = TRUE
/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/try_enter_jaunt(obj/effect/decal/cleanable/blood, mob/living/jaunter)
// Save this before the actual jaunt
@@ -174,12 +178,14 @@
if(!.)
return
+ jaunt_damage_timer = addtimer(CALLBACK(src, PROC_REF(damage_for_lazy_demon), jaunter), 20 SECONDS, TIMER_STOPPABLE)
+
var/turf/jaunt_turf = get_turf(jaunter)
// if we're not pulling anyone, or we can't what we're pulling
- if(!isliving(coming_with))
+ if(!ishuman(coming_with))
return
- var/mob/living/victim = coming_with
+ var/mob/living/carbon/human/victim = coming_with
if(victim.stat == CONSCIOUS)
jaunt_turf.visible_message(
@@ -204,6 +210,28 @@
return TRUE
+/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/on_jaunt_exited(obj/effect/dummy/phased_mob/jaunt, mob/living/unjaunter)
+ deltimer(jaunt_damage_timer)
+ resist_jaunt_damage = FALSE
+ return ..()
+
+/**
+ * Apply damage to demon when he using bloodcrawl.
+ * Every 20 SECONDS check if demon still crawling and update timer.
+ */
+/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/proc/damage_for_lazy_demon(mob/living/lazy_demon)
+ if(QDELETED(lazy_demon))
+ return
+ if(resist_jaunt_damage)
+ return
+ if(isturf(lazy_demon.loc))
+ return
+ if(isnull(jaunt_damage_timer))
+ return
+ lazy_demon.apply_damage(lazy_demon.maxHealth * 0.05, BRUTE)
+ jaunt_damage_timer = addtimer(CALLBACK(src, PROC_REF(damage_for_lazy_demon), lazy_demon), 20 SECONDS, TIMER_STOPPABLE)
+ to_chat(lazy_demon, span_warning("You feel your flesh dissolving into the sea of blood. You shouldn't stay in Blood Crawl for too long!"))
+
/**
* Consumes the [victim] from the [jaunter], fully healing them
* and calling [proc/on_victim_consumed] if successful.)
@@ -236,12 +264,18 @@
* Called when a victim starts to be consumed.
*/
/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/proc/on_victim_start_consume(mob/living/victim, mob/living/jaunter)
+ if(!iscarbon(jaunter))
+ resist_jaunt_damage = TRUE
+ deltimer(jaunt_damage_timer)
to_chat(jaunter, span_danger("You begin to feast on [victim]... You can not move while you are doing this."))
/**
* Called when a victim is successfully consumed.
*/
/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/proc/on_victim_consumed(mob/living/victim, mob/living/jaunter)
+ if(!iscarbon(jaunter))
+ resist_jaunt_damage = FALSE
+ jaunt_damage_timer = addtimer(CALLBACK(src, PROC_REF(damage_for_lazy_demon), jaunter), 20 SECONDS, TIMER_STOPPABLE)
to_chat(jaunter, span_danger("You devour [victim]. Your health is fully restored."))
qdel(victim)
diff --git a/code/modules/spells/spell_types/pointed/_pointed.dm b/code/modules/spells/spell_types/pointed/_pointed.dm
index 04c3ed47944b9..edf3dab2179d4 100644
--- a/code/modules/spells/spell_types/pointed/_pointed.dm
+++ b/code/modules/spells/spell_types/pointed/_pointed.dm
@@ -16,7 +16,7 @@
var/deactive_msg
/// The casting range of our spell
var/cast_range = 7
- /// Variable dictating if the spell will use turf based aim assist
+ /// If aim asisst is used. Disable to disable
var/aim_assist = TRUE
/datum/action/cooldown/spell/pointed/New(Target)
@@ -65,17 +65,18 @@
return TRUE
/datum/action/cooldown/spell/pointed/InterceptClickOn(mob/living/caller, params, atom/target)
-
var/atom/aim_assist_target
- if(aim_assist && isturf(target))
- // Find any human in the list. We aren't picky, it's aim assist after all
- aim_assist_target = locate(/mob/living/carbon/human) in target
- if(!aim_assist_target)
- // If we didn't find a human, we settle for any living at all
- aim_assist_target = locate(/mob/living) in target
-
+ if(aim_assist)
+ aim_assist_target = aim_assist(caller, target)
return ..(caller, params, aim_assist_target || target)
+/datum/action/cooldown/spell/pointed/proc/aim_assist(mob/living/caller, atom/target)
+ if(!isturf(target))
+ return
+
+ // Find any human, or if that fails, any living target
+ return locate(/mob/living/carbon/human) in target || locate(/mob/living) in target
+
/datum/action/cooldown/spell/pointed/is_valid_target(atom/cast_on)
if(cast_on == owner)
to_chat(owner, span_warning("You cannot cast [src] on yourself!"))
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index c83f710d1df1d..e2feaa2bc26ed 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -50,13 +50,10 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)
. = ..()
AddComponent(/datum/component/simple_rotation)
-/obj/machinery/bsa/back/multitool_act(mob/living/user, obj/item/I)
- if(!multitool_check_buffer(user, I)) //make sure it has a data buffer
- return
- var/obj/item/multitool/M = I
+/obj/machinery/bsa/back/multitool_act(mob/living/user, obj/item/multitool/M)
M.set_buffer(src)
balloon_alert(user, "saved to multitool buffer")
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/bsa/front
name = "Bluespace Artillery Bore"
@@ -67,13 +64,10 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)
. = ..()
AddComponent(/datum/component/simple_rotation)
-/obj/machinery/bsa/front/multitool_act(mob/living/user, obj/item/I)
- if(!multitool_check_buffer(user, I)) //make sure it has a data buffer
- return
- var/obj/item/multitool/M = I
+/obj/machinery/bsa/front/multitool_act(mob/living/user, obj/item/multitool/M)
M.set_buffer(src)
balloon_alert(user, "saved to multitool buffer")
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/bsa/middle
name = "Bluespace Artillery Fusor"
@@ -86,22 +80,19 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)
. = ..()
AddComponent(/datum/component/simple_rotation)
-/obj/machinery/bsa/middle/multitool_act(mob/living/user, obj/item/I)
- if(!multitool_check_buffer(user, I))
- return
- var/obj/item/multitool/M = I
- if(M.buffer)
- if(istype(M.buffer, /obj/machinery/bsa/back))
- back_ref = WEAKREF(M.buffer)
- to_chat(user, span_notice("You link [src] with [M.buffer]."))
- M.set_buffer(null)
- else if(istype(M.buffer, /obj/machinery/bsa/front))
- front_ref = WEAKREF(M.buffer)
- to_chat(user, span_notice("You link [src] with [M.buffer]."))
- M.set_buffer(null)
- else
- to_chat(user, span_warning("[I]'s data buffer is empty!"))
- return TRUE
+/obj/machinery/bsa/middle/multitool_act(mob/living/user, obj/item/multitool/tool)
+ . = NONE
+
+ if(istype(tool.buffer, /obj/machinery/bsa/back))
+ back_ref = WEAKREF(tool.buffer)
+ to_chat(user, span_notice("You link [src] with [tool.buffer]."))
+ tool.set_buffer(null)
+ return ITEM_INTERACT_SUCCESS
+ else if(istype(tool.buffer, /obj/machinery/bsa/front))
+ front_ref = WEAKREF(tool.buffer)
+ to_chat(user, span_notice("You link [src] with [tool.buffer]."))
+ tool.set_buffer(null)
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/bsa/middle/proc/check_completion()
var/obj/machinery/bsa/front/front = front_ref?.resolve()
diff --git a/code/modules/surgery/blood_filter.dm b/code/modules/surgery/blood_filter.dm
index 0193ee9c01a8d..401a412bc1c9e 100644
--- a/code/modules/surgery/blood_filter.dm
+++ b/code/modules/surgery/blood_filter.dm
@@ -15,6 +15,13 @@
return ..()
/datum/surgery_step/filter_blood/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, try_to_fail = FALSE)
+ display_results(
+ user,
+ target,
+ span_notice("You begin filtering [target]'s blood..."),
+ span_notice("[user] uses [tool] to filter [target]'s blood."),
+ span_notice("[user] uses [tool] on [target]'s chest."),
+ )
if(!..())
return
while(has_filterable_chems(target, tool))
@@ -33,6 +40,8 @@
*/
/datum/surgery_step/filter_blood/proc/has_filterable_chems(mob/living/carbon/target, obj/item/blood_filter/bloodfilter)
if(!length(target.reagents?.reagent_list))
+ bloodfilter.audible_message(span_notice("[bloodfilter] pings as it reports no chemicals detected in [target]'s blood."))
+ playsound(get_turf(target), 'sound/machines/ping.ogg', 75, TRUE, falloff_exponent = 12, falloff_distance = 1)
return FALSE
if(!length(bloodfilter.whitelist))
@@ -49,16 +58,9 @@
implements = list(/obj/item/blood_filter = 95)
repeatable = TRUE
time = 2.5 SECONDS
- success_sound = 'sound/machines/ping.ogg'
+ success_sound = 'sound/machines/card_slide.ogg'
/datum/surgery_step/filter_blood/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- display_results(
- user,
- target,
- span_notice("You begin filtering [target]'s blood..."),
- span_notice("[user] uses [tool] to filter [target]'s blood."),
- span_notice("[user] uses [tool] on [target]'s chest."),
- )
display_pain(target, "You feel a throbbing pain in your chest!")
/datum/surgery_step/filter_blood/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
@@ -66,13 +68,13 @@
if(target.reagents?.total_volume)
for(var/datum/reagent/chem as anything in target.reagents.reagent_list)
if(!length(bloodfilter.whitelist) || (chem.type in bloodfilter.whitelist))
- target.reagents.remove_reagent(chem.type, min(chem.volume * 0.22, 10))
+ target.reagents.remove_reagent(chem.type, min(round(chem.volume * 0.22, 0.2), 10))
display_results(
user,
target,
- span_notice("\The [tool] pings as it finishes filtering [target]'s blood."),
- span_notice("\The [tool] pings as it stops pumping [target]'s blood."),
- span_notice("\The [tool] pings as it stops pumping."),
+ span_notice("\The [tool] completes a cycle filtering [target]'s blood."),
+ span_notice("\The [tool] whirrs as it filters [target]'s blood."),
+ span_notice("\The [tool] whirrs as it pumps."),
)
if(locate(/obj/item/healthanalyzer) in user.held_items)
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index c03a930395ab9..06599c2fb4809 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -351,7 +351,7 @@
check_list += "\t [span_boldwarning("Your [name] is suffering [wound.a_or_from] [LOWER_TEXT(wound.name)]!!!")]"
for(var/obj/item/embedded_thing in embedded_objects)
- var/stuck_word = embedded_thing.isEmbedHarmless() ? "stuck" : "embedded"
+ var/stuck_word = embedded_thing.is_embed_harmless() ? "stuck" : "embedded"
check_list += "\t There is \a [embedded_thing] [stuck_word] in your [name]!"
/obj/item/bodypart/blob_act()
@@ -1096,15 +1096,15 @@
if(embed in embedded_objects) // go away
return
// We don't need to do anything with projectile embedding, because it will never reach this point
- RegisterSignal(embed, COMSIG_ITEM_EMBEDDING_UPDATE, PROC_REF(embedded_object_changed))
embedded_objects += embed
+ RegisterSignal(embed, COMSIG_ITEM_EMBEDDING_UPDATE, PROC_REF(embedded_object_changed))
refresh_bleed_rate()
/// INTERNAL PROC, DO NOT USE
/// Cleans up any attachment we have to the embedded object, removes it from our list
/obj/item/bodypart/proc/_unembed_object(obj/item/unembed)
- UnregisterSignal(unembed, COMSIG_ITEM_EMBEDDING_UPDATE)
embedded_objects -= unembed
+ UnregisterSignal(unembed, COMSIG_ITEM_EMBEDDING_UPDATE)
refresh_bleed_rate()
/obj/item/bodypart/proc/embedded_object_changed(obj/item/embedded_source)
@@ -1157,7 +1157,7 @@
cached_bleed_rate += 0.5
for(var/obj/item/embeddies in embedded_objects)
- if(!embeddies.isEmbedHarmless())
+ if(!embeddies.is_embed_harmless())
cached_bleed_rate += 0.25
for(var/datum/wound/iter_wound as anything in wounds)
diff --git a/code/modules/surgery/bodyparts/ghetto_parts.dm b/code/modules/surgery/bodyparts/ghetto_parts.dm
index 36c0310dead76..03326f3754e45 100644
--- a/code/modules/surgery/bodyparts/ghetto_parts.dm
+++ b/code/modules/surgery/bodyparts/ghetto_parts.dm
@@ -14,6 +14,9 @@
brute_modifier = 1.2
burn_modifier = 1.5
bodypart_traits = list(TRAIT_CHUNKYFINGERS)
+ disabling_threshold_percentage = 1
+ bodypart_flags = BODYPART_UNHUSKABLE
+ biological_state = (BIO_JOINTED)
/obj/item/bodypart/arm/left/ghetto/Initialize(mapload, ...)
. = ..()
@@ -35,6 +38,9 @@
brute_modifier = 1.2
burn_modifier = 1.5
bodypart_traits = list(TRAIT_CHUNKYFINGERS)
+ disabling_threshold_percentage = 1
+ bodypart_flags = BODYPART_UNHUSKABLE
+ biological_state = (BIO_JOINTED)
/obj/item/bodypart/arm/right/ghetto/Initialize(mapload, ...)
. = ..()
@@ -54,6 +60,9 @@
unarmed_effectiveness = 10
brute_modifier = 1.2
burn_modifier = 1.5
+ disabling_threshold_percentage = 1
+ bodypart_flags = BODYPART_UNHUSKABLE
+ biological_state = (BIO_JOINTED)
/obj/item/bodypart/leg/left/ghetto/Initialize(mapload, ...)
. = ..()
@@ -73,6 +82,9 @@
unarmed_effectiveness = 10
brute_modifier = 1.2
burn_modifier = 1.5
+ disabling_threshold_percentage = 1
+ bodypart_flags = BODYPART_UNHUSKABLE
+ biological_state = (BIO_JOINTED)
/obj/item/bodypart/leg/right/ghetto/Initialize(mapload, ...)
. = ..()
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index 66f42c1e039ba..16a9a288bf0ba 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -141,7 +141,7 @@
if (!can_dismember)
return FALSE
- if(owner.stat < HARD_CRIT)
+ if(!HAS_TRAIT(owner, TRAIT_CURSED) && owner.stat < HARD_CRIT)
return FALSE
return ..()
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index fb0647d0fb504..a0955af4e46c8 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -48,6 +48,15 @@
which_hand = BODY_ZONE_PRECISE_R_HAND
return get_bodypart(check_zone(which_hand))
+/// Gets the inactive hand of the mob. Returns FALSE on non-carbons, otherwise returns the /obj/item/bodypart.
+/mob/proc/get_inactive_hand()
+ return null
+
+/mob/living/carbon/get_inactive_hand()
+ var/which_hand = BODY_ZONE_PRECISE_R_HAND
+ if(!(active_hand_index % RIGHT_HANDS))
+ which_hand = BODY_ZONE_PRECISE_L_HAND
+ return get_bodypart(check_zone(which_hand))
/mob/proc/has_left_hand(check_disabled = TRUE)
return TRUE
@@ -130,7 +139,7 @@
/mob/living/carbon/proc/has_embedded_objects(include_harmless=FALSE)
for(var/obj/item/bodypart/bodypart as anything in bodyparts)
for(var/obj/item/embedded in bodypart.embedded_objects)
- if(!include_harmless && embedded.isEmbedHarmless())
+ if(!include_harmless && embedded.is_embed_harmless())
continue
return TRUE
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 97fa50d76c85b..6e3b5ca921bc4 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -48,7 +48,7 @@
old_owner.gib(DROP_ALL_REMAINS)
/obj/item/bodypart/chest/can_dismember(obj/item/item)
- if(owner.stat < HARD_CRIT || !contents.len)
+ if((!HAS_TRAIT(owner, TRAIT_CURSED) && owner.stat < HARD_CRIT) || !contents.len)
return FALSE
return ..()
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index 3c645f240d484..674f5803f57be 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -1,9 +1,13 @@
+#define MARK_TOOTH 1
+
/datum/surgery/dental_implant
name = "Dental implant"
possible_locs = list(BODY_ZONE_PRECISE_MOUTH)
steps = list(
/datum/surgery_step/drill/pill,
/datum/surgery_step/insert_pill,
+ /datum/surgery_step/search_teeth,
+ /datum/surgery_step/close,
)
/datum/surgery_step/drill/pill/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -84,3 +88,32 @@
item_target.reagents.trans_to(owner, item_target.reagents.total_volume, transferred_by = owner, methods = INGEST)
qdel(target)
return TRUE
+
+/datum/surgery_step/search_teeth
+ name = "search teeth (hand)"
+ accept_hand = TRUE
+ time = 2 SECONDS
+ repeatable = TRUE
+
+/datum/surgery_step/search_teeth/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ display_results(
+ user,
+ target,
+ span_notice("You begin looking in [target]'s mouth for implantable teeth..."),
+ span_notice("[user] begins to look in [target]'s mouth."),
+ span_notice("[user] begins to examine [target]'s teeth."),
+ )
+ display_pain(target, "You feel fingers poke around at your teeth.")
+
+/datum/surgery_step/search_teeth/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+ display_results(
+ user,
+ target,
+ span_notice("[user] marks a tooth in [target]'s mouth."),
+ span_notice("[user] marks a tooth in [target]'s mouth."),
+ span_notice("[user] prods a tooth in [target]'s mouth."),
+ )
+ surgery.status = MARK_TOOTH
+ return ..()
+
+#undef MARK_TOOTH
diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
index 69c246d9e8de5..95c952e7724d4 100644
--- a/code/modules/surgery/experimental_dissection.dm
+++ b/code/modules/surgery/experimental_dissection.dm
@@ -1,5 +1,5 @@
///How many research points you gain from dissecting a Human.
-#define BASE_HUMAN_REWARD 500
+#define BASE_HUMAN_REWARD 10
/datum/surgery/advanced/experimental_dissection
name = "Experimental Dissection"
diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
new file mode 100644
index 0000000000000..e9da6197ed273
--- /dev/null
+++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
@@ -0,0 +1,201 @@
+/*!
+ * Contains Voltaic Combat Cyberheart
+ */
+#define DOAFTER_IMPLANTING_HEART "implanting"
+
+/obj/item/organ/internal/heart/cybernetic/anomalock
+ name = "Voltaic Combat Cyberheart"
+ desc = "A cutting-edge cyberheart, originally designed for Nanotrasen killsquad usage but later declassified for normal research. Voltaic technology allows the heart to keep the body upright in dire circumstances, alongside redirecting anomalous flux energy to fully shield the user from shocks and electro-magnetic pulses. Requires a refined Flux core as a power source."
+ icon_state = "anomalock_heart"
+
+ COOLDOWN_DECLARE(survival_cooldown)
+ ///Cooldown for the activation of the organ
+ var/survival_cooldown_time = 5 MINUTES
+ ///The lightning effect on our mob when the implant is active
+ var/mutable_appearance/lightning_overlay
+ ///how long the lightning lasts
+ var/lightning_timer
+
+ //---- Anomaly core variables:
+ ///The core item the organ runs off.
+ var/obj/item/assembly/signaler/anomaly/core
+ ///Accepted types of anomaly cores.
+ var/required_anomaly = /obj/item/assembly/signaler/anomaly/flux
+ ///If this one starts with a core in.
+ var/prebuilt = FALSE
+ ///If the core is removable once socketed.
+ var/core_removable = TRUE
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
+ . = ..()
+ if(!core)
+ return
+ add_lightning_overlay(30 SECONDS)
+ playsound(organ_owner, 'sound/items/eshield_recharge.ogg', 40)
+ organ_owner.AddElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_CONTENTS)
+ organ_owner.apply_status_effect(/datum/status_effect/stabilized/yellow, src)
+ RegisterSignal(organ_owner, SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION), PROC_REF(activate_survival))
+ RegisterSignal(organ_owner, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/on_mob_remove(mob/living/carbon/organ_owner, special)
+ . = ..()
+ if(!core)
+ return
+ UnregisterSignal(organ_owner, SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION))
+ organ_owner.RemoveElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_CONTENTS)
+ organ_owner.remove_status_effect(/datum/status_effect/stabilized/yellow)
+ tesla_zap(source = organ_owner, zap_range = 20, power = 2.5e5, cutoff = 1e3)
+ qdel(src)
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/attack(mob/living/target_mob, mob/living/user, params)
+ if(target_mob != user || !istype(target_mob) || !core)
+ return ..()
+
+ if(DOING_INTERACTION(user, DOAFTER_IMPLANTING_HEART))
+ return
+ user.balloon_alert(user, "this will hurt...")
+ to_chat(user, span_userdanger("Black cyberveins tear your skin apart, pulling the heart into your ribcage. This feels unwise.."))
+ if(!do_after(user, 5 SECONDS, interaction_key = DOAFTER_IMPLANTING_HEART))
+ return ..()
+ playsound(target_mob, 'sound/weapons/slice.ogg', 100, TRUE)
+ user.temporarilyRemoveItemFromInventory(src, TRUE)
+ Insert(user)
+ user.apply_damage(100, BRUTE, BODY_ZONE_CHEST)
+ user.emote("scream")
+ return TRUE
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/proc/on_emp_act(severity)
+ SIGNAL_HANDLER
+ add_lightning_overlay(10 SECONDS)
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/proc/add_lightning_overlay(time_to_last = 10 SECONDS)
+ if(lightning_overlay)
+ lightning_timer = addtimer(CALLBACK(src, PROC_REF(clear_lightning_overlay)), time_to_last, (TIMER_UNIQUE|TIMER_OVERRIDE))
+ return
+ lightning_overlay = mutable_appearance(icon = 'icons/effects/effects.dmi', icon_state = "lightning")
+ owner.add_overlay(lightning_overlay)
+ lightning_timer = addtimer(CALLBACK(src, PROC_REF(clear_lightning_overlay)), time_to_last, (TIMER_UNIQUE|TIMER_OVERRIDE))
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/proc/clear_lightning_overlay()
+ owner.cut_overlay(lightning_overlay)
+ lightning_overlay = null
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/attack_self(mob/user, modifiers)
+ . = ..()
+ if(.)
+ return
+
+ if(core)
+ return attack(user, user, modifiers)
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/on_life(seconds_per_tick, times_fired)
+ . = ..()
+ if(owner.blood_volume <= BLOOD_VOLUME_NORMAL)
+ owner.blood_volume += 5 * seconds_per_tick
+ if(owner.health <= owner.crit_threshold)
+ activate_survival(owner)
+
+///Does a few things to try to help you live whatever you may be going through
+/obj/item/organ/internal/heart/cybernetic/anomalock/proc/activate_survival(mob/living/carbon/organ_owner)
+ if(!COOLDOWN_FINISHED(src, survival_cooldown))
+ return
+
+ organ_owner.apply_status_effect(/datum/status_effect/voltaic_overdrive)
+ add_lightning_overlay(30 SECONDS)
+ COOLDOWN_START(src, survival_cooldown, survival_cooldown_time)
+ addtimer(CALLBACK(src, PROC_REF(notify_cooldown), organ_owner), COOLDOWN_TIMELEFT(src, survival_cooldown))
+
+///Alerts our owner that the organ is ready to do its thing again
+/obj/item/organ/internal/heart/cybernetic/anomalock/proc/notify_cooldown(mob/living/carbon/organ_owner)
+ balloon_alert(organ_owner, "your heart strenghtens")
+ playsound(organ_owner, 'sound/items/eshield_recharge.ogg', 40)
+
+///Returns the mob we are implanted in so that the electricity effect doesn't runtime
+/obj/item/organ/internal/heart/cybernetic/anomalock/proc/get_held_mob()
+ return owner
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!istype(tool, required_anomaly))
+ return NONE
+ if(core)
+ balloon_alert(user, "core already in!")
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
+ core = tool
+ balloon_alert(user, "core installed")
+ playsound(src, 'sound/machines/click.ogg', 30, TRUE)
+ add_organ_trait(TRAIT_SHOCKIMMUNE)
+ update_icon_state()
+ return ITEM_INTERACT_SUCCESS
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/screwdriver_act(mob/living/user, obj/item/tool)
+ . = ..()
+ if(!core)
+ balloon_alert(user, "no core!")
+ return
+ if(!core_removable)
+ balloon_alert(user, "can't remove core!")
+ return
+ balloon_alert(user, "removing core...")
+ if(!do_after(user, 3 SECONDS, target = src))
+ balloon_alert(user, "interrupted!")
+ return
+ balloon_alert(user, "core removed")
+ core.forceMove(drop_location())
+ if(Adjacent(user) && !issilicon(user))
+ user.put_in_hands(core)
+ core = null
+ remove_organ_trait(TRAIT_SHOCKIMMUNE)
+ update_icon_state()
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/update_icon_state()
+ . = ..()
+ icon_state = initial(icon_state) + (core ? "-core" : "")
+
+/obj/item/organ/internal/heart/cybernetic/anomalock/prebuilt/Initialize(mapload)
+ . = ..()
+ core = new /obj/item/assembly/signaler/anomaly/flux(src)
+ update_icon_state()
+
+/datum/status_effect/voltaic_overdrive
+ id = "voltaic_overdrive"
+ duration = 30 SECONDS
+ alert_type = /atom/movable/screen/alert/status_effect/anomalock_active
+ show_duration = TRUE
+
+/datum/status_effect/voltaic_overdrive/tick(seconds_between_ticks)
+ . = ..()
+
+ if(owner.health <= owner.crit_threshold)
+ owner.heal_overall_damage(5, 5)
+ owner.adjustOxyLoss(-5)
+ owner.adjustToxLoss(-5)
+
+/datum/status_effect/voltaic_overdrive/on_apply()
+ . = ..()
+ owner.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+ REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT)
+ owner.reagents.add_reagent(/datum/reagent/medicine/coagulant, 5)
+ owner.add_filter("emp_shield", 2, outline_filter(1, "#639BFF"))
+ to_chat(owner, span_revendanger("You feel a burst of energy! It's do or die!"))
+ if(iscarbon(owner))
+ var/mob/living/carbon/carbon_owner = owner
+ carbon_owner.gain_trauma(/datum/brain_trauma/special/tenacity, TRAUMA_RESILIENCE_ABSOLUTE)
+
+/datum/status_effect/voltaic_overdrive/on_remove()
+ . = ..()
+ owner.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
+ owner.remove_filter("emp_shield")
+ owner.balloon_alert(owner, "your heart weakens")
+ if(iscarbon(owner))
+ var/mob/living/carbon/carbon_owner = owner
+ carbon_owner.cure_trauma_type(/datum/brain_trauma/special/tenacity, TRAUMA_RESILIENCE_ABSOLUTE)
+
+
+/atom/movable/screen/alert/status_effect/anomalock_active
+ name = "voltaic overdrive"
+ icon_state = "anomalock_heart"
+ desc = "Voltaic energy is flooding your muscles, keeping your body upright. You have 30 seconds before it falters!"
+
+#undef DOAFTER_IMPLANTING_HEART
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 17444590cf2ef..a555548e43268 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -124,10 +124,6 @@
if(isnull(step))
return FALSE
var/obj/item/tool = user.get_active_held_item()
- if(istype(tool, /obj/item/borg/cyborg_omnitool)) //catches borg surgeries
- var/obj/item/borg/cyborg_omnitool/toolarm = tool
- if(toolarm.selected)
- tool = toolarm.selected
if(step.try_op(user, target, user.zone_selected, tool, src, try_to_fail))
return TRUE
if(tool && tool.item_flags & SURGICAL_TOOL) //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 6c3ee9c014713..2bd8f485887f8 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -286,8 +286,8 @@
//saws are very accurate and fast at butchering
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/chainsaw)
- AddComponent(
- /datum/component/slapcrafting,\
+ AddElement(
+ /datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
@@ -316,6 +316,7 @@
attack_verb_continuous = list("slaps")
attack_verb_simple = list("slap")
interaction_flags_atom = parent_type::interaction_flags_atom | INTERACT_ATOM_IGNORE_MOBILITY
+ tool_behaviour = TOOL_DRAPES
/obj/item/surgical_drapes/Initialize(mapload)
. = ..()
diff --git a/code/modules/transport/tram/tram_floors.dm b/code/modules/transport/tram/tram_floors.dm
index 9f0b6907fe9c1..f267ccf5cdc84 100644
--- a/code/modules/transport/tram/tram_floors.dm
+++ b/code/modules/transport/tram/tram_floors.dm
@@ -183,7 +183,7 @@
integrity_failure = 0.75
armor_type = /datum/armor/tram_floor
layer = TRAM_FLOOR_LAYER
- plane = FLOOR_PLANE
+ plane = GAME_PLANE
obj_flags = BLOCK_Z_OUT_DOWN | BLOCK_Z_OUT_UP
appearance_flags = PIXEL_SCALE|KEEP_TOGETHER
var/secured = TRUE
diff --git a/code/modules/transport/tram/tram_signals.dm b/code/modules/transport/tram/tram_signals.dm
index db8aa17ddcb3e..faf4a46e11e28 100644
--- a/code/modules/transport/tram/tram_signals.dm
+++ b/code/modules/transport/tram/tram_signals.dm
@@ -473,6 +473,7 @@
icon_state = "sensor-base"
desc = "Uses an infrared beam to detect passing trams. Works when paired with a sensor on the other side of the track."
layer = TRAM_RAIL_LAYER
+ plane = FLOOR_PLANE
use_power = NO_POWER_USE
circuit = /obj/item/circuitboard/machine/guideway_sensor
/// Sensors work in a married pair
diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm
index 268452743e7b2..104601f2f6ca3 100644
--- a/code/modules/transport/transport_module.dm
+++ b/code/modules/transport/transport_module.dm
@@ -14,7 +14,7 @@
armor_type = /datum/armor/transport_module
max_integrity = 50
layer = TRAM_FLOOR_LAYER
- plane = FLOOR_PLANE
+ plane = GAME_PLANE
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_INDUSTRIAL_LIFT
canSmoothWith = SMOOTH_GROUP_INDUSTRIAL_LIFT
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 3fc6db542196e..8fafe30ac7b93 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -127,6 +127,7 @@
#include "container_sanity.dm"
#include "crayons.dm"
#include "create_and_destroy.dm"
+#include "cyborg_tool.dm"
#include "dcs_check_list_arguments.dm"
#include "dcs_get_id_from_elements.dm"
#include "designs.dm"
@@ -179,6 +180,7 @@
#include "map_landmarks.dm"
#include "mapload_space_verification.dm"
#include "mapping.dm"
+#include "mapping_nearstation_test.dm"
#include "mecha_damage.dm"
#include "medical_wounds.dm"
#include "merge_type.dm"
@@ -212,6 +214,7 @@
#include "pills.dm"
#include "plane_double_transform.dm"
#include "plane_dupe_detector.dm"
+#include "plane_sanity.dm"
#include "plantgrowth_tests.dm"
#include "preference_species.dm"
#include "preferences.dm"
@@ -255,6 +258,7 @@
#include "spell_mindswap.dm"
#include "spell_names.dm"
#include "spell_shapeshift.dm"
+#include "spell_timestop.dm"
#include "spies.dm"
#include "spritesheets.dm"
#include "stack_singular_name.dm"
diff --git a/code/modules/unit_tests/cyborg_tool.dm b/code/modules/unit_tests/cyborg_tool.dm
new file mode 100644
index 0000000000000..39aed619ec50d
--- /dev/null
+++ b/code/modules/unit_tests/cyborg_tool.dm
@@ -0,0 +1,20 @@
+/// Regression test for the cyborg omnitool to ensure it goes through proper channels
+/datum/unit_test/cyborg_tool
+ var/times_wrenched = 0
+
+/datum/unit_test/cyborg_tool/Run()
+ var/mob/living/carbon/human/consistent/not_a_borg = allocate(__IMPLIED_TYPE__)
+ var/obj/item/borg/cyborg_omnitool/engineering/tool = allocate(__IMPLIED_TYPE__)
+ tool.tool_behaviour = TOOL_WRENCH
+
+ not_a_borg.put_in_active_hand(tool)
+
+ var/obj/structure/frame/machine/frame = allocate(__IMPLIED_TYPE__)
+ RegisterSignal(frame, COMSIG_ATOM_TOOL_ACT(TOOL_WRENCH), PROC_REF(wrenched))
+
+ not_a_borg.ClickOn(frame)
+ TEST_ASSERT_EQUAL(times_wrenched, 1, "Wrenching the frame with a cyborg omnitool should have triggered the wrenched signal")
+
+/datum/unit_test/cyborg_tool/proc/wrenched(...)
+ SIGNAL_HANDLER
+ times_wrenched += 1
diff --git a/code/modules/unit_tests/focus_only_tests.dm b/code/modules/unit_tests/focus_only_tests.dm
index 15d04ee885233..31f34d9f2fb94 100644
--- a/code/modules/unit_tests/focus_only_tests.dm
+++ b/code/modules/unit_tests/focus_only_tests.dm
@@ -47,3 +47,6 @@
/// Checks that maploaded mobs with either the `atmos_requirements` or `body_temp_sensitive`
/datum/unit_test/focus_only/atmos_and_temp_requirements
+
+/// Ensures only whitelisted planes can have TOPDOWN_LAYERing, and vis versa
+/datum/unit_test/focus_only/topdown_filtering
diff --git a/code/modules/unit_tests/lootpanel.dm b/code/modules/unit_tests/lootpanel.dm
index 1903c22d54652..41374a1950c02 100644
--- a/code/modules/unit_tests/lootpanel.dm
+++ b/code/modules/unit_tests/lootpanel.dm
@@ -2,8 +2,8 @@
abstract_type = /datum/unit_test/lootpanel
/datum/unit_test/lootpanel/contents/Run()
- var/datum/client_interface/mock_client = new()
- var/datum/lootpanel/panel = new(mock_client)
+ var/datum/client_interface/mock_client = allocate(/datum/client_interface)
+ var/datum/lootpanel/panel = allocate(/datum/lootpanel, mock_client)
var/mob/living/carbon/human/labrat = allocate(/mob/living/carbon/human/consistent)
mock_client.mob = labrat
var/turf/one_over = locate(run_loc_floor_bottom_left.x + 1, run_loc_floor_bottom_left.y, run_loc_floor_bottom_left.z)
@@ -32,4 +32,3 @@
TEST_ASSERT_EQUAL(length(panel.contents), 2, "Panel shouldnt dupe searchables if reopened")
mock_client.mob = null
-
diff --git a/code/modules/unit_tests/mapload_space_verification.dm b/code/modules/unit_tests/mapload_space_verification.dm
index 35556c85fb482..843de4f8fdde2 100644
--- a/code/modules/unit_tests/mapload_space_verification.dm
+++ b/code/modules/unit_tests/mapload_space_verification.dm
@@ -32,6 +32,8 @@
var/area/turf_area = get_area(iterated_turf)
if(!isspaceturf(iterated_turf) || is_type_in_typecache(turf_area, excluded_area_typecache))
continue // Alright, so let's assume we have intended behavior. If something yorks, we'll get a bare `/area` (maploader?) or a mapper is doing something they shouldn't be doing.
+ if(HAS_TRAIT(iterated_turf, TRAIT_HYPERSPACE_STOPPED))
+ continue // This means that a shuttle with a noop template turf is just temporarily parked ontop of us and that we're not actually a part of it. We don't have to care about it as it will leave us alone when it flies away.
// We need turf_area.type for the error message because we have fifteen million ruin areas named "Unexplored Location" and it's completely unhelpful here.
TEST_FAIL("Space turf [iterated_turf.type] found in non-allowed area ([turf_area.type]) at [AREACOORD(iterated_turf)]! Please ensure that all space turfs are in an /area/space!")
diff --git a/code/modules/unit_tests/mapping_nearstation_test.dm b/code/modules/unit_tests/mapping_nearstation_test.dm
new file mode 100644
index 0000000000000..d428b826634b5
--- /dev/null
+++ b/code/modules/unit_tests/mapping_nearstation_test.dm
@@ -0,0 +1,40 @@
+///Detects movables that may have been accidentally placed in space, as well as movables which do not have the proper nearspace area (meaning they aren't lit properly.)
+/datum/unit_test/mapping_nearstation_test
+ priority = TEST_PRE
+
+/datum/unit_test/mapping_nearstation_test/Run()
+ if(SSmapping.is_planetary())
+ return //No need to test for orphaned spaced atoms on this map.
+
+ var/list/safe_atoms = typecacheof(list(
+ /atom/movable/mirage_holder,
+ /obj/docking_port,
+ /obj/effect/landmark,
+ /obj/effect/abstract,
+ /obj/effect/mapping_error,
+ )) //Mapping stuff that we don't actually have to be concerned about.
+ var/list/safe_areas = typecacheof(list(
+ /area/misc/testroom,
+ /area/station/holodeck,
+ ))
+
+ for(var/station_z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+ var/list/turfs_to_check = Z_TURFS(station_z)
+ for(var/turf/station_turf as anything in turfs_to_check)
+ var/area/turf_area = station_turf.loc
+ if(turf_area.static_lighting || is_type_in_typecache(turf_area, safe_areas)) //Only care about turfs that don't have lighting enabled.
+ continue
+ var/has_thing = FALSE
+ for(var/atom/movable/thing_on_the_turf as anything in station_turf.contents) //Find an item on the turf, this can help the mapper identify the turf more easily when combined with the exact coords.
+ if(is_type_in_typecache(thing_on_the_turf, safe_atoms))
+ continue
+ TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [thing_on_the_turf.type] with area of type [turf_area.type]")
+ has_thing = TRUE
+ break
+ if(!has_thing && !isspaceturf(station_turf) && !istype(station_turf, /turf/open/openspace)) //In case it's just a turf without an area
+ if(istype(station_turf, /turf/open/floor/engine/hull/ceiling))
+ TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [station_turf.type] with area of type [turf_area.type]. The turf on the z-level below is a shuttle dock and generated me! An error landmark has been generated on the map for easier debugging!")
+ else
+ TEST_FAIL("[station_turf.x], [station_turf.y], [station_turf.z]: [station_turf.type] with area of type [turf_area.type]")
+ if(!succeeded)
+ TEST_FAIL("Movable Atom located without a proper area. Please verify they are supposed to be there. If they are correct, change the area to /area/space/nearstation (or the correct surrounding type).")
diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm
index 554d226ed2e72..36fc4570540f4 100644
--- a/code/modules/unit_tests/outfit_sanity.dm
+++ b/code/modules/unit_tests/outfit_sanity.dm
@@ -16,7 +16,7 @@
uniform = /obj/item/clothing/under/suit/tuxedo
glasses = /obj/item/clothing/glasses/sunglasses
- mask = /obj/item/clothing/mask/cigarette/cigar/havana
+ mask = /obj/item/cigarette/cigar/havana
shoes = /obj/item/clothing/shoes/laceup
l_hand = /obj/item/stack/spacecash/c1000
r_hand = /obj/item/stack/spacecash/c1000
@@ -25,19 +25,19 @@
/datum/outfit/duffel_user
name = "Mr. Runtime"
back = /obj/item/storage/backpack/duffelbag
- backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana)
+ backpack_contents = list(/obj/item/cigarette/cigar/havana)
/// Satchels too
/datum/outfit/stachel_user
name = "Mr. Runtime"
back = /obj/item/storage/backpack/satchel
- backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana)
+ backpack_contents = list(/obj/item/cigarette/cigar/havana)
/// And just in case we'll check backpacks
/datum/outfit/backpack_user
name = "Mr. Runtime"
back = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/clothing/mask/cigarette/cigar/havana)
+ backpack_contents = list(/obj/item/cigarette/cigar/havana)
/datum/unit_test/outfit_sanity/Run()
var/datum/outfit/prototype_outfit = /datum/outfit
diff --git a/code/modules/unit_tests/plane_sanity.dm b/code/modules/unit_tests/plane_sanity.dm
new file mode 100644
index 0000000000000..890a0531908a4
--- /dev/null
+++ b/code/modules/unit_tests/plane_sanity.dm
@@ -0,0 +1,10 @@
+/// Ensures we have no invalid plane/layer combos post init
+/datum/unit_test/plane_layer_sanity
+ priority = TEST_LONGER
+
+/datum/unit_test/plane_layer_sanity/Run()
+ // This fucker's gonna be slow, I'm sorry
+ for(var/mutable_appearance/appearance)
+ check_topdown_validity(appearance)
+ for(var/atom/thing)
+ check_topdown_validity(thing)
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicateinfiltrator.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicateinfiltrator.png
index 0a9a5ef08e4ee..4c9212509d2ea 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicateinfiltrator.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicateinfiltrator.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicatesleeperagent.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicatesleeperagent.png
index 0a9a5ef08e4ee..4c9212509d2ea 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicatesleeperagent.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_syndicatesleeperagent.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_traitor.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_traitor.png
index 0a9a5ef08e4ee..4c9212509d2ea 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_traitor.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_traitor.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_dynamic_human_icons_syndicate_commando.png b/code/modules/unit_tests/screenshots/screenshot_dynamic_human_icons_syndicate_commando.png
index c29a1e742f1f4..adc462ace50d1 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_dynamic_human_icons_syndicate_commando.png and b/code/modules/unit_tests/screenshots/screenshot_dynamic_human_icons_syndicate_commando.png differ
diff --git a/code/modules/unit_tests/simple_animal_freeze.dm b/code/modules/unit_tests/simple_animal_freeze.dm
index 706fe290cccf4..2f4f7a4b70ae7 100644
--- a/code/modules/unit_tests/simple_animal_freeze.dm
+++ b/code/modules/unit_tests/simple_animal_freeze.dm
@@ -6,7 +6,6 @@
// If you are refactoring a simple_animal, REMOVE it from this list
var/list/allowed_types = list(
/mob/living/simple_animal/bot,
- /mob/living/simple_animal/bot/firebot,
/mob/living/simple_animal/bot/floorbot,
/mob/living/simple_animal/bot/mulebot,
/mob/living/simple_animal/bot/mulebot/paranormal,
@@ -58,6 +57,7 @@
/mob/living/simple_animal/hostile/megafauna/legion/medium/right,
/mob/living/simple_animal/hostile/megafauna/legion/small,
/mob/living/simple_animal/hostile/megafauna/wendigo,
+ /mob/living/simple_animal/hostile/megafauna/wendigo/noportal,
/mob/living/simple_animal/hostile/mimic,
/mob/living/simple_animal/hostile/mimic/copy,
/mob/living/simple_animal/hostile/mimic/copy/machine,
diff --git a/code/modules/unit_tests/spell_timestop.dm b/code/modules/unit_tests/spell_timestop.dm
new file mode 100644
index 0000000000000..f02900f7f8e77
--- /dev/null
+++ b/code/modules/unit_tests/spell_timestop.dm
@@ -0,0 +1,30 @@
+/// Regression test for timestop being a 3x3 instead of a 5x5
+/datum/unit_test/timestop
+
+/datum/unit_test/timestop/Run()
+ var/mob/living/carbon/human/dio = allocate(/mob/living/carbon/human/consistent)
+ var/mob/living/carbon/human/kakyoin = allocate(/mob/living/carbon/human/consistent)
+ var/mob/living/carbon/human/jotaro = allocate(/mob/living/carbon/human/consistent)
+
+ var/turf/center = run_loc_floor_bottom_left
+ var/turf/in_range = locate(center.x + 2, center.y + 2, center.z)
+ var/turf/out_of_range = locate(in_range.x + 1, in_range.y + 1, in_range.z)
+
+ dio.forceMove(center)
+ kakyoin.forceMove(in_range)
+ jotaro.forceMove(out_of_range)
+
+ var/datum/action/cooldown/spell/timestop/timestop = new(dio)
+ timestop.spell_requirements = NONE
+ timestop.Grant(dio)
+ timestop.Trigger()
+ var/obj/effect/timestop/time_effect = locate() in center
+ TEST_ASSERT(time_effect, "Failed to create timestop effect")
+ sleep(0.1 SECONDS) // timestop is invoked async so let's just wait
+
+ TEST_ASSERT(!dio.IsStun(), "Timestopper should not have frozen themselves when using timestop")
+ TEST_ASSERT(kakyoin.IsStun(), "Timestopper should have frozen the target within 2 tiles of range when using timestop")
+ TEST_ASSERT(!jotaro.IsStun(), "Timestopper should not have frozen the target outside of 2 tiles of range when using timestop")
+
+ // cleanup
+ qdel(time_effect)
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index afce8392d5828..ed2510b829434 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -286,6 +286,10 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
returnable_list += typesof(/obj/effect/anomaly/grav/high)
//See above
returnable_list += typesof(/obj/effect/timestop)
+ //Sparks can ignite a number of things, causing a fire to burn the floor away. Only you can prevent CI fires
+ returnable_list += typesof(/obj/effect/particle_effect/sparks)
+ //See above - These are one of those things.
+ returnable_list += typesof(/obj/effect/decal/cleanable/fuel_pool)
//Invoke async in init, skippppp
returnable_list += typesof(/mob/living/silicon/robot/model)
//This lad also sleeps
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
index 98378a9422a03..5e7ba1daba2be 100644
--- a/code/modules/uplink/uplink_items/job.dm
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -390,3 +390,4 @@
restricted = TRUE
refundable = FALSE
purchasable_from = parent_type::purchasable_from & ~UPLINK_SPY
+
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index faf95e8cd73c7..7da8fc0314b10 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -30,7 +30,7 @@
var/canmove = TRUE
var/list/autogrant_actions_passenger //plain list of typepaths
var/list/autogrant_actions_controller //assoc list "[bitflag]" = list(typepaths)
- var/list/mob/occupant_actions //assoc list mob = list(type = action datum assigned to mob)
+ var/list/list/datum/action/occupant_actions //assoc list mob = list(type = action datum assigned to mob)
///This vehicle will follow us when we move (like atrailer duh)
var/obj/vehicle/trailer
var/are_legs_exposed = FALSE
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index f36beee83cd77..d35df3126636e 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -16,6 +16,7 @@
* Clicks are wither translated into mech_melee_attack (see mech_melee_attack.dm)
* Or are used to call action() on equipped gear
* Cooldown for gear is on the mech because exploits
+ * Cooldown for melee is on mech_melee_attack also because exploits
*/
/obj/vehicle/sealed/mecha
name = "exosuit"
@@ -28,7 +29,6 @@
movedelay = 1 SECONDS
move_force = MOVE_FORCE_VERY_STRONG
move_resist = MOVE_FORCE_EXTREMELY_STRONG
- COOLDOWN_DECLARE(mecha_bump_smash)
light_system = OVERLAY_LIGHT_DIRECTIONAL
light_on = FALSE
light_range = 6
@@ -137,9 +137,18 @@
var/stepsound = 'sound/mecha/mechstep.ogg'
///Sound played when the mech walks
var/turnsound = 'sound/mecha/mechturn.ogg'
+ ///Sounds for types of melee attack
+ var/brute_attack_sound = 'sound/weapons/punch4.ogg'
+ var/burn_attack_sound = 'sound/items/welder.ogg'
+ var/tox_attack_sound = 'sound/effects/spray2.ogg'
+ ///Sound on wall destroying
+ var/destroy_wall_sound = 'sound/effects/meteorimpact.ogg'
+
+ ///Melee attack verb
+ var/list/attack_verbs = list("hit", "hits", "hitting")
///Cooldown duration between melee punches
- var/melee_cooldown = 10
+ var/melee_cooldown = CLICK_CD_SLOW
///TIme taken to leave the mech
var/exit_delay = 2 SECONDS
@@ -151,6 +160,8 @@
var/is_currently_ejecting = FALSE
///Safety for weapons. Won't fire if enabled, and toggled by middle click.
var/weapons_safety = FALSE
+ ///Don't play standard sound when set safety if TRUE.
+ var/safety_sound_custom = FALSE
var/datum/effect_system/fluid_spread/smoke/smoke_system
@@ -194,9 +205,6 @@
///Wether we are strafing
var/strafe = FALSE
- ///Cooldown length between bumpsmashes
- var/smashcooldown = 3
-
///Bool for whether this mech can only be used on lavaland
var/lavaland_only = FALSE
@@ -368,7 +376,8 @@
*/
/obj/vehicle/sealed/mecha/proc/set_safety(mob/user)
weapons_safety = !weapons_safety
- SEND_SOUND(user, sound('sound/machines/beep.ogg', volume = 25))
+ if(!safety_sound_custom)
+ SEND_SOUND(user, sound('sound/machines/beep.ogg', volume = 25))
balloon_alert(user, "equipment [weapons_safety ? "safe" : "ready"]")
set_mouse_pointer()
SEND_SIGNAL(src, COMSIG_MECH_SAFETIES_TOGGLE, user, weapons_safety)
@@ -703,10 +712,9 @@
return
use_energy(melee_energy_drain)
- SEND_SIGNAL(user, COMSIG_MOB_USED_MECH_MELEE, src)
- target.mech_melee_attack(src, user)
- TIMER_COOLDOWN_START(src, COOLDOWN_MECHA_MELEE_ATTACK, melee_cooldown)
-
+ SEND_SIGNAL(user, COMSIG_MOB_USED_CLICK_MECH_MELEE, src)
+ if(target.mech_melee_attack(src, user))
+ TIMER_COOLDOWN_START(src, COOLDOWN_MECHA_MELEE_ATTACK, melee_cooldown)
/// Driver alt clicks anything while in mech
/obj/vehicle/sealed/mecha/proc/on_click_alt(mob/user, atom/target, params)
@@ -909,3 +917,9 @@
act.button_icon_state = "mech_lights_off"
balloon_alert(occupant, "lights [mecha_flags & LIGHTS_ON ? "on":"off"]")
act.build_all_button_icons()
+
+/obj/vehicle/sealed/mecha/proc/melee_attack_effect(mob/living/victim, heavy)
+ if(heavy)
+ victim.Unconscious(2 SECONDS)
+ else
+ victim.Knockdown(4 SECONDS)
diff --git a/code/modules/vehicles/mecha/combat/justice.dm b/code/modules/vehicles/mecha/combat/justice.dm
new file mode 100644
index 0000000000000..babdb8af17b99
--- /dev/null
+++ b/code/modules/vehicles/mecha/combat/justice.dm
@@ -0,0 +1,535 @@
+#define DISMEMBER_CHANCE_HIGH 50
+#define DISMEMBER_CHANCE_LOW 25
+
+#define MOVEDELAY_ANGRY 4.5
+#define MOVEDELAY_SAFETY 2.5
+
+/obj/vehicle/sealed/mecha/justice
+ name = "\improper Justice"
+ desc = "Black and red syndicate mech designed for execution orders. \
+ For safety reasons, the syndicate advises against standing too close."
+ icon_state = "justice"
+ base_icon_state = "justice"
+ movedelay = MOVEDELAY_SAFETY // fast
+ max_integrity = 200 // but weak
+ accesses = list(ACCESS_SYNDICATE)
+ armor_type = /datum/armor/mecha_justice
+ max_temperature = 40000
+ force = 60 // dangerous in melee
+ damtype = BRUTE
+ destruction_sleep_duration = 10
+ exit_delay = 10
+ wreckage = /obj/structure/mecha_wreckage/justice
+ mech_type = EXOSUIT_MODULE_JUSTICE
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ mecha_flags = ID_LOCK_ON | QUIET_STEPS | QUIET_TURNS | CAN_STRAFE | HAS_LIGHTS | MMI_COMPATIBLE | IS_ENCLOSED
+ destroy_wall_sound = 'sound/mecha/mech_blade_break_wall.ogg'
+ brute_attack_sound = 'sound/mecha/mech_blade_attack.ogg'
+ attack_verbs = list("cut", "cuts", "cutting")
+ weapons_safety = TRUE
+ safety_sound_custom = TRUE
+ max_equip_by_category = list(
+ MECHA_L_ARM = null,
+ MECHA_R_ARM = null,
+ MECHA_UTILITY = 3,
+ MECHA_POWER = 1,
+ MECHA_ARMOR = 2,
+ )
+ step_energy_drain = 2
+
+/datum/armor/mecha_justice
+ melee = 30
+ bullet = 20
+ laser = 20
+ energy = 30
+ fire = 100
+ acid = 100
+
+/obj/vehicle/sealed/mecha/justice/Initialize(mapload, built_manually)
+ . = ..()
+ RegisterSignal(src, COMSIG_MECHA_MELEE_CLICK, PROC_REF(justice_fatality)) //We do not hit those who are in crit or stun. We are finishing them.
+ transform = transform.Scale(1.04, 1.04)
+
+/obj/vehicle/sealed/mecha/justice/generate_actions()
+ . = ..()
+ initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/invisibility)
+ initialize_passenger_action_type(/datum/action/vehicle/sealed/mecha/charge_attack)
+
+/obj/vehicle/sealed/mecha/justice/update_icon_state()
+ . = ..()
+ if(LAZYLEN(occupants))
+ icon_state = weapons_safety ? "[base_icon_state]" : "[base_icon_state]-angry"
+ if(!has_gravity())
+ icon_state = "[icon_state]-fly"
+
+/obj/vehicle/sealed/mecha/justice/set_safety(mob/user)
+ . = ..()
+ if(weapons_safety)
+ movedelay = MOVEDELAY_SAFETY
+ else
+ movedelay = MOVEDELAY_ANGRY
+
+ playsound(src, 'sound/mecha/mech_blade_safty.ogg', 75, FALSE) //everyone need to hear this sound
+
+ update_appearance(UPDATE_ICON_STATE)
+
+/obj/vehicle/sealed/mecha/justice/Move(newloc, dir)
+ if(HAS_TRAIT(src, TRAIT_IMMOBILIZED))
+ return
+ . = ..()
+ update_appearance(UPDATE_ICON_STATE)
+
+/// Says 1 of 3 epic phrases before attacking and make a finishing blow to targets in stun or crit after 1 SECOND.
+/obj/vehicle/sealed/mecha/justice/proc/justice_fatality(datum/source, mob/living/pilot, atom/target, on_cooldown, is_adjacent)
+ SIGNAL_HANDLER
+
+ if(!ishuman(target))
+ return FALSE
+ var/mob/living/carbon/human/live_or_dead = target
+ if(live_or_dead.stat < UNCONSCIOUS && live_or_dead.getStaminaLoss() < 100)
+ return FALSE
+ var/obj/item/bodypart/check_head = live_or_dead.get_bodypart(BODY_ZONE_HEAD)
+ if(!check_head)
+ return FALSE
+ INVOKE_ASYNC(src, PROC_REF(finish_him), src, pilot, live_or_dead)
+ return TRUE
+
+/**
+ * ## finish_him
+ *
+ * Target's head is cut off (if it has one)
+ * Attack from invisibility and charged attack have higher priority.
+ * Arguments:
+ * * finisher - Mech pilot who makes an attack.
+ * * him - Target at which the mech makes an attack.
+ */
+/obj/vehicle/sealed/mecha/justice/proc/finish_him(obj/vehicle/sealed/mecha/my_mech, mob/finisher, mob/living/him)
+ say(pick("Take my Justice-Slash!", "A falling leaf...", "Justice is quite a lonely path"), forced = "Justice Mech")
+ playsound(src, 'sound/mecha/mech_stealth_pre_attack.ogg', 75, FALSE)
+ if(!do_after(finisher, 1 SECONDS, him))
+ return
+ if(QDELETED(finisher))
+ return
+ if(QDELETED(him))
+ return
+ if(QDELETED(my_mech))
+ return
+ if(!LAZYLEN(my_mech.occupants))
+ return
+ var/turf/finish_turf = get_step(him, get_dir(my_mech, him))
+ var/turf/for_line_turf = get_turf(my_mech)
+ var/obj/item/bodypart/in_your_head = him.get_bodypart(BODY_ZONE_HEAD)
+ in_your_head?.dismember(BRUTE)
+ playsound(src, brute_attack_sound, 75, FALSE)
+ for_line_turf.Beam(src, icon_state = "mech_charge", time = 8)
+ forceMove(finish_turf)
+
+/obj/vehicle/sealed/mecha/justice/melee_attack_effect(mob/living/victim, heavy)
+ if(!heavy)
+ victim.Knockdown(4 SECONDS)
+ return
+ if(!prob(DISMEMBER_CHANCE_HIGH))
+ return
+ var/obj/item/bodypart/cut_bodypart = victim.get_bodypart(pick(BODY_ZONE_R_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG))
+ cut_bodypart?.dismember(BRUTE)
+
+
+/obj/vehicle/sealed/mecha/justice/mob_exit(mob/M, silent, randomstep, forced)
+ . = ..()
+ if(alpha == 255)
+ return
+ animate(src, alpha = 255, time = 0.5 SECONDS)
+ playsound(src, 'sound/mecha/mech_stealth_effect.ogg' , 75, FALSE)
+
+/obj/vehicle/sealed/mecha/justice/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration)
+ if(LAZYLEN(occupants))
+ if(prob(60))
+ new /obj/effect/temp_visual/mech_sparks(get_turf(src))
+ playsound(src, 'sound/mecha/mech_stealth_effect.ogg' , 75, FALSE)
+ return
+ return ..()
+
+/datum/action/vehicle/sealed/mecha/invisibility
+ name = "Invisibility"
+ button_icon_state = "mech_stealth_off"
+ /// Is invisibility activated.
+ var/on = FALSE
+ /// Recharge check.
+ var/charge = TRUE
+ /// Varset for invisibility timer
+ var/invisibility_timer
+ /// Energy cost to become invisibile
+ var/energy_cost = 200
+ /// Aoe pre attack sound.
+ var/stealth_pre_attack_sound = 'sound/mecha/mech_stealth_pre_attack.ogg'
+ /// Aoe attack sound.
+ var/stealth_attack_sound = 'sound/mecha/mech_stealth_attack.ogg'
+
+/datum/action/vehicle/sealed/mecha/invisibility/set_chassis(passed_chassis)
+ . = ..()
+ RegisterSignal(chassis, COMSIG_MECH_SAFETIES_TOGGLE, PROC_REF(on_toggle_safety))
+
+/// update button icon when toggle safety.
+/datum/action/vehicle/sealed/mecha/invisibility/proc/on_toggle_safety()
+ SIGNAL_HANDLER
+
+ build_all_button_icons(UPDATE_BUTTON_STATUS)
+
+/datum/action/vehicle/sealed/mecha/invisibility/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ on = !on
+ if(on)
+ invisibility_on()
+ else
+ invisibility_off()
+
+/datum/action/vehicle/sealed/mecha/invisibility/IsAvailable(feedback)
+ . = ..()
+ if(!.)
+ return FALSE
+ if(!chassis.has_charge(energy_cost))
+ if(feedback)
+ owner.balloon_alert(owner, "not enough energy!")
+ return FALSE
+ if(chassis.weapons_safety)
+ if(feedback)
+ owner.balloon_alert(owner, "safety is on!")
+ return FALSE
+ if(!charge)
+ if(feedback)
+ owner.balloon_alert(owner, "recharging!")
+ return FALSE
+
+ return TRUE
+
+///Called when invisibility activated.
+/datum/action/vehicle/sealed/mecha/invisibility/proc/invisibility_on()
+ new /obj/effect/temp_visual/mech_sparks(get_turf(chassis))
+ playsound(chassis, 'sound/mecha/mech_stealth_effect.ogg' , 75, FALSE)
+ check_charge_attack()
+ animate(chassis, alpha = 0, time = 0.5 SECONDS)
+ button_icon_state = "mech_stealth_on"
+ invisibility_timer = addtimer(CALLBACK(src, PROC_REF(end_stealth)), 20 SECONDS)
+ RegisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK, PROC_REF(stealth_attack_aoe))
+ RegisterSignal(chassis, COMSIG_MOVABLE_BUMP, PROC_REF(bumb_on))
+ RegisterSignal(chassis, COMSIG_ATOM_BUMPED, PROC_REF(bumbed_on))
+ RegisterSignal(chassis, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(take_damage))
+ chassis.use_energy(energy_cost)
+ build_all_button_icons()
+
+///Called when invisibility deactivated.
+/datum/action/vehicle/sealed/mecha/invisibility/proc/invisibility_off()
+ new /obj/effect/temp_visual/mech_sparks(get_turf(chassis))
+ playsound(chassis, 'sound/mecha/mech_stealth_effect.ogg' , 75, FALSE)
+ invisibility_timer = null
+ charge = FALSE
+ addtimer(CALLBACK(src, PROC_REF(charge)), 5 SECONDS)
+ button_icon_state = "mech_stealth_cooldown"
+ animate(chassis, alpha = 255, time = 0.5 SECONDS)
+ UnregisterSignal(chassis, list(
+ COMSIG_MECHA_MELEE_CLICK,
+ COMSIG_MOVABLE_BUMP,
+ COMSIG_ATOM_BUMPED,
+ COMSIG_ATOM_TAKE_DAMAGE
+ ))
+ build_all_button_icons()
+
+///Check if mech use charge attack and deactivate it when we activate invisibility.
+/datum/action/vehicle/sealed/mecha/invisibility/proc/check_charge_attack()
+ for(var/mob/living/occupant in chassis.occupants)
+ var/datum/action/vehicle/sealed/mecha/charge_attack/charge_action = LAZYACCESSASSOC(chassis.occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/charge_attack)
+ if(charge_action?.on)
+ charge_action.on = !on
+ charge_action.charge_attack_off()
+/**
+ * ## end_stealth
+ *
+ * Called when mech runs out of invisibility time.
+ */
+/datum/action/vehicle/sealed/mecha/invisibility/proc/end_stealth()
+ make_visible()
+
+/**
+ * ## bumb_on
+ *
+ * Called when mech bumb on somthing. If is living somthing shutdown mech invisibility.
+ */
+/datum/action/vehicle/sealed/mecha/invisibility/proc/bumb_on(obj/vehicle/sealed/mecha/our_mech, atom/obstacle)
+ SIGNAL_HANDLER
+
+ if(!isliving(obstacle))
+ return
+ make_visible()
+
+/**
+ * ## bumbed_on
+ *
+ * Called when somthing bumbed on mech. If is living somthing shutdown mech invisibility.
+ */
+/datum/action/vehicle/sealed/mecha/invisibility/proc/bumbed_on(obj/vehicle/sealed/mecha/our_mech, atom/movable/bumped_atom)
+ SIGNAL_HANDLER
+
+ if(!isliving(bumped_atom))
+ return
+ make_visible()
+
+/**
+ * ## take_damage
+ *
+ * Called when mech take damage. Shutdown mech invisibility.
+ */
+/datum/action/vehicle/sealed/mecha/invisibility/proc/take_damage(obj/vehicle/sealed/mecha/our_mech)
+ SIGNAL_HANDLER
+
+ make_visible()
+
+/**
+ * ## make_visible
+ *
+ * Called when somthing force invisibility shutdown.
+ */
+/datum/action/vehicle/sealed/mecha/invisibility/proc/make_visible()
+ if(!on)
+ return
+ on = !on
+ invisibility_off()
+
+/**
+ * Proc makes an AOE attack after 1 SECOND.
+ * Called by the mech pilot when he is in stealth mode and wants to attack.
+ * During this, mech cannot move.
+*/
+/datum/action/vehicle/sealed/mecha/invisibility/proc/stealth_attack_aoe(datum/source, mob/living/pilot, atom/target, on_cooldown, is_adjacent)
+ SIGNAL_HANDLER
+
+ if(!charge)
+ return FALSE
+ if(chassis.alpha != 0)
+ UnregisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK)
+ return FALSE
+ UnregisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK)
+ new /obj/effect/temp_visual/mech_attack_aoe_charge(get_turf(chassis))
+ ADD_TRAIT(chassis, TRAIT_IMMOBILIZED, REF(src))
+ playsound(chassis, stealth_pre_attack_sound, 75, FALSE)
+ addtimer(CALLBACK(src, PROC_REF(attack_in_aoe), pilot), 1 SECONDS)
+ return TRUE
+
+/**
+ * ## attack_in_aoe
+ *
+ * Brings mech out of invisibility.
+ * Deal everyone in range 3x3 35 damage and 25 chanse to cut off limb.
+ * Arguments:
+ * * pilot - occupant inside mech.
+ */
+/datum/action/vehicle/sealed/mecha/invisibility/proc/attack_in_aoe(mob/living/pilot)
+ invisibility_off()
+ new /obj/effect/temp_visual/mech_attack_aoe_attack(get_turf(chassis))
+ for(var/mob/living/something_living in range(1, get_turf(chassis)))
+ if(something_living.stat >= UNCONSCIOUS)
+ continue
+ if(something_living.getStaminaLoss() >= 100)
+ continue
+ if(something_living == pilot)
+ continue
+ if(prob(DISMEMBER_CHANCE_LOW))
+ var/obj/item/bodypart/cut_bodypart = something_living.get_bodypart(pick(BODY_ZONE_R_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG))
+ cut_bodypart?.dismember(BRUTE)
+ something_living.apply_damage(35, BRUTE)
+ playsound(chassis, stealth_attack_sound, 75, FALSE)
+ REMOVE_TRAIT(chassis, TRAIT_IMMOBILIZED, REF(src))
+ on = !on
+ charge = FALSE
+ button_icon_state = "mech_stealth_cooldown"
+ build_all_button_icons()
+ addtimer(CALLBACK(src, PROC_REF(charge)), 5 SECONDS)
+
+/**
+ * ## charge
+ *
+ * Recharge invisibility action after 5 SECONDS.
+ */
+/datum/action/vehicle/sealed/mecha/invisibility/proc/charge()
+ button_icon_state = "mech_stealth_off"
+ charge = TRUE
+ build_all_button_icons()
+
+/datum/action/vehicle/sealed/mecha/charge_attack
+ name = "Charge Attack"
+ button_icon_state = "mech_charge_off"
+ /// Is charge attack activated.
+ var/on = FALSE
+ /// Recharge check.
+ var/charge = TRUE
+ /// Energy cost to perform charge attack
+ var/energy_cost = 400
+ /// Maximum range of charge attack.
+ var/max_charge_range = 7
+ /// Sound when mech do charge attack.
+ var/charge_attack_sound = 'sound/mecha/mech_charge_attack.ogg'
+
+/datum/action/vehicle/sealed/mecha/charge_attack/set_chassis(passed_chassis)
+ . = ..()
+ RegisterSignal(chassis, COMSIG_MECH_SAFETIES_TOGGLE, PROC_REF(on_toggle_safety))
+
+/// update button icon when toggle safety.
+/datum/action/vehicle/sealed/mecha/charge_attack/proc/on_toggle_safety()
+ SIGNAL_HANDLER
+
+ build_all_button_icons(UPDATE_BUTTON_STATUS)
+
+/datum/action/vehicle/sealed/mecha/charge_attack/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ on = !on
+ if(on)
+ charge_attack_on()
+ else
+ charge_attack_off()
+
+/datum/action/vehicle/sealed/mecha/charge_attack/IsAvailable(feedback)
+ . = ..()
+ if(!.)
+ return FALSE
+ if(!chassis.has_charge(energy_cost))
+ if(feedback)
+ owner.balloon_alert(owner, "not enough energy!")
+ return FALSE
+ if(chassis.weapons_safety)
+ if(feedback)
+ owner.balloon_alert(owner, "safety is on!")
+ return FALSE
+ if(!charge)
+ if(feedback)
+ owner.balloon_alert(owner, "recharging!")
+ return FALSE
+
+ return TRUE
+
+///Called when charge attack activated
+/datum/action/vehicle/sealed/mecha/charge_attack/proc/charge_attack_on()
+ check_visability()
+ button_icon_state = "mech_charge_on"
+ RegisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK, PROC_REF(click_try_charge))
+ build_all_button_icons()
+
+///Called when charge attack deactivated
+/datum/action/vehicle/sealed/mecha/charge_attack/proc/charge_attack_off()
+ button_icon_state = "mech_charge_off"
+ UnregisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK)
+ build_all_button_icons()
+
+///Check if mech use invisibility and deactivate it when we activate charge attack.
+/datum/action/vehicle/sealed/mecha/charge_attack/proc/check_visability()
+ for(var/who_inside in chassis.occupants)
+ var/mob/living/occupant = who_inside
+ var/datum/action/vehicle/sealed/mecha/invisibility/stealth_action = LAZYACCESSASSOC(chassis.occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/invisibility)
+ if(stealth_action?.on)
+ stealth_action.make_visible()
+
+///Called when mech attacks with charge attack enabled.
+/datum/action/vehicle/sealed/mecha/charge_attack/proc/click_try_charge(datum/source, mob/living/pilot, atom/target, on_cooldown, is_adjacent)
+ SIGNAL_HANDLER
+
+ var/turf = get_turf(target)
+ if(!on)
+ UnregisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK)
+ return FALSE
+ if(isnull(turf))
+ pilot.balloon_alert(pilot, "invalid direction!")
+ return FALSE
+ if(!charge)
+ pilot.balloon_alert(pilot, "recharging!")
+ return FALSE
+ else
+ if(charge_attack(pilot, turf))
+ return TRUE
+ return FALSE
+
+/**
+ * ## charge_attack
+ *
+ * Deal everyone in line for mech location to mouse location 35 damage and 25 chanse to cut off limb.
+ * Teleport mech to the end of line.
+ * Arguments:
+ * * charger - occupant inside mech.
+ * * target - occupant inside mech.
+ */
+/datum/action/vehicle/sealed/mecha/charge_attack/proc/charge_attack(mob/living/charger, turf/target)
+ var/turf/start_charge_here = get_turf(charger)
+ var/charge_range = min(get_dist_euclidean(start_charge_here, target), max_charge_range)
+ var/turf/but_we_gonna_here = get_ranged_target_turf(start_charge_here, get_dir(start_charge_here, target), floor(charge_range))
+ var/turf/here_we_go = start_charge_here
+ for(var/turf/line_turf in get_line(get_step(start_charge_here, get_dir(start_charge_here, target)), but_we_gonna_here))
+ if(get_turf(charger) == get_turf(line_turf))
+ continue
+ if(isclosedturf(line_turf))
+ break
+ var/obj/machinery/power/supermatter_crystal/funny_crystal = locate() in line_turf
+ if(funny_crystal)
+ funny_crystal.Bumped(chassis)
+ break
+ var/obj/machinery/door/airlock/like_a_wall = locate() in line_turf
+ if(like_a_wall?.density)
+ break
+ if(locate(/obj/structure/window) in line_turf)
+ break
+ for(var/mob/living/something_living in line_turf.contents)
+ if(something_living.stat >= UNCONSCIOUS || something_living.getStaminaLoss() >= 100 || something_living == charger)
+ continue
+ if(prob(DISMEMBER_CHANCE_LOW))
+ var/obj/item/bodypart/cut_bodypart = something_living.get_bodypart(pick(BODY_ZONE_R_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_ARM, BODY_ZONE_L_LEG, BODY_ZONE_HEAD))
+ cut_bodypart?.dismember(BRUTE)
+ something_living.apply_damage(35, BRUTE)
+ here_we_go = line_turf
+
+ // If the mech didn't move, it didn't charge
+ if(here_we_go == start_charge_here)
+ charger.balloon_alert(charger, "invalid direction!")
+ return FALSE
+ chassis.forceMove(here_we_go)
+ start_charge_here.Beam(chassis, icon_state = "mech_charge", time = 8)
+ playsound(chassis, charge_attack_sound, 75, FALSE)
+ on = !on
+ chassis.use_energy(energy_cost)
+ UnregisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK)
+ charge = FALSE
+ button_icon_state = "mech_charge_cooldown"
+ build_all_button_icons()
+ addtimer(CALLBACK(src, PROC_REF(charge)), 5 SECONDS)
+ return TRUE
+
+/**
+ * ## charge
+ *
+ * Recharge charge attack action after 5 SECONDS.
+ */
+/datum/action/vehicle/sealed/mecha/charge_attack/proc/charge()
+ charge = TRUE
+ button_icon_state = "mech_charge_off"
+ build_all_button_icons()
+
+/obj/vehicle/sealed/mecha/justice/loaded
+ equip_by_category = list(
+ MECHA_L_ARM = null,
+ MECHA_R_ARM = null,
+ MECHA_UTILITY = list(/obj/item/mecha_parts/mecha_equipment/radio, /obj/item/mecha_parts/mecha_equipment/air_tank/full, /obj/item/mecha_parts/mecha_equipment/thrusters/ion),
+ MECHA_POWER = list(),
+ MECHA_ARMOR = list(),
+ )
+
+/obj/vehicle/sealed/mecha/justice/loaded/populate_parts()
+ cell = new /obj/item/stock_parts/power_store/cell/bluespace(src)
+ scanmod = new /obj/item/stock_parts/scanning_module/triphasic(src)
+ capacitor = new /obj/item/stock_parts/capacitor/quadratic(src)
+ servo = new /obj/item/stock_parts/servo/femto(src)
+ update_part_values()
+
+#undef DISMEMBER_CHANCE_HIGH
+#undef DISMEMBER_CHANCE_LOW
+
+#undef MOVEDELAY_ANGRY
+#undef MOVEDELAY_SAFETY
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index d13b90e5659f7..0bb691160b373 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -4,14 +4,22 @@
equipment_slot = MECHA_WEAPON
destroy_sound = 'sound/mecha/weapdestr.ogg'
mech_flags = EXOSUIT_MODULE_COMBAT
+ /// The type of bullet generated by the mecha weapon.
var/projectile
+ /// The sound of the mecha weapon firing.
var/fire_sound
+ /// How many shots are fired per action.
var/projectiles_per_shot = 1
+ /// The degrees by which each individual bullet fans out from a central point. A predictable spray of bullets.
var/variance = 0
- var/randomspread = FALSE //use random spread for machineguns, instead of shotgun scatter
+ /// Whether our bullets go off trajectory while firing randomly. Used to replicate recoil and not a structured, predictable spray.
+ var/randomspread = FALSE
+ /// The amount in deciseconds that the weapon sleeps between shots to simulate a 'burst fire'. The delay stops another bullet from being fired while sleeping.
var/projectile_delay = 0
- var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the weapon is fired.
- var/kickback = TRUE //Will using this weapon in no grav push mecha back.
+ //the visual effect appearing when the weapon is fired.
+ var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
+ /// Will using this weapon in no grav push mecha back.
+ var/kickback = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/special_attaching_interaction(attach_right = FALSE, obj/vehicle/sealed/mecha/mech, mob/user, checkonly = FALSE)
var/obj/item/mecha_parts/mecha_equipment/concealed_weapon_bay/bay
@@ -43,23 +51,25 @@
/obj/item/mecha_parts/mecha_equipment/weapon/action(mob/source, atom/target, list/modifiers)
if(!action_checks(target))
return FALSE
+
+ /// Find our mecha, find the opposite direction. Used for kickback while the mecha is drifting in zero-g to launch us in this direction.
var/newtonian_target = REVERSE_DIR(chassis.dir)
. = ..()//start the cooldown early because of sleeps
- for(var/i in 1 to projectiles_per_shot)
+ for(var/projectiles_to_shoot in 1 to projectiles_per_shot)
if(energy_drain && !chassis.has_charge(energy_drain))//in case we run out of energy mid-burst, such as emp
break
var/spread = 0
if(variance)
if(randomspread)
- spread = round((rand() - 0.5) * variance)
+ spread = round((rand(0 , 1) - 0.5) * variance, 1)
else
- spread = round((i / projectiles_per_shot - 0.5) * variance)
+ spread = round((projectiles_to_shoot / projectiles_per_shot - 0.5) * variance, 1)
var/obj/projectile/projectile_obj = new projectile(get_turf(src))
projectile_obj.log_override = TRUE //we log being fired ourselves a little further down.
projectile_obj.firer = chassis
projectile_obj.preparePixelProjectile(target, source, modifiers, spread)
- if(source.client && isliving(source)) //dont want it to happen from syndie mecha npc mobs, they do direct fire anyways
+ if(isliving(source) && source.client) //dont want it to happen from syndie mecha npc mobs, they do direct fire anyways
var/mob/living/shooter = source
projectile_obj.hit_prone_targets = shooter.combat_mode
projectile_obj.fire()
diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm
index 47c116cbc6029..c2d37ee6e8348 100644
--- a/code/modules/vehicles/mecha/mech_fabricator.dm
+++ b/code/modules/vehicles/mecha/mech_fabricator.dm
@@ -49,12 +49,24 @@
/// All designs in the techweb that can be fabricated by this machine, since the last update.
var/list/datum/design/cached_designs
+ //looping sound for printing items
+ var/datum/looping_sound/lathe_print/print_sound
+
+ /// Local designs that only this mechfab have(using when mechfab emaged so it's illegal designs).
+ var/list/datum/design/illegal_local_designs
+
/obj/machinery/mecha_part_fabricator/Initialize(mapload)
+ print_sound = new(src, FALSE)
rmat = AddComponent(/datum/component/remote_materials, mapload && link_on_init)
cached_designs = list()
+ illegal_local_designs = list()
RefreshParts() //Recalculating local material sizes if the fab isn't linked
return ..()
+/obj/machinery/mecha_part_fabricator/Destroy()
+ QDEL_NULL(print_sound)
+ return ..()
+
/obj/machinery/mecha_part_fabricator/post_machine_initialize()
. = ..()
if(!CONFIG_GET(flag/no_default_techweb_link) && !stored_research)
@@ -134,6 +146,26 @@
balloon_alert(user, "rotated to [dir2text(dir)].")
return CLICK_ACTION_SUCCESS
+/obj/machinery/mecha_part_fabricator/emag_act(mob/user, obj/item/card/emag/emag_card)
+ if(obj_flags & EMAGGED)
+ return FALSE
+ if(user.job != JOB_ROBOTICIST)
+ to_chat(user, span_warning("You clicking and typing but don’t understand what to do with it"))
+ return FALSE
+ obj_flags |= EMAGGED
+ for(var/found_illegal_mech_nods in SSresearch.techweb_nodes)
+ var/datum/techweb_node/illegal_mech_node = SSresearch.techweb_nodes[found_illegal_mech_nods]
+ if(!illegal_mech_node?.illegal_mech_node)
+ continue
+ for(var/id in illegal_mech_node.design_ids)
+ var/datum/design/illegal_mech_design = SSresearch.techweb_design_by_id(id)
+ illegal_local_designs |= illegal_mech_design
+ cached_designs |= illegal_mech_design
+ say("R$c!i&ed ERROR de#i$ns. C@n%ec$%ng to ~NULL~ se%ve$s.")
+ playsound(src, 'sound/machines/uplinkerror.ogg', 50, TRUE)
+ update_static_data_for_all_viewers()
+ return TRUE
+
/**
* Updates the `final_sets` and `buildable_parts` for the current mecha fabricator.
*/
@@ -163,7 +195,7 @@
/obj/machinery/mecha_part_fabricator/proc/on_start_printing()
add_overlay("fab-active")
update_use_power(ACTIVE_POWER_USE)
-
+ print_sound.start()
/**
* Intended to be called when the exofab has stopped working and is no longer printing items.
*
@@ -174,6 +206,7 @@
update_use_power(IDLE_POWER_USE)
desc = initial(desc)
process_queue = FALSE
+ print_sound.stop()
/**
* Attempts to build the next item in the build queue.
@@ -342,7 +375,7 @@
for(var/datum/design/design in cached_designs)
var/cost = list()
- var/list/materials = design["materials"]
+ var/list/materials = design.materials
for(var/datum/material/mat in materials)
cost[mat.name] = OPTIMAL_COST(materials[mat] * component_coeff)
@@ -409,7 +442,7 @@
if(!istext(design_id))
continue
- if(!stored_research.researched_designs.Find(design_id))
+ if(!(stored_research.researched_designs.Find(design_id) || is_type_in_list(SSresearch.techweb_design_by_id(design_id), illegal_local_designs)))
continue
var/datum/design/design = SSresearch.techweb_design_by_id(design_id)
diff --git a/code/modules/vehicles/mecha/mech_melee_attack.dm b/code/modules/vehicles/mecha/mech_melee_attack.dm
index 08669ebdd0ca8..655a2f3533936 100644
--- a/code/modules/vehicles/mecha/mech_melee_attack.dm
+++ b/code/modules/vehicles/mecha/mech_melee_attack.dm
@@ -2,7 +2,7 @@
* ## Mech melee attack
* Called when a mech melees a target with fists
* Handles damaging the target & associated effects
- * return value is number of damage dealt
+ * return value is number of damage dealt. returning a value puts our mech onto attack cooldown.
* Arguments:
* * mecha_attacker: Mech attacking this target
* * user: mob that initiated the attack from inside the mech as a controller
@@ -10,28 +10,35 @@
/atom/proc/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
SHOULD_CALL_PARENT(TRUE)
SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_MECH, mecha_attacker, user)
- log_combat(user, src, "attacked", mecha_attacker, "(COMBAT MODE: [uppertext(user.combat_mode)] (DAMTYPE: [uppertext(mecha_attacker.damtype)])")
+ if(!isnull(user))
+ log_combat(user, src, "attacked", mecha_attacker, "(COMBAT MODE: [uppertext(user?.combat_mode)] (DAMTYPE: [uppertext(mecha_attacker.damtype)])")
return 0
/turf/closed/wall/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+ if(!user.combat_mode)
+ return 0
+
mecha_attacker.do_attack_animation(src)
switch(mecha_attacker.damtype)
if(BRUTE)
- playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
+ playsound(src, mecha_attacker.brute_attack_sound, 50, TRUE)
if(BURN)
- playsound(src, 'sound/items/welder.ogg', 50, TRUE)
+ playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
else
return 0
mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
if(prob(hardness + mecha_attacker.force) && mecha_attacker.force > 20)
dismantle_wall(1)
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
+ playsound(src, mecha_attacker.destroy_wall_sound, 100, TRUE)
else
add_dent(WALL_DENT_HIT)
..()
return 100 //this is an arbitrary "damage" number since the actual damage is rng dismantle
-/obj/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+/obj/structure/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+ if(!user.combat_mode)
+ return 0
+
mecha_attacker.do_attack_animation(src)
switch(mecha_attacker.damtype)
if(BRUTE)
@@ -44,13 +51,29 @@
..()
return take_damage(mecha_attacker.force * 3, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
+/obj/machinery/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
+ if(!user.combat_mode)
+ return 0
+
+ mecha_attacker.do_attack_animation(src)
+ switch(mecha_attacker.damtype)
+ if(BRUTE)
+ playsound(src, mecha_attacker.brute_attack_sound, 50, TRUE)
+ if(BURN)
+ playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
+ else
+ return 0
+ mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
+ ..()
+ return take_damage(mecha_attacker.force * 3, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
+
/obj/structure/window/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
if(!can_be_reached())
return 0
return ..()
/mob/living/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
- if(!user.combat_mode)
+ if(istype(user) && !user.combat_mode)
step_away(src, mecha_attacker)
log_combat(user, src, "pushed", mecha_attacker)
visible_message(span_warning("[mecha_attacker] pushes [src] out of the way."), \
@@ -58,36 +81,41 @@
to_chat(mecha_attacker, span_danger("You push [src] out of the way."))
return 0
- if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ if(!isnull(user) && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to harm other living beings!"))
return 0
mecha_attacker.do_attack_animation(src)
if(mecha_attacker.damtype == BRUTE)
step_away(src, mecha_attacker, 15)
var/obj/item/bodypart/selected_zone = get_bodypart(pick(BODY_ZONE_CHEST, BODY_ZONE_CHEST, BODY_ZONE_CHEST, BODY_ZONE_HEAD))
- if(selected_zone)
- var/dmg = rand(mecha_attacker.force * 0.5, mecha_attacker.force)
- switch(mecha_attacker.damtype)
- if(BRUTE)
- if(mecha_attacker.force > 35) // durand and other heavy mechas
- Unconscious(20)
- else if(mecha_attacker.force > 20 && !IsKnockdown()) // lightweight mechas like gygax
- Knockdown(40)
+ var/dmg = rand(mecha_attacker.force * 0.5, mecha_attacker.force)
+ switch(mecha_attacker.damtype)
+ if(BRUTE)
+ if(mecha_attacker.force > 35) // durand and other heavy mechas
+ mecha_attacker.melee_attack_effect(src, heavy = TRUE)
+ else if(mecha_attacker.force > 20 && !IsKnockdown()) // lightweight mechas like gygax
+ mecha_attacker.melee_attack_effect(src, heavy = FALSE)
+ if(selected_zone)
selected_zone.receive_damage(dmg, 0, updating_health = TRUE)
- playsound(src, 'sound/weapons/punch4.ogg', 50, TRUE)
- if(FIRE)
+ else
+ apply_damage(dmg, BRUTE)
+ playsound(src, mecha_attacker.brute_attack_sound, 50, TRUE)
+ if(FIRE)
+ if(selected_zone)
selected_zone.receive_damage(0, dmg, updating_health = TRUE)
- playsound(src, 'sound/items/welder.ogg', 50, TRUE)
- if(TOX)
- playsound(src, 'sound/effects/spray2.ogg', 50, TRUE)
- if((reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + mecha_attacker.force) < mecha_attacker.force*2)
- reagents.add_reagent(/datum/reagent/cryptobiolin, mecha_attacker.force/2)
- if((reagents.get_reagent_amount(/datum/reagent/toxin) + mecha_attacker.force) < mecha_attacker.force*2)
- reagents.add_reagent(/datum/reagent/toxin, mecha_attacker.force/2.5)
else
- return 0
- . = dmg
- visible_message(span_danger("[mecha_attacker.name] hits [src]!"), \
- span_userdanger("[mecha_attacker.name] hits you!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, list(mecha_attacker))
- to_chat(mecha_attacker, span_danger("You hit [src]!"))
+ apply_damage(dmg, BURN)
+ playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
+ if(TOX)
+ playsound(src, mecha_attacker.tox_attack_sound, 50, TRUE)
+ if((reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + mecha_attacker.force) < mecha_attacker.force*2)
+ reagents.add_reagent(/datum/reagent/cryptobiolin, mecha_attacker.force/2)
+ if((reagents.get_reagent_amount(/datum/reagent/toxin) + mecha_attacker.force) < mecha_attacker.force*2)
+ reagents.add_reagent(/datum/reagent/toxin, mecha_attacker.force/2.5)
+ else
+ return 0
+ . = dmg
+ visible_message(span_danger("[mecha_attacker.name] [mecha_attacker.attack_verbs[1]] [src]!"), \
+ span_userdanger("[mecha_attacker.name] [mecha_attacker.attack_verbs[2]] you!"), span_hear("You hear a sickening sound of flesh [mecha_attacker.attack_verbs[3]] flesh!"), COMBAT_MESSAGE_RANGE, list(mecha_attacker))
+ to_chat(mecha_attacker, span_danger("You [mecha_attacker.attack_verbs[1]] [src]!"))
..()
diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm
index f4b1a679596b9..0a305a5db66ae 100644
--- a/code/modules/vehicles/mecha/mecha_construction_paths.dm
+++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm
@@ -819,3 +819,39 @@
outer_plating = /obj/item/stack/sheet/plasteel
outer_plating_amount = 5
+
+//Justice
+/datum/component/construction/unordered/mecha_chassis/justice
+ result = /datum/component/construction/mecha/justice
+ steps = list(
+ /obj/item/mecha_parts/part/justice_torso,
+ /obj/item/mecha_parts/part/justice_left_arm,
+ /obj/item/mecha_parts/part/justice_right_arm,
+ /obj/item/mecha_parts/part/justice_left_leg,
+ /obj/item/mecha_parts/part/justice_right_leg
+ )
+
+/datum/component/construction/mecha/justice
+ result = /obj/vehicle/sealed/mecha/justice
+ base_icon = "justice"
+
+ inner_plating = /obj/item/stack/telecrystal
+ inner_plating_amount = 8
+
+ outer_plating = /obj/item/mecha_parts/part/justice_armor
+ outer_plating_amount = 1
+
+/datum/component/construction/mecha/justice/get_circuit_steps()
+ return list()
+
+/datum/component/construction/mecha/justice/get_inner_plating_steps()
+ return list(
+ list(
+ "key" = inner_plating,
+ "amount" = inner_plating_amount,
+ "back_key" = TOOL_SCREWDRIVER,
+ "desc" = "The power cell is secured, and [inner_plating_amount] telecrystals can be added.",
+ "forward_message" = "added telecrystal",
+ "backward_message" = "unsecured power cell"
+ )
+ )
diff --git a/code/modules/vehicles/mecha/mecha_movement.dm b/code/modules/vehicles/mecha/mecha_movement.dm
index 53e61690aba7f..3c743bd7fb357 100644
--- a/code/modules/vehicles/mecha/mecha_movement.dm
+++ b/code/modules/vehicles/mecha/mecha_movement.dm
@@ -154,13 +154,17 @@
return
if(.) //mech was thrown/door/whatever
return
- if(bumpsmash) //Need a pilot to push the PUNCH button.
- if(COOLDOWN_FINISHED(src, mecha_bump_smash))
- var/list/mob/mobster = return_drivers()
- obstacle.mech_melee_attack(src, mobster[1])
- COOLDOWN_START(src, mecha_bump_smash, smashcooldown)
- if(!obstacle || obstacle.CanPass(src, get_dir(obstacle, src) || dir)) // The else is in case the obstacle is in the same turf.
- step(src,dir)
+
+ // Whether or not we're on our mecha melee cooldown
+ var/on_cooldown = TIMER_COOLDOWN_RUNNING(src, COOLDOWN_MECHA_MELEE_ATTACK)
+
+ if(bumpsmash && !on_cooldown)
+ // Our pilot for this evening
+ var/list/mob/mobster = return_drivers()
+ if(obstacle.mech_melee_attack(src, mobster[1]))
+ TIMER_COOLDOWN_START(src, COOLDOWN_MECHA_MELEE_ATTACK, melee_cooldown * 0.3)
+ if(!obstacle || obstacle.CanPass(src, get_dir(obstacle, src) || dir)) // The else is in case the obstacle is in the same turf.
+ step(src,dir)
if(isobj(obstacle))
var/obj/obj_obstacle = obstacle
if(!obj_obstacle.anchored && obj_obstacle.move_resist <= move_force)
diff --git a/code/modules/vehicles/mecha/mecha_parts.dm b/code/modules/vehicles/mecha/mecha_parts.dm
index 7fcee2092590c..474716568eb5b 100644
--- a/code/modules/vehicles/mecha/mecha_parts.dm
+++ b/code/modules/vehicles/mecha/mecha_parts.dm
@@ -332,6 +332,42 @@
desc="Savannah-Ivanov armor plates. They are uniquely shaped and reinforced to deal with the stresses of two pilots, grandiose leaps, and missiles."
icon_state = "savannah_ivanov_armor"
+// Justice
+
+/obj/item/mecha_parts/chassis/justice
+ name = "\improper Justice chassis"
+ construct_type = /datum/component/construction/unordered/mecha_chassis/justice
+
+/obj/item/mecha_parts/part/justice_torso
+ name="\improper Justice torso"
+ desc="A Justice torso part."
+ icon_state = "justice_torso"
+
+/obj/item/mecha_parts/part/justice_left_arm
+ name="\improper Justice left arm"
+ desc="A Justice left arm."
+ icon_state = "justice_l_arm"
+
+/obj/item/mecha_parts/part/justice_right_arm
+ name="\improper Justice right arm"
+ desc="A Justice left arm."
+ icon_state = "justice_r_arm"
+
+/obj/item/mecha_parts/part/justice_left_leg
+ name="\improper Justice left leg"
+ desc="A Justice left leg."
+ icon_state = "justice_l_leg"
+
+/obj/item/mecha_parts/part/justice_right_leg
+ name="\improper Justice right leg"
+ desc="A Justice left leg."
+ icon_state = "justice_r_leg"
+
+/obj/item/mecha_parts/part/justice_armor
+ name="Justice armor"
+ desc="Justice armor plates."
+ icon_state = "justice_armor"
+
///////// Circuitboards
/obj/item/circuitboard/mecha
diff --git a/code/modules/vehicles/mecha/mecha_ui.dm b/code/modules/vehicles/mecha/mecha_ui.dm
index 712d5f0d712bf..1113a85381361 100644
--- a/code/modules/vehicles/mecha/mecha_ui.dm
+++ b/code/modules/vehicles/mecha/mecha_ui.dm
@@ -111,16 +111,17 @@
var/module_index = 0
for(var/category in max_equip_by_category)
var/max_per_category = max_equip_by_category[category]
- for(var/i = 1 to max_per_category)
- var/equipment = equip_by_category[category]
- var/is_slot_free = islist(equipment) ? i > length(equipment) : isnull(equipment)
- if(is_slot_free)
- data += list(list(
- "slot" = category
- ))
- if(ui_selected_module_index == module_index)
- ui_selected_module_index = null
- else
+ if(max_per_category)
+ for(var/i = 1 to max_per_category)
+ var/equipment = equip_by_category[category]
+ var/is_slot_free = islist(equipment) ? i > length(equipment) : isnull(equipment)
+ if(is_slot_free)
+ data += list(list(
+ "slot" = category
+ ))
+ if(ui_selected_module_index == module_index)
+ ui_selected_module_index = null
+ continue
var/obj/item/mecha_parts/mecha_equipment/module = islist(equipment) ? equipment[i] : equipment
data += list(list(
"slot" = category,
@@ -140,7 +141,7 @@
))
if(isnull(ui_selected_module_index))
ui_selected_module_index = module_index
- module_index++
+ module_index++
return data
/obj/vehicle/sealed/mecha/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm
index dc0414e86063a..8f972ef47815c 100644
--- a/code/modules/vehicles/mecha/mecha_wreckage.dm
+++ b/code/modules/vehicles/mecha/mecha_wreckage.dm
@@ -245,3 +245,8 @@
/obj/item/mecha_parts/part/odysseus_right_arm,
/obj/item/mecha_parts/part/odysseus_left_leg,
/obj/item/mecha_parts/part/odysseus_right_leg)
+
+/obj/structure/mecha_wreckage/justice
+ name = "\improper Justice wreckage"
+ icon_state = "justice-broken"
+ welder_salvage = list(/obj/item/stack/sheet/iron, /obj/item/stack/rods)
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 0b842b8ed9cbe..08edbf7886799 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -206,6 +206,21 @@
to_chat(rider, span_warning("[src] [p_are()] not powerful enough to fly upwards."))
return FALSE
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded
+ name = "holy skateboard"
+ desc = "A board blessed by the gods with the power to grind for our sins. Has the initials 'J.C.' on the underside."
+ board_item_type = /obj/item/melee/skateboard/holyboard
+ instability = 3
+ icon_state = "hoverboard_holy"
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/post_buckle_mob(mob/living/M)
+ M.AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
+ return ..()
+
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/post_unbuckle_mob(mob/living/M)
+ if(!has_buckled_mobs())
+ qdel (M.GetComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY))
+ return ..()
+
/obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
name = "\improper Board Of Directors"
desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm
index f8db861449f7a..5f57895d8ac81 100644
--- a/code/modules/vehicles/vehicle_key.dm
+++ b/code/modules/vehicles/vehicle_key.dm
@@ -33,10 +33,15 @@
attack_verb_continuous = list("stubs", "pokes")
attack_verb_simple = list("stub", "poke")
sharpness = SHARP_EDGED
- embedding = list("pain_mult" = 1, "embed_chance" = 30, "fall_chance" = 70)
+ embed_type = /datum/embed_data/janicart_key
wound_bonus = -1
bare_wound_bonus = 2
+/datum/embed_data/janicart_key
+ pain_mult = 1
+ embed_chance = 30
+ fall_chance = 70
+
/obj/item/key/janitor/suicide_act(mob/living/carbon/user)
switch(user.mind?.get_skill_level(/datum/skill/cleaning))
if(SKILL_LEVEL_NONE to SKILL_LEVEL_NOVICE) //Their mind is too weak to ascend as a janny
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 9ca0d41d85367..737a2993d9bef 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -1074,11 +1074,9 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
var/mob/living/carbon/carbon_target = atom_target
for(var/i in 1 to num_shards)
var/obj/item/shard/shard = new /obj/item/shard(get_turf(carbon_target))
- shard.embedding = list(embed_chance = 100, ignore_throwspeed_threshold = TRUE, impact_pain_mult = 1, pain_chance = 5)
- shard.updateEmbedding()
+ shard.set_embed(/datum/embed_data/glass_candy)
carbon_target.hitby(shard, skipcatch = TRUE, hitpush = FALSE)
- shard.embedding = list()
- shard.updateEmbedding()
+ shard.set_embed(initial(shard.embed_type))
return TRUE
if (VENDOR_CRUSH_CRIT_PIN) // pin them beneath the machine until someone untilts it
if (!isliving(atom_target))
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index ddcfd9bb244d9..61379e5635468 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -17,7 +17,7 @@
/obj/item/storage/fancy/rollingpapers = 5,
)
contraband = list(
- /obj/item/clothing/mask/vape = 5,
+ /obj/item/vape = 5,
)
premium = list(
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3,
@@ -66,7 +66,7 @@
)
premium = list(
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker = 5,
- /obj/item/clothing/mask/vape = 5,
+ /obj/item/vape = 5,
/obj/item/lighter = 3,
)
initial_language_holder = /datum/language_holder/beachbum
diff --git a/code/modules/vending/subtype.dm b/code/modules/vending/subtype.dm
new file mode 100644
index 0000000000000..9b4f212224ea7
--- /dev/null
+++ b/code/modules/vending/subtype.dm
@@ -0,0 +1,51 @@
+
+/obj/machinery/vending/subtype_vendor
+ name = "\improper subtype vendor"
+ desc = "A vending machine that vends all subtypes of a specific type."
+ color = COLOR_ADMIN_PINK
+ verb_say = "codes"
+ verb_ask = "queries"
+ verb_exclaim = "compiles"
+ armor_type = /datum/armor/machinery_vending
+ circuit = null
+ product_slogans = "Spawn \" too annoying? Too lazy to open game panel? This one's for you!;Subtype vendor, for all your debugging woes!"
+ default_price = 0
+ /// Spawns coders by default
+ var/type_to_vend = /obj/item/food/grown/citrus
+
+/obj/machinery/vending/subtype_vendor/Initialize(mapload, type_to_vend)
+ . = ..()
+ if(type_to_vend)
+ src.type_to_vend = type_to_vend
+ load_subtypes()
+
+/obj/machinery/vending/subtype_vendor/proc/load_subtypes()
+ products = list()
+ product_records = list()
+
+ for(var/type in typesof(type_to_vend))
+ LAZYADDASSOC(products, type, 50)
+
+ build_inventories()
+
+/obj/machinery/vending/subtype_vendor/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+
+ if(!can_interact(user) || !user.can_perform_action(src, ALLOW_SILICON_REACH|FORBID_TELEKINESIS_REACH))
+ return
+
+ if(!user.client?.holder?.check_for_rights(R_SERVER|R_DEBUG))
+ speak("Hey! You can't use this! Get outta here!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ var/type_to_vend_now = tgui_input_text(user, "What type to set it to?", "Set type to vend", "/obj/item/toy/plush")
+ type_to_vend_now = text2path(type_to_vend_now)
+ if(!ispath(type_to_vend_now))
+ speak("That's not a real path, dumbass! Try again!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ type_to_vend = type_to_vend_now
+ load_subtypes()
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 0f637e82645d9..c4b8de23ae1c1 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -440,7 +440,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/reagent_containers/cup/rag = 2,
/obj/item/radio/headset/headset_srv = 2,
- /obj/item/clothing/under/artisan = 2, // MASSMETA ADITION (oguzok)
+ /obj/item/clothing/under/artisan = 2, // MASSMETA EDIT ADITION (oguzok)
)
refill_canister = /obj/item/vending_refill/wardrobe/chef_wardrobe
payment_department = ACCOUNT_SRV
diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm
index 9afe0303be85e..126cc8894368f 100644
--- a/code/modules/wiremod/shell/controller.dm
+++ b/code/modules/wiremod/shell/controller.dm
@@ -81,6 +81,9 @@
*/
/obj/item/circuit_component/controller/proc/send_right_signal(atom/source, mob/user)
SIGNAL_HANDLER
- if(!user.Adjacent(source))
+
+ if(!user.can_perform_action(source))
return
+
handle_trigger(source, user, "extra", right)
+ return CLICK_ACTION_SUCCESS
diff --git a/code/modules/wiremod/shell/drone.dm b/code/modules/wiremod/shell/drone.dm
index 4627a3cf32624..d2922274b7dab 100644
--- a/code/modules/wiremod/shell/drone.dm
+++ b/code/modules/wiremod/shell/drone.dm
@@ -9,7 +9,7 @@
icon_state = "setup_medium_med"
maxHealth = 300
health = 300
- living_flags = 0
+ living_flags = NONE
light_system = OVERLAY_LIGHT_DIRECTIONAL
light_on = FALSE
diff --git a/config/config.txt b/config/config.txt
index 6252c3bae659e..2dc555d922d96 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -310,6 +310,9 @@ NOTIFY_NEW_PLAYER_ACCOUNT_AGE 1
## Discord ID of a role that should be pinged when a new player makes their first connection
#NEW_PLAYER_ALERT_ROLE_ID 1138188190604341308
+## Whether discord verification is forced or not (for Massmeta)
+FORCE_VERIFICATION 0
+
## Deny all new connections by ckeys we haven't seen before (exempts admins and only denies the connection if the database is enabled and connected)
## Requires database
#PANIC_BUNKER
diff --git a/config/game_options.txt b/config/game_options.txt
index 2979648126dde..ef15cbeb123eb 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -539,3 +539,8 @@ NEGATIVE_STATION_TRAITS 3 1
# If set to 0, then players won't be able to select any positive quirks.
# If commented-out or undefined, the maximum default is 6.
MAX_POSITIVE_QUIRKS 6
+
+# A config that skews with the random spawners weights
+# If the value is lower than 1, it'll tend to even out the odds
+# If higher than 1, it'll lean toward common spawns even more.
+RANDOM_LOOT_WEIGHT_MODIFIER 1
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-83811.yml b/html/changelogs/AutoChangeLog-pr-83811.yml
deleted file mode 100644
index 2aaf9471f4b48..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-83811.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "mc-oofert"
-delete-after: True
-changes:
- - qol: "space dragon can see in the dark and the invalid rift location alert is more informative"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-83831.yml b/html/changelogs/AutoChangeLog-pr-83831.yml
deleted file mode 100644
index b3e655a55ddf2..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-83831.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "carlarctg"
-delete-after: True
-changes:
- - bugfix: "There's now a limit to how many dental implants you can cram into your mouth, which is governed by your species' teeth limit."
- - refactor: "Most species have 32 teeth, due to being based on humans, weirding me out when thinking about their teeth, or lack of enough information"
- - refactor: "Moths and flypeople have NO teeth. They CAN'T get dental implants. I'm NERFING moths."
- - refactor: "Lizards have seventy-five (!!!) teeth. Lizards are weird."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-83859.yml b/html/changelogs/AutoChangeLog-pr-83859.yml
new file mode 100644
index 0000000000000..3b7090f9ca9e7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-83859.yml
@@ -0,0 +1,5 @@
+author: "Xackii"
+delete-after: True
+changes:
+ - balance: "Demon: bloodcrawl now deal damage when you using it."
+ - balance: "Demon: demon can eat only carbon human beings."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84011.yml b/html/changelogs/AutoChangeLog-pr-84011.yml
new file mode 100644
index 0000000000000..12b730fefdcdf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84011.yml
@@ -0,0 +1,4 @@
+author: "Pickle-Coding"
+delete-after: True
+changes:
+ - code_imp: "Supermatter zap power generation takes perspective of the machines subsystem."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84043.yml b/html/changelogs/AutoChangeLog-pr-84043.yml
deleted file mode 100644
index 5397404f75b8d..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84043.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "mc-oofert"
-delete-after: True
-changes:
- - bugfix: "durand shield doesnt immediately depower the mech when taking stamina damage"
- - balance: "durand shield is a bit stronger"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84072.yml b/html/changelogs/AutoChangeLog-pr-84072.yml
deleted file mode 100644
index c36813ba598d8..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84072.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "GPeckman"
-delete-after: True
-changes:
- - bugfix: "Analyzers should work on bioscrambler anomalies again."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84075.yml b/html/changelogs/AutoChangeLog-pr-84075.yml
deleted file mode 100644
index 427cc4f1ae6d0..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84075.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "GoblinBackwards"
-delete-after: True
-changes:
- - bugfix: "Interacting with an assembly bomb in hand will now allow you to interact with the attached assembly instead of opening the gas tank UI. Right-clicking will display the gas tank UI instead."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84079.yml b/html/changelogs/AutoChangeLog-pr-84079.yml
deleted file mode 100644
index f191e2ef2cfad..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84079.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Watermelon, Mayhazah"
-delete-after: True
-changes:
- - balance: "Drastically reduces the power consumption and max charge of power cells"
- - balance: "Added a new stock part called the battery, used primarily in the construction of APCs and SMESs."
- - rscadd: "Suiciding with a cell/battery will shock you and potentially dust you/shock the people around you if the charge is great enough."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84135.yml b/html/changelogs/AutoChangeLog-pr-84135.yml
deleted file mode 100644
index b503e29e311d5..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84135.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Guestify"
-delete-after: True
-changes:
- - bugfix: "The visor of the welding mask no longer goes down when you enable internals"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84143.yml b/html/changelogs/AutoChangeLog-pr-84143.yml
deleted file mode 100644
index 68b36d831d4f6..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84143.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ben10Omintrix"
-delete-after: True
-changes:
- - refactor: "vibebots are not basic bots"
- - rscadd: "vibebots will now seek out the depressed and cheer them up"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84230.yml b/html/changelogs/AutoChangeLog-pr-84230.yml
new file mode 100644
index 0000000000000..165b6de5e2c7a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84230.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - bugfix: "Vent-born wendigos no longer create one-way portals"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84232.yml b/html/changelogs/AutoChangeLog-pr-84232.yml
deleted file mode 100644
index def406abaac4a..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84232.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "mc-oofert"
-delete-after: True
-changes:
- - rscadd: "wawastation stand-in shuttle"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84255.yml b/html/changelogs/AutoChangeLog-pr-84255.yml
deleted file mode 100644
index 95d0dd0b54f27..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84255.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "FlufflesTheDog"
-delete-after: True
-changes:
- - bugfix: "multi-z hole repair works better, especially when the turf below is blocked by items"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84278.yml b/html/changelogs/AutoChangeLog-pr-84278.yml
deleted file mode 100644
index e29caa1b8963f..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84278.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "hyperjll"
-delete-after: True
-changes:
- - balance: "Thanks to incredible strides in selective slime breeding, slimes require substantially less nutrients to grow into adults, and split into children."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84279.yml b/html/changelogs/AutoChangeLog-pr-84279.yml
deleted file mode 100644
index 9fcd48259c7bb..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84279.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "jlsnow301"
-delete-after: True
-changes:
- - rscadd: "Bitrunning: You can now choose your hacker alias in prefs."
- - rscadd: "Bit avatars get orbit icons."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84282.yml b/html/changelogs/AutoChangeLog-pr-84282.yml
deleted file mode 100644
index fe26b6cb2c010..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-84282.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SmArtKar"
-delete-after: True
-changes:
- - bugfix: "RND console now properly rounds research points"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84374.yml b/html/changelogs/AutoChangeLog-pr-84374.yml
new file mode 100644
index 0000000000000..5b4a368896c57
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84374.yml
@@ -0,0 +1,4 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "The power for all science burn chambers across all maps now works properly."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84410.yml b/html/changelogs/AutoChangeLog-pr-84410.yml
new file mode 100644
index 0000000000000..60a7947ca34bc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84410.yml
@@ -0,0 +1,4 @@
+author: "mc-oofert"
+delete-after: True
+changes:
+ - bugfix: "wawastation arrivals has firealarms so you may now leave"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84439.yml b/html/changelogs/AutoChangeLog-pr-84439.yml
new file mode 100644
index 0000000000000..fd4591d8f8792
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84439.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - rscadd: "Humanizing a monkey removes undergarments such as socks"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84448.yml b/html/changelogs/AutoChangeLog-pr-84448.yml
new file mode 100644
index 0000000000000..b579cc85ac2e3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84448.yml
@@ -0,0 +1,4 @@
+author: "thegrb93"
+delete-after: True
+changes:
+ - bugfix: "Game not refocusing after closing a TGUI"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84459.yml b/html/changelogs/AutoChangeLog-pr-84459.yml
new file mode 100644
index 0000000000000..221e9cc6e6cbd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84459.yml
@@ -0,0 +1,5 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - qol: "RD's labcoat is now classified as an actual labcoat instead of a glorified jacket, allowing them to put science-related stuffs into it"
+ - image: "You can now toggle RD's labcoat"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84540.yml b/html/changelogs/AutoChangeLog-pr-84540.yml
new file mode 100644
index 0000000000000..c5bfb8bb9a958
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84540.yml
@@ -0,0 +1,5 @@
+author: "carlarctg"
+delete-after: True
+changes:
+ - code_imp: "Added the subtype vendor which lets admins and coders vend subtypes of a path"
+ - code_imp: "Added the vendor and both varieties of omnitool to runtime station"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84622.yml b/html/changelogs/AutoChangeLog-pr-84622.yml
new file mode 100644
index 0000000000000..1556c8ca97e8a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84622.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - balance: "Bait quality now influences the probabilities of getting a rarer fish compared to the most common one(s)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84656.yml b/html/changelogs/AutoChangeLog-pr-84656.yml
new file mode 100644
index 0000000000000..1707af9661022
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84656.yml
@@ -0,0 +1,4 @@
+author: "DGamerL"
+delete-after: True
+changes:
+ - refactor: "refactored `GetExactComponent` to be 1641 compatible"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84696.yml b/html/changelogs/AutoChangeLog-pr-84696.yml
new file mode 100644
index 0000000000000..68e1d169ecee5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84696.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - image: "You can now flip your security helmet's visor up with alt-click! However, doing so will (obviously) expose your eyes."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84704.yml b/html/changelogs/AutoChangeLog-pr-84704.yml
new file mode 100644
index 0000000000000..5fd293747bdcb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84704.yml
@@ -0,0 +1,5 @@
+author: "mc-oofert"
+delete-after: True
+changes:
+ - qol: "blood bros get a hud to see eachother"
+ - code_imp: "teambased antagonists may not see the HUDs of other teams"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-84723.yml b/html/changelogs/AutoChangeLog-pr-84723.yml
new file mode 100644
index 0000000000000..ef87b3d8127cf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-84723.yml
@@ -0,0 +1,4 @@
+author: "Rhials"
+delete-after: True
+changes:
+ - admin: "Narrate verbs will now allow you to pick what text formatting span you want to use before you send them, if any."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-06.yml b/html/changelogs/archive/2024-06.yml
index 267b8ab773265..100647af4323c 100644
--- a/html/changelogs/archive/2024-06.yml
+++ b/html/changelogs/archive/2024-06.yml
@@ -1153,3 +1153,265 @@
the window, making them nearly impossible to read.
zxaber:
- bugfix: Refactored borg omnitool code, fixing most of the unique interaction issues.
+2024-06-26:
+ Ben10Omintrix:
+ - refactor: vibebots are not basic bots
+ - rscadd: vibebots will now seek out the depressed and cheer them up
+ FlufflesTheDog:
+ - bugfix: multi-z hole repair works better, especially when the turf below is blocked
+ by items
+ GPeckman:
+ - bugfix: Analyzers should work on bioscrambler anomalies again.
+ GoblinBackwards:
+ - bugfix: Interacting with an assembly bomb in hand will now allow you to interact
+ with the attached assembly instead of opening the gas tank UI. Right-clicking
+ will display the gas tank UI instead.
+ Guestify:
+ - bugfix: The visor of the welding mask no longer goes down when you enable internals
+ NewyearnewmeUwu:
+ - qol: ' The xenobio console''s monkey placing command also clears dead monkeys
+ on the tile.'
+ SmArtKar:
+ - bugfix: Spraycans can once more paint things.
+ - bugfix: RND console now properly rounds research points
+ SyncIt21:
+ - bugfix: alt click runtime no more when using style meter
+ - code_imp: improved alt & ctrl click code
+ Vekter:
+ - balance: The Event Horizon Anti-Existential Beam Rifle now requires Unregulated
+ Bluespace Research to be constructed.
+ Watermelon, Mayhazah:
+ - balance: Drastically reduces the power consumption and max charge of power cells
+ - balance: Added a new stock part called the battery, used primarily in the construction
+ of APCs and SMESs.
+ - rscadd: Suiciding with a cell/battery will shock you and potentially dust you/shock
+ the people around you if the charge is great enough.
+ carlarctg:
+ - bugfix: There's now a limit to how many dental implants you can cram into your
+ mouth, which is governed by your species' teeth limit.
+ - refactor: Most species have 32 teeth, due to being based on humans, weirding me
+ out when thinking about their teeth, or lack of enough information
+ - refactor: Moths and flypeople have NO teeth. They CAN'T get dental implants. I'm
+ NERFING moths.
+ - refactor: Lizards have seventy-five (!!!) teeth. Lizards are weird.
+ hyperjll:
+ - balance: Thanks to incredible strides in selective slime breeding, slimes require
+ substantially less nutrients to grow into adults, and split into children.
+ jlsnow301:
+ - rscadd: 'Bitrunning: You can now choose your hacker alias in prefs.'
+ - rscadd: Bit avatars get orbit icons.
+ mc-oofert:
+ - qol: space dragon can see in the dark and the invalid rift location alert is more
+ informative
+ - rscadd: wawastation stand-in shuttle
+ - bugfix: durand shield doesnt immediately depower the mech when taking stamina
+ damage
+ - balance: durand shield is a bit stronger
+2024-06-28:
+ Ben10Omintrix:
+ - refactor: firebots are now basic bots
+ Deadgebert:
+ - rscadd: Crystallizer boards added to Delta and Tram HFR rooms
+ GPeckman:
+ - bugfix: Protolathes/Circuit Imprinters/Techfabs with better parts should now print
+ items faster again.
+ GremlinSeeker:
+ - bugfix: Fixed disconnected APC on birdshot and other minor service fixes.
+ Kapu1178:
+ - bugfix: MODsuit pathfinder module works. Again.
+ - code_imp: AI pathfinding should produce slightly better paths.
+ MTandi:
+ - rscdel: Removed tank dispenser UI to use left/right clicks instead
+ - rscadd: There is a chance that Spess Knife will be in a mail for engi and clowns
+ - qol: Updated Microscope UI
+ - qol: Microscope is easier to use - you can remove dish with right click and swap
+ dishes
+ Melbert:
+ - bugfix: Fixed cyborg omnitools being unusable on some things
+ - bugfix: Fix timestop being 1 tile too small again, and fixes a lot of other field
+ effects from being 1-small as well
+ - sound: Glug-glug sound when dragging a leaking gas tank
+ - bugfix: Lizards and Moths don't deathgasp twice when they die
+ Melberte:
+ - rscadd: Cool Sword Cursor Maintenance App
+ ShizCalev, SpaceLove:
+ - refactor: Techweb strings are defined now so to maintain modularity
+ - balance: Research papers will have less overall point generation.
+ SmArtKar:
+ - bugfix: Retracted pens can be put into PDAs
+ SyncIt21:
+ - qol: adds examines, screentips & balloon alerts for flatpacker, flatpack box &
+ cart
+ - qol: adds correct material colour insertion animation for flat packer, continuous
+ progress bar animation during printing
+ - qol: flat packer has a separate icon when you open its maintenance panel, eject
+ button is disabled when no board is inserted
+ - qol: ejecting the board will place it in your hand, use ctrl click shortcut to
+ eject board from flatpacker
+ - bugfix: you cannot deploy a flat packed box on a turf that has dense objects(like
+ other flat packed boxes & such)
+ - bugfix: you cannot insert hologram/abstract items into a flat packer or flatpack
+ cart, also can hit them with any objects when in combat mode
+ - bugfix: you can deconstruct a flat packer with a crowbar after opening its maintenance
+ panel
+ - bugfix: correct cost of the design scaled with `creation_coefficiency` is displayed
+ in the UI
+ - code_imp: overall improved code quality of all things flat pack related
+ - bugfix: actions buttons can be dragged anywhere again
+ Viralmilk22:
+ - rscadd: Shifted up the service departments on Birdshot.
+ - rscadd: Added an arcade.
+ alien3301:
+ - balance: Mediborg surgical omnitool upgrade makes the health analyzer advanced
+ carlarctg:
+ - bugfix: Fixed hunger affecting your speed in nograv
+ hyperjll:
+ - balance: 'Due to selective breeding of slimes, some species require roughly 3x
+ more plasma than normal to activate a plasma reaction. Slime extracts affected
+ are: Oil, Adamantine, Orange, and Gold. Yellow slimes require 3x more blood
+ to activate a blood reaction.'
+ - balance: Oil slime extracts have become less potent during a plasma reaction due
+ to selective breeding conditions.
+ - balance: Gold slime extracts give rise to one less monster during a plasma reaction
+ due to selective breeding conditions.
+ - balance: Yellow slime extracts have become less potent during a blood reaction
+ due to selective breeding conditions.
+ - balance: Adamantine golem shells require 3 sheets rather than 1, due to unknown
+ circumstances.
+ necromanceranne:
+ - bugfix: Headprotector modules and constructor modules work properly once more.
+ - bugfix: Space heaters do not completely drain their starting cell while trying
+ to change their room temperature by a few degrees.
+ uaioy:
+ - bugfix: infiltrator modsuit sprite is not misaligned anymore
+ vinylspiders:
+ - qol: 'polypore mycelium no longer contains sugar, preventing it from instantly
+ creating fringe weaver beverage when ground up. qol: sugar may be acquired from
+ grinding fireblossoms instead of polypore mycelium.'
+2024-06-29:
+ Bisar:
+ - rscadd: Ashwalkers now start out allied to lavaland fauna (except for raptors).
+ Attacking the fauna will break this alliance with the attacked beast and any
+ who witness it.
+ - bugfix: Ashwalkers are now actually in the ashwalker faction, instead of the neutral
+ one.
+ EnterTheJake:
+ - rscadd: A new Anomaly organ has been introduced, The Voltaic Combat Cyberheart!
+ Higgin:
+ - bugfix: Mood buffs/penalties are now properly equal on both positive/negative
+ sides.
+ JackEnoff:
+ - balance: Changelings regenerate chemicals faster when not on fire
+ - balance: Changelings regenerate chemicals slower when on fire
+ MGOOOOOO:
+ - qol: The "Dental Implant" surgery no longer forces itself to restart after implanting
+ one pill. Now implanting pills in the surgery has another step to either search
+ the patient's mouth for another tooth to implant, or cauterization to end the
+ surgery.
+ Melbert:
+ - bugfix: Fixed modsuit interactions slightly. No longer requires combat mode to
+ use tools on it, plasma core works as intended as well. (Using combat mode,
+ however, will make you insert the item)
+ - refactor: Refactored lockboxes
+ - refactor: Refactored medbot skin application
+ Moonlit2000:
+ - bugfix: peg legs can't bleed
+ ShizCalev:
+ - bugfix: Toggling ambient ship sounds will now instantly turn it on/off.
+ - bugfix: Deafened mobs will no longer hear the station's ambient sounds.
+ - bugfix: Fixed ambient sounds resetting their loop when entering different bodies
+ (ie admin ghosting, being moved to other mobs, ect.)
+ - bugfix: Monkeys that become sentient through the sentience helmet will no longer
+ be notified that they can ventcrawl.
+ - bugfix: Airlocks will now correctly said what other airlock they are cyclelinked
+ with.
+ - bugfix: Portaturrets no longer go invisible when unwrenched from the ground.
+ SmArtKar:
+ - code_imp: Rewrote a portion of storage UI code to allow it to be influenced by
+ UI style.
+ - image: Prettified storage UI and made it affected by UI theme.
+ - image: Ripley and Ripley-based mechs now have consistent outlines
+ SyncIt21:
+ - bugfix: Holodeck closet & crate items are marked as holograms as well
+ - bugfix: Holodeck closet & crate items delete themselves when the program is changed
+ - bugfix: you can access your inventory when lying down
+ TheBoondock:
+ - sound: added liquid pouring sounds to pouring of any reagents
+ Thlumyn:
+ - bugfix: fixed active turfs in icebox listening post
+ Vekter:
+ - bugfix: Fixed the visibility of a pipe in Northstar's ordnance lab
+ - rscadd: Bitrunners can now access specific bounties asking for the item rewards
+ from specific bitrunning domains.
+ - bugfix: Fixed bitrunner pulling from a pool of literally every bounty available.
+ - bugfix: Fixes the door-bolting buttons in the dorms and bathrooms on Birdshot.
+ aaaa1023:
+ - bugfix: Removed a bush trapped inside a wall above morgue on Tramstation
+ carlarctg:
+ - rscadd: Reworked blood loss effects on the user to be much more noticeable.
+ - code_imp: Changed the blood volume defines to be based on the BLOOD_VOLUME_NORMAL
+ define, with a multiplier of blood loss applied, to be more understandable.
+ - rscadd: Added tons of new mutations to Genetics, alongside some recipes!
+ - rscadd: Thermal Adaptation has been made a combination mutation from the stronger
+ but narrower Cold and Heat adaptations.
+ - balance: Cryobeams have 9 tile range, and fiery sweat doesn't cause spread on
+ contact.
+ - image: Added some neat new sprites for the new mutations, and added a greyscale
+ version of the magic hand sprites.
+ - code_imp: Infinitesmally improved mutation code.
+ delingar:
+ - bugfix: Lavaland elite are at lavaland fauna faction now
+ hyperjll:
+ - bugfix: Inducers now accept megacells AND regular cells.
+ junkgle01:
+ - bugfix: added a keycard auth to QM room
+ necromanceranne:
+ - bugfix: Emergency firesuits no longer hide your gloves.
+ - qol: Punching bags are now a equal method of training to the fitness machinery.
+ - qol: Boxing grants more experience overall for participation.
+2024-06-30:
+ Exester509:
+ - spellcheck: Fixed two typos in the heretic lore
+ Ghommie:
+ - bugfix: cigarettes and vapes are no longer treated as clothing (eg. They no longer
+ get shredded and need to be repaired with... cloth).
+ GoblinBackwards:
+ - bugfix: Fixed gas canister shields turning themselves off in unpowered areas when
+ they weren't drawing any cell power.
+ LT3:
+ - code_imp: Blood filter only pings and says finished when it's actually finished
+ Sadboysuss:
+ - bugfix: fixed cyborgs and monkeys not being able to buckle to chairs
+ SmArtKar:
+ - bugfix: Storage no longer deletes all of its viewers upon being deleted
+ - bugfix: Storage UI now renders properly
+ - bugfix: Guns no longer can be overfilled by 1 bullet
+ - bugfix: Russian revolvers now spawn with only 1 live round as originally intended,
+ and click when firing a blank.
+ Xander3359:
+ - bugfix: Fix being unable to add a flux core to new the combat heart cybernetic
+ aaaa1023:
+ - bugfix: Fixed the camera offset for the navigation console on a handful of Whiteships.
+ - bugfix: Fixed the Pubby Whiteship drifting sideways through hyperspace when in
+ flight.
+ - bugfix: Fixed the Kilo Whiteship flying backwards through hyperspace when in flight.
+ - bugfix: The Birdshot Whiteship should actually be able to spawn now.
+ - spellcheck: fixed spelling of "aggressive" in the shuttle manipulator description
+ for the Birdshot Whiteship.
+ carlarctg:
+ - spellcheck: Syndicate jaws of life are now jaws of death!
+ - spellcheck: Made its desc. more descriptive, stating that its faster.
+ - rscadd: Heretics can now sacrifice Cultists for sweet loot.
+ - rscadd: Cultists can now sacrifice Heretics for sick trinkets.
+ - rscdel: Removed Bastard Blade from the game, code, and life
+ - balance: Aggressive Spread now rusts non-turfs next to you as well
+ - balance: Raise Construction cd raised to 7, now breaks rust walls as well, improved
+ autoaim making it actually usable midfight
+ - refactor: Auto-aim code now works on any atoms if configured
+ grungussuss , Kayozz:
+ - sound: exosuit fabricators, Autolathes and Techfabs will now produce sounds when
+ printing items
+ grungususs:
+ - bugfix: fixed the name of a request console in the medical sec outpost on metastation
+ mc-oofert:
+ - bugfix: both engineers and roboticists may now access the controls of a firebot
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
new file mode 100644
index 0000000000000..76b5efc5005a7
--- /dev/null
+++ b/html/changelogs/archive/2024-07.yml
@@ -0,0 +1,494 @@
+2024-07-01:
+ Ben10Omintrix:
+ - balance: raptors will now knock off their rider and disable them if hit by any
+ energy projectiles or if they recieve any stamina damage
+ Chestlet:
+ - bugfix: Nanotrasen sent us a batch of faulty canisters. They've been recalled
+ and replaced with less faulty canisters.
+ - bugfix: Zauker SM interaction works correctly now.
+ DaCoolBoss:
+ - image: Relics ("strange objects") now have unique sprites.
+ Iajret:
+ - bugfix: fixed blood loss knocking you down at somewhat safe (~80%) blood levels
+ LemonInTheDark:
+ - rscadd: Shield generators and shield gen walls now glow a light blue. Pretty!
+ MTandi:
+ - qol: Made light tiles available in the crafting menu
+ - qol: Circuit tile variants can be cycled in-hand
+ - rscadd: Moved loose tiles and wall frames from lathe designs to other tiles and
+ frames in the crafting menu
+ Melbert:
+ - rscadd: Humanizing a monkey removes undergarments such as socks
+ - qol: Handheld Genetic Scanners fit in Geneticist equipment suit storage
+ Pickle-Coding:
+ - code_imp: Supermatter zap power generation takes perspective of the machines subsystem.
+ Rhials:
+ - rscadd: Bounty Hunter teams now have personalized announcements for when they
+ are spawned in.
+ ShizCalev:
+ - bugfix: The power for all science burn chambers across all maps now works properly.
+ SmArtKar:
+ - image: Captain's spare safe received a new texture
+ - bugfix: Vent-born wendigos no longer create one-way portals
+ - image: Decluttered card textures
+ - bugfix: You can grind slime extracts in reagent grinders once more.
+ - bugfix: Pyrokinesis bolts no longer have infinite range and create trails of fiery
+ doom.
+ - qol: RD's labcoat is now classified as an actual labcoat instead of a glorified
+ jacket, allowing them to put science-related stuffs into it
+ - image: You can now toggle RD's labcoat
+ ViktorKoL:
+ - rscadd: Added a new UI for heretic research.
+ Wallem:
+ - rscadd: The detective now starts with the DET.ekt Skillchip, which allows them
+ to identify chemicals and bloodtypes by taste.
+ YesterdaysPromise:
+ - image: updated halloween metoer sprites.
+ aaaa1023:
+ - qol: 'Increased the viewrange in the navigation camera console on the following
+ shuttles: Silverscale pirate shuttle, the Flying Dutchman pirate shuttle, the
+ IRS pirate shuttle, and the Greytide pirate shuttle.'
+ - bugfix: Fixed the Battlecruiser corvette, Silverscale pirate shuttle, and the
+ Greytide pirate shuttle flying in incorrect directions in hyperspace.
+ - bugfix: Fixed the Navigation console camera eye on various pirate ships being
+ off centre.
+ carlarctg:
+ - spellcheck: Heretic spell invocations now use one dead language per path. Altered
+ a few invocation types.
+ grungussuss:
+ - qol: Windoors now stay open for 8 seconds instead of 5
+ - qol: Secure windoors now stay open for 5 seconds instead of 2
+ mc-oofert:
+ - bugfix: brig cell timer ui works properly now
+ - bugfix: wawastation arrivals has firealarms so you may now leave
+ necromanceranne:
+ - bugfix: Mecha weaponry is capable, for the first time ever, of experiencing recoil.
+ This was an intended mechanic, I promise. The code just literally never worked.
+ - bugfix: Mecha bump melee attacks and click melee attacks are now on the same cooldown,
+ but have varying cooldown timers. You will always bump attack faster than you
+ will click.
+ - bugfix: You must be in combat mode to punch objects and to bumpsmash into objects.
+ - bugfix: Stops mecha being able to punch literally any object and damage them.
+ - code_imp: Tidies up some of the autodoc comments for mech weapons.
+ spockye:
+ - bugfix: fixed Wawastation areas
+ - bugfix: fixed wawastation disposals
+ thegrb93:
+ - bugfix: Game not refocusing after closing a TGUI
+ xXPawnStarrXx:
+ - rscdel: Removed cordons on deathmatch maps, since they're autoadded now.
+2024-07-02:
+ 00-Steven:
+ - code_imp: Moved bedsheet bin interactions to the item interaction code. Please
+ report any issues.
+ - qol: Made bedsheet bin tool interactions right click, such that left click is
+ consistently for putting in items.
+ - qol: Added usage screentips to bedsheet bins.
+ - qol: Added more feedback to failing to hide items in bedsheet bins.
+ - sound: Made putting items in bedsheet bins not silent (If the items have associated
+ pickup/drop sounds).
+ - code_imp: Deconstructing light switches now uses the proper tool action and tool
+ usage code, please report any issues.
+ - bugfix: Attempting to deconstruct a light switch by unscrewing it no longer makes
+ you hit it even on a success.
+ - sound: Deconstructing a light switch actually plays tool usage and deconstruction
+ sounds.
+ - qol: Deconstructing light switches is now a left click with a screwdriver parallel
+ to other unscrewing actions.
+ - bugfix: Screentips for deconstructing a light switch no longer show up on every
+ item EXCEPT screwdrivers.
+ - qol: Added an examine hint denoting light switches are screwed to the wall.
+ - qol: Added visible messages for someone deconstructing a light switch parallel
+ to deconstructing intercoms.
+ Bisar:
+ - qol: Loot panels should update more predictably and informatively now.
+ - code_imp: Lootpanels have more consistent logic on when they automatically update.
+ Jolly:
+ - code_imp: Behind the scenes, maps had a little bit of tweaking. If you see things
+ rendering in weird ways, or they don't look like how they used to/supposed to,
+ please report them on GitHub!
+ Kapu (ported by StrangeWeirdKitten):
+ - bugfix: Ambience buzz will now respect ship ambience prefrences for observers.
+ - sound: Ambience buzz requires APC enviorment power to function
+ Kocma-san:
+ - qol: you can now swap pens in pdas
+ LemonInTheDark:
+ - bugfix: Some varieties of snow now visually melt properly again when burned
+ ShizCalev:
+ - bugfix: Fixed a number of shuttles having parts (such as lattices) completely
+ disappearing.
+ - bugfix: Fixed the ceilings above shuttles on station maps being full-bright.
+ - bugfix: Fixed lattices sometimes appearing at random locations in space on station
+ maps.
+ - bugfix: Cleaned up a number of accidentally placed objects in space across all
+ station maps.
+ - bugfix: Fixed a false positive with the mapload_space_verification unit test failing
+ on turfs that weren't actually part of shuttles.
+ - code_imp: Added a unit test that automatically finds all base space turfs with
+ objects on them, as well as non-space turfs that are set to space areas (meaning
+ that these squares weren't lit properly.)
+ SmArtKar:
+ - bugfix: You no longer get dusted upon trying to store your supermatter sliver.
+ - bugfix: Fulton animation is no longer sideways.
+ - bugfix: Hand of Midas now works point-blank.
+ TheBoondock:
+ - sound: added pickup and drop sound for beakers
+ carlarctg:
+ - bugfix: Fix /datum/weakref appearing when linking airlock heretic portals
+ hyperjll:
+ - bugfix: 'Hostile plant monsters (EX: Killer Tomatoes) no longer act hostile toward
+ Seedlings.'
+ jlsnow301:
+ - bugfix: Fixed some UI bugs in the power monitor screen.
+ lorwp:
+ - bugfix: extinguishers now can be filled with subtypes of water again (Namely,
+ holy water)
+ mc-oofert:
+ - balance: Facehuggers dont make people go to sleep but muffles speech
+ - code_imp: Very very minor xenomorph code cleanup
+ - refactor: Muzzles are now an element
+ - balance: portable air scrubbers scrub in a 3x3 square + hold as much gas as a
+ canister
+ nikothedude:
+ - rscadd: Being cursed now enables disembowlements/cranial fissures outside of hardcrit
+2024-07-03:
+ 00-Steven:
+ - bugfix: Fixed telekinesis letting you grab people at a distance, and teleport
+ them to you by strangling them.
+ DaCoolBoss:
+ - bugfix: Removed three traitor posters from Cargo Warehouse's walls. (Metastation)
+ - balance: Added one traitor poster each to the QM's Office, Vault and Evidence
+ Storage to compensate. (Metastation)
+ - rscadd: Ghost role food truck merchants may occasionally turn up at the station.
+ - rscadd: Adds a new fugitive hunter type, MI13 secret agents.
+ DrDiasyl aka DrTuxedo:
+ - sound: Shoves now produce more meaty sound!
+ GremlinSeeker:
+ - bugfix: fixed Birdshot bar and surrounding areas not properly connected to the
+ power grid.
+ LT3:
+ - qol: Crew monitor defaults to sort by vitals
+ MTandi:
+ - image: New linen bin / basket sprites
+ - qol: It is easier to do some required techweb experiments on Charlie station now
+ - bugfix: Fixed experimental dissection surgeries giving too many points
+ - balance: 'Techweb: Moved NTNet relay back to tcomms node'
+ - balance: 'Techweb: Moved blood pack and chem pack to the starting node'
+ MrDas:
+ - bugfix: Bolas now slowdown properly.
+ - bugfix: Cult bolas no longer leave in-hand sprite when they ensnare to non-cult
+ user.
+ OrbisAnima:
+ - bugfix: Fixed the basic Sandwich recipe and tags, now it matches the description
+ and original intent.
+ - bugfix: Brought the fishing rewards experiments to normal values.
+ - bugfix: Bio Emergency crates now bring Bio Suits and Hoods compatible with the
+ Security Hoods and Suits Schematics.
+ Rhials:
+ - balance: All cameras in bathrooms and showers have been removed.
+ SmArtKar:
+ - bugfix: Dark matteors no longer claim that they have missed when they actually
+ impacted the station
+ - image: Fixed shading on some metal ingots.
+ Sosmaster9000:
+ - balance: 'Xenobiologists now have a BZ-filled containment pen. Don''t breathe
+ that!
+
+ balance:Some items which either cannot be printed elsewhere or are part of game
+ progression (e.g. teleporter endpoints and, of course, Nanners) have been moved.
+ Alien Spawnpoints are in the same spot.'
+ bob-b-b:
+ - rscadd: Added flatpacker & multitool to all R&D labs
+ carlarctg:
+ - rscdel: Removed Trichromatic Larynx per @mothblocks decision that it looks uggo.
+ - rscdel: Replaced heckacious laryncks' color and size changes with random bolding,
+ italics, and underlining.
+ - rscadd: Stoner has been un-locked and replaces TL in the above's recipe.
+ - bugfix: Fixed elastic arms users being unable to use abstract items like mending
+ touch or shock touch.
+ - bugfix: Fixed mending touch being bad
+ mc-oofert:
+ - bugfix: portascrubbers also scrub the tile theyre on
+2024-07-04:
+ 00-Steven:
+ - code_imp: Moved bedsheet interactions to the item interaction code. Please report
+ any issues.
+ - bugfix: Bedsheets adjust their offset to match that of the living they're tucking
+ in.
+ - sound: Bedsheets use the cloth drop/pickup sounds instead of being silent.
+ - qol: You can tuck someone in telekinetically.
+ ArcaneDefence:
+ - rscadd: You can now microwave station pets that you can pick up, with predictable
+ outcomes
+ Ben10Omintrix:
+ - bugfix: fixes mansus grasp not clearing runes
+ - bugfix: fixes not being able to clean microwaves
+ Bisar:
+ - bugfix: Dastardly clowns will no longer be able to get counted for three times
+ the steps by moving diagonally.
+ Ghommie:
+ - bugfix: Fixed toggleable screen colors for glasses.
+ - code_imp: De-hardcoded, refactored the above, now-fixed feature.
+ - rscadd: Pumpkin hardhats and the hood of the flash suit now affect the color of
+ your screen.
+ - rscadd: Prism glasses, obtainable through xenobiology crossbreeding, now also
+ affect the color of your screen.
+ - qol: You no longer need to reach the very edge of the game screen to reach the
+ maximum zoom range when scoped.
+ LT3:
+ - sound: Changed blood filter cycle sound
+ MTandi:
+ - image: Fixed the cargo crate having wrong stripe width in open state
+ - rscadd: Added Pipe Scrubber portable atmos machine
+ Melbert:
+ - rscadd: Humonkeys and random corpse spawns now look more... human.
+ Paxilmaniac:
+ - image: The sprites for the projectile dampener field have been updated
+ Profakos:
+ - bugfix: Instruments enhanced with portable tuning can perform the rites that have
+ been granted
+ SmArtKar:
+ - image: Some gloves have received new sprites
+ - bugfix: Mending touch no longer damages non-humans
+ - rscdel: You can no longer get turned into a dullahan by a genetic meltdown
+ - refactor: Refactored genetic meltdown code into datums, making it more extendable.
+ - image: Updated diamond stacks to fit its "unstacked" version.
+ - refactor: Bayonet attachment is now a component.
+ SyncIt21:
+ - bugfix: omni crowbar tool interaction for replacing tiles has been fixed
+ - bugfix: techfab screentip does not runtime when you hover over it with an omnitool
+ multitool
+ - bugfix: medi borgs can do brain surgery again
+ - code_imp: improved multitool & general tool code for some machines
+ - bugfix: you can hold your wound while resting via ctrl click
+ - bugfix: material container won't consume the contents of an item if that item
+ itself is rejected for any reason
+ - qol: you can use any storage medium & not just bags/boxes to dump stuff into material
+ containers
+ - code_imp: improved mouse drag & drop code
+ - code_imp: Improves cpu performance of transferring & removing reagents
+ - bugfix: plumbing machinery should have consistent volumes throughout the course
+ of its operations
+ - bugfix: plumbing iv drop now only accepts reagents from ducts but won't put reagents
+ back into it i.e. it only has a input pipe
+ Thunder12345:
+ - bugfix: Birdshot's AI core no longer has windoors concealed under open shutters.
+ ViktorKoL:
+ - rscadd: the Feast of Owls now leaves more dramatic messages in your chat
+ - sound: the Feast of Owls now has a little theme
+ carlarctg:
+ - qol: Transhumanist and prosthetic limb no longer conflict. If you pick the same
+ limb for both it uses the weaker prosthetic (dumbass)
+ - code_imp: Made the name for prosthetic limb global list more intelligible
+ jlsnow301:
+ - bugfix: Reverts the fully interactive lootpanel, please just refresh it if you
+ want to see new contents
+ - rscadd: 'Added a bitrunning deathmatch map: Island Brawl. Both ghosts and runners
+ get many more spawns than normal.'
+ - bugfix: Lowered the static vision time in domain load in.
+ - bugfix: Bitrunning hacker aliases are now much more permissive
+ mc-oofert:
+ - rscadd: 254 new vox lines
+ - balance: removed tasers, the unfirable turret gun, death wand, polymorph wands
+ and the enchanted modsuit from lootbox loot tables
+ - bugfix: lootbox guns should now mostly not have syndicate firing pins so you can
+ actually use them
+ - bugfix: deathmatch OSHA Violator map has actually functioning field gens now
+ - bugfix: being polymorphed in deathmatch does not count you dead
+ - bugfix: deathmatch cyborgs may not talk in binary
+ - qol: deathmatch map names are sorted alphabetically
+ - spellcheck: deathmatch final destination clown and chef loadouts have been renamed
+ to avoid confusion
+ - rscadd: mecha wire that shoots you or anyone nearby if pulsed or cut
+ - bugfix: mecha shock wire shocks you
+2024-07-05:
+ Absolucy:
+ - qol: Linked speech now prevents messages from highlighting if its a message you
+ sent, or if you are the owner of said link..
+ - qol: Linked speech messages are now marked as radio messages, for chat tab purposes.
+ ArcaneMusic:
+ - rscadd: The Illumination Applications technode now includes a gunkit for a new
+ gun, the Photon Cannon.
+ DATA_, with sounds made by Beebblie:
+ - sound: You will now be able to hear your muffled breathing while using internals.
+ This can be turned off in the game settings.
+ Ghommie:
+ - rscadd: A station trait that fills maintenance with glowsticks.
+ Iamgoofball:
+ - rscadd: You can now craft a singularity hammer using all nine anomaly cores and
+ the supermatter.
+ LemonInTheDark:
+ - bugfix: Grass turfs will render properly now. Reworked how floors render, please
+ report any bugs!
+ - bugfix: Cameras now properly capture lighting
+ - bugfix: The layering seen in photos should better match the actual game
+ MTandi:
+ - bugfix: 'Techweb: Moved upgraded cyber organs to tier 3 from tier 4'
+ - qol: 'Techweb: Added fully augmented android scan discount experiment for Advanced
+ Cybernetic Organs techweb node'
+ - qol: Data disks are now printed in lathes instead of circuit imprinter
+ - balance: 'Techweb: High yield explosive is now a discount experiment for Exotic
+ Ammo node, giving more free points'
+ - balance: 'Techweb: Replaced the botany/xenobio discount experiments with a new
+ mutant scan experiment for the Gene Engineering node'
+ - balance: 'Techweb: Damaged mech scan is a discount experiment for tier 4 Mech
+ Energy Guns node, giving twice more free points'
+ - balance: 'Techweb: Added a new anomaly scan experiment that gives full discount
+ for the Advanced Anomaly Shells, also moving the node to tier 5'
+ - balance: 'Techweb: Moved mech RCD to the Experimental Tools node'
+ - balance: 'Techweb: Moved handcuffs to T2 security node, leaving only zipties in
+ T1'
+ - balance: 'Techweb: Non-human Autopsy is a discount experiment instead of a required
+ one now'
+ - balance: 'Techweb: Parts scan experiments require 6 machines instead of 4'
+ - rscdel: 'Techweb: Removed the New Toys node moving contents to sec and medbay
+ trees'
+ - qol: Made air horn craftable from a spraycan and a bikehorn
+ - qol: 'Techweb: Better wording on the slime scan experiment'
+ - refactor: Vat grower is a normal machine now that doesn't need plumbing
+ - qol: Cytology petri dish smartfridge starts with 3 random samples
+ - rscadd: Added protein powder condiment bottle, available in the cytology supplies
+ locker and the cargo pack
+ - rscdel: Removed science variant of plumbing RCD
+ - bugfix: Fixed a bug when machines without stock parts didn't spawn frames on deconstruction
+ - bugfix: Fixed vat grower not growing
+ - qol: portable scubber, pump and pipe scrubber are buildable as any other machines
+ OrionTheFox:
+ - rscadd: updated Icebox's lavaland ruin. The incursion grows...
+ Rhials:
+ - admin: Quiet-announce random events still announce to admins and can therefore
+ be rerolled.
+ Xackii:
+ - rscadd: 'New traitor mech: Justice. Emag fabricator to get it.'
+ Zergspower:
+ - bugfix: fixes borgs ability to climb
+ aaaa1023:
+ - qol: Increased view_range on the Psyker Bounty Hunters' Shuttle navigation console.
+ - bugfix: 'Fixed the shuttle navigation console camera eye being incorrectly offset
+ on: the SpacePol van, the Russian bounty hunters, the default bounty hunters,
+ the Psyker bounty hunters, and the MI13 Foodtruck.'
+ - bugfix: Fixed the SpacePol van, Russian bounty hunters, default bounty hunters,
+ and Psyker bounty hunters' shuttles all flying in incorrect directions.
+ - bugfix: 'Fixed the following shuttles flying in unexpected directions: Pubby escape
+ pod, Humpback emergency shuttle, Pubby monastery shuttle, Birdboat emergency
+ shuttle, Birdshot emergency shuttle'
+2024-07-06:
+ 00-Steven:
+ - image: Goody case locked/unlocked sprites have been swapped again, having a gap
+ for unlocked and no gap for locked.
+ ArcaneMusic:
+ - qol: Examining a windoor will now provide the construction steps, like other standard
+ buildable objects.
+ DaCoolBoss:
+ - code_imp: Cleaned up relic code.
+ - image: Added necrotech themed relics.
+ GoblinBackwards:
+ - bugfix: Firefighting backpack tank nozzle can be used to hit objects and destroy
+ atmos resin again.
+ MTandi:
+ - bugfix: Binary devices no longer ignore the volume of the output pipe network
+ - bugfix: Fixed the augmented organs experiment
+ OrionTheFox:
+ - image: fixed and touched up the icons for the Doorjack and Cryptographic Sequencer
+ (EMAG)
+ Seven:
+ - balance: Bloody footprint trails go a longer distance now.
+ SyncIt21:
+ - bugfix: Autolathe won't eat the borg omni tool
+ carlarctg:
+ - bugfix: Fixed temp n space adaptations not conflicting
+ - rscadd: Projectile Dampener field now reduces stuns and stamina damage from incoming
+ projectiles
+ hyperjll:
+ - bugfix: Reagent containers are no longer mysteriously fireproof.
+ mc-oofert:
+ - qol: CE and Engineer start with their hardhat as the respective welding hard hat
+ variant
+ necromanceranne:
+ - balance: Settlers are a bit slower on their steeds.
+2024-07-07:
+ Holoo-1:
+ - bugfix: fixed ninja's adrenaline boost module not being rechargable
+ SyncIt21:
+ - bugfix: you can craft the singulo hammer with either a supermatter engine/shard
+ again
+2024-07-08:
+ 00-Steven:
+ - bugfix: Fixes hacker alias name preference not working.
+ Ben10Omintrix:
+ - bugfix: raptors don't easily stress out in lavaland environments
+ Ghommie:
+ - rscadd: Night vision goggles now subtly tint your screen.
+ - rscadd: You can turn your night vision goggles off. Doing so removes the tint
+ and the eye protection malus.
+ - bugfix: Hoverboards properly dysfunction in space without any kind of support
+ underneath them.
+ - qol: Mood more promptly reacts to the beauty of an area as it changes, and not
+ just when changing areas.
+ - rscadd: Coroners (and potentially other mobs with the morbid trait), now like
+ degradated-looking rooms.
+ - rscadd: Aquariums now influence the beauty score of an area based on their contents.
+ - rscadd: Morbid people now get a positive moodlet when admiring an aquarium full
+ of dead fish, and a negative one when fish are alive.
+ - admin: Added a config that regulares random spawners weights.
+ - rscadd: 12% chance of a ouija board spawning in the chaplain office. Wawastation
+ always has one.
+ GremlinSeeker:
+ - bugfix: ' Birdshot botany is resized. bar is also smaller.'
+ - bugfix: Birdshot public shrine now uses the correct dirt. (Goodbye chasms)
+ LT3:
+ - balance: Advanced Medbay Equipment research node lowered to tier 3
+ - balance: Advanced Medbay Equipment now requires haloperidol scan experiment
+ - balance: Haloperidol and cryostylane experiments can be performed roundstart
+ - balance: Cryostasis research node raised to tier 4
+ - balance: Cryostasis now has Fusion instead of Controlled Plasma as a prerequisite
+ - balance: Cryostasis cryostylane scan is now a discount experiment
+ - balance: Crystallizer moved from Controlled Plasma to Fusion
+ Loafin34:
+ - rscadd: There's a previously undiscovered variant of a nullrod, recently revealed
+ from the depths of the skating rink..
+ Melbert:
+ - qol: Vending Machines have a search bar
+ - qol: Random player characters now look less like rainbow vomit and more like some
+ of the most average people you know.
+ SmArtKar:
+ - bugfix: Added a forgotten firelock on second floor of wawa
+ - bugfix: Fixed glass shards generated from falling vending machines or tackling
+ windows not being able to embed into anyone.
+ - refactor: Refactored embedding code to use datums instead of bespoke elements
+ and ugly associated lists.
+ - bugfix: You require breathing once more.
+ Toastgoats:
+ - rscadd: Added the designer EVA suit, a unique pirate hardsuit for Silverscales.
+ - balance: Increased the equipment available to Silverscales
+ - image: Sprites for the designer EVA suit
+ carlarctg:
+ - spellcheck: Renamed the organ thrower module to the 'organizer'
+ - spellcheck: Made its description more accurate. Did you know it instantly replaces
+ up to 5 organs in active surgery?
+ homexp13:
+ - bugfix: ' Examining a fishing spot twice with sufficiently high fishing skill
+ (or the skillchip) will get you a list of fishes that can ACTUALLY be caught'
+ jlsnow301:
+ - bugfix: Fixed the bluescreen while setting a custom font in tgui panel
+ - bugfix: Fixed the orbit icons scrolling sometimes
+ lorwp:
+ - rscadd: using 'skibidi' as a chaplain deity now gives you brain damage
+ mc-oofert:
+ - bugfix: defibrillator no longer has an abstract cell
+ - code_imp: defibrillator attackby replaced with item_interaction
+ - balance: All jetpacks are now modsuit jetpack speed
+ - rscdel: Adv. Ion Jetpack module has been removed
+ - bugfix: you may now use a legion core on an elite tumor
+ necromanceranne:
+ - balance: You can only stun someone with a shove if they have been shoved into
+ objects or people, or have been hit by telescopic batons, contractor batons
+ or the Mansus Grasp.
+ - balance: If someone is knocked to the floor, however, you can still disarm them
+ of any object with a shove.
+ - bugfix: Knight helmets no longer burn as though made of cloth.
+ - rscadd: Fletching starter kit! Make your own bow, shoot your friends in an unfortunate
+ workplace accident. Replace all those holy arrows you lost.
+ - bugfix: Bows now properly undraw once they have fired an arrow.
+ - code_imp: Bows now utilize overlays in order to display loaded arrows. Unique
+ overlays per arrow.
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index 31f26c3e6e11e..38921a6e48402 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi
index fd7bee8ed6075..ae668b0495a56 100644
Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ
diff --git a/icons/effects/bitrunning.dmi b/icons/effects/bitrunning.dmi
index 8efa429389c3a..9a2e9c0228a57 100644
Binary files a/icons/effects/bitrunning.dmi and b/icons/effects/bitrunning.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 96c02aa91f990..1b6e8d68e3682 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/fields.dmi b/icons/effects/fields.dmi
index f87e1f3975e86..1e42870787674 100644
Binary files a/icons/effects/fields.dmi and b/icons/effects/fields.dmi differ
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index ad09351e787f6..47684f4664e89 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/effects/mouse_pointers/cool_sword.dmi b/icons/effects/mouse_pointers/cool_sword.dmi
new file mode 100644
index 0000000000000..a34fa56d87d3c
Binary files /dev/null and b/icons/effects/mouse_pointers/cool_sword.dmi differ
diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi
index ed6c0c8702e45..4e5608330030b 100644
Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index e56df0560531a..dda7d6cc635af 100644
Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ
diff --git a/icons/hud/screen_clockwork.dmi b/icons/hud/screen_clockwork.dmi
index 0923e42e7e429..17e0c92972e25 100644
Binary files a/icons/hud/screen_clockwork.dmi and b/icons/hud/screen_clockwork.dmi differ
diff --git a/icons/hud/screen_detective.dmi b/icons/hud/screen_detective.dmi
index aed6e0d6572a5..9704ca96f4c12 100644
Binary files a/icons/hud/screen_detective.dmi and b/icons/hud/screen_detective.dmi differ
diff --git a/icons/hud/screen_glass.dmi b/icons/hud/screen_glass.dmi
index 63ad3293921b8..6b6d9d515c5f0 100644
Binary files a/icons/hud/screen_glass.dmi and b/icons/hud/screen_glass.dmi differ
diff --git a/icons/hud/screen_midnight.dmi b/icons/hud/screen_midnight.dmi
index 5483ddf4564a5..8a6f2e1e8e06c 100644
Binary files a/icons/hud/screen_midnight.dmi and b/icons/hud/screen_midnight.dmi differ
diff --git a/icons/hud/screen_operative.dmi b/icons/hud/screen_operative.dmi
index f2d60d394acc9..73afee5b3ca40 100644
Binary files a/icons/hud/screen_operative.dmi and b/icons/hud/screen_operative.dmi differ
diff --git a/icons/hud/screen_plasmafire.dmi b/icons/hud/screen_plasmafire.dmi
index 5423d3855b2b6..b0b2c7999c92d 100644
Binary files a/icons/hud/screen_plasmafire.dmi and b/icons/hud/screen_plasmafire.dmi differ
diff --git a/icons/hud/screen_retro.dmi b/icons/hud/screen_retro.dmi
index b4252109d6847..a0d5abf3be511 100644
Binary files a/icons/hud/screen_retro.dmi and b/icons/hud/screen_retro.dmi differ
diff --git a/icons/hud/screen_slimecore.dmi b/icons/hud/screen_slimecore.dmi
index a75fe55c37839..84a7abec2be5f 100644
Binary files a/icons/hud/screen_slimecore.dmi and b/icons/hud/screen_slimecore.dmi differ
diff --git a/icons/hud/screen_trasenknox.dmi b/icons/hud/screen_trasenknox.dmi
index 2569d2a635edd..00ad01258a36a 100644
Binary files a/icons/hud/screen_trasenknox.dmi and b/icons/hud/screen_trasenknox.dmi differ
diff --git a/icons/mob/actions/actions_cult.dmi b/icons/mob/actions/actions_cult.dmi
index f73f5bb6367fa..7725ae691b4c6 100644
Binary files a/icons/mob/actions/actions_cult.dmi and b/icons/mob/actions/actions_cult.dmi differ
diff --git a/icons/mob/actions/actions_ecult.dmi b/icons/mob/actions/actions_ecult.dmi
index 67b6bf1fd2257..3ce72ae54ffe7 100644
Binary files a/icons/mob/actions/actions_ecult.dmi and b/icons/mob/actions/actions_ecult.dmi differ
diff --git a/icons/mob/actions/actions_genetic.dmi b/icons/mob/actions/actions_genetic.dmi
index 9ead1795fe72e..497abffe67451 100644
Binary files a/icons/mob/actions/actions_genetic.dmi and b/icons/mob/actions/actions_genetic.dmi differ
diff --git a/icons/mob/actions/actions_mecha.dmi b/icons/mob/actions/actions_mecha.dmi
index 7c659ca3b573c..60df1b5ed1ae5 100644
Binary files a/icons/mob/actions/actions_mecha.dmi and b/icons/mob/actions/actions_mecha.dmi differ
diff --git a/icons/mob/actions/actions_spells.dmi b/icons/mob/actions/actions_spells.dmi
index fb8c121218ffc..b8d3c3ce34b54 100644
Binary files a/icons/mob/actions/actions_spells.dmi and b/icons/mob/actions/actions_spells.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index eb3f87d9c71f0..be83d83d4228c 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 44ede20f2a5a1..a2d318adfb7d1 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
index 20bf4d18381fd..92b155f62d547 100644
Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index a670c33b7dcf6..ded01542e31b6 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi
index 8b29c935f5ea7..116f0256a6276 100644
Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ
diff --git a/icons/mob/clothing/head/spacehelm.dmi b/icons/mob/clothing/head/spacehelm.dmi
index 0b9f3d4a36eb4..d9a634a63c771 100644
Binary files a/icons/mob/clothing/head/spacehelm.dmi and b/icons/mob/clothing/head/spacehelm.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_clothing.dmi b/icons/mob/clothing/modsuit/mod_clothing.dmi
index 613559b726a7d..64affedb2de4c 100644
Binary files a/icons/mob/clothing/modsuit/mod_clothing.dmi and b/icons/mob/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index a193fbd74a8e3..ed0bb34b46449 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi
index fa93a85c7c6f1..869966528b2e9 100644
Binary files a/icons/mob/clothing/suits/jacket.dmi and b/icons/mob/clothing/suits/jacket.dmi differ
diff --git a/icons/mob/clothing/suits/labcoat.dmi b/icons/mob/clothing/suits/labcoat.dmi
index 37cb0e8696bdb..7edbf91840518 100644
Binary files a/icons/mob/clothing/suits/labcoat.dmi and b/icons/mob/clothing/suits/labcoat.dmi differ
diff --git a/icons/mob/clothing/suits/spacesuit.dmi b/icons/mob/clothing/suits/spacesuit.dmi
index 0067c4bf36a8c..1f691729a3031 100644
Binary files a/icons/mob/clothing/suits/spacesuit.dmi and b/icons/mob/clothing/suits/spacesuit.dmi differ
diff --git a/icons/mob/effects/genetics.dmi b/icons/mob/effects/genetics.dmi
index ebaad5028a25a..76d5224b3c7e7 100644
Binary files a/icons/mob/effects/genetics.dmi and b/icons/mob/effects/genetics.dmi differ
diff --git a/icons/mob/inhands/64x64_lefthand.dmi b/icons/mob/inhands/64x64_lefthand.dmi
index e0545c0d89395..d15a47206f984 100644
Binary files a/icons/mob/inhands/64x64_lefthand.dmi and b/icons/mob/inhands/64x64_lefthand.dmi differ
diff --git a/icons/mob/inhands/64x64_righthand.dmi b/icons/mob/inhands/64x64_righthand.dmi
index bf101ad0ea700..88ad954734bf5 100644
Binary files a/icons/mob/inhands/64x64_righthand.dmi and b/icons/mob/inhands/64x64_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_lefthand.dmi b/icons/mob/inhands/clothing/gloves_lefthand.dmi
index 6277d146ffc3d..4d191e42939b7 100644
Binary files a/icons/mob/inhands/clothing/gloves_lefthand.dmi and b/icons/mob/inhands/clothing/gloves_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_righthand.dmi b/icons/mob/inhands/clothing/gloves_righthand.dmi
index 7479dd8c505cc..f8ce306cc9850 100644
Binary files a/icons/mob/inhands/clothing/gloves_righthand.dmi and b/icons/mob/inhands/clothing/gloves_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/masks_lefthand.dmi b/icons/mob/inhands/clothing/masks_lefthand.dmi
index 64fcf4d70bd27..cac122916bdd2 100644
Binary files a/icons/mob/inhands/clothing/masks_lefthand.dmi and b/icons/mob/inhands/clothing/masks_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/masks_righthand.dmi b/icons/mob/inhands/clothing/masks_righthand.dmi
index 99f45bd1b17c0..f68f2d905e627 100644
Binary files a/icons/mob/inhands/clothing/masks_righthand.dmi and b/icons/mob/inhands/clothing/masks_righthand.dmi differ
diff --git a/icons/mob/inhands/items/touchspell_lefthand.dmi b/icons/mob/inhands/items/touchspell_lefthand.dmi
index 1fc8d962aec11..2cf040fcf8d18 100644
Binary files a/icons/mob/inhands/items/touchspell_lefthand.dmi and b/icons/mob/inhands/items/touchspell_lefthand.dmi differ
diff --git a/icons/mob/inhands/items/touchspell_righthand.dmi b/icons/mob/inhands/items/touchspell_righthand.dmi
index cc3adf5eb1032..d4815fe6b65dc 100644
Binary files a/icons/mob/inhands/items/touchspell_righthand.dmi and b/icons/mob/inhands/items/touchspell_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 967968b339ba7..86bd5020f4f32 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index beb3c84860d64..a6de8b974644c 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/nonhuman-player/cult.dmi b/icons/mob/nonhuman-player/cult.dmi
index 9241b138227c5..683ee9bd6fe32 100644
Binary files a/icons/mob/nonhuman-player/cult.dmi and b/icons/mob/nonhuman-player/cult.dmi differ
diff --git a/icons/mob/rideables/mech_construct.dmi b/icons/mob/rideables/mech_construct.dmi
index c25eb971f2e36..656322b8187a7 100644
Binary files a/icons/mob/rideables/mech_construct.dmi and b/icons/mob/rideables/mech_construct.dmi differ
diff --git a/icons/mob/rideables/mech_construction.dmi b/icons/mob/rideables/mech_construction.dmi
index f26dbe17fd036..6e1cdbc3a2d4a 100644
Binary files a/icons/mob/rideables/mech_construction.dmi and b/icons/mob/rideables/mech_construction.dmi differ
diff --git a/icons/mob/rideables/mecha.dmi b/icons/mob/rideables/mecha.dmi
index 76b089534e6f9..5960d05413781 100644
Binary files a/icons/mob/rideables/mecha.dmi and b/icons/mob/rideables/mecha.dmi differ
diff --git a/icons/mob/rideables/vehicles.dmi b/icons/mob/rideables/vehicles.dmi
index 7e2b8a05f204c..08923668d2663 100644
Binary files a/icons/mob/rideables/vehicles.dmi and b/icons/mob/rideables/vehicles.dmi differ
diff --git a/icons/obj/antags/cult/items.dmi b/icons/obj/antags/cult/items.dmi
index 9a3435dcd833e..fcd5f13c85bf5 100644
Binary files a/icons/obj/antags/cult/items.dmi and b/icons/obj/antags/cult/items.dmi differ
diff --git a/icons/obj/antags/cult/structures.dmi b/icons/obj/antags/cult/structures.dmi
index 373371f5a2f98..982742e876492 100644
Binary files a/icons/obj/antags/cult/structures.dmi and b/icons/obj/antags/cult/structures.dmi differ
diff --git a/icons/obj/antags/eldritch.dmi b/icons/obj/antags/eldritch.dmi
index 7f6af6bfe2e65..664311e5c7c47 100644
Binary files a/icons/obj/antags/eldritch.dmi and b/icons/obj/antags/eldritch.dmi differ
diff --git a/icons/obj/canisters.dmi b/icons/obj/canisters.dmi
index 436467648880b..1555cf0a4782e 100644
Binary files a/icons/obj/canisters.dmi and b/icons/obj/canisters.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 95453cb46edc8..e26731f384667 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index 3612c747f50e2..1be85df6c156d 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index fd898d3105fd8..97f692551f9e3 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index d5099c64e7f65..465340870dd48 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi
index 4d43b542051fc..fe52d505e439d 100644
Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ
diff --git a/icons/obj/clothing/head/spacehelm.dmi b/icons/obj/clothing/head/spacehelm.dmi
index c2830a9d9335f..980d2a07a50be 100644
Binary files a/icons/obj/clothing/head/spacehelm.dmi and b/icons/obj/clothing/head/spacehelm.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 5cb090978ae7c..436785ce6e5e9 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_modules.dmi b/icons/obj/clothing/modsuit/mod_modules.dmi
index 8b4b549eda2ae..6ec143a849e1c 100644
Binary files a/icons/obj/clothing/modsuit/mod_modules.dmi and b/icons/obj/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index e937d125ec2a4..e8726cfcb73a5 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/suits/jacket.dmi b/icons/obj/clothing/suits/jacket.dmi
index 30e1a99d9eed4..b867e7da3a710 100644
Binary files a/icons/obj/clothing/suits/jacket.dmi and b/icons/obj/clothing/suits/jacket.dmi differ
diff --git a/icons/obj/clothing/suits/labcoat.dmi b/icons/obj/clothing/suits/labcoat.dmi
index 430d11d5f96ab..4d5796a12b856 100644
Binary files a/icons/obj/clothing/suits/labcoat.dmi and b/icons/obj/clothing/suits/labcoat.dmi differ
diff --git a/icons/obj/clothing/suits/spacesuit.dmi b/icons/obj/clothing/suits/spacesuit.dmi
index 922ad05c35e7a..7fe01246352d6 100644
Binary files a/icons/obj/clothing/suits/spacesuit.dmi and b/icons/obj/clothing/suits/spacesuit.dmi differ
diff --git a/icons/obj/devices/artefacts.dmi b/icons/obj/devices/artefacts.dmi
new file mode 100644
index 0000000000000..75a6f754fbbed
Binary files /dev/null and b/icons/obj/devices/artefacts.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index 6c2eda1986633..f20b54d9c31f0 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/machines/lathes.dmi b/icons/obj/machines/lathes.dmi
index 0e7d91484216c..4a90132ae60a1 100644
Binary files a/icons/obj/machines/lathes.dmi and b/icons/obj/machines/lathes.dmi differ
diff --git a/icons/obj/medical/organs/organs.dmi b/icons/obj/medical/organs/organs.dmi
index 0d04f7fae3ce4..62a45426e186e 100644
Binary files a/icons/obj/medical/organs/organs.dmi and b/icons/obj/medical/organs/organs.dmi differ
diff --git a/icons/obj/meteor.dmi b/icons/obj/meteor.dmi
index 9fde3f3ef68ea..6b47fe485c34b 100644
Binary files a/icons/obj/meteor.dmi and b/icons/obj/meteor.dmi differ
diff --git a/icons/obj/meteor_spooky.dmi b/icons/obj/meteor_spooky.dmi
deleted file mode 100644
index 287d5b47bd0f7..0000000000000
Binary files a/icons/obj/meteor_spooky.dmi and /dev/null differ
diff --git a/icons/obj/pipes_n_cables/atmos.dmi b/icons/obj/pipes_n_cables/atmos.dmi
index 91badbf3ccf9b..fc67ff54158f9 100644
Binary files a/icons/obj/pipes_n_cables/atmos.dmi and b/icons/obj/pipes_n_cables/atmos.dmi differ
diff --git a/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi b/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi
index 555b6c6328b02..2f10725a0a8f3 100644
Binary files a/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi and b/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi differ
diff --git a/icons/obj/science/vatgrowing.dmi b/icons/obj/science/vatgrowing.dmi
index 646aad055cc3c..ec8b5dcb6acd9 100644
Binary files a/icons/obj/science/vatgrowing.dmi and b/icons/obj/science/vatgrowing.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index b4617915e86ed..f13b10bdf4a8a 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/icons/obj/storage/case.dmi b/icons/obj/storage/case.dmi
index a47c86eea9fb3..a29fd3a6f37c0 100644
Binary files a/icons/obj/storage/case.dmi and b/icons/obj/storage/case.dmi differ
diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi
index 0a8640860eced..34d5db6f3e898 100644
Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index c7b38cb6d1aab..becab20e591de 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/wallmounts.dmi b/icons/obj/wallmounts.dmi
index e020a8818e186..e70024a9edb23 100644
Binary files a/icons/obj/wallmounts.dmi and b/icons/obj/wallmounts.dmi differ
diff --git a/icons/obj/weapons/bows/arrows.dmi b/icons/obj/weapons/bows/arrows.dmi
index 4453d4ca5f247..956a82dd9bf1f 100644
Binary files a/icons/obj/weapons/bows/arrows.dmi and b/icons/obj/weapons/bows/arrows.dmi differ
diff --git a/icons/obj/weapons/bows/bows.dmi b/icons/obj/weapons/bows/bows.dmi
index 81b2fc4822058..4de9d4fca35ab 100644
Binary files a/icons/obj/weapons/bows/bows.dmi and b/icons/obj/weapons/bows/bows.dmi differ
diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi
index 5d607026f0133..6e8e5c60f684a 100644
Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi
index 98a2e59dbc9c3..3be26b2c43fad 100644
Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ
diff --git a/icons/obj/weapons/hand.dmi b/icons/obj/weapons/hand.dmi
index 5d8827e0a7b9b..071113138a7a5 100644
Binary files a/icons/obj/weapons/hand.dmi and b/icons/obj/weapons/hand.dmi differ
diff --git a/icons/obj/weapons/khopesh.dmi b/icons/obj/weapons/khopesh.dmi
index 95774e7f6c733..3c4ba40b34ac1 100644
Binary files a/icons/obj/weapons/khopesh.dmi and b/icons/obj/weapons/khopesh.dmi differ
diff --git a/icons/obj/weapons/sword.dmi b/icons/obj/weapons/sword.dmi
index 9b5a989a0514d..d9a443cfc2699 100644
Binary files a/icons/obj/weapons/sword.dmi and b/icons/obj/weapons/sword.dmi differ
diff --git a/icons/ui_icons/antags/heretic/knowledge.dmi b/icons/ui_icons/antags/heretic/knowledge.dmi
new file mode 100644
index 0000000000000..d24de1a5f0e81
Binary files /dev/null and b/icons/ui_icons/antags/heretic/knowledge.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 941791fbbf4b3..42c626c6ddd4a 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -54,7 +54,7 @@ menu "menu"
category = "&Help"
saved-params = "is-checked"
-// MASSMETA ADDITION (lil bit better ui)
+//MASSMETA EDIT ADDITION BEGIN (better ui)
elem
name = "Refresh TGUI"
command = "refresh-tgui"
@@ -85,7 +85,7 @@ menu "menu"
category = "&Players"
saved-params = "is-checked"
-// EDIT END
+//MASSMETA EDIT ADDITION END
window "mainwindow"
elem "mainwindow"
@@ -97,7 +97,7 @@ window "mainwindow"
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
statusbar = false
- icon = 'massmeta\\icons\\ui_icons\\common\\massmeta_64.png'
+ icon = 'massmeta\\icons\\ui_icons\\common\\massmeta_64.png' //MASSMETA EDIT CHANGE (server main icon)
macro = "default"
menu = "menu"
elem "split"
@@ -157,7 +157,7 @@ window "mapwindow"
is-default = true
right-click = true
saved-params = "zoom;letterbox;zoom-mode"
- style = ".center { text-align: center; } .maptext { font-family: 'MS Serif'; font-size: 7pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold; } .context { font-family: 'Pixellari'; font-size: 12pt; -dm-text-outline: 1px black; } .subcontext { font-family: 'TinyUnicode'; font-size: 12pt; line-height: 0.75; } .small { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; } .big { font-family: 'Pixellari'; font-size: 12pt; } .reallybig { font-size: 12pt; } .extremelybig { font-size: 12pt; } .greentext { color: #00FF00; font-size: 6pt; } .redtext { color: #FF0000; font-size: 6pt; } .clown { color: #FF69BF; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 6px; }"
+ style = ".center { text-align: center; } .maptext { font-family: 'MS Serif'; font-size: 7pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold; } .context { font-family: 'Pixellari'; font-size: 12pt; -dm-text-outline: 1px black; } .subcontext { font-family: 'TinyUnicode'; font-size: 12pt; line-height: 0.75; } .small { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; } .big { font-family: 'Pixellari'; font-size: 12pt; } .reallybig { font-size: 12pt; } .extremelybig { font-size: 12pt; } .greentext { color: #00FF00; font-size: 6pt; } .redtext { color: #FF0000; font-size: 6pt; } .clown { color: #FF69BF; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 6px; }" //MASSMETA EDIT CHANGE (cyrillic)
elem "status_bar"
type = LABEL
pos = 0,464
@@ -216,6 +216,7 @@ window "infowindow"
saved-params = "is-checked"
text = "Wiki"
command = "wiki"
+ //MASSMETA EDIT CHANGE BEGIN (forum -> discord)
elem "discord"
type = BUTTON
pos = 275,5
@@ -225,6 +226,7 @@ window "infowindow"
saved-params = "is-checked"
text = "Discord"
command = "discord"
+ //MASSMETA EDIT CHANGE END
elem "github"
type = BUTTON
pos = 365,5
diff --git a/massmeta/code/__HELPERS/names.dm b/massmeta/code/__HELPERS/names.dm
index 75ba0566c0dac..bf703b95fa3d4 100644
--- a/massmeta/code/__HELPERS/names.dm
+++ b/massmeta/code/__HELPERS/names.dm
@@ -31,34 +31,29 @@
if(1)//1 and 2 can only be selected once each to prevent more than two specific names/places/etc.
switch(rand(1,2))//Mainly to add more options later.
if(1)
- if(names.len && prob(70))
+ if(length(names) && prob(70))
. += pick(names)
else
- if(prob(10))
- . += pick(GLOB.lizard_names_male,GLOB.lizard_names_female)
- else
- var/new_name = pick(pick(GLOB.first_names_male,GLOB.first_names_female))
- new_name += " "
- new_name += pick(GLOB.last_names)
- . += new_name
+ . += generate_random_name()
+
if(2)
- . += pick(GLOB.jobs)//Returns a job.
+ . += LOWER_TEXT(pick(GLOB.jobs))//Returns a job.
safety -= 1
if(2)
switch(rand(1,2))//Food, drinks, or places. Only selectable once.
if(1)
- . += pick(GLOB.cocktails)
+ . += LOWER_TEXT(pick(GLOB.cocktails))
if(2)
- . += pick(GLOB.locations)
+ . += LOWER_TEXT(pick(GLOB.locations))
safety -= 2
if(3)
switch(rand(1,3))//Abstract nouns, adjectives, verbs. Can be selected more than once.
if(1)
- . += pick(GLOB.ru_nouns)
+ . += LOWER_TEXT(pick(GLOB.ru_nouns))
if(2)
- . += pick(GLOB.ru_adjectives)
+ . += LOWER_TEXT(pick(GLOB.ru_adjectives))
if(3)
- . += pick(GLOB.ru_verbs)
+ . += LOWER_TEXT(pick(GLOB.ru_verbs))
if(!return_list)
if(words == 1)
. += "."
diff --git a/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm b/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm
new file mode 100644
index 0000000000000..fe97eaf69bc14
--- /dev/null
+++ b/massmeta/code/modules/antags/wizard/equipment/spellbook_entries/offensive.dm
@@ -0,0 +1,11 @@
+#define SPELLBOOK_CATEGORY_OFFENSIVE "Offensive"
+// Offensive wizard spells
+
+/datum/spellbook_entry/testicular_torsion
+ name = "Testicular Torsion"
+ desc = "A dark spell capable of exploding victim's balls."
+ spell_type = /datum/action/cooldown/spell/touch/testicular_torsion
+ cost = 1
+ category = SPELLBOOK_CATEGORY_OFFENSIVE
+
+#undef SPELLBOOK_CATEGORY_OFFENSIVE
diff --git a/massmeta/code/modules/clothing/masks/moustache_ru.dm b/massmeta/code/modules/clothing/masks/moustache_ru.dm
index e6d6fe21928fe..3a96584447a2d 100644
--- a/massmeta/code/modules/clothing/masks/moustache_ru.dm
+++ b/massmeta/code/modules/clothing/masks/moustache_ru.dm
@@ -2,16 +2,16 @@
var/message = speech_args[SPEECH_MESSAGE]
if(message[1] != "*")
var/static/regex/words = new(@"(?>>>>> their-feature:foobar.dm
+```
+
+В данном случае в череду коммитов /TG/station внедряется дополнительный, про который известно только нам самим. ГитХаб, видя подобное несоответствие - даёт нам сделать выбор.
+
+Например, нам нужно оставить только Наше изменение, то просто удаляем все что нам добавил ГитХаб и оставляем только нужное,
+
+```byond
+var/something = 2 //MASSMETA EDIT
+```
+
+Подобного рода конфликты разрешаются именно ручками, однако есть другие подходы в виде модульного кода, о которых мы расскажем далее в данном руководстве.
+
+Подробнее про [Ветвления и Слияния](https://git-scm.com/book/ru/v2/Ветвление-в-Git-Основы-ветвления-и-слияния).
+
+## Протокол модуляризации 🛠️
+
+У Вашего модуля должно быть короткое и информативное название в документации, например - **`shuttle_toggle`**.
+
+Этим уникальным **ID** Вы затем назовёте:
+
+- Свою модульную папку `modular_meta/features/shuttle_toggle/`, в которой вы будете локально работать.
+
+- А также в дальнейшем Вы будете помечать все **Немодульные** изменения в коде /TG/station.
+
+Теперь подробнее про виды модуляризации.
+
+### Не Модульные Изменения
+
+Время от времени наступает момент, когда редактирование **оригинальных** файлов /TG/station становится неизбежным.
+
+📌 Пожалуйста, не забудьте записать факт их изменения под пунктом **"Original TG Changes"** в **`readme.md`** вашего модуля.
+
+В этих случаях мы решили применять следующую стандартизацию:
+
+- **Добавление:**
+
+ ```byond
+ //MASSMETA EDIT ADDITION BEGIN (shuttle_toggle)
+ var/adminEmergencyNoRecall = FALSE
+ var/lastMode = SHUTTLE_IDLE
+ var/lastCallTime = 6000
+ //MASSMETA EDIT ADDITION END
+ ```
+
+- **Удаление:**
+
+ ```byond
+ //MASSMETA EDIT REMOVAL BEGIN (shuttle_toggle)
+ /*
+ for(var/obj/docking_port/stationary/S in stationary)
+ if(S.id = id)
+ return S
+ */
+ //MASSMETA EDIT REMOVAL END
+ ```
+
+- **Изменения:**
+
+ ```byond
+ //MASSMETA EDIT CHANGE BEGIN (shuttle_toggle)
+ /* ORIGINAL
+ if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE)
+ */
+ if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE, SHUTTLE_DISABLED)
+ //MASSMETA EDIT CHANGE END
+ return 1
+ ```
+
+ 💡 Если предполагается **"Масштабное"** изменений кода, то такое переопределение уже можно переместить в модуль. Однако на месте удаления обязательно допишите: (Moved to: modular_meta/features/shuttle_toggle/randomverbs.dm)
+
+ ⚠️ Обязательно оставляем все что было до вашего вмешательства под пометкой **ORIGINAL**!
+
+### Полностью Модульные Изменения
+
+В нашем проекте присутствует папка **`modular_meta/`**, там будут храниться все наши **"Модульные"** изменения кода /TG/station.
+
+💡 Она полностью независима и этим мы гарантируем, что кодеры с /TG/station не будут туда вмешиваться.
+
+В этой папке есть ещё несколько подпапок и файлов:
+
+| Папка/Файл |
+| ------------------------------- |
+| **~meta_defines/** 📂 |
+| **features/** 📂 |
+| **reverts/** 📂 |
+| **tools/** 📂 |
+| **modular_meta_defines.dm** 📄 |
+| **modular_meta_features.dm** 📄 |
+| **modular_meta_reverts.dm** 📄 |
+| **modularization_guide.md** 📝 |
+| **module_template.md** 📝 |
+| **readme.md** 📝 |
+
+Теперь подробнее про каждую из Папок:
+
+- **`~meta_defines/`** 📂
+
+ Здесь лежат все наши модульные "определения" (они же defines).
+
+ Вынесена отдельно из папки **`features/`** вследствии нюансов связанных с самим проектом /TG/station. (т.к. сам byond работает с дефайнами только в директории **`code/__DEFINES/`**, туда идёт переопределение наших файлов.)
+
+ Если у вас есть **define**, который используется более чем в одном файле вашего кода, то он **обязательно** должен быть объявлен в файле этой папки.
+
+ 💡 Если **define** применяется только в рамках одного файла, то его достаточно объявить вверху и внизу файла.
+
+ ```byond
+ #define MY_DEFINE
+ //some code with MY_DEFINE here
+ #undef MY_DEFINE
+ ```
+
+ 📌 Пожалуйста, не забудьте записать факт их добавления под пунктом **"Defines:"** в **`readme.md`** вашего модуля.
+
+ Все файлы в папке включены в **`modular_meta/modular_meta_defines.dm`**.
+
+- **`features/`** 📂
+
+ Здесь лежат все модульные файлы **"Новых Фич"**, которых нет в апстриме. Каждой присвоен уникальный **module_id**.
+
+ Подробнее про строение папок отдельных модулей расскажем чуть ниже.
+
+ Только `includes.dm` файлы каждого модуля включены в **`modular_meta_features.dm`**.
+
+- **`reverts/`** 📂
+
+ Папка аналогичная `features/`, но там располагаются недавние откаты плохих и возвраты хороших по нашему мнению фич, введёных апстримом /TG/station.
+
+ ❗ Если фича была уже выпилена давно или же апстрим произвел её полное удаление сразу, то она уже может рассматриваться как самостоятельный модуль. Такое помещаем её уже в папку `features/`!
+
+ Такой модуль именовать уже обязательно с припиской **"revert_"**, например вот так: **revert_module_id**.
+
+ ⚠️ Обязательно укажите в файле **`readme.md`** модуля ссылку на пиар, который откатываевается!
+
+ Только `includes.dm` файлы каждого модуля включены в **`modular_meta_reverts.dm`**.
+
+- **`tools/`** 📂
+
+ Тут лежат все дополнительные инструменты проверки нашего кода.
+
+ Они проверяют только файлы в модульной папке, помогая нам не совершать дополнительных ошибкок.
+
+ К ним идет прямое обращение только в файле: **`.github/workflows/ci_suite.yml`**.
+
+## Подробнее про наполнение папок (features/ и reverts/)
+
+Чтобы сохранить общий стиль и обеспечить удобную навигацию по большинству модулей, а также контролировать количество файлов и папок в репозитории, Вы должны располагать определённые типы файлов по своим папкам.
+
+⚠️ Каждый модуль обязан содержать в себе файл документации модуля – `readme.md`.
+
+| Папка/Файл | Содержимое |
+| ------------------ | ---------------------------------------------------------- |
+| **code/** 📁 | Файлы кода: **`.dm`** |
+| **icon/** 📁 | Файлы иконок и картинок: **`.dmi`** и **`.png`** |
+| **sound/** 📁 | Звуковые файлы: **`.ogg`** и **`.waw`** |
+| **includes.dm** 📄 | Перечисление всех файлов в папке **code/** |
+| **readme.md** 📝 | Полная документация к модулю, [пример](module_template.md) |
+
+⚠️ Файлы строк: **`.txt`** и **`.json`** вы помещаете в папку `strings/massmeta/`, т.к. код /TG/station не может работать нормально со всеми файлами-строк вне этой папки. Укажите факт из добавления в **`readme.md`** вашего модуля.
+
+⛔ У проектов **Skyrat** присуствует папка `master_files/`, однако у нас в проекте её НЕТ! Все переопредения кода у нас помещается полностью в модуль с особыми пометками! Пояснения будут позже.
+
+❗ Также у проектов **Skyrat** стандартно все новые файлы сразу включаются в общий файл **`tgstation.dme`**, что я считаю достаточно трудным для дальнейшней поддрежки, да и в целом это не особо согласуется с их модульным принципом. У нашего проекта другой поход в этом моменте, как Вы видите.
+
+### Подробнее про папку **`code/`**
+
+⚠️ В этих файлах не должно быть закомментированного кода, тем более полностью закомментированных файлов! А вот пояснения к коду оставлять можно, порой даже и нужно.
+
+Здесь располагается код двух типов:
+
+#### Абсолютно новые функции и объекты 🆕
+
+Просто ложите все свои новые файлы кода в папку `code/` своего модуля.
+
+💡 Можете разбивать Ваш под по подпапкам, если в этом есть нужда.
+
+Не забывайте проставлять все ваши пути к иконкам и звуку правильно!
+
+#### Переопределение объектов и функций /TG/station 🔀
+
+С помощью этих файлов мы косвенно изменяем основной код /TG/station. Это позволяет нам очень изящно внедрять свои коррективы, не вмешиваясь напрямую в основной код. Тем самым не нарушая их череду коммитов и не создавая для нас самих в будущем **Конфликтов Слияния**.
+
+Однако это является и минусом такого подхода. Гитхаб не сможет нам оперативно подсказать где файл поменялся из-за вмешательства апстрима и где следует учесть измененое или дополнительное переопределение. Иногда прямые изменения кода через `//MASSMETA EDIT` предпочтительнее. Старайтесь использовать здравый смысл в этом вопросе.
+
+⚠️ У данных файлов **Не надо соблюдать Иерархию** аналогичной папки `code/` у /TG/station! Просто ложите вместе со всеми файлами в модуль.
+
+Эти файлы выносите в "отдельную группу" с помощью пометки `"master_"`, например: `master_tg_filename.dm`.
+
+⚠️ Над каждым блоком таких функций/объектов **подписывайте в каком оригинальном файле /TG/station они расположены**. Таким образом нам будет проще смекнуть что к чему.
+
+📌 Пожалуйста, не забудьте записать факт таких переопределений под пунктом **"Modular Overrides:"** в **`readme.md`** вашего модуля.
+
+- **Пример модульного переопределения объекта** 💡
+
+ Например, Вы решили модульно переопределить иконку и описание у мольберта (easel).
+
+ Оригинальный объект в коде /TG/station по пути `code/modules/art/paintings.dm`:
+
+ ```byond
+ /obj/structure/easel
+ name = "easel"
+ desc = "Only for the finest of art!"
+ icon = 'icons/obj/art/artstuff.dmi'
+ icon_state = "easel"
+ density = TRUE
+ resistance_flags = FLAMMABLE
+ max_integrity = 60
+ var/obj/item/canvas/painting = null
+ ```
+
+ Для этого создайте новый файл желательно с таким же именем как у оригинала и расположите в папке `code/` вашего модуля: `code/master_paintings.dm`.
+
+ Для выполнения нашей цели, наполнение даного файла будет выглядеть примерно так:
+
+ ```byond
+ //ORIGINAL: code/modules/art/paintings.dm
+ /obj/structure/easel
+ desc = "Let yourself draw!"
+ icon = 'massmeta/features/art/icons/artstuff.dmi'
+ icon_state = "new_easel"
+ ```
+
+ Теперь при компилировании проекта, данное переопределение подменит эти переменные у оригинального объекта мольберта. Тем самым в готовом проекте у мольберта будет уже Новая иконка и описание. Даже код /TG/station менять не пришлось! 🎉
+
+- **Пример модульного добавления фичи в функцию** 💡
+
+ Для простоты предположим, что вы хотите заставить оружие искрить при выстреле для имитации дульной вспышки.
+
+ Также Вы хотите, чтобы это можно было использовать со всеми видами оружия, использующими эту функцию.
+
+ В модульном файле объекта можно начать с добавления новой переменной `var/muzzle_flash`.
+
+ ```byond
+ /obj/item/gun
+ var/muzzle_flash = TRUE
+ ```
+
+ Теперь у Вас будет **у каждого** наследника этого объекта доступна эта переменная. После этого, допустим, вы захотите проверять её и вызвать искры после выстрела.
+
+ У этого объекта уже есть процедура, что вызывается при стрельбе:
+
+ ```byond
+ /obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
+ ```
+
+ Теперь мы начинаем **добавлять код** для работы нашей фичи в дочернюю процедуру `/obj/item/gun/shoot_live_shot()`.
+
+ ```byond
+ /obj/item/gun/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
+ . = ..()
+ if(muzzle_flash)
+ spawn_sparks(src)
+ ```
+
+ Тут мы обязательно вызываем такую конструкцию **`. = ..()`**, она по сути своей говорит, что мы наследуемся от родительской функции. После данной конструкции добаляем весь наш **Новый** код.
+
+ Теперь при компилировании проекта, данные "добавления" допишутся в оригинальный объект и функцию. Этим мы добились того, что оружие при выстреле ещё и искрит, при том не вмешиваясь в функции /TG/station напрямую! 🎉
+
+### **`. = ..()`** для чайников
+
+Как вы уже могли заметить, у языка DM частично заложена парадигма ООП, нас в данном случае интересует процесс наследования объектов и их функций.
+
+💡 Вы также можете нажать F1 в Dream Maker и прочитать подробный мануал на английском.
+
+- `.` – это возвращаемое значение нашей функции по умолчанию. Изначально оно равно `null`.
+
+- `..` – это возвращаемое значение родительской функции.
+
+ Через `..()` Вы обращаетесь к родительской функции, этим вызывая её в нужном месте Вашей функции-наследника.
+
+И теперь, если вы сделаетете подобый манёвр `. = ..()`, то Вы вызовите родительскую функцию и присвоите её значение возвращаемому значению нашей функции. После этого можете свободно дополнять свою `.` чем хотите.
+
+Так же в случае, если Вы не хотите возвращать родительский вывод, то Вы можете сохранить его в любую переменную или просто использовать `..()`
+
+Мы так же можем вообще не вызывать `..()` - тогда функция оверрайдится полностью. Но я бы не рекомендовал делать подобное, ради перемещения ориг. функции в модуль и дальнейшей модификации её уже там, ибо когда /TG/station поменяет её у себя, то пиши пропало.
+
+Также учтите, что вы не сможете при модульном дополнии функции использовать те переменные, которые были объявленны в функции оригинале!
+
+## Карты 🗺️
+
+### Не Модульное Изменение Карт
+
+Используются карты:
+* 🔴 Оригинальные с офф ТГ (без прямых наших изменений)
+* 🟡 Заимствованные с других билдов (некоторые желательно не менять, т.к. мы можем подтягивать обновления в других билдов)
+* 🟢 Наши самодельные, они же полностью независимые, например, ProtoBoxStation (меняем и чиним как хотим)
+
+Все наши Новые карты лежат по пути **`massmeta/_maps/map_files/`** (не в модульной папке).
+
+К каждой карте идёт дополнительно **`.json`** файл-конфигурации в **`massmeta/_maps/`**, не забудьте добавить его тоже!
+
+### Модульное Изменение Карт (Авто-мапперы)
+
+⚠️ Не изменяйте оригинальные карты /TG/station напрямую, Вы стокнётесь потом с таким же хаосом, как если вы бы меняли файлы иконок! Для внесения изменений ипользуйте способы ниже.
+
+Когда вы добавляете новый элемент на карту, то вы должны сперва определеить масштаб переделок.
+
+- Если это **небольшое изменение на 1 предмет**, то используйте простой автоматизатор области.
+
+ Автомаппер простых областей использует записи точек отсчета, чтобы поместить один элемент в область карты, которая имеет определенный смысл.
+
+- Если речь идет об **изменении целой комнаты**, то используйте автоматизатор шаблонов.
+
+ Автомаппер использует готовые шаблоны для переопределения участков карты, используя координаты для определения начального местоположения. Примеры смотрите в файле automapper_config.toml.
+
+## Модульный TGUI (TG User Interface)
+
+**TGUI** - еще один исключительный случай, поскольку он использует Javascript, который не может быть модульным, нежели же код DM.
+
+ВСЕ файлы TGUI находятся в папке `/tgui/packages/tgui/interfaces/` и ее подкаталогах. Нет какой-то конкретной папки для Наших TGUI файлов!
+
+📌 Пожалуйста, не забудьте записать факт их добавления/изменения под пунктом **"TGUI Files:"** в **`readme.md`** вашего модуля.
+
+### Изменение оригинальных файлов /TG/station
+
+При изменении оригинальных файлов TGUI поступаем аналогично, как и при изменении вышележащего кода DM, однако схема написания комментариев тут несколько иная.
+
+Вы можете использовать как `// MASSMETA EDIT`, так и `/* MASSMETA EDIT */`, хотя в некоторых случаях вам придется использовать одно вместо другого. (в некотрых языках '//' - могут не являться комментированием, учтите это)
+
+В целом, старайтесь, чтобы комментарии к изменениям находились на той же строке, что и само изменение. Предпочтительно внутри JSX-тега. Например:
+
+```js
+
+```
+
+```js
+
+```
+
+```js
+
+```
+
+В крайнем случае Вы можете заключить ваше редактирование в фигурные скобки, например так:
+
+```js
+{/* MASSMETA EDIT ADDITION START */}
+
+ someProp="whatever"
+
+{/* MASSMETA EDIT ADDITION END */}
+```
+
+### Создание новых файлов TGUI
+
+⚠️ При создании нового файла TGUI с нуля, пожалуйста, добавьте **Заголовочный Комментарий** самом верху файла:
+
+```js
+// THIS IS A MASSMETA UI FILE
+```
+
+Таким образом, они легко идентифицируются как **Наши** модульные файлы TGUI `.tsx` и `.jsx`.
+
+Собственно ничего больше делать и не нужно, комментарии `// MASSMETA EDIT` в таком файле TGUI излишне.
+
+
+
+## В заключении
+
+Терпение и труд – ТГ к*дера перетрут. Если мы будем последовательны, то в конечном итоге это избавит НАС от будущих болей в области ГМ, когда Нам (Вам) же придется разрешать конфликты вручную.
+Благодаря более скрупулезному документированию будет сразу понятно, какие изменения были сделаны, где и с помощью каких функций, и все станет гораздо менее двусмысленным и запутанным.
+
+Желаю удачи в ТГ кодинге. Помните, что сообщество всегда готово помочь Вам, если вдруг понадобится помощь.
+
+Оригинальное руководство: Skyrat/NovaSector. Перевод + дополнения: Artemchik542. Рецензент текста: SmArtKar.
diff --git a/massmeta/module_template.md b/massmeta/module_template.md
index ff9d70955b9fe..28c7491a4beae 100644
--- a/massmeta/module_template.md
+++ b/massmeta/module_template.md
@@ -1,28 +1,26 @@
-
+
-https://github.com/Huz2e/massmeta/pull/
-
-## \ <!--Title of your addition.-->
-
-Module ID: <!-- Uppercase, UNDERSCORE_CONNECTED name of your module, that you use to mark files. This is so people can case-sensitive search for your edits, if any. -->
+## Module ID: <!--Впишите сюда свой уникальный ID вашего модуля-->
### Description:
-<!-- Here, try to describe what your PR does, what features it provides and any other directly useful information. -->
+<!-- Здесь опишите Ваш PR, расскажите что он добавляет/убирает в проект ну и любую другую непосредственно полезную информацию.
+Если Вы делаете модуль Реверта фичи, то обязательно укажте ссылку на оригинальный пиар /TG/station, который вы вернули.
+-->
-### TG Proc/File Changes:
+### Original TG Changes:
- N/A
-<!-- If you edited any core procs, you should list them here. You should specify the files and procs you changed.
-E.g:
+<!-- Если вы редактировали какие-либо объекты/процедуры в файлах /TG/station, то укажите их здесь. Укажите файлы и желательно ещё и процедуры, которые вы изменили в них.
+Например:
- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var`
-->
### Modular Overrides:
- N/A
-<!-- If you added a new modular override (file or code-wise) for your module, you should list it here. Code files should specify what procs they changed, in case of multiple modules using the same file.
-E.g:
+<!-- Если вы добавили новое модульное переопределение кода /TG/station для вашего модуля, то вы должны указать его здесь. В файлах кода следует указать, какие процедуры были изменены, в случае, если несколько модулей используют один и тот же файл.
+Например:
- `modular_meta/master_files/sound/my_cool_sound.ogg`
- `modular_meta/master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var`
-->
@@ -30,13 +28,14 @@ E.g:
### Defines:
- N/A
-<!-- If you needed to add any defines, mention the files you added those defines in, along with the name of the defines. -->
+<!-- Если вам потребовалось добавить какие-либо defines (определения), то укажите файлы, в которые вы добавили эти определения, а также их названия. -->
-### Included files that are not contained in this module:
+### TGUI Files:
- N/A
-<!-- Likewise, be it a non-modular file or a modular one that's not contained within the folder belonging to this specific module, it should be mentioned here. Good examples are icons or sounds that are used between multiple modules, or other such edge-cases. -->
+<!-- Файлы TGUI, новые или измененные под ваш модуль. Обратите внимание, что TGUI не может быть модульным, как .dm код! -->
### Credits:
-<!-- Here go the credits to you, dear coder, and in case of collaborative work or ports, credits to the original source of the code. -->
+- N/A
+<!-- Укажите здесь авторство кода (по желанию) -->
diff --git a/massmeta/readme.md b/massmeta/readme.md
index 501e1078d689e..776ec7697e849 100644
--- a/massmeta/readme.md
+++ b/massmeta/readme.md
@@ -1,399 +1,21 @@
-# Руководство по модуляризации кода - MassMeta style, v0.3
+### Это модульная папка проекта МассМета
-## Чем тщательнее вы соблюдаете правила из этого руководства - тем меньше претензий будет к вам и ваш PR будет быстрее замержан в репозиторий.
+Здесь находятся:
-## Вступление
-Разработка и поддержка отдельной код-базы, что постоянно подсасывает обновления с основного проекта (в нашем случае это /TG/station) - это ну ооочень непростая задача, многие подобные "типо модульные" проекты утонули в грязном коде (посмотри в код Монке-станции), а подобные "Авгиевые конюшни" поддерживать - та ещё запара.
+| Папка/Файл | Описание
+| ------------------------------- | -------------------------------------------------------------|
+| **~meta_defines** 📁 | Папка со всеми нашими модульно определенными defines |
+| **master_files** 📁 | Файлы, что мы модульно Переопределили у /TG/Station |
+| **modules** 📁 | Все Новые модульные файлы |
+| **tools** 📁 | Инструменты, что позволяют удобнее вести проект |
+| **modular_meta.dm** 📄 | Файл, где описаны все наши модули, что мы добавляем в проект |
+| **modular_meta_defines.dm** 📄 | Файл, где описаны все наши модульно определенные defines |
+| **modularization_guide.md** 📝 | Инструкция по модульному ведению проекта (на Русском) |
+| **module_template.md** 📝 | Примерный шаблон, как должно выглядеть описание вашего PR'а |
-Поймите, чем больше разрастается наш модульный код - тем тщательнее нужно его поддерживать для дальнейшей нашей работы.
+⚠️ Все Defines, применяющиеся в вашем модуле, должны быть реализованы в папке **~meta_defines**! ⚠️
-Удобство сопровождения вашего дополнительного кода - является одной из основных причин соблюдения МОДУЛЬНОСТИ у нашего проекта.
+📚 Вам предоставлено **modularization_guide.md** пособие на Русском, о том как модульно вести проект.
-Хорошо организованный и документированный код избавляет наш Моск при дальнейшем "обновлении до оффов ТГ" или внесении или удалении "фичи". **Сделай все сразу качественно как можешь.**
-
-Этот документ будет обновляться и изменяться каждый раз, когда в него будут добавляться новые исключения. Возможно, время от времени стоит проверять, возможно тут появится более правильный/удобный прием модуляризации.
-
-GitHub - это одна из многих видов систем контроля версий (СКВ). Мы на ней т.к. оффы ТГ тоже на ней. Сам Git одновременно и достаточно проработан в плане алгоритмов, он ими же и ограничен. Они не всегда могут однозначно разрешить определенные изменения в коде, что приводит к конфликтам, которые придется Вам починять вручную.
-
-**Все Баг-фиксы и прочую дичь Ты льешь только в корневой проект ТГ**
-
-### Важное примечание - ТЕСТИРУЙТЕ СВОИ PR'ы
-
-Как ответственный ТГ К*дер - Вы несете ответственность за тестирование вашего контента. Ты - это и тестировщик, что тестирует свой продукт для клиентов - игроков. А игроков на сервере обычно больше 1-го, то порой нужно проверять вашу фичу вдвоем/втроем/итд.
-
-Если вам нужен отдельный клиент для тестирования, вы можете использовать гостевой аккаунт, выйдя из BYOND-хаба и зайдя на локалку как Guest. Как только вас уже доконал этот кодинг фичи - закидывай PR на репозиторий и жди пока тебе его починят (заставят переделывать твоими же ручками).
-
-## Из-за чего же весь сыр-бор?
-
-### Итак, у Вас возник конфликт...
-
-Предположим в оригинале у нас было так:
-
-```byond
-var/something = 1
-```
-
-и вдруг нам протребовалось изменить значение с 1 на 2 для нашего проекта,
-
-```diff
-- var/something = 1
-+ var/something = 2 //MASSMETA EDIT
-```
-
-но внезапно наш доблестный ТГ К*дер с оффов вносит свои изменения в основную код-базу, меняя её с 1 на 4,
-
-```diff
-- var/something = 1
-+ var/something = 4
-```
-затем мы решили синхронизировать изменения ни о чём не подозревая, однако видим следующее,
-
-```byond
-var/something = 2 //MASSMETA EDIT
-```
-
-Как бы ни был прост данный пример, но он приводит к относительно простому конфликту.
-
-Где мы начинаем думать головой, чтобы выбрать наилучший вариант вручную.
-
-### Выходы из ситуации
-
-ТЫ - ТОТ КТО РЕШАЕТ КОНФЛИКТЫ, ПРОГРАММА - ГЛУПА И ГОТОВА В ЛЮБОЙ МОМЕНТ ПОДСТАВИТЬ ТЕБЯ, НЕ НАДЕЙСЯ НА НЕЁ!
-
-Ну так о чем мы... Ах да, МОДУЛЯРИЗАЦИЯ!
-
-**Модуляризация** означает, что большинство изменений и дополнений, которые мы делаем, будут храниться в отдельной папке **`modular_meta/`**, там наш код полностью независим от основного кода. Однако не всегда возможно все сделать полностью модульным, подобные случаи должны быть особым образом отмечены комментариями, указывающими, где начинаются изменения, где они заканчиваются, и к какой функции они относятся.
-
-## Протокол модуляризации
-
-«Как корабль назовешь, так он и поплывет». Придумайте короткое (но информативное) название для своего пиара для дальнейших пометок ваших изменений в коде. (Вы аналогично можете назвать вашу ветку (Branch) в вашем репозитории). После того как вы придумали название - то проверь, нет ли уже подобного в проекте!
-
-Например, `DNA-FEATURE-WINGS` или `XENOARCHEAOLOGY` или `SHUTTLE_TOGGLE` - Мы будем использовать его в будущей документации, как некий уникальный ID. Он должен быть единым во всех ваших изменениях/дополнениях. Все пометки ДОЛЖНЫ быть абсолютно одинаковыми! Это необходимо для удобства поиска.
-
-Затем вам нужно создать основную папку, в которой вы будете локально работать, назови сразу её подобно ID твоего модуля. Например, `modular_meta/modules/shuttle_toggle`.
-
-### Карты
-
-В нашем репозитории не предполагается держать модульные карты (это которые с применением авто-мапперов).
-
-Используются карты:
-* оригинальные с офф ТГ (без изменений)
-* заимствованные с других билдов (некоторые желательно не менять, уточните)
-* наши самодельные = полностью независимые (например: ProtoBoxStation)
-
-### Ресурсы: изображения (.png), звуки (.ogg), значки (.dmi) и прочие бинарники (= не Текст).
-
-Git сам по себе может справиться с конфликтами двоичных файлов, однако Вы - нет. Для вас бинарник будет выглядеть как беспорядочный набор всякого, поэтому вносить изменения в основные Бинарные файлы категорически не рекомендуется.
-
-Все (кроме TGUI, строк и конфигов со строками) добавленные нами файлы должны быть помещены в ту же модульную папку, что и ваш код. Это означает, что все локаально хранится в папке вашего модуля: звуки, значки и файлы кода. - УДОБНО!
-
-- ***Пример:*** Решили Вы добавить нового моба для лаваленда.
-
- Прежде всего вы создаете свою модульную папку. Например: `modular_meta/modules/lavalandmob`
-
- Далее Вы создаете подпапки для каждого компонента (если нужно).
- Например:
- * `/code` для кода
- * `/sounds` для звуковых файлов
- * `/icons` для любых файлов картинок/значков.
-
- После этого вам нужно будет установить ссылки на ваши файлы в коде.
-
- ```byond
- /mob/lavaland/newmob
- icon = 'modular_meta/modules/lavalandmob/icons/mob.dmi'
- icon_state = "dead_1"
- sound = 'modular_meta/modules/lavalandmob/sounds/boom.ogg'
- ```
-
- Это гарантирует нам, что ваш код является полностью модульным и облегчит его будущие изменения.
-
-- С прочими "нетекстовыми" файлами следует обращаться аналогичным образом, в зависимости от контекста каждого конкретного случая. Если у вас есть сомнения, обратитесь за советами и предложениями к сопровождающему проекта или другим участникам.
-
-- Any additional clothing icon files you add MUST go into the existing files in master_files clothing section. (непонятно что имел ввиду автор)
-
-### Папка `master_files` (oh yes Sir!)
-
-Вы всегда должны помещать любые модульные переопределения значков, звуков, кода и т. д. в эту папку, и они **должны** соответствовать структуре папки основного кода.
-
-Пример: `code/modules/mob/living/living.dm` -> `modular_meta/master_files/code/modules/mob/living/living.dm`
-
-Это сделано для того, чтобы было проще выяснить, что вы или кто-то другой поменяли в Базовом файле, без необходимости поиска в определениях процедур.
-
-Это также помогает предотвратить многократное переопределение одного и того же процесса модулями. Более подробная информация об этих типах редактирования расскажется позже.
-
-### Полностью модульные части вашего кода
-
-Раздел ниже относительно прост, там будет рассказано об основах Модульности с понятными примерами, так как руководство предназначено, скорее, для новичков.
-
-Правило гласит, что если вы сможете обойтись без этого, то не следует вносить изменения в файлы основной код-базы. За некоторыми исключениями, которые будут упомянуты в ближайшее время.
-
-Короче говоря, большая часть модульного кода будет размещена во вложенных папках вашей основной папки модуля **`modular_meta/modules/yourmodule/code/`**, с теми же правилами, что и в случае с остальными файлами. Не отражайте структуру папок основного кода в модульной папке!
-
-Например, `modular_meta/modules/xenoarcheaology/code`, содержит весь код, инструменты, предметы и прочее, связанное с этим.
-
-Такие модули, за исключением _очень_ простых, **должны** иметь в своей папке `readme.md`, содержащий следующее:
-
-- ссылки на PR'ы, которые внедрили этот модуль или внесли в него какие-либо существенные изменения
-- краткое описание модуля
-- список файлов, измененных в основном коде, с кратким описанием изменений, а также список изменений в других модульных файлах, не являющихся частью того же модуля, которые были необходимы для правильной работы этого модуля
-- (опционально) немного более подробная документация для корректировки кода на будущее, которая будет полезна при дальнейшем развитии и сопровождении
-- авторство
-
-***Примерный Шаблон:*** [Тык](module_template.md)
-
-## Модульные переопределения (важно!!)
-
-Обратите внимание, что можно модульно добавлять код перед или за основной процедурой, не редактируя исходную процедуру, а обращаясь к родительской процедуре с помощью `. = ..()` или `..()`. Аналогичным образом можно добавить новый var к существующему datum или obj, не редактируя напрямую файлы офф ТГ.
-
-**Примечание о переопределении proc: Если вы можете, это не значит, что вы должны!!!**
-
-В целом, такой подход является хорошей идеей и поощряется, когда это возможно. Однако это не жесткое правило, и иногда "//MASSMETA EDIT" предпочтительнее. Просто постарайтесь использовать здравый смысл в этом вопросе.
-
-Например: пожалуйста, не вставляйте всю TG-процедуру в модульную переопределённую процедуру, внесите одно небольшое изменение, а затем объявите её "полностью модульной". Эти процедуры - абсолютный кошмар для поддержки, потому что как только что-то изменится, вам придется обновлять переопределенную процедуру.
-
-Иногда вы даже не знаете о существовании переопределения, если оно компилируется нормально и не вызывает никаких ошибок. Это часто приводит к тому, что функции, которые были добавлены выше по течению, здесь отсутствуют. Так что да. Избегайте этого. Нет ничего страшного, если что-то не является полностью модульным. Иногда это лучший выбор из двух зол.
-
-Лучшими кандидатами для модульных переопределений proc являются те, в которых вы можете просто добавить что-то после вызова родителя или ловко вплести вызов родителя в середину, чтобы достичь желаемого эффекта.
-
-Производительность также следует учитывать, когда вы переопределяете горячую (часто вызываемую) процедуру (например, Life()), поскольку каждый дополнительный вызов увеличивает накладные расходы сервера. В таких случаях редактирование "//MASSMETA EDIT" намного критичны к общей производительности кода. Однако для большинства процедур об этом даже и не нужно беспокоиться.
-
-### Эти модульные переопределения должны храниться именно в `master_files`, и вам следует по возможности избегать их размещения внутри модулей.
-
-Для простоты предположим, что вы хотите заставить оружие искрить при выстреле для имитации дульной вспышки и вы хотите, чтобы это можно было использовать с любыми видами оружия.
-
-В модульном файле можно начать с добавления переменной var.
-
-```byond
-/obj/item/gun
- var/muzzle_flash = TRUE
-```
-
-И все будет работать как полагается. После этого, допустим, вы захотите проверить var и вызвать искры после выстрела.
-Зная, что исходный proc, вызываемый при стрельбе, является
-
-```byond
-/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
-```
-
-вы можете определить для него дочернюю процедуру, которая будет вставлена в цепочку наследования связанных с ней процедур (выглядит на вид сложно, но в таких простых случаях, как этот, вам не нужно беспокоиться)
-
-```byond
-/obj/item/gun/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
- . = ..() //. is the default return value, we assign what the parent proc returns to it, as we call it before ours
- if(muzzle_flash)
- spawn_sparks(src) //For simplicity, I assume you've already made a proc for this
-```
-
-На этом мы закончили с основами.
-
-### Немодульные изменения основного кода - ВАЖНО
-
-Время от времени наступает момент, когда редактирование основных файлов становится неизбежным.
-
-Пожалуйста, не забудьте записать факт их изменения в readme.md вашего модуля.
-
-В этих случаях мы решили применить следующую стандартизацию с примерами:
-
-- **Добавление:**
-
- ```byond
- //MASSMETA EDIT ADDITION BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
- var/adminEmergencyNoRecall = FALSE
- var/lastMode = SHUTTLE_IDLE
- var/lastCallTime = 6000
- //MASSMETA EDIT ADDITION END
- ```
-
-- **Удаление:**
-
- ```byond
- //MASSMETA EDIT REMOVAL BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
- /*
- for(var/obj/docking_port/stationary/S in stationary)
- if(S.id = id)
- return S
- */
- //MASSMETA EDIT REMOVAL END
- WARNING("couldn't find dock with id: [id]")
- ```
-
- И для любых удалений, которые перемещаются в другие файлы:
-
- ```byond
- //MASSMETA EDIT REMOVAL BEGIN - SHUTTLE_TOGGLE - (Moved to modular_meta/shuttle_toggle/randomverbs.dm)
- /*
- /client/proc/admin_call_shuttle()
- set category = "Admin - Events"
- set name = "Call Shuttle"
-
- if(EMERGENCY_AT_LEAST_DOCKED)
- return
-
- if(!check_rights(R_ADMIN))
- return
-
- var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
- if(confirm != "Yes")
- return
-
- SSshuttle.emergency.request()
- SSblackbox.record_feedback("tally", "admin_verb", 1, "Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- log_admin("[key_name(usr)] admin-called the emergency shuttle.")
- message_admins(span_adminnotice("[key_name_admin(usr)] admin-called the emergency shuttle."))
- return
- */
- //MASSMETA EDIT REMOVAL END
- ```
-
-- **Изменения:**
-
- ```byond
- //MASSMETA EDIT CHANGE BEGIN - SHUTTLE_TOGGLE - (Optional Reason/comment)
- //if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE) - MASSMETA EDIT - ORIGINAL
- if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE, SHUTTLE_DISABLED)
- //MASSMETA EDIT CHANGE END
- return 1
- ```
-
- при небольшом локальном изменении кода хорошим тоном будет в комментарии указать то что было там до вашего вмешательства.
-
-## Особые случаи модульного кода
-
-Из каждого правила есть исключения, обусловленные множеством обстоятельств.
-
-### Определения
-Свои модульные определения (defines) помещаем именно в папку **`massmeta/~meta_defines`**.
-
-Если у вас есть определение, которое используется более чем в одном файле, оно **обязательно** должно быть объявлено там.
-
-Если у вас есть define, который используется в одном файле и больше нигде не предполагается, объявите его вверху файла, а `#undef MY_DEFINE` - внизу файла. Это нужно для того, чтобы сохранить чистоту контекстных меню и не запутать тех, кто использует IDE (по типу VS Code) с автозаполнением.
-
-(Сам byond работает с дефайнами только в директории **`code/__DEFINES`**, туда идет переопределение нашего файла.)
-
-### Компоновка модульной папки
-Чтобы сохранить общий стиль и обеспечить удобную навигацию по большинству модулей, а также контролировать количество файлов и папок в репозитории, вы должны следовать этой схеме.
-
-Убедитесь, что имена папок точно соответствуют указанным.
-
-Самая верхняя папка: module_id
-
-**НЕ КОПИРУЙТЕ ФАЙЛОВУЮ СТРУКТУРУ ОСНОВНОГО КОДА ОФФОВ ТГ В СВОЙ МОДУЛЬ!!!**
-
-**Code** (код): Все файлы .DM должны располагаться здесь.
-
-- Делай так: /modular_meta/modules/module_id/code/disease_mob.dm
-- НЕ так: /modular_meta/modules/module_id/code/modules/antagonists/disease/disease_mob.dm
-
-**Icons** (изображения/иконки): Все файлы .DMI должны располагаться здесь.
-
-- Делай так: /modular_meta/modules/module_id/icons/mining_righthand.dmi
-- НЕ так: /modular_meta/modules/module_id/icons/mob/inhands/equipment/mining_righthand.dmi
-
-**Sound** (звуки/музыка): Все файлы .OGG должны располагаться здесь.
-
-- Делай так: /modular_meta/modules/module_id/sound/space_dragon_roar.ogg
-- НЕ так: /modular_meta/modules/module_id/sound/creatures/space_dragon_roar.ogg
-
-Файл Readme следует поместить в родительскую папку /modular_meta/modules/module_id.
-
-**ДЕРЖИТЕ РАЗНЫЕ ТИПЫ ФАЙЛОВ ПО СВОИ ПАПКАМ!**
-
-### Комментировнный код (= неиспользуемый) - НЕ ДЕЛАЙТЕ ЭТОГО
-
-Если вы комментируете избыточный код в модулях - значит его нужно полностью удалить.
-
-Даже если вы думаете, что кто-то собирается переделать то, что вы закомментировали, не делайте этого, gitblame существует не просто так, (прим. от переводчика: есть такая команда 'git blame', что позволяет показать, историю редактирования конкретной строки кода).
-
-Это относится и к файлам, не комментируйте целые файлы, просто удалите это безобразие. Это поможет нам избежать их раздувания и бессмысленных комментариев. Тем более вы всегда можете посмотреть что было именно в этом файле просто нажав в гите "Посмотреть историю изменений".
-
-**Это не относится к немодульным изменениям.**
-
-### Иерархия инклюдов (includes.dm) ваших модулей
-
-У Скайратов (в данном случае у Nova Sector) все новые файлы сразу включаются в общий файл tgstation.dme, что я считаю достаточно трудным для дальнейшней поддрежки, да и в целом не особо согласуется с их модульным принципом.
-
-В корне папки /modular_meta лежит файл modular_meta.dm (он включен в общий tgstation.dme)
-
-В этом файле описаны все дополнения, которые мы добавили в наш проект модульно. Они тоже представлены в виде .dm файлов. (например hardsuits.dm)
-
-Каждый такой .dm файл в каждом модуле содержит в себе все наши дополнительные модульные-файлы (тоже .dm).
-
-Таким образом мы соблюдаем некую красивую иерархию.
-
-### Вставка в код своих строковых (.txt .json) и config файлов
-
-Помещаете свои файлы в подпапку **`strings/~modular_meta_strings`**.
-По аналогии и config-файлами **`config/~modular_meta_config`**.
-
-Не забывайте выставлять правильный файловый путь к вашему файлу с учетом новой подпапки!
-
-## Модульный TGUI (TG User Interface)
-
-TGUI - еще один исключительный случай, поскольку он использует javascript и не может быть модульным, нежели же код DM.
-
-ВСЕ файлы tgui находятся в папке `/tgui/packages/tgui/interfaces` и ее подкаталогах; отдельной папки для пользовательских интерфейсов Massmeta не существует.
-
-### Изменение файлов самих офф ТГ
-
-При изменении оригинальных файлов TGUI действуют те же правила, что и при изменении вышележащего кода DM, однако схема написания комментариев порой тут несколько иная.
-
-Вы можете использовать как `// MASSMETA EDIT`, так и `/* MASSMETA EDIT */`, хотя в некоторых случаях вам придется использовать одно вместо другого. (в некотрых языках '//' - могут не являться комментированием, учтите это)
-
-В целом, старайтесь, чтобы комментарии к изменениям находились на той же строке, что и само изменение. Предпочтительно внутри JSX-тега. Например:
-
-```js
-<Button
- onClick={() => act('spin', { high_quality: true })}
- icon="rat" // MASSMETA EDIT ADDITION
-</Button>
-```
-
-```js
-<Button
- onClick={() => act('spin', { high_quality: true })}
- // MASSMETA EDIT ADDITION START - another example, multiline changes
- icon="rat"
- tooltip="spin the rat."
- // MASSMETA EDIT ADDITION END
-</Button>
-```
-
-```js
-<SomeThing someProp="whatever" /* it also works in self-closing tags */ />
-```
-
-Если это не представляется возможным, вы можете заключить ваше редактирование в фигурные скобки, например так:
-
-```js
-{/* MASSMETA EDIT ADDITION START */}
-<SomeThing>
- someProp="whatever"
-</SomeThing>
-{/* MASSMETA EDIT ADDITION END */}
-```
-
-### Создание новых файлов TGUI
-
-** ВАЖНО! При создании нового файла TGUI с нуля, пожалуйста, добавьте следующее в самом верху файла (строка 1):**
-
-```js
-// THIS IS A MASSMETA UI FILE
-```
-
-Таким образом, они легко идентифицируются как модульные файлы TGUI .tsx/.jsx. Собственно ничего больше делать и не нужно, комментарии "// MASSMETA EDIT" в модульном файле TGUI не нужны.
-
-<!-- ## Exemplary PR's // TODO: REPLACE THESE!
-
-Here are a couple PR's that are great examples of the guide being followed, reference them if you are stuck:
-
-- <https://github.com/Skyrat-SS13/Skyrat-tg/pull/241>
-- <https://github.com/Skyrat-SS13/Skyrat-tg/pull/111> -->
-
-## В заключении
-
-Терпение и труд - ТГ к*дера перетрут. Если мы будем последовательны, то в конечном итоге это избавит НАС от будущих болей в области ГМ, когда Нам (Вам) же придется разрешать конфликты вручную.
-Благодаря более скрупулезному документированию будет сразу понятно, какие изменения были сделаны, где и с помощью каких функций, и все станет гораздо менее двусмысленным и запутанным.
-
-Желаю удачи в ТГ к*динге. Помните, что сообщество всегда готово помочь вам, если вдруг понадобится помощь.
+💡 Для вашего удобства предоставленна примерная схема содержания вашего PR'а на наш репозиторй в **module_template.md**.
diff --git a/massmeta/tools/massmeta_check_grep.sh b/massmeta/tools/massmeta_check_grep.sh
new file mode 100644
index 0000000000000..653128b6b3e30
--- /dev/null
+++ b/massmeta/tools/massmeta_check_grep.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+#ANSI Escape Codes for colors to increase contrast of errors
+RED="\033[0;31m"
+GREEN="\033[0;32m"
+BLUE="\033[0;34m"
+NC="\033[0m" # No Color
+
+echo -e "${BLUE}Re-running grep checks, but looking in modular_meta/features/...${NC}"
+
+# Run the linters again, but modular massmeta code (features).
+sed 's/code\/\*\*\/\*\*.dm/massmeta\/features\/\*\*\/\*\*.dm/g' <tools/ci/check_grep.sh | bash
+
+echo -e "${BLUE}Re-running grep checks, but looking in modular_meta/master_files/...${NC}"
+
+# Run the linters again, but modular massmeta code (master_files).
+sed 's/code\/\*\*\/\*\*.dm/massmeta\/master_files\/\*\*\/\*\*.dm/g' <tools/ci/check_grep.sh | bash
diff --git a/massmeta/tools/readme.md b/massmeta/tools/readme.md
new file mode 100644
index 0000000000000..0df2c4ad2cf3b
--- /dev/null
+++ b/massmeta/tools/readme.md
@@ -0,0 +1,3 @@
+## Тут лежат все наши Новые Инструменты проверки нашего кода.
+
+Они находятся только в данной папке. К ним идет обращение в файле: **.github/workflows/ci_suite.yml**
diff --git a/massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json
new file mode 100644
index 0000000000000..d7204d7555c34
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta.json
@@ -0,0 +1,7 @@
+{
+ "file": "massmeta/modular_meta.dm",
+ "scannable_directory": "massmeta/features/",
+ "subdirectories": true,
+ "excluded_files": [],
+ "forbidden_includes": []
+}
diff --git a/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json
new file mode 100644
index 0000000000000..e2a72f9ed5d35
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_defines.json
@@ -0,0 +1,7 @@
+{
+ "file": "massmeta/modular_meta_defines.dm",
+ "scannable_directory": "massmeta/~meta_defines/",
+ "subdirectories": true,
+ "excluded_files": [],
+ "forbidden_includes": []
+}
diff --git a/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json
new file mode 100644
index 0000000000000..fe4c9bf68f2a4
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/schemas/modular_meta_master.json
@@ -0,0 +1,7 @@
+{
+ "file": "massmeta/modular_meta_master.dm",
+ "scannable_directory": "massmeta/master_files/",
+ "subdirectories": true,
+ "excluded_files": [],
+ "forbidden_includes": []
+}
diff --git a/massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py b/massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py
new file mode 100644
index 0000000000000..32fe9db93df66
--- /dev/null
+++ b/massmeta/tools/ticked_file_enforcement/ticked_file_enforcement.py
@@ -0,0 +1,212 @@
+import codecs
+import fnmatch
+import functools
+import glob
+import json
+import os
+import sys
+
+# simple way to check if we're running on github actions, or on a local machine
+on_github = os.getenv("GITHUB_ACTIONS") == "true"
+
+def green(text):
+ return "\033[32m" + str(text) + "\033[0m"
+
+def red(text):
+ return "\033[31m" + str(text) + "\033[0m"
+
+def blue(text):
+ return "\033[34m" + str(text) + "\033[0m"
+
+schema = json.load(sys.stdin)
+file_reference = schema["file"]
+file_reference_basename = os.path.basename(file_reference)
+scannable_directory = schema["scannable_directory"]
+subdirectories = schema["subdirectories"]
+FORBIDDEN_INCLUDES = schema["forbidden_includes"]
+excluded_files = schema["excluded_files"]
+
+def post_error(string):
+ print(red(f"Ticked File Enforcement [{file_reference}]: " + string))
+ if on_github:
+ print(f"::error file={file_reference},line=1,title=Ticked File Enforcement::{string}")
+
+for excluded_file in excluded_files:
+ full_file_path = scannable_directory + excluded_file
+ if not os.path.isfile(full_file_path):
+ post_error(f"Excluded file {full_file_path} does not exist, please remove it!")
+ sys.exit(1)
+
+file_extensions = ("dm", "dmf")
+
+reading = False
+lines = []
+total = 0
+
+# need just for better logs look
+if (scannable_directory == "massmeta/features/") or (scannable_directory == "massmeta/~meta_defines/") or (scannable_directory == "massmeta/master_files/"):
+ print(blue(f"Scanning Modular Code..."))
+ print(blue(f" Checking files in [{scannable_directory}]"))
+
+with open(file_reference, 'r') as file:
+ for line in file:
+ total += 1
+ line = line.strip()
+
+ if line == "// BEGIN_INCLUDE":
+ reading = True
+ continue
+ elif line == "// END_INCLUDE":
+ break
+ elif not reading:
+ continue
+
+ # need to make full path
+ if (scannable_directory == "massmeta/features/") or (scannable_directory == "massmeta/~meta_defines/") or (scannable_directory == "massmeta/master_files/"):
+ line = line[:10] + "massmeta\\" + line[10:]
+
+ # checks defines folder
+ fail_no_include_modular = False
+ if scannable_directory == "massmeta/~meta_defines/":
+ module_file_path = line.replace('\\', '/')
+ module_file_path_clean = module_file_path[10:-1]
+ print(f" [{module_file_path_clean}]")
+ if (module_file_path_clean[9:22] != "~meta_defines"):
+ print(red(f" File [{module_file_path_clean}] must be in \"~meta_defines/\" folder"))
+ fail_no_include_modular = True
+
+ # checks master folder
+ if scannable_directory == "massmeta/master_files/":
+ module_file_path = line.replace('\\', '/')
+ module_file_path_clean = module_file_path[10:-1]
+ print(f" [{module_file_path_clean}]")
+ if (module_file_path_clean[9:21] != "master_files"):
+ print(red(f" File [{module_file_path_clean}] must be in \"master_files/\" folder"))
+ fail_no_include_modular = True
+
+ lines.append(line)
+
+ # checks main module folder
+ if scannable_directory == "massmeta/features/":
+ module_file_path = line.replace('\\', '/')
+ module_file_path_clean = module_file_path[10:-1]
+ print(f" [{module_file_path_clean}] with in it:")
+ if module_file_path_clean[-11:] != "includes.dm":
+ print(red(f" File [{module_file_path_clean}] must be named \"includes.dm\", skipping the file."))
+ fail_no_include_modular = True
+ continue
+
+ with open(module_file_path_clean, 'r') as extra_file:
+ for extra_line in extra_file:
+ total += 1
+ extra_line = extra_line.strip()
+ if (extra_line[10:14] != "code"):
+ print(red(f" File [{extra_line}] must be in \"code/\" folder"))
+ fail_no_include_modular = True
+
+ # make full path
+ extra_line = line[:-12] + extra_line[10:]
+ lines.append(extra_line)
+ extra_line.replace('\\', '/')
+ print(f" [{extra_line[10:-1]}]")
+
+ if fail_no_include_modular:
+ post_error(f"Modular Ticked File Enforcement has failed!")
+ sys.exit(1)
+
+offset = total - len(lines)
+print(blue(f"Ticked File Enforcement: {offset} lines were ignored in output for [{file_reference}]."))
+fail_no_include = False
+
+scannable_files = []
+for file_extension in file_extensions:
+ compiled_directory = f"{scannable_directory}/**/*.{file_extension}"
+ scannable_files += glob.glob(compiled_directory, recursive=True)
+
+if len(scannable_files) == 0:
+ post_error(f"No files were found in {scannable_directory}. Ticked File Enforcement has failed!")
+ sys.exit(1)
+
+for code_file in scannable_files:
+ dm_path = ""
+
+ if subdirectories is True:
+ dm_path = code_file.replace('/', '\\')
+ else:
+ dm_path = os.path.basename(code_file)
+
+ included = f"#include \"{dm_path}\"" in lines
+
+ forbid_include = False
+ for forbidable in FORBIDDEN_INCLUDES:
+ if not fnmatch.fnmatch(code_file, forbidable):
+ continue
+
+ forbid_include = True
+
+ if included:
+ post_error(f"{dm_path} should NOT be included.")
+ fail_no_include = True
+
+ if forbid_include:
+ continue
+
+ if not included:
+ if(dm_path == file_reference_basename):
+ continue
+
+ if(dm_path in excluded_files):
+ continue
+
+ post_error(f"Missing include for {dm_path}.")
+ fail_no_include = True
+
+if fail_no_include:
+ sys.exit(1)
+
+def compare_lines(a, b):
+ # Remove initial include as well as the final quotation mark
+ a = a[len("#include \""):-1].lower()
+ b = b[len("#include \""):-1].lower()
+
+ split_by_period = a.split('.')
+ a_suffix = ""
+ if len(split_by_period) >= 2:
+ a_suffix = split_by_period[len(split_by_period) - 1]
+ split_by_period = b.split('.')
+ b_suffix = ""
+ if len(split_by_period) >= 2:
+ b_suffix = split_by_period[len(split_by_period) - 1]
+
+ a_segments = a.split('\\')
+ b_segments = b.split('\\')
+
+ for (a_segment, b_segment) in zip(a_segments, b_segments):
+ a_is_file = a_segment.endswith(file_extensions)
+ b_is_file = b_segment.endswith(file_extensions)
+
+ # code\something.dm will ALWAYS come before code\directory\something.dm
+ if a_is_file and not b_is_file:
+ return -1
+
+ if b_is_file and not a_is_file:
+ return 1
+
+ # interface\something.dm will ALWAYS come after code\something.dm
+ if a_segment != b_segment:
+ # if we're at the end of a compare, then this is about the file name
+ # files with longer suffixes come after ones with shorter ones
+ if a_suffix != b_suffix:
+ return (a_suffix > b_suffix) - (a_suffix < b_suffix)
+ return (a_segment > b_segment) - (a_segment < b_segment)
+
+ print(f"Two lines were exactly the same ({a} vs. {b})")
+ sys.exit(1)
+
+sorted_lines = sorted(lines, key = functools.cmp_to_key(compare_lines))
+for (index, line) in enumerate(lines):
+ if sorted_lines[index] != line:
+ post_error(f"The include at line {index + offset} is out of order ({line}, expected {sorted_lines[index]})")
+ sys.exit(1)
+
+print(green(f"Ticked File Enforcement: [{file_reference}] All includes (for {len(scannable_files)} scanned files) are in order!"))
diff --git a/massmeta/~meta_defines/readme.md b/massmeta/~meta_defines/readme.md
index 7647433003d31..e25a2d40f5a8b 100644
--- a/massmeta/~meta_defines/readme.md
+++ b/massmeta/~meta_defines/readme.md
@@ -1 +1,3 @@
-На этот файл идёт переадресация из code/__DEFINES/~meta_defines_include.dm
+## Тут лежат все наши Новые Defines, что мы определили в нашем модуле, они все добавлены в файле:
+
+**massmeta/modular_meta_defines.dm**
diff --git a/sound/ambience/antag/heretic/heretic_gain_intense.ogg b/sound/ambience/antag/heretic/heretic_gain_intense.ogg
new file mode 100644
index 0000000000000..5e6d4f4174fc9
Binary files /dev/null and b/sound/ambience/antag/heretic/heretic_gain_intense.ogg differ
diff --git a/sound/attributions.txt b/sound/attributions.txt
index 528542e59ca78..123fde0794c19 100644
--- a/sound/attributions.txt
+++ b/sound/attributions.txt
@@ -193,6 +193,19 @@ valve_opening.ogg was made by mixing water flowing samples from:
https://freesound.org/people/scriotxstudios/sounds/349111/?attribution=1 and squeaky scrape sound from:
https://freesound.org/people/Department64/sounds/669028/ which was modified with lower pitch
+liquid_pour2.ogg and liquid_pour3.ogg were cut from
+https://freesound.org/people/MattRuthSound/sounds/561896/
+https://freesound.org/people/MattRuthSound/sounds/561895/
+
ayylien.ogg was made by remixing:
SCIRetro_Energy Swells Synth_Funky Audio_Sonics Spices by Funky_Audio under CC0 -- https://freesound.org/people/realtheremin/sounds/119011/
-scifi_scare_a.aiff by realtheremin under CC0 -- https://freesound.org/people/Funky_Audio/sounds/729392/
\ No newline at end of file
+scifi_scare_a.aiff by realtheremin under CC0 -- https://freesound.org/people/Funky_Audio/sounds/729392/
+
+solarflare.ogg was made by ArcaneMusic, using the following sources from Freesound.org.
+"Flashbang Explosion Designed 14m" by modusmogulus https://freesound.org/people/modusmogulus/sounds/734095/ under CC 0
+"Hammer and anvil" by Duasun -- https://freesound.org/people/Duasun/sounds/321889/ under CC 0
+
+beaker_pickup.ogg was made by lowering pitch:
+Bottle Tap.wav by alex_alexalex -- https://freesound.org/s/395492/ -- License: Attribution NonCommercial 3.0
+beaker_place.ogg was made by cutting and lowering pitch:
+place glass object.wav by milpower -- https://freesound.org/s/353105/ -- License: Creative Commons 0
diff --git a/sound/effects/glug.ogg b/sound/effects/glug.ogg
new file mode 100644
index 0000000000000..268ff4557e8e6
Binary files /dev/null and b/sound/effects/glug.ogg differ
diff --git a/sound/effects/liquid_pour1.ogg b/sound/effects/liquid_pour1.ogg
new file mode 100644
index 0000000000000..71e57ad19f7ef
Binary files /dev/null and b/sound/effects/liquid_pour1.ogg differ
diff --git a/sound/effects/liquid_pour2.ogg b/sound/effects/liquid_pour2.ogg
new file mode 100644
index 0000000000000..773b30e59e5c0
Binary files /dev/null and b/sound/effects/liquid_pour2.ogg differ
diff --git a/sound/effects/liquid_pour3.ogg b/sound/effects/liquid_pour3.ogg
new file mode 100644
index 0000000000000..0548d7b14a4ed
Binary files /dev/null and b/sound/effects/liquid_pour3.ogg differ
diff --git a/sound/items/attributions.txt b/sound/items/attributions.txt
new file mode 100644
index 0000000000000..de55b8daebe95
--- /dev/null
+++ b/sound/items/attributions.txt
@@ -0,0 +1 @@
+night_vision_on.ogg by Syna-Max -- https://freesound.org/s/60345/ -- License: Attribution NonCommercial 4.0
diff --git a/sound/items/eshield_recharge.ogg b/sound/items/eshield_recharge.ogg
new file mode 100644
index 0000000000000..747ad4563e5c1
Binary files /dev/null and b/sound/items/eshield_recharge.ogg differ
diff --git a/sound/items/handling/beaker_pickup.ogg b/sound/items/handling/beaker_pickup.ogg
new file mode 100644
index 0000000000000..c31bf6856dcaf
Binary files /dev/null and b/sound/items/handling/beaker_pickup.ogg differ
diff --git a/sound/items/handling/beaker_place.ogg b/sound/items/handling/beaker_place.ogg
new file mode 100644
index 0000000000000..14b3868d0673d
Binary files /dev/null and b/sound/items/handling/beaker_place.ogg differ
diff --git a/sound/items/night_vision_on.ogg b/sound/items/night_vision_on.ogg
new file mode 100644
index 0000000000000..13ca202669c4b
Binary files /dev/null and b/sound/items/night_vision_on.ogg differ
diff --git a/sound/machines/attributions.txt b/sound/machines/attributions.txt
new file mode 100644
index 0000000000000..b459be3d3e158
--- /dev/null
+++ b/sound/machines/attributions.txt
@@ -0,0 +1 @@
+sound/machines/lathe/lathe_print.ogg - made by kayozzx (discord) , license: CCbySA
diff --git a/sound/machines/lathe/lathe_print.ogg b/sound/machines/lathe/lathe_print.ogg
new file mode 100644
index 0000000000000..eace2da907558
Binary files /dev/null and b/sound/machines/lathe/lathe_print.ogg differ
diff --git a/sound/mecha/mech_blade_attack.ogg b/sound/mecha/mech_blade_attack.ogg
new file mode 100644
index 0000000000000..f6c9274762b1f
Binary files /dev/null and b/sound/mecha/mech_blade_attack.ogg differ
diff --git a/sound/mecha/mech_blade_break_wall.ogg b/sound/mecha/mech_blade_break_wall.ogg
new file mode 100644
index 0000000000000..cec9c7a667cb0
Binary files /dev/null and b/sound/mecha/mech_blade_break_wall.ogg differ
diff --git a/sound/mecha/mech_blade_safty.ogg b/sound/mecha/mech_blade_safty.ogg
new file mode 100644
index 0000000000000..80e06388127f0
Binary files /dev/null and b/sound/mecha/mech_blade_safty.ogg differ
diff --git a/sound/mecha/mech_charge_attack.ogg b/sound/mecha/mech_charge_attack.ogg
new file mode 100644
index 0000000000000..b6d202c8e26d0
Binary files /dev/null and b/sound/mecha/mech_charge_attack.ogg differ
diff --git a/sound/mecha/mech_stealth_attack.ogg b/sound/mecha/mech_stealth_attack.ogg
new file mode 100644
index 0000000000000..e12ff890c7de5
Binary files /dev/null and b/sound/mecha/mech_stealth_attack.ogg differ
diff --git a/sound/mecha/mech_stealth_effect.ogg b/sound/mecha/mech_stealth_effect.ogg
new file mode 100644
index 0000000000000..b7a5a513308df
Binary files /dev/null and b/sound/mecha/mech_stealth_effect.ogg differ
diff --git a/sound/mecha/mech_stealth_pre_attack.ogg b/sound/mecha/mech_stealth_pre_attack.ogg
new file mode 100644
index 0000000000000..15b2c04ab5c2a
Binary files /dev/null and b/sound/mecha/mech_stealth_pre_attack.ogg differ
diff --git a/sound/voice/breathing.ogg b/sound/voice/breathing.ogg
new file mode 100644
index 0000000000000..f940a1b211a6b
Binary files /dev/null and b/sound/voice/breathing.ogg differ
diff --git a/sound/voice/firebot/candle_tip.ogg b/sound/voice/firebot/candle_tip.ogg
new file mode 100644
index 0000000000000..0f29f18e3f969
Binary files /dev/null and b/sound/voice/firebot/candle_tip.ogg differ
diff --git a/sound/voice/firebot/electric_fire_tip.ogg b/sound/voice/firebot/electric_fire_tip.ogg
new file mode 100644
index 0000000000000..29910024b1995
Binary files /dev/null and b/sound/voice/firebot/electric_fire_tip.ogg differ
diff --git a/sound/voice/firebot/gasoline_tip.ogg b/sound/voice/firebot/gasoline_tip.ogg
new file mode 100644
index 0000000000000..838c0d267e65e
Binary files /dev/null and b/sound/voice/firebot/gasoline_tip.ogg differ
diff --git a/sound/vox_fem/absorb.ogg b/sound/vox_fem/absorb.ogg
new file mode 100644
index 0000000000000..e05b4aa464570
Binary files /dev/null and b/sound/vox_fem/absorb.ogg differ
diff --git a/sound/vox_fem/absorbed.ogg b/sound/vox_fem/absorbed.ogg
new file mode 100644
index 0000000000000..726f1aa8c6ffb
Binary files /dev/null and b/sound/vox_fem/absorbed.ogg differ
diff --git a/sound/vox_fem/absorbing.ogg b/sound/vox_fem/absorbing.ogg
new file mode 100644
index 0000000000000..8b8c1f575c744
Binary files /dev/null and b/sound/vox_fem/absorbing.ogg differ
diff --git a/sound/vox_fem/activating.ogg b/sound/vox_fem/activating.ogg
new file mode 100644
index 0000000000000..8082efb691143
Binary files /dev/null and b/sound/vox_fem/activating.ogg differ
diff --git a/sound/vox_fem/activation.ogg b/sound/vox_fem/activation.ogg
new file mode 100644
index 0000000000000..f06d33245df5b
Binary files /dev/null and b/sound/vox_fem/activation.ogg differ
diff --git a/sound/vox_fem/active.ogg b/sound/vox_fem/active.ogg
new file mode 100644
index 0000000000000..54d0c1eb45f5c
Binary files /dev/null and b/sound/vox_fem/active.ogg differ
diff --git a/sound/vox_fem/affect.ogg b/sound/vox_fem/affect.ogg
new file mode 100644
index 0000000000000..4c9b7aaeaad67
Binary files /dev/null and b/sound/vox_fem/affect.ogg differ
diff --git a/sound/vox_fem/affected.ogg b/sound/vox_fem/affected.ogg
new file mode 100644
index 0000000000000..c634e08f73421
Binary files /dev/null and b/sound/vox_fem/affected.ogg differ
diff --git a/sound/vox_fem/affecting.ogg b/sound/vox_fem/affecting.ogg
new file mode 100644
index 0000000000000..18f2e3c0c7a67
Binary files /dev/null and b/sound/vox_fem/affecting.ogg differ
diff --git a/sound/vox_fem/alcohol.ogg b/sound/vox_fem/alcohol.ogg
new file mode 100644
index 0000000000000..a304167a27f85
Binary files /dev/null and b/sound/vox_fem/alcohol.ogg differ
diff --git a/sound/vox_fem/align.ogg b/sound/vox_fem/align.ogg
new file mode 100644
index 0000000000000..bcf4b6465a89d
Binary files /dev/null and b/sound/vox_fem/align.ogg differ
diff --git a/sound/vox_fem/allow.ogg b/sound/vox_fem/allow.ogg
new file mode 100644
index 0000000000000..ea0b8098fd75a
Binary files /dev/null and b/sound/vox_fem/allow.ogg differ
diff --git a/sound/vox_fem/alongside.ogg b/sound/vox_fem/alongside.ogg
new file mode 100644
index 0000000000000..a96b9e7ba25d0
Binary files /dev/null and b/sound/vox_fem/alongside.ogg differ
diff --git a/sound/vox_fem/amount.ogg b/sound/vox_fem/amount.ogg
new file mode 100644
index 0000000000000..19b59e8263cf8
Binary files /dev/null and b/sound/vox_fem/amount.ogg differ
diff --git a/sound/vox_fem/annihilate.ogg b/sound/vox_fem/annihilate.ogg
new file mode 100644
index 0000000000000..375dfda691fd1
Binary files /dev/null and b/sound/vox_fem/annihilate.ogg differ
diff --git a/sound/vox_fem/annihilated.ogg b/sound/vox_fem/annihilated.ogg
new file mode 100644
index 0000000000000..823cc93dc6a6c
Binary files /dev/null and b/sound/vox_fem/annihilated.ogg differ
diff --git a/sound/vox_fem/annihilating.ogg b/sound/vox_fem/annihilating.ogg
new file mode 100644
index 0000000000000..95a507df8503f
Binary files /dev/null and b/sound/vox_fem/annihilating.ogg differ
diff --git a/sound/vox_fem/annihilation.ogg b/sound/vox_fem/annihilation.ogg
new file mode 100644
index 0000000000000..6acb85503388c
Binary files /dev/null and b/sound/vox_fem/annihilation.ogg differ
diff --git a/sound/vox_fem/anti-noblium.ogg b/sound/vox_fem/anti-noblium.ogg
new file mode 100644
index 0000000000000..70f89e82229a7
Binary files /dev/null and b/sound/vox_fem/anti-noblium.ogg differ
diff --git a/sound/vox_fem/arc.ogg b/sound/vox_fem/arc.ogg
new file mode 100644
index 0000000000000..3ebed29740dd1
Binary files /dev/null and b/sound/vox_fem/arc.ogg differ
diff --git a/sound/vox_fem/arcs.ogg b/sound/vox_fem/arcs.ogg
new file mode 100644
index 0000000000000..cb32908d5b84e
Binary files /dev/null and b/sound/vox_fem/arcs.ogg differ
diff --git a/sound/vox_fem/around.ogg b/sound/vox_fem/around.ogg
new file mode 100644
index 0000000000000..76183f92cda08
Binary files /dev/null and b/sound/vox_fem/around.ogg differ
diff --git a/sound/vox_fem/ask.ogg b/sound/vox_fem/ask.ogg
new file mode 100644
index 0000000000000..c8d00b0039996
Binary files /dev/null and b/sound/vox_fem/ask.ogg differ
diff --git a/sound/vox_fem/ate.ogg b/sound/vox_fem/ate.ogg
new file mode 100644
index 0000000000000..8dcdd461d11c2
Binary files /dev/null and b/sound/vox_fem/ate.ogg differ
diff --git a/sound/vox_fem/beaker.ogg b/sound/vox_fem/beaker.ogg
new file mode 100644
index 0000000000000..6863afc5c79af
Binary files /dev/null and b/sound/vox_fem/beaker.ogg differ
diff --git a/sound/vox_fem/began.ogg b/sound/vox_fem/began.ogg
new file mode 100644
index 0000000000000..548143aff53c5
Binary files /dev/null and b/sound/vox_fem/began.ogg differ
diff --git a/sound/vox_fem/begin.ogg b/sound/vox_fem/begin.ogg
new file mode 100644
index 0000000000000..5c70cebbb0966
Binary files /dev/null and b/sound/vox_fem/begin.ogg differ
diff --git a/sound/vox_fem/begins.ogg b/sound/vox_fem/begins.ogg
new file mode 100644
index 0000000000000..5fedd2ef4b59b
Binary files /dev/null and b/sound/vox_fem/begins.ogg differ
diff --git a/sound/vox_fem/bottle.ogg b/sound/vox_fem/bottle.ogg
new file mode 100644
index 0000000000000..b5bd1f34e761b
Binary files /dev/null and b/sound/vox_fem/bottle.ogg differ
diff --git a/sound/vox_fem/broke.ogg b/sound/vox_fem/broke.ogg
new file mode 100644
index 0000000000000..a1a075d6769c9
Binary files /dev/null and b/sound/vox_fem/broke.ogg differ
diff --git a/sound/vox_fem/broken.ogg b/sound/vox_fem/broken.ogg
new file mode 100644
index 0000000000000..589dabc0a3924
Binary files /dev/null and b/sound/vox_fem/broken.ogg differ
diff --git a/sound/vox_fem/bump.ogg b/sound/vox_fem/bump.ogg
new file mode 100644
index 0000000000000..c6892a3412fa5
Binary files /dev/null and b/sound/vox_fem/bump.ogg differ
diff --git a/sound/vox_fem/bumped.ogg b/sound/vox_fem/bumped.ogg
new file mode 100644
index 0000000000000..6d111a8731d1a
Binary files /dev/null and b/sound/vox_fem/bumped.ogg differ
diff --git a/sound/vox_fem/bumps.ogg b/sound/vox_fem/bumps.ogg
new file mode 100644
index 0000000000000..a7fff16f04802
Binary files /dev/null and b/sound/vox_fem/bumps.ogg differ
diff --git a/sound/vox_fem/can.ogg b/sound/vox_fem/can.ogg
new file mode 100644
index 0000000000000..0d77353ad99e1
Binary files /dev/null and b/sound/vox_fem/can.ogg differ
diff --git a/sound/vox_fem/cascade.ogg b/sound/vox_fem/cascade.ogg
new file mode 100644
index 0000000000000..cc7e70ed00d25
Binary files /dev/null and b/sound/vox_fem/cascade.ogg differ
diff --git a/sound/vox_fem/cause.ogg b/sound/vox_fem/cause.ogg
new file mode 100644
index 0000000000000..2294d0405d037
Binary files /dev/null and b/sound/vox_fem/cause.ogg differ
diff --git a/sound/vox_fem/caused.ogg b/sound/vox_fem/caused.ogg
new file mode 100644
index 0000000000000..c91eecaa90db4
Binary files /dev/null and b/sound/vox_fem/caused.ogg differ
diff --git a/sound/vox_fem/causes.ogg b/sound/vox_fem/causes.ogg
new file mode 100644
index 0000000000000..019430ccb4a07
Binary files /dev/null and b/sound/vox_fem/causes.ogg differ
diff --git a/sound/vox_fem/causing.ogg b/sound/vox_fem/causing.ogg
new file mode 100644
index 0000000000000..e41ab06c2b4ae
Binary files /dev/null and b/sound/vox_fem/causing.ogg differ
diff --git a/sound/vox_fem/charge.ogg b/sound/vox_fem/charge.ogg
new file mode 100644
index 0000000000000..b5adb81d83b57
Binary files /dev/null and b/sound/vox_fem/charge.ogg differ
diff --git a/sound/vox_fem/clog.ogg b/sound/vox_fem/clog.ogg
new file mode 100644
index 0000000000000..31e6bf604ec49
Binary files /dev/null and b/sound/vox_fem/clog.ogg differ
diff --git a/sound/vox_fem/clothing.ogg b/sound/vox_fem/clothing.ogg
new file mode 100644
index 0000000000000..912a7532fe3a4
Binary files /dev/null and b/sound/vox_fem/clothing.ogg differ
diff --git a/sound/vox_fem/coil.ogg b/sound/vox_fem/coil.ogg
new file mode 100644
index 0000000000000..d9a76618eb4f5
Binary files /dev/null and b/sound/vox_fem/coil.ogg differ
diff --git a/sound/vox_fem/coils.ogg b/sound/vox_fem/coils.ogg
new file mode 100644
index 0000000000000..12d0d54fd3e8f
Binary files /dev/null and b/sound/vox_fem/coils.ogg differ
diff --git a/sound/vox_fem/combat.ogg b/sound/vox_fem/combat.ogg
new file mode 100644
index 0000000000000..51a438ea95325
Binary files /dev/null and b/sound/vox_fem/combat.ogg differ
diff --git a/sound/vox_fem/combatant.ogg b/sound/vox_fem/combatant.ogg
new file mode 100644
index 0000000000000..d82f5dddd0092
Binary files /dev/null and b/sound/vox_fem/combatant.ogg differ
diff --git a/sound/vox_fem/complete.ogg b/sound/vox_fem/complete.ogg
new file mode 100644
index 0000000000000..134d280d068ff
Binary files /dev/null and b/sound/vox_fem/complete.ogg differ
diff --git a/sound/vox_fem/completed.ogg b/sound/vox_fem/completed.ogg
new file mode 100644
index 0000000000000..bdeca3b4fe34d
Binary files /dev/null and b/sound/vox_fem/completed.ogg differ
diff --git a/sound/vox_fem/completion.ogg b/sound/vox_fem/completion.ogg
new file mode 100644
index 0000000000000..c4d65fbdad0c7
Binary files /dev/null and b/sound/vox_fem/completion.ogg differ
diff --git a/sound/vox_fem/conditions.ogg b/sound/vox_fem/conditions.ogg
new file mode 100644
index 0000000000000..79e0a6bfe8f3a
Binary files /dev/null and b/sound/vox_fem/conditions.ogg differ
diff --git a/sound/vox_fem/configure.ogg b/sound/vox_fem/configure.ogg
new file mode 100644
index 0000000000000..753339e761e8a
Binary files /dev/null and b/sound/vox_fem/configure.ogg differ
diff --git a/sound/vox_fem/configured.ogg b/sound/vox_fem/configured.ogg
new file mode 100644
index 0000000000000..544ed189add4f
Binary files /dev/null and b/sound/vox_fem/configured.ogg differ
diff --git a/sound/vox_fem/configuring.ogg b/sound/vox_fem/configuring.ogg
new file mode 100644
index 0000000000000..eb81a1bb1df1c
Binary files /dev/null and b/sound/vox_fem/configuring.ogg differ
diff --git a/sound/vox_fem/container.ogg b/sound/vox_fem/container.ogg
new file mode 100644
index 0000000000000..59fe11b5f48c7
Binary files /dev/null and b/sound/vox_fem/container.ogg differ
diff --git a/sound/vox_fem/cool.ogg b/sound/vox_fem/cool.ogg
new file mode 100644
index 0000000000000..0e8c39a92608c
Binary files /dev/null and b/sound/vox_fem/cool.ogg differ
diff --git a/sound/vox_fem/cooling.ogg b/sound/vox_fem/cooling.ogg
new file mode 100644
index 0000000000000..eef866ca1b16b
Binary files /dev/null and b/sound/vox_fem/cooling.ogg differ
diff --git a/sound/vox_fem/could.ogg b/sound/vox_fem/could.ogg
new file mode 100644
index 0000000000000..fdbd14f696c29
Binary files /dev/null and b/sound/vox_fem/could.ogg differ
diff --git a/sound/vox_fem/couldnt.ogg b/sound/vox_fem/couldnt.ogg
new file mode 100644
index 0000000000000..80550544ee497
Binary files /dev/null and b/sound/vox_fem/couldnt.ogg differ
diff --git a/sound/vox_fem/countdown.ogg b/sound/vox_fem/countdown.ogg
new file mode 100644
index 0000000000000..93b0f64961575
Binary files /dev/null and b/sound/vox_fem/countdown.ogg differ
diff --git a/sound/vox_fem/create.ogg b/sound/vox_fem/create.ogg
new file mode 100644
index 0000000000000..f4f1797202af2
Binary files /dev/null and b/sound/vox_fem/create.ogg differ
diff --git a/sound/vox_fem/creating.ogg b/sound/vox_fem/creating.ogg
new file mode 100644
index 0000000000000..ca2a92d5d7264
Binary files /dev/null and b/sound/vox_fem/creating.ogg differ
diff --git a/sound/vox_fem/delaminating.ogg b/sound/vox_fem/delaminating.ogg
new file mode 100644
index 0000000000000..3c023387abf4a
Binary files /dev/null and b/sound/vox_fem/delaminating.ogg differ
diff --git a/sound/vox_fem/delamination.ogg b/sound/vox_fem/delamination.ogg
new file mode 100644
index 0000000000000..993c06fd4eae7
Binary files /dev/null and b/sound/vox_fem/delamination.ogg differ
diff --git a/sound/vox_fem/deny.ogg b/sound/vox_fem/deny.ogg
new file mode 100644
index 0000000000000..df6b5cb40fb63
Binary files /dev/null and b/sound/vox_fem/deny.ogg differ
diff --git a/sound/vox_fem/detect.ogg b/sound/vox_fem/detect.ogg
new file mode 100644
index 0000000000000..e5ea9092f0af4
Binary files /dev/null and b/sound/vox_fem/detect.ogg differ
diff --git a/sound/vox_fem/detecting.ogg b/sound/vox_fem/detecting.ogg
new file mode 100644
index 0000000000000..1b849cd836ddb
Binary files /dev/null and b/sound/vox_fem/detecting.ogg differ
diff --git a/sound/vox_fem/different.ogg b/sound/vox_fem/different.ogg
new file mode 100644
index 0000000000000..dfce0903818db
Binary files /dev/null and b/sound/vox_fem/different.ogg differ
diff --git a/sound/vox_fem/direct.ogg b/sound/vox_fem/direct.ogg
new file mode 100644
index 0000000000000..f1268e34a0968
Binary files /dev/null and b/sound/vox_fem/direct.ogg differ
diff --git a/sound/vox_fem/dont.ogg b/sound/vox_fem/dont.ogg
new file mode 100644
index 0000000000000..20723c8687ca3
Binary files /dev/null and b/sound/vox_fem/dont.ogg differ
diff --git a/sound/vox_fem/double.ogg b/sound/vox_fem/double.ogg
new file mode 100644
index 0000000000000..3c3eb3157bc36
Binary files /dev/null and b/sound/vox_fem/double.ogg differ
diff --git a/sound/vox_fem/dress.ogg b/sound/vox_fem/dress.ogg
new file mode 100644
index 0000000000000..84cc7fe79b99f
Binary files /dev/null and b/sound/vox_fem/dress.ogg differ
diff --git a/sound/vox_fem/dressed.ogg b/sound/vox_fem/dressed.ogg
new file mode 100644
index 0000000000000..4a9ef3515a63f
Binary files /dev/null and b/sound/vox_fem/dressed.ogg differ
diff --git a/sound/vox_fem/dressing.ogg b/sound/vox_fem/dressing.ogg
new file mode 100644
index 0000000000000..dded3edabb3b4
Binary files /dev/null and b/sound/vox_fem/dressing.ogg differ
diff --git a/sound/vox_fem/easily.ogg b/sound/vox_fem/easily.ogg
new file mode 100644
index 0000000000000..cadf6f9291fbb
Binary files /dev/null and b/sound/vox_fem/easily.ogg differ
diff --git a/sound/vox_fem/eat.ogg b/sound/vox_fem/eat.ogg
new file mode 100644
index 0000000000000..b33c5a3503459
Binary files /dev/null and b/sound/vox_fem/eat.ogg differ
diff --git a/sound/vox_fem/eaten.ogg b/sound/vox_fem/eaten.ogg
new file mode 100644
index 0000000000000..9005930d0f6ad
Binary files /dev/null and b/sound/vox_fem/eaten.ogg differ
diff --git a/sound/vox_fem/education.ogg b/sound/vox_fem/education.ogg
new file mode 100644
index 0000000000000..9a7ed1d17d12c
Binary files /dev/null and b/sound/vox_fem/education.ogg differ
diff --git a/sound/vox_fem/effects.ogg b/sound/vox_fem/effects.ogg
new file mode 100644
index 0000000000000..59eb22c67fe4c
Binary files /dev/null and b/sound/vox_fem/effects.ogg differ
diff --git a/sound/vox_fem/electrical.ogg b/sound/vox_fem/electrical.ogg
new file mode 100644
index 0000000000000..08e40b2367c55
Binary files /dev/null and b/sound/vox_fem/electrical.ogg differ
diff --git a/sound/vox_fem/emitted.ogg b/sound/vox_fem/emitted.ogg
new file mode 100644
index 0000000000000..d31b6307a3d1d
Binary files /dev/null and b/sound/vox_fem/emitted.ogg differ
diff --git a/sound/vox_fem/emitter.ogg b/sound/vox_fem/emitter.ogg
new file mode 100644
index 0000000000000..6662ece8be40c
Binary files /dev/null and b/sound/vox_fem/emitter.ogg differ
diff --git a/sound/vox_fem/emitting.ogg b/sound/vox_fem/emitting.ogg
new file mode 100644
index 0000000000000..377f792c08016
Binary files /dev/null and b/sound/vox_fem/emitting.ogg differ
diff --git a/sound/vox_fem/end.ogg b/sound/vox_fem/end.ogg
new file mode 100644
index 0000000000000..95b430e8b6434
Binary files /dev/null and b/sound/vox_fem/end.ogg differ
diff --git a/sound/vox_fem/ends.ogg b/sound/vox_fem/ends.ogg
new file mode 100644
index 0000000000000..34e06feb39ef7
Binary files /dev/null and b/sound/vox_fem/ends.ogg differ
diff --git a/sound/vox_fem/enough.ogg b/sound/vox_fem/enough.ogg
new file mode 100644
index 0000000000000..b7056903b955e
Binary files /dev/null and b/sound/vox_fem/enough.ogg differ
diff --git a/sound/vox_fem/even.ogg b/sound/vox_fem/even.ogg
new file mode 100644
index 0000000000000..75294ef40251a
Binary files /dev/null and b/sound/vox_fem/even.ogg differ
diff --git a/sound/vox_fem/every.ogg b/sound/vox_fem/every.ogg
new file mode 100644
index 0000000000000..6468158bd7dca
Binary files /dev/null and b/sound/vox_fem/every.ogg differ
diff --git a/sound/vox_fem/everybody.ogg b/sound/vox_fem/everybody.ogg
new file mode 100644
index 0000000000000..8d8cc97489485
Binary files /dev/null and b/sound/vox_fem/everybody.ogg differ
diff --git a/sound/vox_fem/everyone.ogg b/sound/vox_fem/everyone.ogg
new file mode 100644
index 0000000000000..19e137b9a0cb6
Binary files /dev/null and b/sound/vox_fem/everyone.ogg differ
diff --git a/sound/vox_fem/exploded.ogg b/sound/vox_fem/exploded.ogg
new file mode 100644
index 0000000000000..1534b362892c6
Binary files /dev/null and b/sound/vox_fem/exploded.ogg differ
diff --git a/sound/vox_fem/exploding.ogg b/sound/vox_fem/exploding.ogg
new file mode 100644
index 0000000000000..a6980e6b53b70
Binary files /dev/null and b/sound/vox_fem/exploding.ogg differ
diff --git a/sound/vox_fem/external.ogg b/sound/vox_fem/external.ogg
new file mode 100644
index 0000000000000..d6f39b2651e0b
Binary files /dev/null and b/sound/vox_fem/external.ogg differ
diff --git a/sound/vox_fem/extra.ogg b/sound/vox_fem/extra.ogg
new file mode 100644
index 0000000000000..0b5b16c6957b4
Binary files /dev/null and b/sound/vox_fem/extra.ogg differ
diff --git a/sound/vox_fem/feature.ogg b/sound/vox_fem/feature.ogg
new file mode 100644
index 0000000000000..59a3f68d456a6
Binary files /dev/null and b/sound/vox_fem/feature.ogg differ
diff --git a/sound/vox_fem/featured.ogg b/sound/vox_fem/featured.ogg
new file mode 100644
index 0000000000000..e087b0d7cc668
Binary files /dev/null and b/sound/vox_fem/featured.ogg differ
diff --git a/sound/vox_fem/features.ogg b/sound/vox_fem/features.ogg
new file mode 100644
index 0000000000000..745992b760a7a
Binary files /dev/null and b/sound/vox_fem/features.ogg differ
diff --git a/sound/vox_fem/featuring.ogg b/sound/vox_fem/featuring.ogg
new file mode 100644
index 0000000000000..72578f2bb19d6
Binary files /dev/null and b/sound/vox_fem/featuring.ogg differ
diff --git a/sound/vox_fem/few.ogg b/sound/vox_fem/few.ogg
new file mode 100644
index 0000000000000..5ba76619c0f4f
Binary files /dev/null and b/sound/vox_fem/few.ogg differ
diff --git a/sound/vox_fem/filter.ogg b/sound/vox_fem/filter.ogg
new file mode 100644
index 0000000000000..3b2ae95e37ff1
Binary files /dev/null and b/sound/vox_fem/filter.ogg differ
diff --git a/sound/vox_fem/filters.ogg b/sound/vox_fem/filters.ogg
new file mode 100644
index 0000000000000..204b82da198eb
Binary files /dev/null and b/sound/vox_fem/filters.ogg differ
diff --git a/sound/vox_fem/foolish.ogg b/sound/vox_fem/foolish.ogg
new file mode 100644
index 0000000000000..214ed30f2c43c
Binary files /dev/null and b/sound/vox_fem/foolish.ogg differ
diff --git a/sound/vox_fem/freon.ogg b/sound/vox_fem/freon.ogg
new file mode 100644
index 0000000000000..82128fee24109
Binary files /dev/null and b/sound/vox_fem/freon.ogg differ
diff --git a/sound/vox_fem/gases.ogg b/sound/vox_fem/gases.ogg
new file mode 100644
index 0000000000000..0605a2605566f
Binary files /dev/null and b/sound/vox_fem/gases.ogg differ
diff --git a/sound/vox_fem/gave.ogg b/sound/vox_fem/gave.ogg
new file mode 100644
index 0000000000000..beb35f1f4215b
Binary files /dev/null and b/sound/vox_fem/gave.ogg differ
diff --git a/sound/vox_fem/gear.ogg b/sound/vox_fem/gear.ogg
new file mode 100644
index 0000000000000..629667e5df418
Binary files /dev/null and b/sound/vox_fem/gear.ogg differ
diff --git a/sound/vox_fem/geared.ogg b/sound/vox_fem/geared.ogg
new file mode 100644
index 0000000000000..7188c657589d4
Binary files /dev/null and b/sound/vox_fem/geared.ogg differ
diff --git a/sound/vox_fem/gearing.ogg b/sound/vox_fem/gearing.ogg
new file mode 100644
index 0000000000000..9e27a7956943d
Binary files /dev/null and b/sound/vox_fem/gearing.ogg differ
diff --git a/sound/vox_fem/generate.ogg b/sound/vox_fem/generate.ogg
new file mode 100644
index 0000000000000..ceb09ec3b4360
Binary files /dev/null and b/sound/vox_fem/generate.ogg differ
diff --git a/sound/vox_fem/generated.ogg b/sound/vox_fem/generated.ogg
new file mode 100644
index 0000000000000..42a49e7d43e54
Binary files /dev/null and b/sound/vox_fem/generated.ogg differ
diff --git a/sound/vox_fem/generating.ogg b/sound/vox_fem/generating.ogg
new file mode 100644
index 0000000000000..a90e62d9dd760
Binary files /dev/null and b/sound/vox_fem/generating.ogg differ
diff --git a/sound/vox_fem/give.ogg b/sound/vox_fem/give.ogg
new file mode 100644
index 0000000000000..8144ba82cccea
Binary files /dev/null and b/sound/vox_fem/give.ogg differ
diff --git a/sound/vox_fem/given.ogg b/sound/vox_fem/given.ogg
new file mode 100644
index 0000000000000..63f86c4878f8a
Binary files /dev/null and b/sound/vox_fem/given.ogg differ
diff --git a/sound/vox_fem/halon.ogg b/sound/vox_fem/halon.ogg
new file mode 100644
index 0000000000000..0cab7dee9a5c9
Binary files /dev/null and b/sound/vox_fem/halon.ogg differ
diff --git a/sound/vox_fem/hard.ogg b/sound/vox_fem/hard.ogg
new file mode 100644
index 0000000000000..be1a80c3f091b
Binary files /dev/null and b/sound/vox_fem/hard.ogg differ
diff --git a/sound/vox_fem/hardly.ogg b/sound/vox_fem/hardly.ogg
new file mode 100644
index 0000000000000..bb4de217a1767
Binary files /dev/null and b/sound/vox_fem/hardly.ogg differ
diff --git a/sound/vox_fem/harness.ogg b/sound/vox_fem/harness.ogg
new file mode 100644
index 0000000000000..a81840955f4b7
Binary files /dev/null and b/sound/vox_fem/harness.ogg differ
diff --git a/sound/vox_fem/harnessed.ogg b/sound/vox_fem/harnessed.ogg
new file mode 100644
index 0000000000000..d1f259c7bdfd4
Binary files /dev/null and b/sound/vox_fem/harnessed.ogg differ
diff --git a/sound/vox_fem/harnessing.ogg b/sound/vox_fem/harnessing.ogg
new file mode 100644
index 0000000000000..3dbdd03af886d
Binary files /dev/null and b/sound/vox_fem/harnessing.ogg differ
diff --git a/sound/vox_fem/heal.ogg b/sound/vox_fem/heal.ogg
new file mode 100644
index 0000000000000..f31b53c1cba5b
Binary files /dev/null and b/sound/vox_fem/heal.ogg differ
diff --git a/sound/vox_fem/healed.ogg b/sound/vox_fem/healed.ogg
new file mode 100644
index 0000000000000..80eea8068a5b7
Binary files /dev/null and b/sound/vox_fem/healed.ogg differ
diff --git a/sound/vox_fem/healing.ogg b/sound/vox_fem/healing.ogg
new file mode 100644
index 0000000000000..6ebcc588294ff
Binary files /dev/null and b/sound/vox_fem/healing.ogg differ
diff --git a/sound/vox_fem/healium.ogg b/sound/vox_fem/healium.ogg
new file mode 100644
index 0000000000000..79b4fd19de329
Binary files /dev/null and b/sound/vox_fem/healium.ogg differ
diff --git a/sound/vox_fem/heated.ogg b/sound/vox_fem/heated.ogg
new file mode 100644
index 0000000000000..e3db67adee43b
Binary files /dev/null and b/sound/vox_fem/heated.ogg differ
diff --git a/sound/vox_fem/heating.ogg b/sound/vox_fem/heating.ogg
new file mode 100644
index 0000000000000..553b4d5576605
Binary files /dev/null and b/sound/vox_fem/heating.ogg differ
diff --git a/sound/vox_fem/hydrogen.ogg b/sound/vox_fem/hydrogen.ogg
new file mode 100644
index 0000000000000..050a3bc028cc5
Binary files /dev/null and b/sound/vox_fem/hydrogen.ogg differ
diff --git a/sound/vox_fem/hyper-noblium.ogg b/sound/vox_fem/hyper-noblium.ogg
new file mode 100644
index 0000000000000..4fda6b404689f
Binary files /dev/null and b/sound/vox_fem/hyper-noblium.ogg differ
diff --git a/sound/vox_fem/inert.ogg b/sound/vox_fem/inert.ogg
new file mode 100644
index 0000000000000..00826c23b2afa
Binary files /dev/null and b/sound/vox_fem/inert.ogg differ
diff --git a/sound/vox_fem/internal.ogg b/sound/vox_fem/internal.ogg
new file mode 100644
index 0000000000000..0cc275bd471c1
Binary files /dev/null and b/sound/vox_fem/internal.ogg differ
diff --git a/sound/vox_fem/irradiate.ogg b/sound/vox_fem/irradiate.ogg
new file mode 100644
index 0000000000000..d14b296179828
Binary files /dev/null and b/sound/vox_fem/irradiate.ogg differ
diff --git a/sound/vox_fem/its.ogg b/sound/vox_fem/its.ogg
new file mode 100644
index 0000000000000..b5c2c22dd5720
Binary files /dev/null and b/sound/vox_fem/its.ogg differ
diff --git a/sound/vox_fem/job.ogg b/sound/vox_fem/job.ogg
new file mode 100644
index 0000000000000..5b8186d0f7266
Binary files /dev/null and b/sound/vox_fem/job.ogg differ
diff --git a/sound/vox_fem/jobs.ogg b/sound/vox_fem/jobs.ogg
new file mode 100644
index 0000000000000..3fd3529e06c38
Binary files /dev/null and b/sound/vox_fem/jobs.ogg differ
diff --git a/sound/vox_fem/kelvin.ogg b/sound/vox_fem/kelvin.ogg
new file mode 100644
index 0000000000000..dd759e02214f6
Binary files /dev/null and b/sound/vox_fem/kelvin.ogg differ
diff --git a/sound/vox_fem/limit.ogg b/sound/vox_fem/limit.ogg
new file mode 100644
index 0000000000000..d88bd43e01d91
Binary files /dev/null and b/sound/vox_fem/limit.ogg differ
diff --git a/sound/vox_fem/limited.ogg b/sound/vox_fem/limited.ogg
new file mode 100644
index 0000000000000..df3d3b3ebe4c1
Binary files /dev/null and b/sound/vox_fem/limited.ogg differ
diff --git a/sound/vox_fem/list.ogg b/sound/vox_fem/list.ogg
new file mode 100644
index 0000000000000..1c3d643983307
Binary files /dev/null and b/sound/vox_fem/list.ogg differ
diff --git a/sound/vox_fem/made.ogg b/sound/vox_fem/made.ogg
new file mode 100644
index 0000000000000..3540661b5c1c9
Binary files /dev/null and b/sound/vox_fem/made.ogg differ
diff --git a/sound/vox_fem/making.ogg b/sound/vox_fem/making.ogg
new file mode 100644
index 0000000000000..d2ee9ab93e3dd
Binary files /dev/null and b/sound/vox_fem/making.ogg differ
diff --git a/sound/vox_fem/mean.ogg b/sound/vox_fem/mean.ogg
new file mode 100644
index 0000000000000..d53391b033fdb
Binary files /dev/null and b/sound/vox_fem/mean.ogg differ
diff --git a/sound/vox_fem/means.ogg b/sound/vox_fem/means.ogg
new file mode 100644
index 0000000000000..068cb7bfd1a73
Binary files /dev/null and b/sound/vox_fem/means.ogg differ
diff --git a/sound/vox_fem/medium.ogg b/sound/vox_fem/medium.ogg
new file mode 100644
index 0000000000000..0bd964ffe35b9
Binary files /dev/null and b/sound/vox_fem/medium.ogg differ
diff --git a/sound/vox_fem/meson.ogg b/sound/vox_fem/meson.ogg
new file mode 100644
index 0000000000000..5bd85d3292003
Binary files /dev/null and b/sound/vox_fem/meson.ogg differ
diff --git a/sound/vox_fem/method.ogg b/sound/vox_fem/method.ogg
new file mode 100644
index 0000000000000..4da8e60475f38
Binary files /dev/null and b/sound/vox_fem/method.ogg differ
diff --git a/sound/vox_fem/miasma.ogg b/sound/vox_fem/miasma.ogg
new file mode 100644
index 0000000000000..5956b203f87a1
Binary files /dev/null and b/sound/vox_fem/miasma.ogg differ
diff --git a/sound/vox_fem/minute.ogg b/sound/vox_fem/minute.ogg
new file mode 100644
index 0000000000000..fe29d747120de
Binary files /dev/null and b/sound/vox_fem/minute.ogg differ
diff --git a/sound/vox_fem/mixture.ogg b/sound/vox_fem/mixture.ogg
new file mode 100644
index 0000000000000..63525110a7a70
Binary files /dev/null and b/sound/vox_fem/mixture.ogg differ
diff --git a/sound/vox_fem/most.ogg b/sound/vox_fem/most.ogg
new file mode 100644
index 0000000000000..472837fced880
Binary files /dev/null and b/sound/vox_fem/most.ogg differ
diff --git a/sound/vox_fem/moved.ogg b/sound/vox_fem/moved.ogg
new file mode 100644
index 0000000000000..e8eb17787ef4f
Binary files /dev/null and b/sound/vox_fem/moved.ogg differ
diff --git a/sound/vox_fem/moving.ogg b/sound/vox_fem/moving.ogg
new file mode 100644
index 0000000000000..258c38a711668
Binary files /dev/null and b/sound/vox_fem/moving.ogg differ
diff --git a/sound/vox_fem/near.ogg b/sound/vox_fem/near.ogg
new file mode 100644
index 0000000000000..0c48f322133a8
Binary files /dev/null and b/sound/vox_fem/near.ogg differ
diff --git a/sound/vox_fem/nearly.ogg b/sound/vox_fem/nearly.ogg
new file mode 100644
index 0000000000000..2b76f6323f834
Binary files /dev/null and b/sound/vox_fem/nearly.ogg differ
diff --git a/sound/vox_fem/none.ogg b/sound/vox_fem/none.ogg
new file mode 100644
index 0000000000000..6c16899ce9264
Binary files /dev/null and b/sound/vox_fem/none.ogg differ
diff --git a/sound/vox_fem/normal.ogg b/sound/vox_fem/normal.ogg
new file mode 100644
index 0000000000000..cf68ed5ec5e29
Binary files /dev/null and b/sound/vox_fem/normal.ogg differ
diff --git a/sound/vox_fem/normally.ogg b/sound/vox_fem/normally.ogg
new file mode 100644
index 0000000000000..81d7c16d366d4
Binary files /dev/null and b/sound/vox_fem/normally.ogg differ
diff --git a/sound/vox_fem/notably.ogg b/sound/vox_fem/notably.ogg
new file mode 100644
index 0000000000000..d6f604390502f
Binary files /dev/null and b/sound/vox_fem/notably.ogg differ
diff --git a/sound/vox_fem/object.ogg b/sound/vox_fem/object.ogg
new file mode 100644
index 0000000000000..091c4b6b190e6
Binary files /dev/null and b/sound/vox_fem/object.ogg differ
diff --git a/sound/vox_fem/ordered.ogg b/sound/vox_fem/ordered.ogg
new file mode 100644
index 0000000000000..a483e355544f8
Binary files /dev/null and b/sound/vox_fem/ordered.ogg differ
diff --git a/sound/vox_fem/ordering.ogg b/sound/vox_fem/ordering.ogg
new file mode 100644
index 0000000000000..e05a1534d3c5b
Binary files /dev/null and b/sound/vox_fem/ordering.ogg differ
diff --git a/sound/vox_fem/output.ogg b/sound/vox_fem/output.ogg
new file mode 100644
index 0000000000000..fc3e5312c4eaf
Binary files /dev/null and b/sound/vox_fem/output.ogg differ
diff --git a/sound/vox_fem/own.ogg b/sound/vox_fem/own.ogg
new file mode 100644
index 0000000000000..e978ba4a8da1e
Binary files /dev/null and b/sound/vox_fem/own.ogg differ
diff --git a/sound/vox_fem/pda.ogg b/sound/vox_fem/pda.ogg
new file mode 100644
index 0000000000000..72407e2b0e324
Binary files /dev/null and b/sound/vox_fem/pda.ogg differ
diff --git a/sound/vox_fem/plating.ogg b/sound/vox_fem/plating.ogg
new file mode 100644
index 0000000000000..d0783ca5e351e
Binary files /dev/null and b/sound/vox_fem/plating.ogg differ
diff --git a/sound/vox_fem/pluoxium.ogg b/sound/vox_fem/pluoxium.ogg
new file mode 100644
index 0000000000000..cb52c5ac29856
Binary files /dev/null and b/sound/vox_fem/pluoxium.ogg differ
diff --git a/sound/vox_fem/portion.ogg b/sound/vox_fem/portion.ogg
new file mode 100644
index 0000000000000..7f2f699da1900
Binary files /dev/null and b/sound/vox_fem/portion.ogg differ
diff --git a/sound/vox_fem/powered.ogg b/sound/vox_fem/powered.ogg
new file mode 100644
index 0000000000000..d03eb08d5645e
Binary files /dev/null and b/sound/vox_fem/powered.ogg differ
diff --git a/sound/vox_fem/powering.ogg b/sound/vox_fem/powering.ogg
new file mode 100644
index 0000000000000..7c13b590846c2
Binary files /dev/null and b/sound/vox_fem/powering.ogg differ
diff --git a/sound/vox_fem/premature.ogg b/sound/vox_fem/premature.ogg
new file mode 100644
index 0000000000000..19fb67b8f3b87
Binary files /dev/null and b/sound/vox_fem/premature.ogg differ
diff --git a/sound/vox_fem/prematurely.ogg b/sound/vox_fem/prematurely.ogg
new file mode 100644
index 0000000000000..b3422a535f6ae
Binary files /dev/null and b/sound/vox_fem/prematurely.ogg differ
diff --git a/sound/vox_fem/priority.ogg b/sound/vox_fem/priority.ogg
new file mode 100644
index 0000000000000..5084584a44e12
Binary files /dev/null and b/sound/vox_fem/priority.ogg differ
diff --git a/sound/vox_fem/projectile.ogg b/sound/vox_fem/projectile.ogg
new file mode 100644
index 0000000000000..ec6d297926ac9
Binary files /dev/null and b/sound/vox_fem/projectile.ogg differ
diff --git a/sound/vox_fem/protect.ogg b/sound/vox_fem/protect.ogg
new file mode 100644
index 0000000000000..512d7e30e27d1
Binary files /dev/null and b/sound/vox_fem/protect.ogg differ
diff --git a/sound/vox_fem/protected.ogg b/sound/vox_fem/protected.ogg
new file mode 100644
index 0000000000000..7f6c8c0f6efdc
Binary files /dev/null and b/sound/vox_fem/protected.ogg differ
diff --git a/sound/vox_fem/protection.ogg b/sound/vox_fem/protection.ogg
new file mode 100644
index 0000000000000..90b6a508e2aa9
Binary files /dev/null and b/sound/vox_fem/protection.ogg differ
diff --git a/sound/vox_fem/proto-nitrate.ogg b/sound/vox_fem/proto-nitrate.ogg
new file mode 100644
index 0000000000000..13f3aed7b450e
Binary files /dev/null and b/sound/vox_fem/proto-nitrate.ogg differ
diff --git a/sound/vox_fem/pull.ogg b/sound/vox_fem/pull.ogg
new file mode 100644
index 0000000000000..9ac8e2c399ad7
Binary files /dev/null and b/sound/vox_fem/pull.ogg differ
diff --git a/sound/vox_fem/pulled.ogg b/sound/vox_fem/pulled.ogg
new file mode 100644
index 0000000000000..ef3388a25c9a7
Binary files /dev/null and b/sound/vox_fem/pulled.ogg differ
diff --git a/sound/vox_fem/pulling.ogg b/sound/vox_fem/pulling.ogg
new file mode 100644
index 0000000000000..5a2b5532e5acb
Binary files /dev/null and b/sound/vox_fem/pulling.ogg differ
diff --git a/sound/vox_fem/pump.ogg b/sound/vox_fem/pump.ogg
new file mode 100644
index 0000000000000..07400cb2b8c26
Binary files /dev/null and b/sound/vox_fem/pump.ogg differ
diff --git a/sound/vox_fem/pumps.ogg b/sound/vox_fem/pumps.ogg
new file mode 100644
index 0000000000000..eba663d3963c4
Binary files /dev/null and b/sound/vox_fem/pumps.ogg differ
diff --git a/sound/vox_fem/release.ogg b/sound/vox_fem/release.ogg
new file mode 100644
index 0000000000000..4a9350168483f
Binary files /dev/null and b/sound/vox_fem/release.ogg differ
diff --git a/sound/vox_fem/releasing.ogg b/sound/vox_fem/releasing.ogg
new file mode 100644
index 0000000000000..3d2a5d0ed70bd
Binary files /dev/null and b/sound/vox_fem/releasing.ogg differ
diff --git a/sound/vox_fem/remove.ogg b/sound/vox_fem/remove.ogg
new file mode 100644
index 0000000000000..e9b2cb3bc1204
Binary files /dev/null and b/sound/vox_fem/remove.ogg differ
diff --git a/sound/vox_fem/removed.ogg b/sound/vox_fem/removed.ogg
new file mode 100644
index 0000000000000..2a7d78e9280b5
Binary files /dev/null and b/sound/vox_fem/removed.ogg differ
diff --git a/sound/vox_fem/removing.ogg b/sound/vox_fem/removing.ogg
new file mode 100644
index 0000000000000..638d20b0c354d
Binary files /dev/null and b/sound/vox_fem/removing.ogg differ
diff --git a/sound/vox_fem/resistant.ogg b/sound/vox_fem/resistant.ogg
new file mode 100644
index 0000000000000..4401519979172
Binary files /dev/null and b/sound/vox_fem/resistant.ogg differ
diff --git a/sound/vox_fem/resisting.ogg b/sound/vox_fem/resisting.ogg
new file mode 100644
index 0000000000000..c3c23d267fd94
Binary files /dev/null and b/sound/vox_fem/resisting.ogg differ
diff --git a/sound/vox_fem/resonance.ogg b/sound/vox_fem/resonance.ogg
new file mode 100644
index 0000000000000..0d569574c8363
Binary files /dev/null and b/sound/vox_fem/resonance.ogg differ
diff --git a/sound/vox_fem/sabotaged.ogg b/sound/vox_fem/sabotaged.ogg
new file mode 100644
index 0000000000000..9d883d12218c0
Binary files /dev/null and b/sound/vox_fem/sabotaged.ogg differ
diff --git a/sound/vox_fem/sabotaging.ogg b/sound/vox_fem/sabotaging.ogg
new file mode 100644
index 0000000000000..a8b5d6680c329
Binary files /dev/null and b/sound/vox_fem/sabotaging.ogg differ
diff --git a/sound/vox_fem/same.ogg b/sound/vox_fem/same.ogg
new file mode 100644
index 0000000000000..38adb22168bca
Binary files /dev/null and b/sound/vox_fem/same.ogg differ
diff --git a/sound/vox_fem/saw.ogg b/sound/vox_fem/saw.ogg
new file mode 100644
index 0000000000000..fa3c7b1994d11
Binary files /dev/null and b/sound/vox_fem/saw.ogg differ
diff --git a/sound/vox_fem/scan.ogg b/sound/vox_fem/scan.ogg
new file mode 100644
index 0000000000000..36026e8f8c471
Binary files /dev/null and b/sound/vox_fem/scan.ogg differ
diff --git a/sound/vox_fem/scanned.ogg b/sound/vox_fem/scanned.ogg
new file mode 100644
index 0000000000000..bc9bb80ac4c9c
Binary files /dev/null and b/sound/vox_fem/scanned.ogg differ
diff --git a/sound/vox_fem/scanner.ogg b/sound/vox_fem/scanner.ogg
new file mode 100644
index 0000000000000..2098a81a34c8f
Binary files /dev/null and b/sound/vox_fem/scanner.ogg differ
diff --git a/sound/vox_fem/scanners.ogg b/sound/vox_fem/scanners.ogg
new file mode 100644
index 0000000000000..74bbdae300aa7
Binary files /dev/null and b/sound/vox_fem/scanners.ogg differ
diff --git a/sound/vox_fem/scanning.ogg b/sound/vox_fem/scanning.ogg
new file mode 100644
index 0000000000000..84701910e997f
Binary files /dev/null and b/sound/vox_fem/scanning.ogg differ
diff --git a/sound/vox_fem/screw.ogg b/sound/vox_fem/screw.ogg
new file mode 100644
index 0000000000000..ae9325f69a658
Binary files /dev/null and b/sound/vox_fem/screw.ogg differ
diff --git a/sound/vox_fem/seen.ogg b/sound/vox_fem/seen.ogg
new file mode 100644
index 0000000000000..7ad89a173ab59
Binary files /dev/null and b/sound/vox_fem/seen.ogg differ
diff --git a/sound/vox_fem/set.ogg b/sound/vox_fem/set.ogg
new file mode 100644
index 0000000000000..f2f8c19c27842
Binary files /dev/null and b/sound/vox_fem/set.ogg differ
diff --git a/sound/vox_fem/sever.ogg b/sound/vox_fem/sever.ogg
new file mode 100644
index 0000000000000..3bc2e2102f72e
Binary files /dev/null and b/sound/vox_fem/sever.ogg differ
diff --git a/sound/vox_fem/severed.ogg b/sound/vox_fem/severed.ogg
new file mode 100644
index 0000000000000..4f6f7e47bf0a8
Binary files /dev/null and b/sound/vox_fem/severed.ogg differ
diff --git a/sound/vox_fem/severing.ogg b/sound/vox_fem/severing.ogg
new file mode 100644
index 0000000000000..1ddad6209efb0
Binary files /dev/null and b/sound/vox_fem/severing.ogg differ
diff --git a/sound/vox_fem/shame.ogg b/sound/vox_fem/shame.ogg
new file mode 100644
index 0000000000000..f90b1306da05f
Binary files /dev/null and b/sound/vox_fem/shame.ogg differ
diff --git a/sound/vox_fem/shameful.ogg b/sound/vox_fem/shameful.ogg
new file mode 100644
index 0000000000000..526b70909f66b
Binary files /dev/null and b/sound/vox_fem/shameful.ogg differ
diff --git a/sound/vox_fem/shameless.ogg b/sound/vox_fem/shameless.ogg
new file mode 100644
index 0000000000000..804a92e29615f
Binary files /dev/null and b/sound/vox_fem/shameless.ogg differ
diff --git a/sound/vox_fem/shard.ogg b/sound/vox_fem/shard.ogg
new file mode 100644
index 0000000000000..2a6b0c195804e
Binary files /dev/null and b/sound/vox_fem/shard.ogg differ
diff --git a/sound/vox_fem/shift.ogg b/sound/vox_fem/shift.ogg
new file mode 100644
index 0000000000000..70e7d3ca6d17d
Binary files /dev/null and b/sound/vox_fem/shift.ogg differ
diff --git a/sound/vox_fem/shifts.ogg b/sound/vox_fem/shifts.ogg
new file mode 100644
index 0000000000000..f2caa538efc61
Binary files /dev/null and b/sound/vox_fem/shifts.ogg differ
diff --git a/sound/vox_fem/sides.ogg b/sound/vox_fem/sides.ogg
new file mode 100644
index 0000000000000..cef8d153207bf
Binary files /dev/null and b/sound/vox_fem/sides.ogg differ
diff --git a/sound/vox_fem/single.ogg b/sound/vox_fem/single.ogg
new file mode 100644
index 0000000000000..1d5912ecc57ed
Binary files /dev/null and b/sound/vox_fem/single.ogg differ
diff --git a/sound/vox_fem/siphon.ogg b/sound/vox_fem/siphon.ogg
new file mode 100644
index 0000000000000..789653f5cbb67
Binary files /dev/null and b/sound/vox_fem/siphon.ogg differ
diff --git a/sound/vox_fem/siphoning.ogg b/sound/vox_fem/siphoning.ogg
new file mode 100644
index 0000000000000..163f2ed4734b8
Binary files /dev/null and b/sound/vox_fem/siphoning.ogg differ
diff --git a/sound/vox_fem/soft.ogg b/sound/vox_fem/soft.ogg
new file mode 100644
index 0000000000000..ea9361ea8c980
Binary files /dev/null and b/sound/vox_fem/soft.ogg differ
diff --git a/sound/vox_fem/source.ogg b/sound/vox_fem/source.ogg
new file mode 100644
index 0000000000000..824dd3f0a8c1c
Binary files /dev/null and b/sound/vox_fem/source.ogg differ
diff --git a/sound/vox_fem/special.ogg b/sound/vox_fem/special.ogg
new file mode 100644
index 0000000000000..f0f219c13974b
Binary files /dev/null and b/sound/vox_fem/special.ogg differ
diff --git a/sound/vox_fem/spew.ogg b/sound/vox_fem/spew.ogg
new file mode 100644
index 0000000000000..b9d20048d2651
Binary files /dev/null and b/sound/vox_fem/spew.ogg differ
diff --git a/sound/vox_fem/start.ogg b/sound/vox_fem/start.ogg
new file mode 100644
index 0000000000000..b07dc5faf259b
Binary files /dev/null and b/sound/vox_fem/start.ogg differ
diff --git a/sound/vox_fem/starts.ogg b/sound/vox_fem/starts.ogg
new file mode 100644
index 0000000000000..fca5914927f2d
Binary files /dev/null and b/sound/vox_fem/starts.ogg differ
diff --git a/sound/vox_fem/stations.ogg b/sound/vox_fem/stations.ogg
new file mode 100644
index 0000000000000..c0a495263698c
Binary files /dev/null and b/sound/vox_fem/stations.ogg differ
diff --git a/sound/vox_fem/stationwide.ogg b/sound/vox_fem/stationwide.ogg
new file mode 100644
index 0000000000000..b7b000b3b9f8c
Binary files /dev/null and b/sound/vox_fem/stationwide.ogg differ
diff --git a/sound/vox_fem/such.ogg b/sound/vox_fem/such.ogg
new file mode 100644
index 0000000000000..a85d0642e6ed1
Binary files /dev/null and b/sound/vox_fem/such.ogg differ
diff --git a/sound/vox_fem/suited.ogg b/sound/vox_fem/suited.ogg
new file mode 100644
index 0000000000000..36b2b45c5275a
Binary files /dev/null and b/sound/vox_fem/suited.ogg differ
diff --git a/sound/vox_fem/super.ogg b/sound/vox_fem/super.ogg
new file mode 100644
index 0000000000000..6d110152fdc23
Binary files /dev/null and b/sound/vox_fem/super.ogg differ
diff --git a/sound/vox_fem/tesla.ogg b/sound/vox_fem/tesla.ogg
new file mode 100644
index 0000000000000..70cb9e4ca82b9
Binary files /dev/null and b/sound/vox_fem/tesla.ogg differ
diff --git a/sound/vox_fem/tick.ogg b/sound/vox_fem/tick.ogg
new file mode 100644
index 0000000000000..bb986534a5bbb
Binary files /dev/null and b/sound/vox_fem/tick.ogg differ
diff --git a/sound/vox_fem/tile.ogg b/sound/vox_fem/tile.ogg
new file mode 100644
index 0000000000000..2d794c26a1291
Binary files /dev/null and b/sound/vox_fem/tile.ogg differ
diff --git a/sound/vox_fem/touched.ogg b/sound/vox_fem/touched.ogg
new file mode 100644
index 0000000000000..e4cb940d71fc6
Binary files /dev/null and b/sound/vox_fem/touched.ogg differ
diff --git a/sound/vox_fem/touching.ogg b/sound/vox_fem/touching.ogg
new file mode 100644
index 0000000000000..b1ef04d443a6a
Binary files /dev/null and b/sound/vox_fem/touching.ogg differ
diff --git a/sound/vox_fem/trigger.ogg b/sound/vox_fem/trigger.ogg
new file mode 100644
index 0000000000000..22ed22d489039
Binary files /dev/null and b/sound/vox_fem/trigger.ogg differ
diff --git a/sound/vox_fem/triggered.ogg b/sound/vox_fem/triggered.ogg
new file mode 100644
index 0000000000000..7fe30ad804606
Binary files /dev/null and b/sound/vox_fem/triggered.ogg differ
diff --git a/sound/vox_fem/triggering.ogg b/sound/vox_fem/triggering.ogg
new file mode 100644
index 0000000000000..8cb4788155618
Binary files /dev/null and b/sound/vox_fem/triggering.ogg differ
diff --git a/sound/vox_fem/triple.ogg b/sound/vox_fem/triple.ogg
new file mode 100644
index 0000000000000..6b6679258100a
Binary files /dev/null and b/sound/vox_fem/triple.ogg differ
diff --git a/sound/vox_fem/tritium.ogg b/sound/vox_fem/tritium.ogg
new file mode 100644
index 0000000000000..7e62eddb9c504
Binary files /dev/null and b/sound/vox_fem/tritium.ogg differ
diff --git a/sound/vox_fem/turned.ogg b/sound/vox_fem/turned.ogg
new file mode 100644
index 0000000000000..2d9c59edfac3f
Binary files /dev/null and b/sound/vox_fem/turned.ogg differ
diff --git a/sound/vox_fem/unique.ogg b/sound/vox_fem/unique.ogg
new file mode 100644
index 0000000000000..cb773507fcbb9
Binary files /dev/null and b/sound/vox_fem/unique.ogg differ
diff --git a/sound/vox_fem/unwrench.ogg b/sound/vox_fem/unwrench.ogg
new file mode 100644
index 0000000000000..bd31681fe3171
Binary files /dev/null and b/sound/vox_fem/unwrench.ogg differ
diff --git a/sound/vox_fem/unwrenching.ogg b/sound/vox_fem/unwrenching.ogg
new file mode 100644
index 0000000000000..6f4d8b7de7ef9
Binary files /dev/null and b/sound/vox_fem/unwrenching.ogg differ
diff --git a/sound/vox_fem/useful.ogg b/sound/vox_fem/useful.ogg
new file mode 100644
index 0000000000000..dfd8e6952a594
Binary files /dev/null and b/sound/vox_fem/useful.ogg differ
diff --git a/sound/vox_fem/useless.ogg b/sound/vox_fem/useless.ogg
new file mode 100644
index 0000000000000..5b9bb7aa2941c
Binary files /dev/null and b/sound/vox_fem/useless.ogg differ
diff --git a/sound/vox_fem/way.ogg b/sound/vox_fem/way.ogg
new file mode 100644
index 0000000000000..fdc121629c9cf
Binary files /dev/null and b/sound/vox_fem/way.ogg differ
diff --git a/sound/vox_fem/ways.ogg b/sound/vox_fem/ways.ogg
new file mode 100644
index 0000000000000..8fa99a1c4b74e
Binary files /dev/null and b/sound/vox_fem/ways.ogg differ
diff --git a/sound/vox_fem/weld.ogg b/sound/vox_fem/weld.ogg
new file mode 100644
index 0000000000000..6273ba147a6d4
Binary files /dev/null and b/sound/vox_fem/weld.ogg differ
diff --git a/sound/vox_fem/which.ogg b/sound/vox_fem/which.ogg
new file mode 100644
index 0000000000000..ae1486f816afc
Binary files /dev/null and b/sound/vox_fem/which.ogg differ
diff --git a/sound/vox_fem/work.ogg b/sound/vox_fem/work.ogg
new file mode 100644
index 0000000000000..8ddb06ef1d522
Binary files /dev/null and b/sound/vox_fem/work.ogg differ
diff --git a/sound/vox_fem/worked.ogg b/sound/vox_fem/worked.ogg
new file mode 100644
index 0000000000000..7ea59ff0b2b97
Binary files /dev/null and b/sound/vox_fem/worked.ogg differ
diff --git a/sound/vox_fem/working.ogg b/sound/vox_fem/working.ogg
new file mode 100644
index 0000000000000..8e49779ee5c5b
Binary files /dev/null and b/sound/vox_fem/working.ogg differ
diff --git a/sound/vox_fem/works.ogg b/sound/vox_fem/works.ogg
new file mode 100644
index 0000000000000..c35984171ab37
Binary files /dev/null and b/sound/vox_fem/works.ogg differ
diff --git a/sound/vox_fem/would.ogg b/sound/vox_fem/would.ogg
new file mode 100644
index 0000000000000..2df534769afe8
Binary files /dev/null and b/sound/vox_fem/would.ogg differ
diff --git a/sound/vox_fem/wouldnt.ogg b/sound/vox_fem/wouldnt.ogg
new file mode 100644
index 0000000000000..0c3b01facee79
Binary files /dev/null and b/sound/vox_fem/wouldnt.ogg differ
diff --git a/sound/vox_fem/wrench.ogg b/sound/vox_fem/wrench.ogg
new file mode 100644
index 0000000000000..98cf94db09a5f
Binary files /dev/null and b/sound/vox_fem/wrench.ogg differ
diff --git a/sound/vox_fem/wrenching.ogg b/sound/vox_fem/wrenching.ogg
new file mode 100644
index 0000000000000..b61b70fd363c6
Binary files /dev/null and b/sound/vox_fem/wrenching.ogg differ
diff --git a/sound/vox_fem/zap.ogg b/sound/vox_fem/zap.ogg
new file mode 100644
index 0000000000000..233653de9131a
Binary files /dev/null and b/sound/vox_fem/zap.ogg differ
diff --git a/sound/vox_fem/zauker.ogg b/sound/vox_fem/zauker.ogg
new file mode 100644
index 0000000000000..ed586c6c3f0f3
Binary files /dev/null and b/sound/vox_fem/zauker.ogg differ
diff --git a/sound/weapons/shove.ogg b/sound/weapons/shove.ogg
new file mode 100644
index 0000000000000..eb10eabed26a4
Binary files /dev/null and b/sound/weapons/shove.ogg differ
diff --git a/sound/weapons/solarflare.ogg b/sound/weapons/solarflare.ogg
new file mode 100644
index 0000000000000..48f6c5e892292
Binary files /dev/null and b/sound/weapons/solarflare.ogg differ
diff --git a/strings/heckacious.json b/strings/heckacious.json
new file mode 100644
index 0000000000000..1c648ce123815
--- /dev/null
+++ b/strings/heckacious.json
@@ -0,0 +1,98 @@
+{
+ "heckacious": {
+ "your": "youre",
+ "fucking": "banging",
+ "economy": "econony",
+ "know": "no",
+ "ing": "in",
+ "they are": "there",
+ "sometimes": "some times",
+ "do": "does",
+ "hug": "bro hug bump",
+ "we're": "where",
+ "game": "big game",
+ "has": "hass",
+ "downtown": "down town",
+ "jimmy": "geromy",
+ "jeremy": "geromy",
+ "anywhere": "anywear",
+ "smoking": "toking up",
+ "lying": "lyong",
+ "AH": "AUGH",
+ "distraction": "distaction",
+ "lie": "ruse",
+ "angle": "angel",
+ "drink": "pour",
+ "the": "thef",
+ "backward": [ "back ward", "awayways" ],
+ "god damn": "GOD DAMN",
+ "goddamn": "GOD DAMN",
+ "trick": "dunk",
+ "impossible": "unreal",
+ "court": "coart",
+ "holding": "holdung",
+ "reverse": "flip",
+ "inverse": "flip",
+ "around": "turn-ways",
+ "difference": "differance",
+ "values": "vaules",
+ "inside": "insine",
+ "pipe": "punpe",
+ "suspicious": "plot thicken",
+ "awesome": "hella",
+ "reference": "refrance",
+ "amazing": "fucking incredible",
+ "woman": "wonan",
+ "god": "gog",
+ "bible": "bibble",
+ "jesus": "jescus",
+ "christ": [ "chris", "dick" ],
+ "sigh": "sign",
+ "bathroom": "banthroom",
+ "remember": "remender",
+ "night": "nite",
+ "nachos": "nachoes",
+ "nacho": "nancho",
+ "dorito": "nancho",
+ "party": "panty",
+ "dumbass": "dumpass",
+ "they": "their",
+ "okay": "ohh kayy",
+ "stupid": "stutid",
+ "reagent": "regent",
+ "idiot": "fuckass",
+ "awful": "conksuck",
+ "moron": "PIECE OF SHIT",
+ "more": "wider",
+ "serious": "keeping it real",
+ "extreme": "x-treme",
+ "guaranteed": "garganted",
+ "black": "blapck",
+ "glow": "glowns",
+ "deadly": "deudly",
+ "flying": "lifdoff",
+ "cloud": "cloun",
+ "seeing": "scoping",
+ "great": "choice",
+ "look": "lonk",
+ "battery": "babbery",
+ "retard": "dicktard",
+ "gay": "homo",
+ "close": "closte",
+ "wrong": "wrog",
+ "who": "whoof",
+ "new": "newd",
+ "holy": "hopy",
+ "um": "unm",
+ "horse": "hornse",
+ "this": "thits",
+ "then": "than",
+ "quick": "soon",
+ "bro": [ "brah", "bro" ],
+ "dude": [ "duge", "bro", "brah" ],
+ "'": [ "'", "" ],
+ "i'm": [ "im", "i am" ],
+ "shit": [ "balls warmed oveur", "shit" ],
+ "he's": [ "hes", "he is", "he'ss" ]
+ }
+}
diff --git a/strings/massmeta/italian_replacement_ru.json b/strings/massmeta/oguzok.json
similarity index 81%
rename from strings/massmeta/italian_replacement_ru.json
rename to strings/massmeta/oguzok.json
index 5d4f44a48a692..1dadfda8a11b0 100644
--- a/strings/massmeta/italian_replacement_ru.json
+++ b/strings/massmeta/oguzok.json
@@ -1,6 +1,6 @@
{
- "italian": {
+ "oguzok": {
"ассистент": [
"дармоед",
"холоп"
@@ -9,6 +9,38 @@
"дармоеды",
"холопы"
],
+ "ассистента": [
+ "дармоеда",
+ "холопа"
+ ],
+ "ассистентов": [
+ "дармоедов",
+ "холопов"
+ ],
+ "ассистенту": [
+ "дармоеду",
+ "холопу"
+ ],
+ "ассистентам": [
+ "дармоедам",
+ "холопам"
+ ],
+ "ассистентом": [
+ "дармоедом",
+ "холопом"
+ ],
+ "ассистентами": [
+ "дармоедами",
+ "холопами"
+ ],
+ "ассистенте": [
+ "дармоеде",
+ "холопе"
+ ],
+ "ассистентах": [
+ "дармоедах",
+ "холопах"
+ ],
"ассистентская": "притон дармоедов",
"ассистентской": "притоне дармоедов",
"ассистос": [
diff --git a/strings/massmeta/traumas.json b/strings/massmeta/traumas.json
index d288bdd75b52c..6c995cbd5d859 100644
--- a/strings/massmeta/traumas.json
+++ b/strings/massmeta/traumas.json
@@ -1,20 +1,20 @@
{
- "brain_damage": [
- "@pick(bug)",
- "@pick(semicolon) @pick(admins) грифят ПОМГИЕТ!!!",
- "@pick(semicolon)Я розавая вульпв",
- "@pick(semicolon)ИИ заког 22 аткрывай",
- "@pick(semicolon)шатыл зовитею",
- "@pick(semicolon)я вошел в кристал и пропал?? @pick(bug)",
- "@pick(semicolon)Н-НЯЯЯЯЯЯЯЯЯ~",
- "@pick(semicolon)@pick(admins) @pick(create_verbs) @pick(create_nouns)???",
- "@pick(semicolon)уву ><",
- "@pick(semicolon)ии с боргами метакомят проверте",
- "@pick(semicolon)чоо??????????? @pick(bug)",
+ "brain_damage": [
+ "@pick(bug)",
+ "@pick(semicolon)@pick(admins) грифят ПОМГИЕТ!!!",
+ "@pick(semicolon)Я розавая вульпв",
+ "@pick(semicolon)ИИ заког 22 аткрывай",
+ "@pick(semicolon)шатыл зовитею",
+ "@pick(semicolon)я вошел в кристал и пропал?? @pick(bug)",
+ "@pick(semicolon)Н-НЯЯЯЯЯЯЯЯЯ~",
+ "@pick(semicolon)@pick(admins) @pick(create_verbs) @pick(create_nouns)???",
+ "@pick(semicolon)уву ><",
+ "@pick(semicolon)ии с боргами метакомят проверте",
+ "@pick(semicolon)чоо??????????? @pick(bug)",
"@pick(semicolon)КАК ЖЕ ЗАЕБАЛИ ХУЕСОСЫ КОТОРЫЙ ПРОВОЦИРУЮТ СБ РАДИ ПОПИЗДИТЬСЯ!!",
- "ебало @pick(admins) претставили?",
- "Мне пожалуйста @pick(powergame_tools), @pick(powergame_shoes), @pick(powergame_potions), @pick(powergame_acronym), @pick(powergame_animal), @pick(powergame_implant), @pick(powergame_hud), @pick(powergame_pump), @pick(powergame_tube), @pick(powergame_anti), @pick(powergame_ator), @pick(powergame_ammo)",
- "да чо этот вашь @pick(random_gibberish) знгачит??????",
+ "ебало @pick(admins) претставили?",
+ "Мне пожалуйста @pick(powergame_tools), @pick(powergame_shoes), @pick(powergame_potions), @pick(powergame_acronym), @pick(powergame_animal), @pick(powergame_implant), @pick(powergame_hud), @pick(powergame_pump), @pick(powergame_tube), @pick(powergame_anti), @pick(powergame_ator), @pick(powergame_ammo)",
+ "да чо этот вашь @pick(random_gibberish) знгачит??????",
"калий потассиум вода",
"это убевает игровую атмосферу!",
"это жесткий абъюз механник который сводит на нет ролевой отыгрыш",
@@ -28,19 +28,19 @@
"А это валидное имя для моли?",
"ПРОКЛЯТИЕ 220!!!",
"МАМУ УКРАЛИ!!"
- ],
+ ],
- "powergame_tools": [
- "легендарные инструменты абдукторов",
+ "powergame_tools": [
+ "легендарные инструменты абдукторов",
"инженерные инструменты абдукторов",
"хирургические инструменты абдукторов",
"музыкальные инструменты абдукторов"
- ],
+ ],
- "powergame_shoes": [
+ "powergame_shoes": [
"джампбутсы",
- "магбутсы",
- "подкрадутсы"
+ "магбутсы",
+ "подкрадутсы"
],
"powergame_potions": [
@@ -115,79 +115,79 @@
"тазерслаги"
],
- "admins": [
- "одмины",
- "педали",
- "пидали",
- "говно на педаляъ"
- ],
+ "admins": [
+ "одмины",
+ "педали",
+ "пидали",
+ "говно на педаляъ"
+ ],
- "random_gibberish": [
- "Z",
- "V",
+ "random_gibberish": [
+ "Z",
+ "V",
"ГОЙДА",
- "шкибиди"
- ],
-
- "servers": [
- "масмета",
- "мамета",
- "ссмета",
- "массмеит"
- ],
-
- "create_verbs": [
- "дай",
- "делай",
- "мне сюда",
- "меня"
- ],
-
- "create_nouns": [
- "аптуктарами",
- "антагум",
- "прищельцам",
- "блоп",
- "ривинантом",
- "кошмаром"
- ],
-
- "bug": [
- "",
- "накодил гавна!!!",
- "хуйню накодлил??",
- "не роабоает,/",
+ "шкибиди"
+ ],
+
+ "servers": [
+ "масмета",
+ "мамета",
+ "ссмета",
+ "массмеит"
+ ],
+
+ "create_verbs": [
+ "дай",
+ "делай",
+ "мне сюда",
+ "меня"
+ ],
+
+ "create_nouns": [
+ "аптуктарами",
+ "антагум",
+ "прищельцам",
+ "блоп",
+ "ривинантом",
+ "кошмаром"
+ ],
+
+ "bug": [
+ "",
+ "накодил гавна!!!",
+ "хуйню накодлил??",
+ "не роабоает,/",
"тг кодер момен"
- ],
+ ],
- "semicolon": [
- "",
- ";",
- ".h"
- ],
+ "semicolon": [
+ "",
+ ";",
+ ".h"
+ ],
- "god_foe": [
+ "god_foe": [
"BLASPHEMERS",
"PARASITES",
"PEASANTS",
"UNBELIEVERS",
"WEAKLINGS",
- "HERETICS",
- "INSECTS",
- "MORTALS"
- ],
+ "HERETICS",
+ "INSECTS",
+ "MORTALS"
+ ],
- "god_aggressive": [
+ "god_aggressive": [
"ALL WILL FALL BEFORE ME!",
"BURN, @pick(god_foe)!",
"DEATH TO @pick(god_foe)!",
"ENDLESS SUFFERING AWAITS YOU, @pick(god_foe).",
- "BEGONE, @pick(god_foe)!",
- "BLEED, @pick(god_foe)!",
- "DIE, @pick(god_foe)!"
- ],
+ "BEGONE, @pick(god_foe)!",
+ "BLEED, @pick(god_foe)!",
+ "DIE, @pick(god_foe)!"
+ ],
- "god_neutral": [
+ "god_neutral": [
"BE HEALED, MORTALS. I AM FEELING MERCIFUL.",
"BEGONE, MORTALS.",
"DANCE FOR ME, LITTLE MORTALS.",
@@ -198,22 +198,22 @@
"SEE THE TRUTH BEFORE YOU, MORTALS.",
"YOU MORTALS MAKE ME SICK.",
"YOU. STOP.",
- "BE SILENT.",
- "QUIET",
- "STOP"
- ],
+ "BE SILENT.",
+ "QUIET",
+ "STOP"
+ ],
- "god_unstun": [
+ "god_unstun": [
"GET UP, PRIEST.",
"GET UP. I HAVE NO TIME TO LOSE.",
"GET UP."
- ],
+ ],
- "god_heal": [
+ "god_heal": [
"BE HEALED, PRIEST.",
"YOU SHALL SURVIVE THIS, MY PRIEST.",
"YOU WILL LIVE TO SEE ANOTHER DAY.",
"YOUR LIFE IS IMPORTANT. KEEP IT."
- ]
+ ]
}
diff --git a/tgstation.dme b/tgstation.dme
index f5a47895674b2..9b09ef9539c00 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -389,6 +389,7 @@
#include "code\__DEFINES\research\anomalies.dm"
#include "code\__DEFINES\research\research_categories.dm"
#include "code\__DEFINES\research\slimes.dm"
+#include "code\__DEFINES\research\techweb_nodes.dm"
#include "code\__DEFINES\traits\_traits.dm"
#include "code\__DEFINES\traits\declarations.dm"
#include "code\__DEFINES\traits\macros.dm"
@@ -452,7 +453,6 @@
#include "code\__HELPERS\radio.dm"
#include "code\__HELPERS\randoms.dm"
#include "code\__HELPERS\reagents.dm"
-#include "code\__HELPERS\records.dm"
#include "code\__HELPERS\ref.dm"
#include "code\__HELPERS\roundend.dm"
#include "code\__HELPERS\sanitize_values.dm"
@@ -777,6 +777,7 @@
#include "code\datums\dog_fashion.dm"
#include "code\datums\ductnet.dm"
#include "code\datums\eigenstate.dm"
+#include "code\datums\embed_data.dm"
#include "code\datums\emotes.dm"
#include "code\datums\ert.dm"
#include "code\datums\hailer_phrase.dm"
@@ -784,6 +785,7 @@
#include "code\datums\hotkeys_help.dm"
#include "code\datums\http.dm"
#include "code\datums\hud.dm"
+#include "code\datums\instability_meltdown.dm"
#include "code\datums\json_database.dm"
#include "code\datums\json_savefile.dm"
#include "code\datums\lazy_template.dm"
@@ -1016,6 +1018,7 @@
#include "code\datums\components\ai_has_target_timer.dm"
#include "code\datums\components\ai_listen_to_weather.dm"
#include "code\datums\components\ai_retaliate_advanced.dm"
+#include "code\datums\components\amputating_limbs.dm"
#include "code\datums\components\anti_magic.dm"
#include "code\datums\components\appearance_on_aggro.dm"
#include "code\datums\components\aquarium_content.dm"
@@ -1029,6 +1032,7 @@
#include "code\datums\components\basic_inhands.dm"
#include "code\datums\components\basic_mob_attack_telegraph.dm"
#include "code\datums\components\basic_ranged_ready_overlay.dm"
+#include "code\datums\components\bayonet_attachable.dm"
#include "code\datums\components\beetlejuice.dm"
#include "code\datums\components\blob_minion.dm"
#include "code\datums\components\blood_walk.dm"
@@ -1269,7 +1273,6 @@
#include "code\datums\components\crafting\misc.dm"
#include "code\datums\components\crafting\ranged_weapon.dm"
#include "code\datums\components\crafting\robot.dm"
-#include "code\datums\components\crafting\slapcrafting.dm"
#include "code\datums\components\crafting\structures.dm"
#include "code\datums\components\crafting\tailoring.dm"
#include "code\datums\components\crafting\tiles.dm"
@@ -1372,7 +1375,6 @@
#include "code\datums\elements\ai_retaliate.dm"
#include "code\datums\elements\ai_swap_combat_mode.dm"
#include "code\datums\elements\ai_target_damagesource.dm"
-#include "code\datums\elements\amputating_limbs.dm"
#include "code\datums\elements\animal_variety.dm"
#include "code\datums\elements\art.dm"
#include "code\datums\elements\atmos_requirements.dm"
@@ -1458,6 +1460,7 @@
#include "code\datums\elements\kneejerk.dm"
#include "code\datums\elements\knockback.dm"
#include "code\datums\elements\lazy_fishing_spot.dm"
+#include "code\datums\elements\leeching_walk.dm"
#include "code\datums\elements\lifesteal.dm"
#include "code\datums\elements\light_blocking.dm"
#include "code\datums\elements\light_eaten.dm"
@@ -1472,6 +1475,7 @@
#include "code\datums\elements\move_force_on_death.dm"
#include "code\datums\elements\movement_turf_changer.dm"
#include "code\datums\elements\movetype_handler.dm"
+#include "code\datums\elements\muffles_speech.dm"
#include "code\datums\elements\nerfed_pulling.dm"
#include "code\datums\elements\noisy_movement.dm"
#include "code\datums\elements\noticable_organ.dm"
@@ -1500,6 +1504,7 @@
#include "code\datums\elements\simple_flying.dm"
#include "code\datums\elements\skill_reward.dm"
#include "code\datums\elements\skittish.dm"
+#include "code\datums\elements\slapcrafting.dm"
#include "code\datums\elements\soft_landing.dm"
#include "code\datums\elements\spooky.dm"
#include "code\datums\elements\squish.dm"
@@ -1528,6 +1533,7 @@
#include "code\datums\elements\wall_walker.dm"
#include "code\datums\elements\watery_tile.dm"
#include "code\datums\elements\weapon_description.dm"
+#include "code\datums\elements\wearable_client_colour.dm"
#include "code\datums\elements\weather_listener.dm"
#include "code\datums\elements\web_walker.dm"
#include "code\datums\elements\wheel.dm"
@@ -1590,6 +1596,7 @@
#include "code\datums\keybinding\robot.dm"
#include "code\datums\looping_sounds\_looping_sound.dm"
#include "code\datums\looping_sounds\acid.dm"
+#include "code\datums\looping_sounds\breathing.dm"
#include "code\datums\looping_sounds\burning.dm"
#include "code\datums\looping_sounds\choking.dm"
#include "code\datums\looping_sounds\cyborg.dm"
@@ -1643,6 +1650,7 @@
#include "code\datums\mood_events\needs_events.dm"
#include "code\datums\mutations\_combined.dm"
#include "code\datums\mutations\_mutations.dm"
+#include "code\datums\mutations\active.dm"
#include "code\datums\mutations\adaptation.dm"
#include "code\datums\mutations\antenna.dm"
#include "code\datums\mutations\autotomy.dm"
@@ -1650,13 +1658,14 @@
#include "code\datums\mutations\chameleon.dm"
#include "code\datums\mutations\cold.dm"
#include "code\datums\mutations\fire_breath.dm"
+#include "code\datums\mutations\hot.dm"
#include "code\datums\mutations\hulk.dm"
#include "code\datums\mutations\olfaction.dm"
#include "code\datums\mutations\passive.dm"
#include "code\datums\mutations\radioactive.dm"
+#include "code\datums\mutations\reach.dm"
#include "code\datums\mutations\sight.dm"
#include "code\datums\mutations\speech.dm"
-#include "code\datums\mutations\telekinesis.dm"
#include "code\datums\mutations\telepathy.dm"
#include "code\datums\mutations\tongue_spike.dm"
#include "code\datums\mutations\touch.dm"
@@ -1855,6 +1864,7 @@
#include "code\datums\status_effects\debuffs\slime\slime_leech.dm"
#include "code\datums\status_effects\debuffs\slime\slimed.dm"
#include "code\datums\storage\storage.dm"
+#include "code\datums\storage\storage_interface.dm"
#include "code\datums\storage\subtypes\backpack.dm"
#include "code\datums\storage\subtypes\bag_of_holding.dm"
#include "code\datums\storage\subtypes\cards.dm"
@@ -2459,6 +2469,7 @@
#include "code\game\objects\items\granters\crafting\combat_baking.dm"
#include "code\game\objects\items\granters\crafting\death_sandwich.dm"
#include "code\game\objects\items\granters\crafting\desserts.dm"
+#include "code\game\objects\items\granters\crafting\fletching.dm"
#include "code\game\objects\items\granters\crafting\pipegun.dm"
#include "code\game\objects\items\granters\crafting\rebarxbowsyndie.dm"
#include "code\game\objects\items\granters\crafting\regal_condor.dm"
@@ -3047,7 +3058,6 @@
#include "code\modules\antagonists\clown_ops\clownop.dm"
#include "code\modules\antagonists\clown_ops\outfits.dm"
#include "code\modules\antagonists\cult\blood_magic.dm"
-#include "code\modules\antagonists\cult\cult_bastard_sword.dm"
#include "code\modules\antagonists\cult\cult_comms.dm"
#include "code\modules\antagonists\cult\cult_items.dm"
#include "code\modules\antagonists\cult\cult_objectives.dm"
@@ -3060,6 +3070,7 @@
#include "code\modules\antagonists\cult\cult_turf_overlay.dm"
#include "code\modules\antagonists\cult\rune_spawn_action.dm"
#include "code\modules\antagonists\cult\runes.dm"
+#include "code\modules\antagonists\cult\sword_fling.dm"
#include "code\modules\antagonists\cult\datums\constructs.dm"
#include "code\modules\antagonists\cult\datums\cult_team.dm"
#include "code\modules\antagonists\cult\datums\cultist.dm"
@@ -3082,6 +3093,7 @@
#include "code\modules\antagonists\heretic\knife_effect.dm"
#include "code\modules\antagonists\heretic\moon_lunatic.dm"
#include "code\modules\antagonists\heretic\rust_effect.dm"
+#include "code\modules\antagonists\heretic\soultrapped_heretic.dm"
#include "code\modules\antagonists\heretic\transmutation_rune.dm"
#include "code\modules\antagonists\heretic\items\corrupted_organs.dm"
#include "code\modules\antagonists\heretic\items\eldritch_flask.dm"
@@ -3439,6 +3451,7 @@
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\manifold4w.dm"
#include "code\modules\atmospherics\machinery\pipes\heat_exchange\simple.dm"
#include "code\modules\atmospherics\machinery\portable\canister.dm"
+#include "code\modules\atmospherics\machinery\portable\pipe_scrubber.dm"
#include "code\modules\atmospherics\machinery\portable\portable_atmospherics.dm"
#include "code\modules\atmospherics\machinery\portable\pump.dm"
#include "code\modules\atmospherics\machinery\portable\scrubber.dm"
@@ -3492,6 +3505,13 @@
#include "code\modules\bitrunning\components\netpod_healing.dm"
#include "code\modules\bitrunning\components\npc_friendly.dm"
#include "code\modules\bitrunning\components\virtual_entity.dm"
+#include "code\modules\bitrunning\netpod\_netpod.dm"
+#include "code\modules\bitrunning\netpod\container.dm"
+#include "code\modules\bitrunning\netpod\outfitting.dm"
+#include "code\modules\bitrunning\netpod\signals.dm"
+#include "code\modules\bitrunning\netpod\tools.dm"
+#include "code\modules\bitrunning\netpod\ui.dm"
+#include "code\modules\bitrunning\netpod\utils.dm"
#include "code\modules\bitrunning\objects\byteforge.dm"
#include "code\modules\bitrunning\objects\clothing.dm"
#include "code\modules\bitrunning\objects\debug.dm"
@@ -3501,7 +3521,6 @@
#include "code\modules\bitrunning\objects\landmarks.dm"
#include "code\modules\bitrunning\objects\loot_box.dm"
#include "code\modules\bitrunning\objects\loot_crate.dm"
-#include "code\modules\bitrunning\objects\netpod.dm"
#include "code\modules\bitrunning\objects\quantum_console.dm"
#include "code\modules\bitrunning\objects\vendor.dm"
#include "code\modules\bitrunning\orders\bepis.dm"
@@ -3531,6 +3550,7 @@
#include "code\modules\bitrunning\virtual_domain\domains\fredingtonfastingbear.dm"
#include "code\modules\bitrunning\virtual_domain\domains\gondola_asteroid.dm"
#include "code\modules\bitrunning\virtual_domain\domains\hierophant.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\island_brawl.dm"
#include "code\modules\bitrunning\virtual_domain\domains\pipedream.dm"
#include "code\modules\bitrunning\virtual_domain\domains\pirates.dm"
#include "code\modules\bitrunning\virtual_domain\domains\psyker_shuffle.dm"
@@ -3592,6 +3612,7 @@
#include "code\modules\cargo\universal_scanner.dm"
#include "code\modules\cargo\bounties\assistant.dm"
#include "code\modules\cargo\bounties\atmos.dm"
+#include "code\modules\cargo\bounties\bitrunning.dm"
#include "code\modules\cargo\bounties\botany.dm"
#include "code\modules\cargo\bounties\chef.dm"
#include "code\modules\cargo\bounties\engineering.dm"
@@ -4394,6 +4415,7 @@
#include "code\modules\library\skill_learning\job_skillchips\_job.dm"
#include "code\modules\library\skill_learning\job_skillchips\chef.dm"
#include "code\modules\library\skill_learning\job_skillchips\clown.dm"
+#include "code\modules\library\skill_learning\job_skillchips\detective.dm"
#include "code\modules\library\skill_learning\job_skillchips\janitor.dm"
#include "code\modules\library\skill_learning\job_skillchips\miner.dm"
#include "code\modules\library\skill_learning\job_skillchips\psychologist.dm"
@@ -4472,6 +4494,7 @@
#include "code\modules\mapfluff\ruins\lavaland_ruin_code.dm"
#include "code\modules\mapfluff\ruins\icemoonruin_code\commsagent.dm"
#include "code\modules\mapfluff\ruins\icemoonruin_code\hotsprings.dm"
+#include "code\modules\mapfluff\ruins\icemoonruin_code\lavaland_incursion.dm"
#include "code\modules\mapfluff\ruins\icemoonruin_code\library.dm"
#include "code\modules\mapfluff\ruins\icemoonruin_code\mailroom.dm"
#include "code\modules\mapfluff\ruins\icemoonruin_code\mining_site.dm"
@@ -4660,6 +4683,8 @@
#include "code\modules\mob\living\basic\bots\cleanbot\cleanbot.dm"
#include "code\modules\mob\living\basic\bots\cleanbot\cleanbot_abilities.dm"
#include "code\modules\mob\living\basic\bots\cleanbot\cleanbot_ai.dm"
+#include "code\modules\mob\living\basic\bots\firebot\firebot.dm"
+#include "code\modules\mob\living\basic\bots\firebot\firebot_ai.dm"
#include "code\modules\mob\living\basic\bots\honkbots\honkbot.dm"
#include "code\modules\mob\living\basic\bots\honkbots\honkbot_abilities.dm"
#include "code\modules\mob\living\basic\bots\honkbots\honkbot_ai.dm"
@@ -5115,7 +5140,6 @@
#include "code\modules\mob\living\simple_animal\bot\bot_announcement.dm"
#include "code\modules\mob\living\simple_animal\bot\construction.dm"
#include "code\modules\mob\living\simple_animal\bot\ed209bot.dm"
-#include "code\modules\mob\living\simple_animal\bot\firebot.dm"
#include "code\modules\mob\living\simple_animal\bot\floorbot.dm"
#include "code\modules\mob\living\simple_animal\bot\mulebot.dm"
#include "code\modules\mob\living\simple_animal\bot\secbot.dm"
@@ -5257,6 +5281,7 @@
#include "code\modules\modular_computers\file_system\programs\chatroom\ntnrc_client.dm"
#include "code\modules\modular_computers\file_system\programs\maintenance\_maintenance_program.dm"
#include "code\modules\modular_computers\file_system\programs\maintenance\camera.dm"
+#include "code\modules\modular_computers\file_system\programs\maintenance\cool_sword.dm"
#include "code\modules\modular_computers\file_system\programs\maintenance\modsuit.dm"
#include "code\modules\modular_computers\file_system\programs\maintenance\phys_scanner.dm"
#include "code\modules\modular_computers\file_system\programs\maintenance\spectre_meter.dm"
@@ -5331,10 +5356,10 @@
#include "code\modules\plumbing\plumbers\plumbing_buffer.dm"
#include "code\modules\plumbing\plumbers\pumps.dm"
#include "code\modules\plumbing\plumbers\reaction_chamber.dm"
+#include "code\modules\plumbing\plumbers\simple_machines.dm"
#include "code\modules\plumbing\plumbers\splitters.dm"
#include "code\modules\plumbing\plumbers\synthesizer.dm"
#include "code\modules\plumbing\plumbers\teleporter.dm"
-#include "code\modules\plumbing\plumbers\vatgrower.dm"
#include "code\modules\point\point.dm"
#include "code\modules\power\battery.dm"
#include "code\modules\power\cable.dm"
@@ -5509,6 +5534,7 @@
#include "code\modules\projectiles\projectile\energy\net_snare.dm"
#include "code\modules\projectiles\projectile\energy\ninja.dm"
#include "code\modules\projectiles\projectile\energy\nuclear_particle.dm"
+#include "code\modules\projectiles\projectile\energy\photon.dm"
#include "code\modules\projectiles\projectile\energy\radiation.dm"
#include "code\modules\projectiles\projectile\energy\stun.dm"
#include "code\modules\projectiles\projectile\energy\tesla.dm"
@@ -5727,6 +5753,7 @@
#include "code\modules\research\xenobiology\vatgrowing\microscope.dm"
#include "code\modules\research\xenobiology\vatgrowing\petri_dish.dm"
#include "code\modules\research\xenobiology\vatgrowing\swab.dm"
+#include "code\modules\research\xenobiology\vatgrowing\vatgrower.dm"
#include "code\modules\research\xenobiology\vatgrowing\samples\_micro_organism.dm"
#include "code\modules\research\xenobiology\vatgrowing\samples\_sample.dm"
#include "code\modules\research\xenobiology\vatgrowing\samples\cell_lines\common.dm"
@@ -5937,6 +5964,7 @@
#include "code\modules\surgery\organs\internal\ears\_ears.dm"
#include "code\modules\surgery\organs\internal\eyes\_eyes.dm"
#include "code\modules\surgery\organs\internal\heart\_heart.dm"
+#include "code\modules\surgery\organs\internal\heart\heart_anomalock.dm"
#include "code\modules\surgery\organs\internal\heart\heart_ethereal.dm"
#include "code\modules\surgery\organs\internal\liver\_liver.dm"
#include "code\modules\surgery\organs\internal\liver\liver_golem.dm"
@@ -6075,6 +6103,7 @@
#include "code\modules\vehicles\mecha\combat\durand.dm"
#include "code\modules\vehicles\mecha\combat\gygax.dm"
#include "code\modules\vehicles\mecha\combat\honker.dm"
+#include "code\modules\vehicles\mecha\combat\justice.dm"
#include "code\modules\vehicles\mecha\combat\marauder.dm"
#include "code\modules\vehicles\mecha\combat\phazon.dm"
#include "code\modules\vehicles\mecha\combat\reticence.dm"
@@ -6119,6 +6148,7 @@
#include "code\modules\vending\security.dm"
#include "code\modules\vending\snack.dm"
#include "code\modules\vending\sovietsoda.dm"
+#include "code\modules\vending\subtype.dm"
#include "code\modules\vending\sustenance.dm"
#include "code\modules\vending\toys.dm"
#include "code\modules\vending\wardrobes.dm"
@@ -6278,4 +6308,5 @@
#include "interface\fonts\tiny_unicode.dm"
#include "interface\fonts\vcr_osd_mono.dm"
#include "massmeta\modular_meta.dm"
+#include "massmeta\modular_meta_master.dm"
// END_INCLUDE
diff --git a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
new file mode 100644
index 0000000000000..8203f0313951d
--- /dev/null
+++ b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
@@ -0,0 +1,173 @@
+import { toFixed } from 'common/math';
+import { capitalize } from 'common/string';
+import { useState } from 'react';
+import { useDispatch, useSelector } from 'tgui/backend';
+import {
+ Button,
+ Collapsible,
+ Divider,
+ Input,
+ LabeledList,
+ NumberInput,
+ Section,
+ Stack,
+} from 'tgui/components';
+
+import { clearChat, saveChatToDisk } from '../chat/actions';
+import { THEMES } from '../themes';
+import { updateSettings } from './actions';
+import { FONTS } from './constants';
+import { selectSettings } from './selectors';
+
+export function SettingsGeneral(props) {
+ const { theme, fontFamily, fontSize, lineHeight } =
+ useSelector(selectSettings);
+ const dispatch = useDispatch();
+ const [freeFont, setFreeFont] = useState(false);
+
+ return (
+ <Section>
+ <LabeledList>
+ <LabeledList.Item label="Theme">
+ {THEMES.map((THEME) => (
+ <Button
+ key={THEME}
+ selected={theme === THEME}
+ color="transparent"
+ onClick={() =>
+ dispatch(
+ updateSettings({
+ theme: THEME,
+ }),
+ )
+ }
+ >
+ {capitalize(THEME)}
+ </Button>
+ ))}
+ </LabeledList.Item>
+ <LabeledList.Item label="Font style">
+ <Stack.Item>
+ {!freeFont ? (
+ <Collapsible
+ title={fontFamily}
+ width={'100%'}
+ buttons={
+ <Button
+ icon={freeFont ? 'lock-open' : 'lock'}
+ color={freeFont ? 'good' : 'bad'}
+ onClick={() => {
+ setFreeFont(!freeFont);
+ }}
+ >
+ Custom font
+ </Button>
+ }
+ >
+ {FONTS.map((FONT) => (
+ <Button
+ key={FONT}
+ fontFamily={FONT}
+ selected={fontFamily === FONT}
+ color="transparent"
+ onClick={() =>
+ dispatch(
+ updateSettings({
+ fontFamily: FONT,
+ }),
+ )
+ }
+ >
+ {FONT}
+ </Button>
+ ))}
+ </Collapsible>
+ ) : (
+ <Stack>
+ <Input
+ width={'100%'}
+ value={fontFamily}
+ onChange={(e, value) =>
+ dispatch(
+ updateSettings({
+ fontFamily: value,
+ }),
+ )
+ }
+ />
+ <Button
+ ml={0.5}
+ icon={freeFont ? 'lock-open' : 'lock'}
+ color={freeFont ? 'good' : 'bad'}
+ onClick={() => {
+ setFreeFont(!freeFont);
+ }}
+ >
+ Custom font
+ </Button>
+ </Stack>
+ )}
+ </Stack.Item>
+ </LabeledList.Item>
+ <LabeledList.Item label="Font size">
+ <NumberInput
+ width="4.2em"
+ step={1}
+ stepPixelSize={10}
+ minValue={8}
+ maxValue={32}
+ value={fontSize}
+ unit="px"
+ format={(value) => toFixed(value)}
+ onChange={(value) =>
+ dispatch(
+ updateSettings({
+ fontSize: value,
+ }),
+ )
+ }
+ />
+ </LabeledList.Item>
+ <LabeledList.Item label="Line height">
+ <NumberInput
+ width="4.2em"
+ step={0.01}
+ stepPixelSize={2}
+ minValue={0.8}
+ maxValue={5}
+ value={lineHeight}
+ format={(value) => toFixed(value, 2)}
+ onDrag={(value) =>
+ dispatch(
+ updateSettings({
+ lineHeight: value,
+ }),
+ )
+ }
+ />
+ </LabeledList.Item>
+ </LabeledList>
+ <Divider />
+ <Stack fill>
+ <Stack.Item grow mt={0.15}>
+ <Button
+ icon="save"
+ tooltip="Export current tab history into HTML file"
+ onClick={() => dispatch(saveChatToDisk())}
+ >
+ Save chat log
+ </Button>
+ </Stack.Item>
+ <Stack.Item mt={0.15}>
+ <Button.Confirm
+ icon="trash"
+ tooltip="Erase current tab history"
+ onClick={() => dispatch(clearChat())}
+ >
+ Clear chat
+ </Button.Confirm>
+ </Stack.Item>
+ </Stack>
+ </Section>
+ );
+}
diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.jsx b/tgui/packages/tgui-panel/settings/SettingsPanel.jsx
deleted file mode 100644
index e5691037bba68..0000000000000
--- a/tgui/packages/tgui-panel/settings/SettingsPanel.jsx
+++ /dev/null
@@ -1,371 +0,0 @@
-/**
- * @file
- * @copyright 2020 Aleksej Komarov
- * @license MIT
- */
-
-import { toFixed } from 'common/math';
-import { capitalize } from 'common/string';
-import { useLocalState } from 'tgui/backend';
-import { useDispatch, useSelector } from 'tgui/backend';
-import {
- Box,
- Button,
- Collapsible,
- ColorBox,
- Divider,
- Input,
- LabeledList,
- NumberInput,
- Section,
- Stack,
- Tabs,
- TextArea,
-} from 'tgui/components';
-
-import { ChatPageSettings } from '../chat';
-import { clearChat, rebuildChat, saveChatToDisk } from '../chat/actions';
-import { THEMES } from '../themes';
-import {
- addHighlightSetting,
- changeSettingsTab,
- removeHighlightSetting,
- updateHighlightSetting,
- updateSettings,
-} from './actions';
-import { FONTS, MAX_HIGHLIGHT_SETTINGS, SETTINGS_TABS } from './constants';
-import {
- selectActiveTab,
- selectHighlightSettingById,
- selectHighlightSettings,
- selectSettings,
-} from './selectors';
-
-export const SettingsPanel = (props) => {
- const activeTab = useSelector(selectActiveTab);
- const dispatch = useDispatch();
- return (
- <Stack fill>
- <Stack.Item>
- <Section fitted fill minHeight="8em">
- <Tabs vertical>
- {SETTINGS_TABS.map((tab) => (
- <Tabs.Tab
- key={tab.id}
- selected={tab.id === activeTab}
- onClick={() =>
- dispatch(
- changeSettingsTab({
- tabId: tab.id,
- }),
- )
- }
- >
- {tab.name}
- </Tabs.Tab>
- ))}
- </Tabs>
- </Section>
- </Stack.Item>
- <Stack.Item grow={1} basis={0}>
- {activeTab === 'general' && <SettingsGeneral />}
- {activeTab === 'chatPage' && <ChatPageSettings />}
- {activeTab === 'textHighlight' && <TextHighlightSettings />}
- </Stack.Item>
- </Stack>
- );
-};
-
-export const SettingsGeneral = (props) => {
- const { theme, fontFamily, fontSize, lineHeight } =
- useSelector(selectSettings);
- const dispatch = useDispatch();
- const [freeFont, setFreeFont] = useLocalState('freeFont', false);
- return (
- <Section>
- <LabeledList>
- <LabeledList.Item label="Theme">
- {THEMES.map((THEME) => (
- <Button
- key={THEME}
- content={capitalize(THEME)}
- selected={theme === THEME}
- color="transparent"
- onClick={() =>
- dispatch(
- updateSettings({
- theme: THEME,
- }),
- )
- }
- />
- ))}
- </LabeledList.Item>
- <LabeledList.Item label="Font style">
- <Stack.Item>
- {(!freeFont && (
- <Collapsible
- title={fontFamily}
- width={'100%'}
- buttons={
- <Button
- content="Custom font"
- icon={freeFont ? 'lock-open' : 'lock'}
- color={freeFont ? 'good' : 'bad'}
- onClick={() => {
- setFreeFont(!freeFont);
- }}
- />
- }
- >
- {FONTS.map((FONT) => (
- <Button
- key={FONT}
- content={FONT}
- fontFamily={FONT}
- selected={fontFamily === FONT}
- color="transparent"
- onClick={() =>
- dispatch(
- updateSettings({
- fontFamily: FONT,
- }),
- )
- }
- />
- ))}
- </Collapsible>
- )) || (
- <Stack>
- <Input
- width={'100%'}
- value={fontFamily}
- onChange={(value) =>
- dispatch(
- updateSettings({
- fontFamily: value,
- }),
- )
- }
- />
- <Button
- ml={0.5}
- content="Custom font"
- icon={freeFont ? 'lock-open' : 'lock'}
- color={freeFont ? 'good' : 'bad'}
- onClick={() => {
- setFreeFont(!freeFont);
- }}
- />
- </Stack>
- )}
- </Stack.Item>
- </LabeledList.Item>
- <LabeledList.Item label="Font size">
- <NumberInput
- width="4.2em"
- step={1}
- stepPixelSize={10}
- minValue={8}
- maxValue={32}
- value={fontSize}
- unit="px"
- format={(value) => toFixed(value)}
- onChange={(value) =>
- dispatch(
- updateSettings({
- fontSize: value,
- }),
- )
- }
- />
- </LabeledList.Item>
- <LabeledList.Item label="Line height">
- <NumberInput
- width="4.2em"
- step={0.01}
- stepPixelSize={2}
- minValue={0.8}
- maxValue={5}
- value={lineHeight}
- format={(value) => toFixed(value, 2)}
- onDrag={(value) =>
- dispatch(
- updateSettings({
- lineHeight: value,
- }),
- )
- }
- />
- </LabeledList.Item>
- </LabeledList>
- <Divider />
- <Stack fill>
- <Stack.Item grow mt={0.15}>
- <Button
- content="Save chat log"
- icon="save"
- tooltip="Export current tab history into HTML file"
- onClick={() => dispatch(saveChatToDisk())}
- />
- </Stack.Item>
- <Stack.Item mt={0.15}>
- <Button.Confirm
- content="Clear chat"
- icon="trash"
- tooltip="Erase current tab history"
- onClick={() => dispatch(clearChat())}
- />
- </Stack.Item>
- </Stack>
- </Section>
- );
-};
-
-const TextHighlightSettings = (props) => {
- const highlightSettings = useSelector(selectHighlightSettings);
- const dispatch = useDispatch();
- return (
- <Section fill scrollable height="250px">
- <Stack vertical>
- {highlightSettings.map((id, i) => (
- <TextHighlightSetting
- key={i}
- id={id}
- mb={i + 1 === highlightSettings.length ? 0 : '10px'}
- />
- ))}
- {highlightSettings.length < MAX_HIGHLIGHT_SETTINGS && (
- <Stack.Item>
- <Button
- color="transparent"
- icon="plus"
- content="Add Highlight Setting"
- onClick={() => {
- dispatch(addHighlightSetting());
- }}
- />
- </Stack.Item>
- )}
- </Stack>
- <Divider />
- <Box>
- <Button icon="check" onClick={() => dispatch(rebuildChat())}>
- Apply now
- </Button>
- <Box inline fontSize="0.9em" ml={1} color="label">
- Can freeze the chat for a while.
- </Box>
- </Box>
- </Section>
- );
-};
-
-const TextHighlightSetting = (props) => {
- const { id, ...rest } = props;
- const highlightSettingById = useSelector(selectHighlightSettingById);
- const dispatch = useDispatch();
- const {
- highlightColor,
- highlightText,
- highlightWholeMessage,
- matchWord,
- matchCase,
- } = highlightSettingById[id];
- return (
- <Stack.Item {...rest}>
- <Stack mb={1} color="label" align="baseline">
- <Stack.Item grow>
- <Button
- content="Delete"
- color="transparent"
- icon="times"
- onClick={() =>
- dispatch(
- removeHighlightSetting({
- id: id,
- }),
- )
- }
- />
- </Stack.Item>
- <Stack.Item>
- <Button.Checkbox
- checked={highlightWholeMessage}
- content="Whole Message"
- tooltip="If this option is selected, the entire message will be highlighted in yellow."
- onClick={() =>
- dispatch(
- updateHighlightSetting({
- id: id,
- highlightWholeMessage: !highlightWholeMessage,
- }),
- )
- }
- />
- </Stack.Item>
- <Stack.Item>
- <Button.Checkbox
- content="Exact"
- checked={matchWord}
- tooltipPosition="bottom-start"
- tooltip="If this option is selected, only exact matches (no extra letters before or after) will trigger. Not compatible with punctuation. Overriden if regex is used."
- onClick={() =>
- dispatch(
- updateHighlightSetting({
- id: id,
- matchWord: !matchWord,
- }),
- )
- }
- />
- </Stack.Item>
- <Stack.Item>
- <Button.Checkbox
- content="Case"
- tooltip="If this option is selected, the highlight will be case-sensitive."
- checked={matchCase}
- onClick={() =>
- dispatch(
- updateHighlightSetting({
- id: id,
- matchCase: !matchCase,
- }),
- )
- }
- />
- </Stack.Item>
- <Stack.Item>
- <ColorBox mr={1} color={highlightColor} />
- <Input
- width="5em"
- monospace
- placeholder="#ffffff"
- value={highlightColor}
- onInput={(e, value) =>
- dispatch(
- updateHighlightSetting({
- id: id,
- highlightColor: value,
- }),
- )
- }
- />
- </Stack.Item>
- </Stack>
- <TextArea
- height="3em"
- value={highlightText}
- placeholder="Put words to highlight here. Separate terms with commas, i.e. (term1, term2, term3)"
- onChange={(e, value) =>
- dispatch(
- updateHighlightSetting({
- id: id,
- highlightText: value,
- }),
- )
- }
- />
- </Stack.Item>
- );
-};
diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.tsx b/tgui/packages/tgui-panel/settings/SettingsPanel.tsx
new file mode 100644
index 0000000000000..abb0ef86f6335
--- /dev/null
+++ b/tgui/packages/tgui-panel/settings/SettingsPanel.tsx
@@ -0,0 +1,51 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { useDispatch, useSelector } from 'tgui/backend';
+import { Section, Stack, Tabs } from 'tgui/components';
+
+import { ChatPageSettings } from '../chat';
+import { changeSettingsTab } from './actions';
+import { SETTINGS_TABS } from './constants';
+import { selectActiveTab } from './selectors';
+import { SettingsGeneral } from './SettingsGeneral';
+import { TextHighlightSettings } from './TextHighlight';
+
+export function SettingsPanel(props) {
+ const activeTab = useSelector(selectActiveTab);
+ const dispatch = useDispatch();
+
+ return (
+ <Stack fill>
+ <Stack.Item>
+ <Section fitted fill minHeight="8em">
+ <Tabs vertical>
+ {SETTINGS_TABS.map((tab) => (
+ <Tabs.Tab
+ key={tab.id}
+ selected={tab.id === activeTab}
+ onClick={() =>
+ dispatch(
+ changeSettingsTab({
+ tabId: tab.id,
+ }),
+ )
+ }
+ >
+ {tab.name}
+ </Tabs.Tab>
+ ))}
+ </Tabs>
+ </Section>
+ </Stack.Item>
+ <Stack.Item grow basis={0}>
+ {activeTab === 'general' && <SettingsGeneral />}
+ {activeTab === 'chatPage' && <ChatPageSettings />}
+ {activeTab === 'textHighlight' && <TextHighlightSettings />}
+ </Stack.Item>
+ </Stack>
+ );
+}
diff --git a/tgui/packages/tgui-panel/settings/TextHighlight.tsx b/tgui/packages/tgui-panel/settings/TextHighlight.tsx
new file mode 100644
index 0000000000000..76512cf3770f6
--- /dev/null
+++ b/tgui/packages/tgui-panel/settings/TextHighlight.tsx
@@ -0,0 +1,178 @@
+import { useDispatch, useSelector } from 'tgui/backend';
+import {
+ Box,
+ Button,
+ ColorBox,
+ Divider,
+ Input,
+ Section,
+ Stack,
+ TextArea,
+} from 'tgui/components';
+
+import { rebuildChat } from '../chat/actions';
+import {
+ addHighlightSetting,
+ removeHighlightSetting,
+ updateHighlightSetting,
+} from './actions';
+import { MAX_HIGHLIGHT_SETTINGS } from './constants';
+import {
+ selectHighlightSettingById,
+ selectHighlightSettings,
+} from './selectors';
+
+export function TextHighlightSettings(props) {
+ const highlightSettings = useSelector(selectHighlightSettings);
+ const dispatch = useDispatch();
+
+ return (
+ <Section fill scrollable height="250px">
+ <Stack vertical>
+ {highlightSettings.map((id, i) => (
+ <TextHighlightSetting
+ key={i}
+ id={id}
+ mb={i + 1 === highlightSettings.length ? 0 : '10px'}
+ />
+ ))}
+ {highlightSettings.length < MAX_HIGHLIGHT_SETTINGS && (
+ <Stack.Item>
+ <Button
+ color="transparent"
+ icon="plus"
+ onClick={() => {
+ dispatch(addHighlightSetting());
+ }}
+ >
+ Add Highlight Setting
+ </Button>
+ </Stack.Item>
+ )}
+ </Stack>
+ <Divider />
+ <Box>
+ <Button icon="check" onClick={() => dispatch(rebuildChat())}>
+ Apply now
+ </Button>
+ <Box inline fontSize="0.9em" ml={1} color="label">
+ Can freeze the chat for a while.
+ </Box>
+ </Box>
+ </Section>
+ );
+}
+
+function TextHighlightSetting(props) {
+ const { id, ...rest } = props;
+ const highlightSettingById = useSelector(selectHighlightSettingById);
+ const dispatch = useDispatch();
+ const {
+ highlightColor,
+ highlightText,
+ highlightWholeMessage,
+ matchWord,
+ matchCase,
+ } = highlightSettingById[id];
+
+ return (
+ <Stack.Item {...rest}>
+ <Stack mb={1} color="label" align="baseline">
+ <Stack.Item grow>
+ <Button
+ color="transparent"
+ icon="times"
+ onClick={() =>
+ dispatch(
+ removeHighlightSetting({
+ id: id,
+ }),
+ )
+ }
+ >
+ Delete
+ </Button>
+ </Stack.Item>
+ <Stack.Item>
+ <Button.Checkbox
+ checked={highlightWholeMessage}
+ tooltip="If this option is selected, the entire message will be highlighted in yellow."
+ onClick={() =>
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ highlightWholeMessage: !highlightWholeMessage,
+ }),
+ )
+ }
+ >
+ Whole Message
+ </Button.Checkbox>
+ </Stack.Item>
+ <Stack.Item>
+ <Button.Checkbox
+ checked={matchWord}
+ tooltipPosition="bottom-start"
+ tooltip="If this option is selected, only exact matches (no extra letters before or after) will trigger. Not compatible with punctuation. Overriden if regex is used."
+ onClick={() =>
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ matchWord: !matchWord,
+ }),
+ )
+ }
+ >
+ Exact
+ </Button.Checkbox>
+ </Stack.Item>
+ <Stack.Item>
+ <Button.Checkbox
+ tooltip="If this option is selected, the highlight will be case-sensitive."
+ checked={matchCase}
+ onClick={() =>
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ matchCase: !matchCase,
+ }),
+ )
+ }
+ >
+ Case
+ </Button.Checkbox>
+ </Stack.Item>
+ <Stack.Item>
+ <ColorBox mr={1} color={highlightColor} />
+ <Input
+ width="5em"
+ monospace
+ placeholder="#ffffff"
+ value={highlightColor}
+ onInput={(e, value) =>
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ highlightColor: value,
+ }),
+ )
+ }
+ />
+ </Stack.Item>
+ </Stack>
+ <TextArea
+ height="3em"
+ value={highlightText}
+ placeholder="Put words to highlight here. Separate terms with commas, i.e. (term1, term2, term3)"
+ onChange={(e, value) =>
+ dispatch(
+ updateHighlightSetting({
+ id: id,
+ highlightText: value,
+ }),
+ )
+ }
+ />
+ </Stack.Item>
+ );
+}
diff --git a/tgui/packages/tgui-panel/settings/middleware.js b/tgui/packages/tgui-panel/settings/middleware.js
deleted file mode 100644
index edb16a51c4c41..0000000000000
--- a/tgui/packages/tgui-panel/settings/middleware.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file
- * @copyright 2020 Aleksej Komarov
- * @license MIT
- */
-
-import { storage } from 'common/storage';
-
-import { setClientTheme } from '../themes';
-import {
- addHighlightSetting,
- loadSettings,
- removeHighlightSetting,
- updateHighlightSetting,
- updateSettings,
-} from './actions';
-import { FONTS_DISABLED } from './constants';
-import { selectSettings } from './selectors';
-
-let overrideRule = null;
-let overrideFontFamily = null;
-let overrideFontSize = null;
-
-const updateGlobalOverrideRule = () => {
- let fontFamily = '';
-
- if (overrideFontFamily !== null) {
- fontFamily = `font-family: ${overrideFontFamily} !important;`;
- }
-
- const constructedRule = `body * :not(.Icon) {
- ${fontFamily}
- }`;
-
- if (overrideRule === null) {
- overrideRule = document.createElement('style');
- document.querySelector('head').append(overrideRule);
- }
-
- // no other way to force a CSS refresh other than to update its innerText
- overrideRule.innerText = constructedRule;
-
- document.body.style.setProperty('font-size', overrideFontSize);
-};
-
-const setGlobalFontSize = (fontSize) => {
- overrideFontSize = `${fontSize}px`;
-};
-
-const setGlobalFontFamily = (fontFamily) => {
- if (fontFamily === FONTS_DISABLED) fontFamily = null;
- overrideFontFamily = fontFamily;
-};
-
-export const settingsMiddleware = (store) => {
- let initialized = false;
- return (next) => (action) => {
- const { type, payload } = action;
- if (!initialized) {
- initialized = true;
- storage.get('panel-settings').then((settings) => {
- store.dispatch(loadSettings(settings));
- });
- }
- if (
- type === updateSettings.type ||
- type === loadSettings.type ||
- type === addHighlightSetting.type ||
- type === removeHighlightSetting.type ||
- type === updateHighlightSetting.type
- ) {
- // Set client theme
- const theme = payload?.theme;
- if (theme) {
- setClientTheme(theme);
- }
- // Pass action to get an updated state
- next(action);
- const settings = selectSettings(store.getState());
- // Update global UI font size
- setGlobalFontSize(settings.fontSize);
- setGlobalFontFamily(settings.fontFamily);
- updateGlobalOverrideRule();
- // Save settings to the web storage
- storage.set('panel-settings', settings);
- return;
- }
- return next(action);
- };
-};
diff --git a/tgui/packages/tgui-panel/settings/middleware.ts b/tgui/packages/tgui-panel/settings/middleware.ts
new file mode 100644
index 0000000000000..01ad88561904f
--- /dev/null
+++ b/tgui/packages/tgui-panel/settings/middleware.ts
@@ -0,0 +1,98 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import { storage } from 'common/storage';
+
+import { setClientTheme } from '../themes';
+import {
+ addHighlightSetting,
+ loadSettings,
+ removeHighlightSetting,
+ updateHighlightSetting,
+ updateSettings,
+} from './actions';
+import { FONTS_DISABLED } from './constants';
+import { selectSettings } from './selectors';
+
+let overrideRule: HTMLStyleElement;
+let overrideFontFamily: string | undefined;
+let overrideFontSize: string;
+
+/** Updates the global CSS rule to override the font family and size. */
+function updateGlobalOverrideRule() {
+ let fontFamily = '';
+
+ if (overrideFontFamily !== undefined) {
+ fontFamily = `font-family: ${overrideFontFamily} !important;`;
+ }
+
+ const constructedRule = `body * :not(.Icon) {
+ ${fontFamily}
+ }`;
+
+ if (overrideRule === undefined) {
+ overrideRule = document.createElement('style');
+ document.querySelector('head')!.append(overrideRule);
+ }
+
+ // no other way to force a CSS refresh other than to update its innerText
+ overrideRule.innerText = constructedRule;
+
+ document.body.style.setProperty('font-size', overrideFontSize);
+}
+
+function setGlobalFontSize(fontSize: string) {
+ overrideFontSize = `${fontSize}px`;
+}
+
+function setGlobalFontFamily(fontFamily: string) {
+ overrideFontFamily = fontFamily === FONTS_DISABLED ? undefined : fontFamily;
+}
+
+export function settingsMiddleware(store) {
+ let initialized = false;
+
+ return (next) => (action) => {
+ const { type, payload } = action;
+
+ if (!initialized) {
+ initialized = true;
+ storage.get('panel-settings').then((settings) => {
+ store.dispatch(loadSettings(settings));
+ });
+ }
+ if (
+ type !== updateSettings.type &&
+ type !== loadSettings.type &&
+ type !== addHighlightSetting.type &&
+ type !== removeHighlightSetting.type &&
+ type !== updateHighlightSetting.type
+ ) {
+ return next(action);
+ }
+
+ // Set client theme
+ const theme = payload?.theme;
+ if (theme) {
+ setClientTheme(theme);
+ }
+
+ // Pass action to get an updated state
+ next(action);
+
+ const settings = selectSettings(store.getState());
+
+ // Update global UI font size
+ setGlobalFontSize(settings.fontSize);
+ setGlobalFontFamily(settings.fontFamily);
+ updateGlobalOverrideRule();
+
+ // Save settings to the web storage
+ storage.set('panel-settings', settings);
+
+ return;
+ };
+}
diff --git a/tgui/packages/tgui-panel/settings/reducer.js b/tgui/packages/tgui-panel/settings/reducer.js
deleted file mode 100644
index 1240198df8a3d..0000000000000
--- a/tgui/packages/tgui-panel/settings/reducer.js
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * @file
- * @copyright 2020 Aleksej Komarov
- * @license MIT
- */
-
-import {
- addHighlightSetting,
- changeSettingsTab,
- loadSettings,
- openChatSettings,
- removeHighlightSetting,
- toggleSettings,
- updateHighlightSetting,
- updateSettings,
-} from './actions';
-import { FONTS, MAX_HIGHLIGHT_SETTINGS, SETTINGS_TABS } from './constants';
-import { createDefaultHighlightSetting } from './model';
-
-const defaultHighlightSetting = createDefaultHighlightSetting();
-
-const initialState = {
- version: 1,
- fontSize: 13,
- fontFamily: FONTS[0],
- lineHeight: 1.2,
- theme: 'light',
- adminMusicVolume: 0.5,
- // Keep these two state vars for compatibility with other servers
- highlightText: '',
- highlightColor: '#ffdd44',
- // END compatibility state vars
- highlightSettings: [defaultHighlightSetting.id],
- highlightSettingById: {
- [defaultHighlightSetting.id]: defaultHighlightSetting,
- },
- view: {
- visible: false,
- activeTab: SETTINGS_TABS[0].id,
- },
-};
-
-export const settingsReducer = (state = initialState, action) => {
- const { type, payload } = action;
- if (type === updateSettings.type) {
- return {
- ...state,
- ...payload,
- };
- }
- if (type === loadSettings.type) {
- // Validate version and/or migrate state
- if (!payload?.version) {
- return state;
- }
-
- delete payload.view;
- const nextState = {
- ...state,
- ...payload,
- };
- // Lazy init the list for compatibility reasons
- if (!nextState.highlightSettings) {
- nextState.highlightSettings = [defaultHighlightSetting.id];
- nextState.highlightSettingById[defaultHighlightSetting.id] =
- defaultHighlightSetting;
- }
- // Compensating for mishandling of default highlight settings
- else if (!nextState.highlightSettingById[defaultHighlightSetting.id]) {
- nextState.highlightSettings = [
- defaultHighlightSetting.id,
- ...nextState.highlightSettings,
- ];
- nextState.highlightSettingById[defaultHighlightSetting.id] =
- defaultHighlightSetting;
- }
- // Update the highlight settings for default highlight
- // settings compatibility
- const highlightSetting =
- nextState.highlightSettingById[defaultHighlightSetting.id];
- highlightSetting.highlightColor = nextState.highlightColor;
- highlightSetting.highlightText = nextState.highlightText;
- return nextState;
- }
- if (type === toggleSettings.type) {
- return {
- ...state,
- view: {
- ...state.view,
- visible: !state.view.visible,
- },
- };
- }
- if (type === openChatSettings.type) {
- return {
- ...state,
- view: {
- ...state.view,
- visible: true,
- activeTab: 'chatPage',
- },
- };
- }
- if (type === changeSettingsTab.type) {
- const { tabId } = payload;
- return {
- ...state,
- view: {
- ...state.view,
- activeTab: tabId,
- },
- };
- }
- if (type === addHighlightSetting.type) {
- const highlightSetting = payload;
- if (state.highlightSettings.length >= MAX_HIGHLIGHT_SETTINGS) {
- return state;
- }
- return {
- ...state,
- highlightSettings: [...state.highlightSettings, highlightSetting.id],
- highlightSettingById: {
- ...state.highlightSettingById,
- [highlightSetting.id]: highlightSetting,
- },
- };
- }
- if (type === removeHighlightSetting.type) {
- const { id } = payload;
- const nextState = {
- ...state,
- highlightSettings: [...state.highlightSettings],
- highlightSettingById: {
- ...state.highlightSettingById,
- },
- };
- if (id === defaultHighlightSetting.id) {
- nextState.highlightSettings[defaultHighlightSetting.id] =
- defaultHighlightSetting;
- } else {
- delete nextState.highlightSettingById[id];
- nextState.highlightSettings = nextState.highlightSettings.filter(
- (sid) => sid !== id,
- );
- if (!nextState.highlightSettings.length) {
- nextState.highlightSettings.push(defaultHighlightSetting.id);
- nextState.highlightSettingById[defaultHighlightSetting.id] =
- defaultHighlightSetting;
- }
- }
- return nextState;
- }
- if (type === updateHighlightSetting.type) {
- const { id, ...settings } = payload;
- const nextState = {
- ...state,
- highlightSettings: [...state.highlightSettings],
- highlightSettingById: {
- ...state.highlightSettingById,
- },
- };
-
- // Transfer this data from the default highlight setting
- // so they carry over to other servers
- if (id === defaultHighlightSetting.id) {
- if (settings.highlightText) {
- nextState.highlightText = settings.highlightText;
- }
- if (settings.highlightColor) {
- nextState.highlightColor = settings.highlightColor;
- }
- }
-
- if (nextState.highlightSettingById[id]) {
- nextState.highlightSettingById[id] = {
- ...nextState.highlightSettingById[id],
- ...settings,
- };
- }
-
- return nextState;
- }
- return state;
-};
diff --git a/tgui/packages/tgui-panel/settings/reducer.ts b/tgui/packages/tgui-panel/settings/reducer.ts
new file mode 100644
index 0000000000000..62d08986a1479
--- /dev/null
+++ b/tgui/packages/tgui-panel/settings/reducer.ts
@@ -0,0 +1,208 @@
+/**
+ * @file
+ * @copyright 2020 Aleksej Komarov
+ * @license MIT
+ */
+
+import {
+ addHighlightSetting,
+ changeSettingsTab,
+ loadSettings,
+ openChatSettings,
+ removeHighlightSetting,
+ toggleSettings,
+ updateHighlightSetting,
+ updateSettings,
+} from './actions';
+import { FONTS, MAX_HIGHLIGHT_SETTINGS, SETTINGS_TABS } from './constants';
+import { createDefaultHighlightSetting } from './model';
+
+const defaultHighlightSetting = createDefaultHighlightSetting();
+
+const initialState = {
+ version: 1,
+ fontSize: 13,
+ fontFamily: FONTS[0],
+ lineHeight: 1.2,
+ theme: 'light',
+ adminMusicVolume: 0.5,
+ // Keep these two state vars for compatibility with other servers
+ highlightText: '',
+ highlightColor: '#ffdd44',
+ // END compatibility state vars
+ highlightSettings: [defaultHighlightSetting.id],
+ highlightSettingById: {
+ [defaultHighlightSetting.id]: defaultHighlightSetting,
+ },
+ view: {
+ visible: false,
+ activeTab: SETTINGS_TABS[0].id,
+ },
+} as const;
+
+export function settingsReducer(
+ state = initialState,
+ action: { type: string; payload: any },
+) {
+ const { type, payload } = action;
+
+ switch (type) {
+ case updateSettings.type:
+ return {
+ ...state,
+ ...payload,
+ };
+
+ case loadSettings.type: {
+ {
+ // Validate version and/or migrate state
+ if (!payload?.version) {
+ return state;
+ }
+
+ delete payload.view;
+ const nextState = {
+ ...state,
+ ...payload,
+ };
+ // Lazy init the list for compatibility reasons
+ if (!nextState.highlightSettings) {
+ nextState.highlightSettings = [defaultHighlightSetting.id];
+ nextState.highlightSettingById[defaultHighlightSetting.id] =
+ defaultHighlightSetting;
+ }
+ // Compensating for mishandling of default highlight settings
+ else if (!nextState.highlightSettingById[defaultHighlightSetting.id]) {
+ nextState.highlightSettings = [
+ defaultHighlightSetting.id,
+ ...nextState.highlightSettings,
+ ];
+ nextState.highlightSettingById[defaultHighlightSetting.id] =
+ defaultHighlightSetting;
+ }
+
+ // Update the highlight settings for default highlight
+ // settings compatibility
+ const highlightSetting =
+ nextState.highlightSettingById[defaultHighlightSetting.id];
+ highlightSetting.highlightColor = nextState.highlightColor;
+ highlightSetting.highlightText = nextState.highlightText;
+
+ return nextState;
+ }
+ }
+
+ case toggleSettings.type: {
+ return {
+ ...state,
+ view: {
+ ...state.view,
+ visible: !state.view.visible,
+ },
+ };
+ }
+
+ case openChatSettings.type: {
+ return {
+ ...state,
+ view: {
+ ...state.view,
+ visible: true,
+ activeTab: 'chatPage',
+ },
+ };
+ }
+
+ case changeSettingsTab.type: {
+ const { tabId } = payload;
+
+ return {
+ ...state,
+ view: {
+ ...state.view,
+ activeTab: tabId,
+ },
+ };
+ }
+
+ case addHighlightSetting.type: {
+ const highlightSetting = payload;
+
+ if (state.highlightSettings.length >= MAX_HIGHLIGHT_SETTINGS) {
+ return state;
+ }
+
+ return {
+ ...state,
+ highlightSettings: [...state.highlightSettings, highlightSetting.id],
+ highlightSettingById: {
+ ...state.highlightSettingById,
+ [highlightSetting.id]: highlightSetting,
+ },
+ };
+ }
+
+ case removeHighlightSetting.type: {
+ const { id } = payload;
+
+ const nextState = {
+ ...state,
+ highlightSettings: [...state.highlightSettings],
+ highlightSettingById: {
+ ...state.highlightSettingById,
+ },
+ };
+
+ if (id === defaultHighlightSetting.id) {
+ nextState.highlightSettings[defaultHighlightSetting.id] =
+ defaultHighlightSetting;
+ } else {
+ delete nextState.highlightSettingById[id];
+ nextState.highlightSettings = nextState.highlightSettings.filter(
+ (sid) => sid !== id,
+ );
+ if (!nextState.highlightSettings.length) {
+ nextState.highlightSettings.push(defaultHighlightSetting.id);
+ nextState.highlightSettingById[defaultHighlightSetting.id] =
+ defaultHighlightSetting;
+ }
+ }
+
+ return nextState;
+ }
+
+ case updateHighlightSetting.type: {
+ const { id, ...settings } = payload;
+
+ const nextState = {
+ ...state,
+ highlightSettings: [...state.highlightSettings],
+ highlightSettingById: {
+ ...state.highlightSettingById,
+ },
+ };
+
+ // Transfer this data from the default highlight setting
+ // so they carry over to other servers
+ if (id === defaultHighlightSetting.id) {
+ if (settings.highlightText) {
+ nextState.highlightText = settings.highlightText;
+ }
+ if (settings.highlightColor) {
+ nextState.highlightColor = settings.highlightColor;
+ }
+ }
+
+ if (nextState.highlightSettingById[id]) {
+ nextState.highlightSettingById[id] = {
+ ...nextState.highlightSettingById[id],
+ ...settings,
+ };
+ }
+
+ return nextState;
+ }
+ }
+
+ return state;
+}
diff --git a/tgui/packages/tgui/components/DmIcon.tsx b/tgui/packages/tgui/components/DmIcon.tsx
index fb6816576ac0c..bb785fc6e3968 100644
--- a/tgui/packages/tgui/components/DmIcon.tsx
+++ b/tgui/packages/tgui/components/DmIcon.tsx
@@ -29,7 +29,7 @@ type Props = {
/** Frame number. Default is 1 */
frame: number;
/** Movement state. Default is false */
- movement: boolean;
+ movement: any;
}> &
BoxProps;
@@ -49,7 +49,7 @@ export function DmIcon(props: Props) {
const [iconRef, setIconRef] = useState('');
- const query = `${iconRef}?state=${icon_state}&dir=${direction}&movement=${movement}&frame=${frame}`;
+ const query = `${iconRef}?state=${icon_state}&dir=${direction}&movement=${!!movement}&frame=${frame}`;
useEffect(() => {
async function fetchRefMap() {
diff --git a/tgui/packages/tgui/interfaces/AbductorConsole.jsx b/tgui/packages/tgui/interfaces/AbductorConsole.jsx
index e870089a1bcf4..bb2f1dffccfe3 100644
--- a/tgui/packages/tgui/interfaces/AbductorConsole.jsx
+++ b/tgui/packages/tgui/interfaces/AbductorConsole.jsx
@@ -1,5 +1,12 @@
+import {
+ Button,
+ LabeledList,
+ NoticeBox,
+ Section,
+ Tabs,
+} from 'tgui-core/components';
+
import { useBackend, useSharedState } from '../backend';
-import { Button, LabeledList, NoticeBox, Section, Tabs } from '../components';
import { Window } from '../layouts';
import { GenericUplink } from './Uplink/GenericUplink';
diff --git a/tgui/packages/tgui/interfaces/AccountingConsole.tsx b/tgui/packages/tgui/interfaces/AccountingConsole.tsx
index f737234fc6a6c..726abb78ece78 100644
--- a/tgui/packages/tgui/interfaces/AccountingConsole.tsx
+++ b/tgui/packages/tgui/interfaces/AccountingConsole.tsx
@@ -1,7 +1,4 @@
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
BlockQuote,
Collapsible,
@@ -9,7 +6,10 @@ import {
Section,
Stack,
Tabs,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/Achievements.jsx b/tgui/packages/tgui/interfaces/Achievements.jsx
index a9b6b914b9ee9..ccb7c2807f698 100644
--- a/tgui/packages/tgui/interfaces/Achievements.jsx
+++ b/tgui/packages/tgui/interfaces/Achievements.jsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
+import { Box, Flex, Icon, Table, Tabs, Tooltip } from 'tgui-core/components';
import { useBackend } from '../backend';
-import { Box, Flex, Icon, Table, Tabs, Tooltip } from '../components';
import { Window } from '../layouts';
export const Achievements = (props) => {
diff --git a/tgui/packages/tgui/interfaces/AdminFax.jsx b/tgui/packages/tgui/interfaces/AdminFax.jsx
index 3e6026d4ce46e..37bdd523c4196 100644
--- a/tgui/packages/tgui/interfaces/AdminFax.jsx
+++ b/tgui/packages/tgui/interfaces/AdminFax.jsx
@@ -1,6 +1,4 @@
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -12,7 +10,9 @@ import {
Section,
TextArea,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
export const AdminFax = (props) => {
diff --git a/tgui/packages/tgui/interfaces/AdminPDA.jsx b/tgui/packages/tgui/interfaces/AdminPDA.jsx
index fa83f200e52c7..da06e7d294d68 100644
--- a/tgui/packages/tgui/interfaces/AdminPDA.jsx
+++ b/tgui/packages/tgui/interfaces/AdminPDA.jsx
@@ -1,5 +1,6 @@
+import { Box, Dropdown, Input, Section, TextArea } from 'tgui-core/components';
+
import { useBackend, useLocalState } from '../backend';
-import { Box, Dropdown, Input, Section, TextArea } from '../components';
import { Button } from '../components/Button';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/Adminhelp.tsx b/tgui/packages/tgui/interfaces/Adminhelp.tsx
index 7e29a807f1d4e..af1e273b68523 100644
--- a/tgui/packages/tgui/interfaces/Adminhelp.tsx
+++ b/tgui/packages/tgui/interfaces/Adminhelp.tsx
@@ -1,8 +1,15 @@
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
+import {
+ Box,
+ Button,
+ Input,
+ NoticeBox,
+ Stack,
+ TextArea,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Box, Button, Input, NoticeBox, Stack, TextArea } from '../components';
import { Window } from '../layouts';
type AdminhelpData = {
diff --git a/tgui/packages/tgui/interfaces/AdventureBrowser.tsx b/tgui/packages/tgui/interfaces/AdventureBrowser.tsx
index cb43f6f319d47..86e05231952a6 100644
--- a/tgui/packages/tgui/interfaces/AdventureBrowser.tsx
+++ b/tgui/packages/tgui/interfaces/AdventureBrowser.tsx
@@ -1,5 +1,6 @@
+import { Box, Button, NoticeBox, Section, Table } from 'tgui-core/components';
+
import { useBackend, useLocalState } from '../backend';
-import { Box, Button, NoticeBox, Section, Table } from '../components';
import { formatTime } from '../format';
import { Window } from '../layouts';
import { AdventureDataProvider, AdventureScreen } from './ExodroneConsole';
diff --git a/tgui/packages/tgui/interfaces/AiAirlock.jsx b/tgui/packages/tgui/interfaces/AiAirlock.jsx
index b74735d8e6a12..bf9cdf4a7ffe5 100644
--- a/tgui/packages/tgui/interfaces/AiAirlock.jsx
+++ b/tgui/packages/tgui/interfaces/AiAirlock.jsx
@@ -1,5 +1,6 @@
+import { Button, LabeledList, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, LabeledList, Section } from '../components';
import { Window } from '../layouts';
const dangerMap = {
diff --git a/tgui/packages/tgui/interfaces/AiRestorer.tsx b/tgui/packages/tgui/interfaces/AiRestorer.tsx
index 1add6b5e934bb..a7987145a2c77 100644
--- a/tgui/packages/tgui/interfaces/AiRestorer.tsx
+++ b/tgui/packages/tgui/interfaces/AiRestorer.tsx
@@ -1,6 +1,3 @@
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -8,7 +5,10 @@ import {
NoticeBox,
ProgressBar,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx b/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx
index 09c1aa04e57f1..a9bd489c7b0b1 100644
--- a/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx
+++ b/tgui/packages/tgui/interfaces/AiVoiceChanger.tsx
@@ -1,7 +1,13 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ Dropdown,
+ Input,
+ LabeledList,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, Dropdown, Input, LabeledList, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AirAlarm.tsx b/tgui/packages/tgui/interfaces/AirAlarm.tsx
index bacfe259fe182..f5d439915e991 100644
--- a/tgui/packages/tgui/interfaces/AirAlarm.tsx
+++ b/tgui/packages/tgui/interfaces/AirAlarm.tsx
@@ -1,7 +1,4 @@
-import { BooleanLike } from 'common/react';
import { Fragment } from 'react';
-
-import { useBackend, useLocalState } from '../backend';
import {
Box,
Button,
@@ -11,7 +8,10 @@ import {
Section,
Table,
VirtualList,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend, useLocalState } from '../backend';
import { Window } from '../layouts';
import {
Scrubber,
diff --git a/tgui/packages/tgui/interfaces/AirlockButtonController.tsx b/tgui/packages/tgui/interfaces/AirlockButtonController.tsx
index 98a3f7c91135d..83f984974896c 100644
--- a/tgui/packages/tgui/interfaces/AirlockButtonController.tsx
+++ b/tgui/packages/tgui/interfaces/AirlockButtonController.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Button, NoticeBox, Section, Stack } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, NoticeBox, Section, Stack } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AirlockController.tsx b/tgui/packages/tgui/interfaces/AirlockController.tsx
index ca3551c3415a4..81a10f75bc52d 100644
--- a/tgui/packages/tgui/interfaces/AirlockController.tsx
+++ b/tgui/packages/tgui/interfaces/AirlockController.tsx
@@ -1,5 +1,6 @@
+import { Box, Button, Icon, LabeledList, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Box, Button, Icon, LabeledList, Section } from '../components';
import { Window } from '../layouts';
type AirlockControllerData = {
diff --git a/tgui/packages/tgui/interfaces/AirlockElectronics.tsx b/tgui/packages/tgui/interfaces/AirlockElectronics.tsx
index b90e8ac3b578f..2a0e535ac8842 100644
--- a/tgui/packages/tgui/interfaces/AirlockElectronics.tsx
+++ b/tgui/packages/tgui/interfaces/AirlockElectronics.tsx
@@ -1,7 +1,13 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ Input,
+ LabeledList,
+ Section,
+ Stack,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, Input, LabeledList, Section, Stack } from '../components';
import { Window } from '../layouts';
import { AccessConfig, Region } from './common/AccessConfig';
diff --git a/tgui/packages/tgui/interfaces/AlertModal.tsx b/tgui/packages/tgui/interfaces/AlertModal.tsx
index 5924dc7ae7cf2..8341d5dbd66c0 100644
--- a/tgui/packages/tgui/interfaces/AlertModal.tsx
+++ b/tgui/packages/tgui/interfaces/AlertModal.tsx
@@ -1,9 +1,9 @@
-import { isEscape, KEY } from 'common/keys';
-import { BooleanLike } from 'common/react';
import { KeyboardEvent, useState } from 'react';
+import { Autofocus, Box, Button, Section, Stack } from 'tgui-core/components';
+import { isEscape, KEY } from 'tgui-core/keys';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Autofocus, Box, Button, Section, Stack } from '../components';
import { Window } from '../layouts';
import { Loader } from './common/Loader';
diff --git a/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx b/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx
index 89f95e28c4a64..870bb5c264649 100644
--- a/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx
+++ b/tgui/packages/tgui/interfaces/AnomalyRefinery.jsx
@@ -1,4 +1,3 @@
-import { useBackend, useSharedState } from '../backend';
import {
Box,
Button,
@@ -7,7 +6,9 @@ import {
Modal,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend, useSharedState } from '../backend';
import { Window } from '../layouts';
import { GasmixParser } from './common/GasmixParser';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx b/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx
index fccf02a8b1c77..dfb2bd5bb2c89 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoBlob.tsx
@@ -1,4 +1,3 @@
-import { useBackend } from '../backend';
import {
Box,
Collapsible,
@@ -6,7 +5,9 @@ import {
LabeledList,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { Objective } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx b/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx
index a506171504a9b..dfa05895bd047 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoBrainwashed.tsx
@@ -1,5 +1,6 @@
+import { Box, Icon, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Box, Icon, Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective, ObjectivePrintout } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx b/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx
index 294fc10113590..731e24e485fe5 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoBrother.tsx
@@ -1,5 +1,6 @@
+import { Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective, ObjectivePrintout } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx
index 2f41fa7c46d05..ada2aa8cd2a92 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoChangeling.tsx
@@ -1,7 +1,4 @@
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Button,
Dimmer,
@@ -9,7 +6,10 @@ import {
NoticeBox,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import {
Objective,
diff --git a/tgui/packages/tgui/interfaces/AntagInfoDemon.tsx b/tgui/packages/tgui/interfaces/AntagInfoDemon.tsx
index 1dceb6a60a6c1..aaa02521167c8 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoDemon.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoDemon.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Box, Section, Stack } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Box, Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective, ObjectivePrintout } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx
index 8aeae3510c4f8..c4a81426585d8 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoGeneric.tsx
@@ -1,5 +1,6 @@
+import { Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective, ObjectivePrintout } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx b/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx
index 0fd7d18a47c56..469215a7f4595 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoGlitch.tsx
@@ -1,5 +1,6 @@
+import { Divider, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Divider, Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
index 30908b606fa2f..097a417829c04 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoHeretic.tsx
@@ -1,9 +1,16 @@
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
+import {
+ Box,
+ Button,
+ DmIcon,
+ Flex,
+ Section,
+ Stack,
+ Tabs,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { BlockQuote, Box, Button, Section, Stack, Tabs } from '../components';
-import { CssColor } from '../constants';
import { Window } from '../layouts';
import {
Objective,
@@ -35,20 +42,33 @@ const hereticYellow = {
color: 'yellow',
};
+type IconParams = {
+ icon: string;
+ state: string;
+ frame: number;
+ dir: number;
+ moving: BooleanLike;
+};
+
type Knowledge = {
path: string;
+ icon_params: IconParams;
name: string;
desc: string;
gainFlavor: string;
cost: number;
- disabled: boolean;
- hereticPath: string;
- color: CssColor;
+ bgr: string;
+ disabled: BooleanLike;
+ finished: BooleanLike;
+ ascension: BooleanLike;
};
type KnowledgeInfo = {
- learnableKnowledge: Knowledge[];
- learnedKnowledge: Knowledge[];
+ knowledge_tiers: KnowledgeTier[];
+};
+
+type KnowledgeTier = {
+ nodes: Knowledge[];
};
type Info = {
@@ -219,63 +239,96 @@ const InformationSection = (props) => {
);
};
-const ResearchedKnowledge = (props) => {
- const { data } = useBackend<KnowledgeInfo>();
- const { learnedKnowledge } = data;
+const KnowledgeTree = (props) => {
+ const { data, act } = useBackend<KnowledgeInfo>();
+ const { knowledge_tiers } = data;
return (
- <Stack.Item grow>
- <Section title="Researched Knowledge" fill scrollable>
- <Stack vertical>
- {(!learnedKnowledge.length && 'None!') ||
- learnedKnowledge.map((learned) => (
- <Stack.Item key={learned.name}>
- <Button
- width="100%"
- color={learned.color}
- content={`${learned.hereticPath} - ${learned.name}`}
- tooltip={learned.desc}
- />
+ <Section title="Research Tree" fill scrollable>
+ <Box textAlign="center" fontSize="32px">
+ <span style={hereticYellow}>DAWN</span>
+ </Box>
+ <Stack vertical>
+ {knowledge_tiers.length === 0
+ ? 'None!'
+ : knowledge_tiers.map((tier, i) => (
+ <Stack.Item key={i}>
+ <Flex
+ justify="center"
+ align="center"
+ backgroundColor="transparent"
+ wrap="wrap"
+ >
+ {tier.nodes.map((node) => (
+ <Flex.Item key={node.name}>
+ <Button
+ color="transparent"
+ tooltip={`${node.name}:
+ ${node.desc}`}
+ onClick={
+ node.disabled || node.finished
+ ? undefined
+ : () => act('research', { path: node.path })
+ }
+ width={node.ascension ? '192px' : '64px'}
+ height={node.ascension ? '192px' : '64px'}
+ m="8px"
+ style={{
+ borderRadius: '50%',
+ }}
+ >
+ <DmIcon
+ icon="icons/ui_icons/antags/heretic/knowledge.dmi"
+ icon_state={
+ node.disabled
+ ? 'node_locked'
+ : node.finished
+ ? 'node_finished'
+ : node.bgr
+ }
+ height={node.ascension ? '192px' : '64px'}
+ width={node.ascension ? '192px' : '64px'}
+ top="0px"
+ left="0px"
+ position="absolute"
+ />
+ <DmIcon
+ icon={node.icon_params.icon}
+ icon_state={node.icon_params.state}
+ frame={node.icon_params.frame}
+ direction={node.icon_params.dir}
+ movement={node.icon_params.moving}
+ height={node.ascension ? '152px' : '64px'}
+ width={node.ascension ? '152px' : '64px'}
+ top={node.ascension ? '20px' : '0px'}
+ left={node.ascension ? '20px' : '0px'}
+ position="absolute"
+ />
+ <Box
+ position="absolute"
+ top="0px"
+ left="0px"
+ backgroundColor="black"
+ textColor="white"
+ bold
+ >
+ {!node.finished &&
+ (node.cost > 0 ? node.cost : 'FREE')}
+ </Box>
+ </Button>
+ {!!node.ascension && (
+ <Box textAlign="center" fontSize="32px">
+ <span style={hereticPurple}>DUSK</span>
+ </Box>
+ )}
+ </Flex.Item>
+ ))}
+ </Flex>
+ <hr />
</Stack.Item>
))}
- </Stack>
- </Section>
- </Stack.Item>
- );
-};
-
-const KnowledgeShop = (props) => {
- const { data, act } = useBackend<KnowledgeInfo>();
- const { learnableKnowledge } = data;
-
- return (
- <Stack.Item grow>
- <Section title="Potential Knowledge" fill scrollable>
- {(!learnableKnowledge.length && 'None!') ||
- learnableKnowledge.map((toLearn) => (
- <Stack.Item key={toLearn.name} mb={1}>
- <Button
- width="100%"
- color={toLearn.color}
- disabled={toLearn.disabled}
- content={`${toLearn.hereticPath} - ${
- toLearn.cost > 0
- ? `${toLearn.name}: ${toLearn.cost}
- point${toLearn.cost !== 1 ? 's' : ''}`
- : toLearn.name
- }`}
- tooltip={toLearn.desc}
- onClick={() => act('research', { path: toLearn.path })}
- />
- {!!toLearn.gainFlavor && (
- <BlockQuote>
- <i>{toLearn.gainFlavor}</i>
- </BlockQuote>
- )}
- </Stack.Item>
- ))}
- </Section>
- </Stack.Item>
+ </Stack>
+ </Section>
);
};
@@ -284,23 +337,16 @@ const ResearchInfo = (props) => {
const { charges } = data;
return (
- <Stack justify="space-evenly" height="100%" width="100%">
+ <Stack vertical fill>
+ <Stack.Item fontSize="20px" textAlign="center">
+ You have <b>{charges || 0}</b>
+ <span style={hereticBlue}>
+ knowledge point{charges !== 1 ? 's' : ''}
+ </span>{' '}
+ to spend.
+ </Stack.Item>
<Stack.Item grow>
- <Stack vertical height="100%">
- <Stack.Item fontSize="20px" textAlign="center">
- You have <b>{charges || 0}</b>
- <span style={hereticBlue}>
- knowledge point{charges !== 1 ? 's' : ''}
- </span>{' '}
- to spend.
- </Stack.Item>
- <Stack.Item grow>
- <Stack height="100%">
- <ResearchedKnowledge />
- <KnowledgeShop />
- </Stack>
- </Stack.Item>
- </Stack>
+ <KnowledgeTree />
</Stack.Item>
</Stack>
);
diff --git a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx
index a996899c5288f..e64673ed5a596 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoMalf.tsx
@@ -1,8 +1,8 @@
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
+import { BlockQuote, Button, Section, Stack, Tabs } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { BlockQuote, Button, Section, Stack, Tabs } from '../components';
import { Window } from '../layouts';
import {
Objective,
diff --git a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx
index e6ce213d3e72d..c4f8e5a442fec 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoMorph.tsx
@@ -1,4 +1,5 @@
-import { BlockQuote, Stack } from '../components';
+import { BlockQuote, Stack } from 'tgui-core/components';
+
import { Window } from '../layouts';
const goodstyle = {
diff --git a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx
index f0b897e764545..3c27598101f89 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoNightmare.tsx
@@ -1,4 +1,5 @@
-import { BlockQuote, LabeledList, Section, Stack } from '../components';
+import { BlockQuote, LabeledList, Section, Stack } from 'tgui-core/components';
+
import { Window } from '../layouts';
const tipstyle = {
diff --git a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx
index 7ffc1b8413e87..c846b748b491b 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoNinja.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Icon, Section, Stack } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Icon, Section, Stack } from '../components';
import { Window } from '../layouts';
import {
Objective,
diff --git a/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx b/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx
index d3d939b50c62d..5d3c901c9fc4a 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoSentient.jsx
@@ -1,5 +1,6 @@
+import { BlockQuote, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { BlockQuote, Section, Stack } from '../components';
import { Window } from '../layouts';
export const AntagInfoSentient = (props) => {
diff --git a/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx b/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx
index 1a14c6203c6f7..2999024659d35 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoSeparatist.tsx
@@ -1,5 +1,6 @@
+import { Icon, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Icon, Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective, ObjectivePrintout } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoShade.jsx b/tgui/packages/tgui/interfaces/AntagInfoShade.jsx
index 4a44a323f7d92..3929d0ca68ad5 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoShade.jsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoShade.jsx
@@ -1,5 +1,6 @@
+import { Icon, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Icon, Section, Stack } from '../components';
import { Window } from '../layouts';
export const AntagInfoShade = (props) => {
diff --git a/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx b/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx
index a26266bceb4d0..98ed0ae72d2eb 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoSpy.tsx
@@ -1,5 +1,6 @@
+import { Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective, ObjectivePrintout } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx b/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx
index f574919a16d71..9d3f2369661de 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoTraitor.tsx
@@ -1,7 +1,13 @@
-import { BooleanLike } from 'common/react';
+import {
+ BlockQuote,
+ Button,
+ Dimmer,
+ Section,
+ Stack,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { BlockQuote, Button, Dimmer, Section, Stack } from '../components';
import { Window } from '../layouts';
import { Objective, ObjectivePrintout } from './common/Objectives';
diff --git a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx
index a2b4136f81d10..93c0c67409bc0 100644
--- a/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx
+++ b/tgui/packages/tgui/interfaces/AntagInfoWizard.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Box, Section, Stack } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Box, Section, Stack } from '../components';
import { Window } from '../layouts';
import {
Objective,
diff --git a/tgui/packages/tgui/interfaces/Apc.jsx b/tgui/packages/tgui/interfaces/Apc.jsx
index 13a8984f9d4c0..e4f3ebe94b92a 100644
--- a/tgui/packages/tgui/interfaces/Apc.jsx
+++ b/tgui/packages/tgui/interfaces/Apc.jsx
@@ -1,4 +1,3 @@
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -6,7 +5,9 @@ import {
NoticeBox,
ProgressBar,
Section,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox';
diff --git a/tgui/packages/tgui/interfaces/ApcControl.jsx b/tgui/packages/tgui/interfaces/ApcControl.jsx
index fb29c78032d8a..caeb5ee1bed6e 100644
--- a/tgui/packages/tgui/interfaces/ApcControl.jsx
+++ b/tgui/packages/tgui/interfaces/ApcControl.jsx
@@ -1,8 +1,6 @@
import { map, sortBy } from 'common/collections';
import { flow } from 'common/fp';
import { useState } from 'react';
-
-import { useBackend, useLocalState } from '../backend';
import {
Box,
Button,
@@ -12,7 +10,9 @@ import {
Stack,
Table,
Tabs,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend, useLocalState } from '../backend';
import { Window } from '../layouts';
import { AreaCharge, powerRank } from './PowerMonitor';
diff --git a/tgui/packages/tgui/interfaces/ApprenticeContract.tsx b/tgui/packages/tgui/interfaces/ApprenticeContract.tsx
index b61f9ea598421..ca89a36e1d3d7 100644
--- a/tgui/packages/tgui/interfaces/ApprenticeContract.tsx
+++ b/tgui/packages/tgui/interfaces/ApprenticeContract.tsx
@@ -1,6 +1,14 @@
+import {
+ BlockQuote,
+ Box,
+ Button,
+ Icon,
+ Section,
+ Stack,
+} from 'tgui-core/components';
+
import { resolveAsset } from '../assets';
import { useBackend } from '../backend';
-import { BlockQuote, Box, Button, Icon, Section, Stack } from '../components';
import { Window } from '../layouts';
export const ApprenticeContract = (props) => {
diff --git a/tgui/packages/tgui/interfaces/Aquarium.tsx b/tgui/packages/tgui/interfaces/Aquarium.tsx
index 259844d58a8d7..caa0c65d75f65 100644
--- a/tgui/packages/tgui/interfaces/Aquarium.tsx
+++ b/tgui/packages/tgui/interfaces/Aquarium.tsx
@@ -1,6 +1,3 @@
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Button,
Flex,
@@ -8,7 +5,10 @@ import {
LabeledControls,
NumberInput,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx b/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx
index 1202c5d73bd5f..e27ddaa139655 100644
--- a/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosAlertConsole.tsx
@@ -1,5 +1,6 @@
+import { Button, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx
index 52852e908e243..0fb88d386f964 100644
--- a/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosControlConsole.tsx
@@ -1,6 +1,4 @@
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -9,7 +7,9 @@ import {
NumberInput,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import {
AtmosHandbookContent,
diff --git a/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx b/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx
index c39778c410f28..36d0b40e0eb29 100644
--- a/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx
+++ b/tgui/packages/tgui/interfaces/AtmosControlPanel.jsx
@@ -1,7 +1,7 @@
import { map, sortBy } from 'common/collections';
+import { Box, Button, Flex, Section, Table } from 'tgui-core/components';
import { useBackend } from '../backend';
-import { Box, Button, Flex, Section, Table } from '../components';
import { Window } from '../layouts';
export const AtmosControlPanel = (props) => {
diff --git a/tgui/packages/tgui/interfaces/AtmosFilter.tsx b/tgui/packages/tgui/interfaces/AtmosFilter.tsx
index e99c09c6695c1..1a4134e615d16 100644
--- a/tgui/packages/tgui/interfaces/AtmosFilter.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosFilter.tsx
@@ -1,7 +1,12 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ LabeledList,
+ NumberInput,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList, NumberInput, Section } from '../components';
import { getGasLabel } from '../constants';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/AtmosMixer.tsx b/tgui/packages/tgui/interfaces/AtmosMixer.tsx
index 5f1578a69e7e4..87643c4dd596c 100644
--- a/tgui/packages/tgui/interfaces/AtmosMixer.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosMixer.tsx
@@ -1,7 +1,12 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ LabeledList,
+ NumberInput,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList, NumberInput, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AtmosPump.tsx b/tgui/packages/tgui/interfaces/AtmosPump.tsx
index 002af582fb5d9..5cdd8764a6c39 100644
--- a/tgui/packages/tgui/interfaces/AtmosPump.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosPump.tsx
@@ -1,7 +1,12 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ LabeledList,
+ NumberInput,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList, NumberInput, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AtmosTempGate.tsx b/tgui/packages/tgui/interfaces/AtmosTempGate.tsx
index 11c1356b7cce3..049adbdc49af5 100644
--- a/tgui/packages/tgui/interfaces/AtmosTempGate.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosTempGate.tsx
@@ -1,7 +1,12 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ LabeledList,
+ NumberInput,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList, NumberInput, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/AtmosTempPump.tsx b/tgui/packages/tgui/interfaces/AtmosTempPump.tsx
index 48d7234fd8713..f398f9969ccff 100644
--- a/tgui/packages/tgui/interfaces/AtmosTempPump.tsx
+++ b/tgui/packages/tgui/interfaces/AtmosTempPump.tsx
@@ -1,7 +1,12 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ LabeledList,
+ NumberInput,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList, NumberInput, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/Autolathe.tsx b/tgui/packages/tgui/interfaces/Autolathe.tsx
index cf110806830fc..26b5254072684 100644
--- a/tgui/packages/tgui/interfaces/Autolathe.tsx
+++ b/tgui/packages/tgui/interfaces/Autolathe.tsx
@@ -1,7 +1,3 @@
-import { BooleanLike, classes } from 'common/react';
-import { capitalize } from 'common/string';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -12,7 +8,11 @@ import {
Section,
Stack,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike, classes } from 'tgui-core/react';
+import { capitalize } from 'tgui-core/string';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { DesignBrowser } from './Fabrication/DesignBrowser';
import { MaterialCostSequence } from './Fabrication/MaterialCostSequence';
diff --git a/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx b/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx
index 6446ac5f6de34..f08ee83fd4ffd 100644
--- a/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx
+++ b/tgui/packages/tgui/interfaces/AutomatedAnnouncement.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Button, Input, LabeledList, Section } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, Input, LabeledList, Section } from '../components';
import { Window } from '../layouts';
const TOOLTIP_TEXT = `
diff --git a/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx b/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx
index c1b966674a78d..baae00676f591 100644
--- a/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx
+++ b/tgui/packages/tgui/interfaces/AuxBaseConsole.tsx
@@ -1,8 +1,8 @@
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
+import { Button, NoticeBox, Section, Table, Tabs } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, NoticeBox, Section, Table, Tabs } from '../components';
import { Window } from '../layouts';
import { ShuttleConsoleContent } from './ShuttleConsole';
diff --git a/tgui/packages/tgui/interfaces/AvatarHelp.tsx b/tgui/packages/tgui/interfaces/AvatarHelp.tsx
index d25beb6aa3621..0a57d9cc8f047 100644
--- a/tgui/packages/tgui/interfaces/AvatarHelp.tsx
+++ b/tgui/packages/tgui/interfaces/AvatarHelp.tsx
@@ -1,5 +1,6 @@
+import { Box, Icon, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Box, Icon, Section, Stack } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/BankMachine.tsx b/tgui/packages/tgui/interfaces/BankMachine.tsx
index c45cc424fa6b7..005b94da0aad9 100644
--- a/tgui/packages/tgui/interfaces/BankMachine.tsx
+++ b/tgui/packages/tgui/interfaces/BankMachine.tsx
@@ -1,13 +1,13 @@
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Button,
LabeledList,
NoticeBox,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { formatMoney } from '../format';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/BasketballPanel.tsx b/tgui/packages/tgui/interfaces/BasketballPanel.tsx
index 6de429e923464..d5d2865a81aa7 100644
--- a/tgui/packages/tgui/interfaces/BasketballPanel.tsx
+++ b/tgui/packages/tgui/interfaces/BasketballPanel.tsx
@@ -1,5 +1,6 @@
+import { Button, NoticeBox, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, NoticeBox, Section, Stack } from '../components';
import { Window } from '../layouts';
type BasketballPanelData = {
diff --git a/tgui/packages/tgui/interfaces/BattleArcade.tsx b/tgui/packages/tgui/interfaces/BattleArcade.tsx
index a400628575f8b..d455bfe8e528e 100644
--- a/tgui/packages/tgui/interfaces/BattleArcade.tsx
+++ b/tgui/packages/tgui/interfaces/BattleArcade.tsx
@@ -1,6 +1,7 @@
+import { Box, Button, Image, Section } from 'tgui-core/components';
+
import { resolveAsset } from '../assets';
import { useBackend } from '../backend';
-import { Box, Button, Image, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/Biogenerator.tsx b/tgui/packages/tgui/interfaces/Biogenerator.tsx
index 2459740439627..f87eb73d903f9 100644
--- a/tgui/packages/tgui/interfaces/Biogenerator.tsx
+++ b/tgui/packages/tgui/interfaces/Biogenerator.tsx
@@ -1,8 +1,4 @@
-import { BooleanLike } from 'common/react';
-import { classes } from 'common/react';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -15,7 +11,11 @@ import {
Stack,
Table,
Tabs,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+import { classes } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx
index 0f2915f5a0df6..51d397d500cd8 100644
--- a/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx
+++ b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx
@@ -1,4 +1,3 @@
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Box,
@@ -7,7 +6,9 @@ import {
Section,
Stack,
Tabs,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { formatMoney } from '../format';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/BloodFilter.tsx b/tgui/packages/tgui/interfaces/BloodFilter.tsx
index 4e1d553edfd0f..57ac279428731 100644
--- a/tgui/packages/tgui/interfaces/BloodFilter.tsx
+++ b/tgui/packages/tgui/interfaces/BloodFilter.tsx
@@ -1,5 +1,6 @@
+import { Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Stack } from '../components';
import { Window } from '../layouts';
import { ChemFilterPane } from './ChemFilter';
diff --git a/tgui/packages/tgui/interfaces/Blueprints.tsx b/tgui/packages/tgui/interfaces/Blueprints.tsx
index 644412a9a777e..2a2369188c445 100644
--- a/tgui/packages/tgui/interfaces/Blueprints.tsx
+++ b/tgui/packages/tgui/interfaces/Blueprints.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Box, Button, Divider, Section, Stack } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Box, Button, Divider, Section, Stack } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx b/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx
index dbaf0caa0b264..004407ed30ce2 100644
--- a/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx
+++ b/tgui/packages/tgui/interfaces/BluespaceArtillery.tsx
@@ -1,7 +1,13 @@
-import { BooleanLike } from 'common/react';
+import {
+ Box,
+ Button,
+ LabeledList,
+ NoticeBox,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Box, Button, LabeledList, NoticeBox, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/BluespaceLocator.tsx b/tgui/packages/tgui/interfaces/BluespaceLocator.tsx
index 9b08accd34124..5d8f177b4adee 100644
--- a/tgui/packages/tgui/interfaces/BluespaceLocator.tsx
+++ b/tgui/packages/tgui/interfaces/BluespaceLocator.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react';
+import { Icon, ProgressBar, Tabs } from 'tgui-core/components';
import { useBackend } from '../backend';
-import { Icon, ProgressBar, Tabs } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/BluespaceSender.tsx b/tgui/packages/tgui/interfaces/BluespaceSender.tsx
index 2f94af4cfaa9d..823090eeb4eb6 100644
--- a/tgui/packages/tgui/interfaces/BluespaceSender.tsx
+++ b/tgui/packages/tgui/interfaces/BluespaceSender.tsx
@@ -1,8 +1,4 @@
import { filter, sortBy } from 'common/collections';
-import { toFixed } from 'common/math';
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -12,7 +8,11 @@ import {
ProgressBar,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { getGasColor } from '../constants';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/BluespaceVendor.tsx b/tgui/packages/tgui/interfaces/BluespaceVendor.tsx
index 7b9619de26e55..76f6594e45565 100644
--- a/tgui/packages/tgui/interfaces/BluespaceVendor.tsx
+++ b/tgui/packages/tgui/interfaces/BluespaceVendor.tsx
@@ -1,15 +1,15 @@
import { filter, sortBy } from 'common/collections';
-import { toFixed } from 'common/math';
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Button,
NumberInput,
ProgressBar,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Table, TableCell, TableRow } from '../components/Table';
import { getGasColor } from '../constants';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/BorgHypo.tsx b/tgui/packages/tgui/interfaces/BorgHypo.tsx
index 8fa8d2c8131b3..bafa2fc302c5d 100644
--- a/tgui/packages/tgui/interfaces/BorgHypo.tsx
+++ b/tgui/packages/tgui/interfaces/BorgHypo.tsx
@@ -1,7 +1,13 @@
-import { toFixed } from 'common/math';
+import {
+ Button,
+ Flex,
+ NoticeBox,
+ ProgressBar,
+ Section,
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
import { useBackend } from '../backend';
-import { Button, Flex, NoticeBox, ProgressBar, Section } from '../components';
import { Window } from '../layouts';
type BorgHypoContext = {
diff --git a/tgui/packages/tgui/interfaces/BorgPanel.jsx b/tgui/packages/tgui/interfaces/BorgPanel.jsx
index 96b536af0aa81..b9ef7ed45c5b6 100644
--- a/tgui/packages/tgui/interfaces/BorgPanel.jsx
+++ b/tgui/packages/tgui/interfaces/BorgPanel.jsx
@@ -1,5 +1,12 @@
+import {
+ Box,
+ Button,
+ LabeledList,
+ ProgressBar,
+ Section,
+} from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Box, Button, LabeledList, ProgressBar, Section } from '../components';
import { Window } from '../layouts';
export const BorgPanel = (props) => {
diff --git a/tgui/packages/tgui/interfaces/BorgShaker.tsx b/tgui/packages/tgui/interfaces/BorgShaker.tsx
index c77bf32ea8c38..b16a68a39181c 100644
--- a/tgui/packages/tgui/interfaces/BorgShaker.tsx
+++ b/tgui/packages/tgui/interfaces/BorgShaker.tsx
@@ -1,5 +1,6 @@
+import { Button, NoticeBox, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, NoticeBox, Section } from '../components';
import { Window } from '../layouts';
type BorgShakerContext = {
diff --git a/tgui/packages/tgui/interfaces/BotAnnouncement.tsx b/tgui/packages/tgui/interfaces/BotAnnouncement.tsx
index 3292e81a0e75f..4064df6ffd6f0 100644
--- a/tgui/packages/tgui/interfaces/BotAnnouncement.tsx
+++ b/tgui/packages/tgui/interfaces/BotAnnouncement.tsx
@@ -1,7 +1,4 @@
-import { createSearch } from 'common/string';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -11,7 +8,10 @@ import {
Section,
Stack,
Tabs,
-} from '../components';
+} from 'tgui-core/components';
+import { createSearch } from 'tgui-core/string';
+
+import { useBackend } from '../backend';
import { RADIO_CHANNELS } from '../constants';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/BountyBoard.tsx b/tgui/packages/tgui/interfaces/BountyBoard.tsx
index 2f271bfb4f9de..9b892b3ca7023 100644
--- a/tgui/packages/tgui/interfaces/BountyBoard.tsx
+++ b/tgui/packages/tgui/interfaces/BountyBoard.tsx
@@ -1,4 +1,3 @@
-import { useBackend } from '../backend';
import {
BlockQuote,
Box,
@@ -9,7 +8,9 @@ import {
Section,
Stack,
TextArea,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { formatMoney } from '../format';
import { Window } from '../layouts';
import { UserDetails } from './Vending';
diff --git a/tgui/packages/tgui/interfaces/BrigTimer.tsx b/tgui/packages/tgui/interfaces/BrigTimer.tsx
index 18527b9aab470..2069b5a8626e5 100644
--- a/tgui/packages/tgui/interfaces/BrigTimer.tsx
+++ b/tgui/packages/tgui/interfaces/BrigTimer.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Button, Section } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/CTFPanel.tsx b/tgui/packages/tgui/interfaces/CTFPanel.tsx
index b4760bb619d87..7dbfa75296401 100644
--- a/tgui/packages/tgui/interfaces/CTFPanel.tsx
+++ b/tgui/packages/tgui/interfaces/CTFPanel.tsx
@@ -1,6 +1,7 @@
+import { Box, Button, Flex, Section, Stack } from 'tgui-core/components';
+
import { BooleanLike } from '../../common/react';
import { useBackend } from '../backend';
-import { Box, Button, Flex, Section, Stack } from '../components';
import { Window } from '../layouts';
type CTFPanelData =
diff --git a/tgui/packages/tgui/interfaces/CameraConsole.tsx b/tgui/packages/tgui/interfaces/CameraConsole.tsx
index 3dafe1240dfe3..b47f043e3eb5f 100644
--- a/tgui/packages/tgui/interfaces/CameraConsole.tsx
+++ b/tgui/packages/tgui/interfaces/CameraConsole.tsx
@@ -1,9 +1,5 @@
import { filter, sort } from 'common/collections';
-import { BooleanLike, classes } from 'common/react';
-import { createSearch } from 'common/string';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Button,
ByondUi,
@@ -11,7 +7,11 @@ import {
NoticeBox,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike, classes } from 'tgui-core/react';
+import { createSearch } from 'tgui-core/string';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/Canister.tsx b/tgui/packages/tgui/interfaces/Canister.tsx
index f650085df463e..7a2d63f734542 100644
--- a/tgui/packages/tgui/interfaces/Canister.tsx
+++ b/tgui/packages/tgui/interfaces/Canister.tsx
@@ -1,7 +1,3 @@
-import { toFixed } from 'common/math';
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -13,7 +9,11 @@ import {
RoundGauge,
Section,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { formatSiUnit } from '../format';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/Canvas.tsx b/tgui/packages/tgui/interfaces/Canvas.tsx
index 648418e7abd06..3621c12eb3cb7 100644
--- a/tgui/packages/tgui/interfaces/Canvas.tsx
+++ b/tgui/packages/tgui/interfaces/Canvas.tsx
@@ -1,9 +1,9 @@
-import { Color } from 'common/color';
-import { decodeHtmlEntities } from 'common/string';
import { Component, createRef, RefObject } from 'react';
+import { Color } from 'tgui-core/color';
+import { Box, Button, Flex, Icon, Tooltip } from 'tgui-core/components';
+import { decodeHtmlEntities } from 'tgui-core/string';
import { useBackend } from '../backend';
-import { Box, Button, Flex, Icon, Tooltip } from '../components';
import { Window } from '../layouts';
const LEFT_CLICK = 0;
diff --git a/tgui/packages/tgui/interfaces/CargoExpress.tsx b/tgui/packages/tgui/interfaces/CargoExpress.tsx
index 83947b5adc473..9115695645516 100644
--- a/tgui/packages/tgui/interfaces/CargoExpress.tsx
+++ b/tgui/packages/tgui/interfaces/CargoExpress.tsx
@@ -1,13 +1,13 @@
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Box,
Button,
LabeledList,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { CargoCatalog } from './Cargo/CargoCatalog';
import { InterfaceLockNoticeBox } from './common/InterfaceLockNoticeBox';
diff --git a/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx b/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx
index 6a392a3840208..818706d57e75b 100644
--- a/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx
+++ b/tgui/packages/tgui/interfaces/CargoHoldTerminal.tsx
@@ -1,13 +1,13 @@
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Box,
Button,
LabeledList,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/CellularEmporium.tsx b/tgui/packages/tgui/interfaces/CellularEmporium.tsx
index 77c3943cddf58..a766bcae3e576 100644
--- a/tgui/packages/tgui/interfaces/CellularEmporium.tsx
+++ b/tgui/packages/tgui/interfaces/CellularEmporium.tsx
@@ -1,7 +1,4 @@
import { useState } from 'react';
-
-import { BooleanLike } from '../../common/react';
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -11,7 +8,10 @@ import {
NoticeBox,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+
+import { BooleanLike } from '../../common/react';
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type typePath = string;
diff --git a/tgui/packages/tgui/interfaces/Changelog.jsx b/tgui/packages/tgui/interfaces/Changelog.jsx
index 8af62faa84859..7c1ed8b933c47 100644
--- a/tgui/packages/tgui/interfaces/Changelog.jsx
+++ b/tgui/packages/tgui/interfaces/Changelog.jsx
@@ -1,10 +1,6 @@
-import { classes } from 'common/react';
import dateformat from 'dateformat';
import yaml from 'js-yaml';
import { Component, Fragment } from 'react';
-
-import { resolveAsset } from '../assets';
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -13,7 +9,11 @@ import {
Section,
Stack,
Table,
-} from '../components';
+} from 'tgui-core/components';
+import { classes } from 'tgui-core/react';
+
+import { resolveAsset } from '../assets';
+import { useBackend } from '../backend';
import { Window } from '../layouts';
const icons = {
diff --git a/tgui/packages/tgui/interfaces/CheckboxInput.tsx b/tgui/packages/tgui/interfaces/CheckboxInput.tsx
index ab98a8a1f02a2..6ff49847df41f 100644
--- a/tgui/packages/tgui/interfaces/CheckboxInput.tsx
+++ b/tgui/packages/tgui/interfaces/CheckboxInput.tsx
@@ -1,7 +1,4 @@
-import { createSearch, decodeHtmlEntities } from 'common/string';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Button,
Icon,
@@ -11,7 +8,10 @@ import {
Stack,
Table,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+import { createSearch, decodeHtmlEntities } from 'tgui-core/string';
+
+import { useBackend } from '../backend';
import { TableCell, TableRow } from '../components/Table';
import { Window } from '../layouts';
import { InputButtons } from './common/InputButtons';
diff --git a/tgui/packages/tgui/interfaces/ChemAcclimator.tsx b/tgui/packages/tgui/interfaces/ChemAcclimator.tsx
index 622b7055ddf1b..f400030bf23a8 100644
--- a/tgui/packages/tgui/interfaces/ChemAcclimator.tsx
+++ b/tgui/packages/tgui/interfaces/ChemAcclimator.tsx
@@ -1,7 +1,12 @@
-import { BooleanLike } from 'common/react';
+import {
+ Button,
+ LabeledList,
+ NumberInput,
+ Section,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList, NumberInput, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.tsx b/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.tsx
index 06af6c1727f03..b0a5b7a7681af 100644
--- a/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.tsx
+++ b/tgui/packages/tgui/interfaces/ChemDebugSynthesizer.tsx
@@ -1,5 +1,6 @@
+import { Button, NumberInput, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, NumberInput, Section } from '../components';
import { Window } from '../layouts';
import { Beaker, BeakerDisplay } from './common/BeakerDisplay';
diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.tsx b/tgui/packages/tgui/interfaces/ChemDispenser.tsx
index 2bb50df59de26..421c9353e0983 100644
--- a/tgui/packages/tgui/interfaces/ChemDispenser.tsx
+++ b/tgui/packages/tgui/interfaces/ChemDispenser.tsx
@@ -1,8 +1,4 @@
-import { BooleanLike } from 'common/react';
-import { toTitleCase } from 'common/string';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -10,7 +6,11 @@ import {
LabeledList,
ProgressBar,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+import { toTitleCase } from 'tgui-core/string';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { Beaker, BeakerDisplay } from './common/BeakerDisplay';
diff --git a/tgui/packages/tgui/interfaces/ChemFilter.tsx b/tgui/packages/tgui/interfaces/ChemFilter.tsx
index 7615ec7de7b6c..f9ccb78fcb912 100644
--- a/tgui/packages/tgui/interfaces/ChemFilter.tsx
+++ b/tgui/packages/tgui/interfaces/ChemFilter.tsx
@@ -1,7 +1,7 @@
import { Fragment } from 'react';
+import { Button, Section, Stack } from 'tgui-core/components';
import { useBackend } from '../backend';
-import { Button, Section, Stack } from '../components';
import { CssColor } from '../constants';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/ChemHeater.tsx b/tgui/packages/tgui/interfaces/ChemHeater.tsx
index adf8020ba21b5..08df90ad4bd28 100644
--- a/tgui/packages/tgui/interfaces/ChemHeater.tsx
+++ b/tgui/packages/tgui/interfaces/ChemHeater.tsx
@@ -1,6 +1,3 @@
-import { round, toFixed } from '../../common/math';
-import { BooleanLike } from '../../common/react';
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Box,
@@ -12,7 +9,11 @@ import {
RoundGauge,
Section,
Table,
-} from '../components';
+} from 'tgui-core/components';
+
+import { round, toFixed } from '../../common/math';
+import { BooleanLike } from '../../common/react';
+import { useBackend } from '../backend';
import { COLORS } from '../constants';
import { Window } from '../layouts';
import { Beaker, BeakerSectionDisplay } from './common/BeakerDisplay';
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.tsx b/tgui/packages/tgui/interfaces/ChemMaster.tsx
index c23ca29f8d9ec..62692588c6516 100644
--- a/tgui/packages/tgui/interfaces/ChemMaster.tsx
+++ b/tgui/packages/tgui/interfaces/ChemMaster.tsx
@@ -1,8 +1,4 @@
-import { BooleanLike, classes } from 'common/react';
-import { capitalize } from 'common/string';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Box,
@@ -16,7 +12,11 @@ import {
Stack,
Table,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike, classes } from 'tgui-core/react';
+import { capitalize } from 'tgui-core/string';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { Beaker, BeakerReagent } from './common/BeakerDisplay';
diff --git a/tgui/packages/tgui/interfaces/ChemMixingChamber.tsx b/tgui/packages/tgui/interfaces/ChemMixingChamber.tsx
index a82fad9d465ea..765862ab4b86c 100644
--- a/tgui/packages/tgui/interfaces/ChemMixingChamber.tsx
+++ b/tgui/packages/tgui/interfaces/ChemMixingChamber.tsx
@@ -1,8 +1,4 @@
-import { round, toFixed } from 'common/math';
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Box,
@@ -10,7 +6,11 @@ import {
NumberInput,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { round, toFixed } from 'tgui-core/math';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Reagent = {
diff --git a/tgui/packages/tgui/interfaces/ChemPress.tsx b/tgui/packages/tgui/interfaces/ChemPress.tsx
index 58e578f8027a4..ce54f04c8a562 100644
--- a/tgui/packages/tgui/interfaces/ChemPress.tsx
+++ b/tgui/packages/tgui/interfaces/ChemPress.tsx
@@ -1,7 +1,4 @@
-import { capitalizeAll } from 'common/string';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -9,7 +6,10 @@ import {
LabeledList,
NumberInput,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { capitalizeAll } from 'tgui-core/string';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Product = {
diff --git a/tgui/packages/tgui/interfaces/ChemReactionChamber.tsx b/tgui/packages/tgui/interfaces/ChemReactionChamber.tsx
index 8104065c88f12..cdc2b6fac97b9 100644
--- a/tgui/packages/tgui/interfaces/ChemReactionChamber.tsx
+++ b/tgui/packages/tgui/interfaces/ChemReactionChamber.tsx
@@ -1,7 +1,4 @@
-import { round, toFixed } from 'common/math';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Box,
@@ -11,7 +8,10 @@ import {
RoundGauge,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { round, toFixed } from 'tgui-core/math';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { MixingData } from './ChemMixingChamber';
diff --git a/tgui/packages/tgui/interfaces/ChemRecipeDebug.tsx b/tgui/packages/tgui/interfaces/ChemRecipeDebug.tsx
index 5ebdd7d1e0832..4fe2340757e3c 100644
--- a/tgui/packages/tgui/interfaces/ChemRecipeDebug.tsx
+++ b/tgui/packages/tgui/interfaces/ChemRecipeDebug.tsx
@@ -1,7 +1,4 @@
-import { BooleanLike } from 'common/react';
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -11,7 +8,10 @@ import {
Section,
Stack,
Tabs,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { ActiveReaction, ReactionDisplay } from './ChemHeater';
import { Beaker, BeakerSectionDisplay } from './common/BeakerDisplay';
diff --git a/tgui/packages/tgui/interfaces/ChemSeparator.tsx b/tgui/packages/tgui/interfaces/ChemSeparator.tsx
index e6be430466f70..6a6a83a771baa 100644
--- a/tgui/packages/tgui/interfaces/ChemSeparator.tsx
+++ b/tgui/packages/tgui/interfaces/ChemSeparator.tsx
@@ -1,6 +1,3 @@
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -8,7 +5,10 @@ import {
LabeledList,
ProgressBar,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type RegHolderData = {
diff --git a/tgui/packages/tgui/interfaces/ChemSplitter.tsx b/tgui/packages/tgui/interfaces/ChemSplitter.tsx
index 75089e9a96151..688cfa28020e9 100644
--- a/tgui/packages/tgui/interfaces/ChemSplitter.tsx
+++ b/tgui/packages/tgui/interfaces/ChemSplitter.tsx
@@ -1,7 +1,7 @@
-import { toFixed } from 'common/math';
+import { LabeledList, NumberInput, Section } from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
import { useBackend } from '../backend';
-import { LabeledList, NumberInput, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/ChemSynthesizer.tsx b/tgui/packages/tgui/interfaces/ChemSynthesizer.tsx
index 898ac07b2928b..440460c5d1ce0 100644
--- a/tgui/packages/tgui/interfaces/ChemSynthesizer.tsx
+++ b/tgui/packages/tgui/interfaces/ChemSynthesizer.tsx
@@ -1,7 +1,7 @@
-import { toFixed } from 'common/math';
+import { Box, Button, Section } from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
import { useBackend } from '../backend';
-import { Box, Button, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/CircuitAccessChecker.tsx b/tgui/packages/tgui/interfaces/CircuitAccessChecker.tsx
index f37414a86f52f..baddb0ea65efd 100644
--- a/tgui/packages/tgui/interfaces/CircuitAccessChecker.tsx
+++ b/tgui/packages/tgui/interfaces/CircuitAccessChecker.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Button, LabeledList } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList } from '../components';
import { Window } from '../layouts';
import { AccessConfig, Region } from './common/AccessConfig';
diff --git a/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx b/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx
index e95c7714dcd7c..8b4628bb90005 100644
--- a/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx
+++ b/tgui/packages/tgui/interfaces/CircuitAdminPanel.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Button, Stack, Table } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, Stack, Table } from '../components';
import { Window } from '../layouts';
type CircuitAdminPanelData = {
diff --git a/tgui/packages/tgui/interfaces/CircuitModule.jsx b/tgui/packages/tgui/interfaces/CircuitModule.jsx
index bbb323e5e5a7e..9aa3a61664424 100644
--- a/tgui/packages/tgui/interfaces/CircuitModule.jsx
+++ b/tgui/packages/tgui/interfaces/CircuitModule.jsx
@@ -1,5 +1,6 @@
+import { Button, Dropdown, Input, Section, Stack } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, Dropdown, Input, Section, Stack } from '../components';
import { Window } from '../layouts';
export const CircuitModule = (props) => {
diff --git a/tgui/packages/tgui/interfaces/CircuitSignalHandler.tsx b/tgui/packages/tgui/interfaces/CircuitSignalHandler.tsx
index 66d04644391c3..43e4895d06bbe 100644
--- a/tgui/packages/tgui/interfaces/CircuitSignalHandler.tsx
+++ b/tgui/packages/tgui/interfaces/CircuitSignalHandler.tsx
@@ -1,8 +1,15 @@
-import { BooleanLike } from 'common/react';
import { Component, KeyboardEvent, MouseEvent } from 'react';
+import {
+ Box,
+ Button,
+ Dropdown,
+ Input,
+ Section,
+ Stack,
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Box, Button, Dropdown, Input, Section, Stack } from '../components';
import { Window } from '../layouts';
type Response = {
diff --git a/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx b/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx
index 438030e39472c..a1cceecc7d77f 100644
--- a/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx
+++ b/tgui/packages/tgui/interfaces/CivCargoHoldTerminal.jsx
@@ -1,4 +1,3 @@
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -6,7 +5,9 @@ import {
LabeledList,
NoticeBox,
Section,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
export const CivCargoHoldTerminal = (props) => {
diff --git a/tgui/packages/tgui/interfaces/Clipboard.tsx b/tgui/packages/tgui/interfaces/Clipboard.tsx
index 67cb86a1a984a..119b0e800429d 100644
--- a/tgui/packages/tgui/interfaces/Clipboard.tsx
+++ b/tgui/packages/tgui/interfaces/Clipboard.tsx
@@ -1,6 +1,3 @@
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -8,7 +5,10 @@ import {
Flex,
LabeledList,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/CodexGigas.tsx b/tgui/packages/tgui/interfaces/CodexGigas.tsx
index cd0f3dc55e0bf..581341fb67acb 100644
--- a/tgui/packages/tgui/interfaces/CodexGigas.tsx
+++ b/tgui/packages/tgui/interfaces/CodexGigas.tsx
@@ -1,5 +1,6 @@
+import { Button, LabeledList, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, LabeledList, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/ColorBlindTester.tsx b/tgui/packages/tgui/interfaces/ColorBlindTester.tsx
index 3f33edcedc78b..be0b89cd0e6a1 100644
--- a/tgui/packages/tgui/interfaces/ColorBlindTester.tsx
+++ b/tgui/packages/tgui/interfaces/ColorBlindTester.tsx
@@ -1,5 +1,6 @@
+import { Box, Button, NoticeBox, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Box, Button, NoticeBox, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/ColorMatrixEditor.tsx b/tgui/packages/tgui/interfaces/ColorMatrixEditor.tsx
index edf75dcf161d9..c0d515b4d2726 100644
--- a/tgui/packages/tgui/interfaces/ColorMatrixEditor.tsx
+++ b/tgui/packages/tgui/interfaces/ColorMatrixEditor.tsx
@@ -1,6 +1,3 @@
-import { toFixed } from 'common/math';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -8,7 +5,10 @@ import {
NumberInput,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/CommandReport.tsx b/tgui/packages/tgui/interfaces/CommandReport.tsx
index 9185bebb5b4cd..8153ab81c7266 100644
--- a/tgui/packages/tgui/interfaces/CommandReport.tsx
+++ b/tgui/packages/tgui/interfaces/CommandReport.tsx
@@ -1,6 +1,4 @@
import { useState } from 'react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -9,7 +7,9 @@ import {
Section,
Stack,
TextArea,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/CommunicationsConsole.jsx b/tgui/packages/tgui/interfaces/CommunicationsConsole.jsx
index 48a7d98a40155..7affe96bf198b 100644
--- a/tgui/packages/tgui/interfaces/CommunicationsConsole.jsx
+++ b/tgui/packages/tgui/interfaces/CommunicationsConsole.jsx
@@ -1,8 +1,5 @@
import { sortBy } from 'common/collections';
-import { capitalize } from 'common/string';
import { useState } from 'react';
-
-import { useBackend, useLocalState } from '../backend';
import {
Blink,
Box,
@@ -13,7 +10,10 @@ import {
Modal,
Section,
TextArea,
-} from '../components';
+} from 'tgui-core/components';
+import { capitalize } from 'tgui-core/string';
+
+import { useBackend, useLocalState } from '../backend';
import { Window } from '../layouts';
import { sanitizeText } from '../sanitize';
import { StatusDisplayControls } from './common/StatusDisplayControls';
diff --git a/tgui/packages/tgui/interfaces/ComponentPrinter.tsx b/tgui/packages/tgui/interfaces/ComponentPrinter.tsx
index 7c8f16a8c5350..9baf102e9513a 100644
--- a/tgui/packages/tgui/interfaces/ComponentPrinter.tsx
+++ b/tgui/packages/tgui/interfaces/ComponentPrinter.tsx
@@ -1,7 +1,7 @@
-import { classes } from 'common/react';
+import { Box, Icon, Section, Stack, Tooltip } from 'tgui-core/components';
+import { classes } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Box, Icon, Section, Stack, Tooltip } from '../components';
import { Window } from '../layouts';
import { DesignBrowser } from './Fabrication/DesignBrowser';
import { MaterialAccessBar } from './Fabrication/MaterialAccessBar';
diff --git a/tgui/packages/tgui/interfaces/Crayon.tsx b/tgui/packages/tgui/interfaces/Crayon.tsx
index 27a36f745cd39..333f02f47cd50 100644
--- a/tgui/packages/tgui/interfaces/Crayon.tsx
+++ b/tgui/packages/tgui/interfaces/Crayon.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { Button, LabeledList, Section } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Button, LabeledList, Section } from '../components';
import { Window } from '../layouts';
import { ColorItem } from './RapidPipeDispenser';
diff --git a/tgui/packages/tgui/interfaces/CrewConsole.tsx b/tgui/packages/tgui/interfaces/CrewConsole.tsx
index 52af3eaff4320..9c15a551bb0ea 100644
--- a/tgui/packages/tgui/interfaces/CrewConsole.tsx
+++ b/tgui/packages/tgui/interfaces/CrewConsole.tsx
@@ -1,9 +1,9 @@
-import { BooleanLike } from 'common/react';
-import { createSearch } from 'common/string';
import { useState } from 'react';
+import { Box, Button, Icon, Input, Section, Table } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
+import { createSearch } from 'tgui-core/string';
import { useBackend } from '../backend';
-import { Box, Button, Icon, Input, Section, Table } from '../components';
import { COLORS } from '../constants';
import { Window } from '../layouts';
@@ -26,7 +26,7 @@ const SORT_NAMES = {
const STAT_LIVING = 0;
const STAT_DEAD = 4;
-const SORT_OPTIONS = ['ijob', 'name', 'area', 'health'];
+const SORT_OPTIONS = ['health', 'ijob', 'name', 'area'];
const jobIsHead = (jobId: number) => jobId % 10 === 0;
@@ -69,10 +69,10 @@ const statToIcon = (life_status: number) => {
};
const healthSort = (a: CrewSensor, b: CrewSensor) => {
- if (a.life_status < b.life_status) return -1;
- if (a.life_status > b.life_status) return 1;
- if (a.health > b.health) return -1;
- if (a.health < b.health) return 1;
+ if (a.life_status > b.life_status) return -1;
+ if (a.life_status < b.life_status) return 1;
+ if (a.health < b.health) return -1;
+ if (a.health > b.health) return 1;
return 0;
};
diff --git a/tgui/packages/tgui/interfaces/CrewManifest.jsx b/tgui/packages/tgui/interfaces/CrewManifest.jsx
index d550260087bea..4039eb8fc3a2f 100644
--- a/tgui/packages/tgui/interfaces/CrewManifest.jsx
+++ b/tgui/packages/tgui/interfaces/CrewManifest.jsx
@@ -1,7 +1,7 @@
-import { classes } from 'common/react';
+import { Icon, Section, Table, Tooltip } from 'tgui-core/components';
+import { classes } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { Icon, Section, Table, Tooltip } from '../components';
import { Window } from '../layouts';
const commandJobs = [
diff --git a/tgui/packages/tgui/interfaces/CrossingSignal.tsx b/tgui/packages/tgui/interfaces/CrossingSignal.tsx
index e0585318649a0..ecdc52f6a1d72 100644
--- a/tgui/packages/tgui/interfaces/CrossingSignal.tsx
+++ b/tgui/packages/tgui/interfaces/CrossingSignal.tsx
@@ -1,7 +1,7 @@
-import { BooleanLike } from 'common/react';
+import { LabeledList, Section } from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend } from '../backend';
-import { LabeledList, Section } from '../components';
import { Window } from '../layouts';
type Data = {
diff --git a/tgui/packages/tgui/interfaces/Cryo.tsx b/tgui/packages/tgui/interfaces/Cryo.tsx
index 2999f4c04d8de..a4c2d36801733 100644
--- a/tgui/packages/tgui/interfaces/Cryo.tsx
+++ b/tgui/packages/tgui/interfaces/Cryo.tsx
@@ -1,14 +1,14 @@
-import { round } from 'common/math';
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
AnimatedNumber,
Button,
LabeledList,
ProgressBar,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { round } from 'tgui-core/math';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { Beaker, BeakerSectionDisplay } from './common/BeakerDisplay';
diff --git a/tgui/packages/tgui/interfaces/Crystallizer.tsx b/tgui/packages/tgui/interfaces/Crystallizer.tsx
index 6cdd0bb86a50b..213fef342a655 100644
--- a/tgui/packages/tgui/interfaces/Crystallizer.tsx
+++ b/tgui/packages/tgui/interfaces/Crystallizer.tsx
@@ -1,7 +1,3 @@
-import { toFixed } from 'common/math';
-import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -9,7 +5,11 @@ import {
NumberInput,
ProgressBar,
Section,
-} from '../components';
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
+import { BooleanLike } from 'tgui-core/react';
+
+import { useBackend } from '../backend';
import { getGasColor } from '../constants';
import { Window } from '../layouts';
diff --git a/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx b/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx
index 914d4373ea082..d023240c7e1fa 100644
--- a/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx
+++ b/tgui/packages/tgui/interfaces/CyborgBootDebug.jsx
@@ -1,5 +1,6 @@
+import { Button, Input, LabeledList, Section } from 'tgui-core/components';
+
import { useBackend } from '../backend';
-import { Button, Input, LabeledList, Section } from '../components';
import { Window } from '../layouts';
const TOOLTIP_NAME = `
diff --git a/tgui/packages/tgui/interfaces/Fabricator.tsx b/tgui/packages/tgui/interfaces/Fabricator.tsx
index 0511907618023..9c50cf973b31b 100644
--- a/tgui/packages/tgui/interfaces/Fabricator.tsx
+++ b/tgui/packages/tgui/interfaces/Fabricator.tsx
@@ -1,6 +1,4 @@
import { classes } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -9,7 +7,9 @@ import {
Section,
Stack,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
import { DesignBrowser } from './Fabrication/DesignBrowser';
import { MaterialAccessBar } from './Fabrication/MaterialAccessBar';
diff --git a/tgui/packages/tgui/interfaces/FishCatalog.tsx b/tgui/packages/tgui/interfaces/FishCatalog.tsx
index 7bb85054fb002..34ee7a629b2c8 100644
--- a/tgui/packages/tgui/interfaces/FishCatalog.tsx
+++ b/tgui/packages/tgui/interfaces/FishCatalog.tsx
@@ -27,6 +27,7 @@ type FishInfo = {
weight: string;
size: string;
icon: string;
+ beauty: string;
};
type FishCatalogData = {
@@ -93,6 +94,9 @@ export const FishCatalog = (props) => {
<LabeledList.Item label="Average weight">
{currentFish.weight} g
</LabeledList.Item>
+ <LabeledList.Item label="Aquarium Beauty Score">
+ {currentFish.beauty}
+ </LabeledList.Item>
<LabeledList.Item label="Fishing and Aquarium tips">
<LabeledList>
<LabeledList.Item label="Fishing locations">
diff --git a/tgui/packages/tgui/interfaces/Flatpacker.tsx b/tgui/packages/tgui/interfaces/Flatpacker.tsx
index 43fed9e49e4b9..157a30a375b41 100644
--- a/tgui/packages/tgui/interfaces/Flatpacker.tsx
+++ b/tgui/packages/tgui/interfaces/Flatpacker.tsx
@@ -39,7 +39,7 @@ export const Flatpacker = (props: any) => {
const { SHEET_MATERIAL_AMOUNT, materials, design, busy } = data;
return (
- <Window width={400} height={445} title="Flatpacker">
+ <Window width={670} height={400} title="Flatpacker">
<Window.Content>
{!!busy && (
<Dimmer
@@ -74,6 +74,7 @@ export const Flatpacker = (props: any) => {
tooltipPosition="left"
height="37px"
width="37px"
+ disabled={!design}
onClick={() => act('ejectBoard')}
>
<Icon name="eject" size={1.5} mt="0.8rem" ml="0rem" />
@@ -167,22 +168,28 @@ const CostPreview = (props: CostPreviewProps) => {
const { materials, SHEET_MATERIAL_AMOUNT } = props;
return (
- <Section fill>
+ <Section fill scrollable>
{materials ? (
<Table>
{materials.map((material) => (
<Table.Row key={material.name} className="candystripe">
<Table.Cell verticalAlign="middle">
- <MaterialIcon
- materialName={material.name}
- sheets={material.amount / SHEET_MATERIAL_AMOUNT}
- />
+ <div style={{ width: '200px' }}>
+ <MaterialIcon
+ materialName={material.name}
+ sheets={material.amount / SHEET_MATERIAL_AMOUNT}
+ />
+ </div>
</Table.Cell>
<TableCell verticalAlign="middle">
- {toTitleCase(material.name)}
+ <div style={{ width: '200px' }}>
+ {toTitleCase(material.name)}
+ </div>
</TableCell>
<Table.Cell verticalAlign="middle">
- ×{(material.amount / SHEET_MATERIAL_AMOUNT).toFixed(2)}
+ <div style={{ width: '200px' }}>
+ {(material.amount / SHEET_MATERIAL_AMOUNT).toFixed(2)}
+ </div>
</Table.Cell>
</Table.Row>
))}
diff --git a/tgui/packages/tgui/interfaces/Microscope.jsx b/tgui/packages/tgui/interfaces/Microscope.jsx
deleted file mode 100644
index 74591fce7d3c3..0000000000000
--- a/tgui/packages/tgui/interfaces/Microscope.jsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { useBackend, useSharedState } from '../backend';
-import { Button, LabeledList, NoticeBox, Section, Tabs } from '../components';
-import { Window } from '../layouts';
-
-export const Microscope = (props) => {
- const { act, data } = useBackend();
- const [tab, setTab] = useSharedState('tab', 1);
- const { has_dish, cell_lines = [], viruses = [] } = data;
-
- return (
- <Window>
- <Window.Content scrollable>
- <Section>
- <LabeledList>
- <LabeledList.Item label="Dish Sample">
- <Button
- icon="eject"
- content="Eject"
- disabled={!has_dish}
- onClick={() => act('eject_petridish')}
- />
- </LabeledList.Item>
- </LabeledList>
- </Section>
- <Tabs>
- <Tabs.Tab
- icon="microscope"
- lineHeight="23px"
- selected={tab === 1}
- onClick={() => setTab(1)}
- >
- Micro-Organisms ({cell_lines.length})
- </Tabs.Tab>
- <Tabs.Tab
- icon="microscope"
- lineHeight="23px"
- selected={tab === 2}
- onClick={() => setTab(2)}
- >
- Viruses ({viruses.length})
- </Tabs.Tab>
- </Tabs>
- {tab === 1 && <Organisms cell_lines={cell_lines} />}
- {tab === 2 && <Viruses viruses={viruses} />}
- </Window.Content>
- </Window>
- );
-};
-
-const Organisms = (props) => {
- const { cell_lines } = props;
- const { act, data } = useBackend();
- if (!cell_lines.length) {
- return <NoticeBox>No micro-organisms found</NoticeBox>;
- }
-
- return cell_lines.map((cell_line) => {
- return (
- <Section key={cell_line.desc} title={cell_line.desc}>
- <LabeledList>
- <LabeledList.Item label="Growth Rate">
- {cell_line.growth_rate}
- </LabeledList.Item>
- <LabeledList.Item label="Virus Suspectibility">
- {cell_line.suspectibility}
- </LabeledList.Item>
- <LabeledList.Item label="Required Reagents">
- {cell_line.requireds}
- </LabeledList.Item>
- <LabeledList.Item label="Supplementary Reagents">
- {cell_line.supplementaries}
- </LabeledList.Item>
- <LabeledList.Item label="Suppresive reagents">
- {cell_line.suppressives}
- </LabeledList.Item>
- </LabeledList>
- </Section>
- );
- });
-};
-
-const Viruses = (props) => {
- const { viruses } = props;
- const { act } = useBackend();
- if (!viruses.length) {
- return <NoticeBox>No viruses found</NoticeBox>;
- }
- return viruses.map((virus) => {
- return <Section key={virus.desc} title={virus.desc} />;
- });
-};
diff --git a/tgui/packages/tgui/interfaces/Microscope.tsx b/tgui/packages/tgui/interfaces/Microscope.tsx
new file mode 100644
index 0000000000000..44aa7d2b660b0
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/Microscope.tsx
@@ -0,0 +1,184 @@
+import { BooleanLike } from 'common/react';
+
+import { useBackend } from '../backend';
+import {
+ Box,
+ Button,
+ Divider,
+ DmIcon,
+ Icon,
+ NoticeBox,
+ Section,
+ Stack,
+} from '../components';
+import { Window } from '../layouts';
+
+type Data = {
+ has_dish: BooleanLike;
+ cell_lines: CellLine[];
+};
+
+type CellLine = {
+ type: string;
+ name: string;
+ desc: string;
+ icon: string;
+ icon_state: string;
+ consumption_rate: number;
+ growth_rate: number;
+ suspectibility: number;
+ requireds: Record<string, number>;
+ supplementaries: Record<string, number>;
+ suppressives: Record<string, number>;
+};
+
+export const Microscope = (props) => {
+ const { act, data } = useBackend<Data>();
+ const { has_dish, cell_lines = [] } = data;
+
+ return (
+ <Window width={620} height={620}>
+ <Window.Content scrollable>
+ <Section
+ title={has_dish ? 'Petri Dish Sample' : 'No Petri Dish'}
+ buttons={
+ !!has_dish && (
+ <Button
+ icon="eject"
+ disabled={!has_dish}
+ onClick={() => act('eject_petridish')}
+ >
+ Take Dish
+ </Button>
+ )
+ }
+ >
+ <CellList cell_lines={cell_lines} />
+ </Section>
+ </Window.Content>
+ </Window>
+ );
+};
+
+const CellList = (props) => {
+ const { cell_lines } = props;
+ const fallback = (
+ <Icon name="spinner" size={5} height="64px" width="64px" spin />
+ );
+ if (!cell_lines.length) {
+ return <NoticeBox>No micro-organisms found</NoticeBox>;
+ }
+
+ return cell_lines.map((cell_line) => {
+ return cell_line.type !== 'virus' ? (
+ <Stack key={cell_line.desc} mt={2}>
+ <Stack.Item>
+ <DmIcon
+ fallback={fallback}
+ icon={cell_line.icon}
+ icon_state={cell_line.icon_state}
+ height="64px"
+ width="64px"
+ />
+ </Stack.Item>
+ <Stack.Item grow pl={1}>
+ <Section
+ title={cell_line.desc}
+ buttons={
+ <Button
+ color="transparent"
+ icon="circle-question"
+ tooltip="Put the sample into a Growing Vat and pour the required reagents."
+ />
+ }
+ >
+ <Box my={1}>
+ Consume {cell_line.consumption_rate} units of every nutrient per
+ second to grow by {cell_line.growth_rate}%.
+ </Box>
+ {cell_line.suspectibility > 0 && (
+ <Box my={1}>
+ Reduced by {cell_line.suspectibility}% when infected with
+ viruses.
+ </Box>
+ )}
+ <Stack fill>
+ <Stack.Item grow>
+ <GroupTitle title="Required Reagents" />
+ {Object.keys(cell_line.requireds).map((reagent) => (
+ <Button fluid key={reagent}>
+ {reagent}
+ </Button>
+ ))}
+ </Stack.Item>
+ <Stack.Item grow>
+ <GroupTitle title="Supplements" />
+ {Object.keys(cell_line.supplementaries).map((reagent) => (
+ <Button
+ fluid
+ color="good"
+ key={reagent}
+ tooltip={
+ '+' + cell_line.supplementaries[reagent] + '% growth/sec.'
+ }
+ >
+ {reagent}
+ </Button>
+ ))}
+ </Stack.Item>
+ <Stack.Item grow>
+ <GroupTitle title="Supressives" />
+ {Object.keys(cell_line.suppressives).map((reagent) => (
+ <Button
+ fluid
+ color="bad"
+ key={reagent}
+ tooltip={cell_line.suppressives[reagent] + '% growth/sec.'}
+ >
+ {reagent}
+ </Button>
+ ))}
+ </Stack.Item>
+ </Stack>
+ </Section>
+ </Stack.Item>
+ </Stack>
+ ) : (
+ <Stack key={cell_line.desc} mt={2}>
+ <Stack.Item>
+ <Icon name="viruses" color="bad" size={4} mr={1} />
+ </Stack.Item>
+ <Stack.Item grow pl={1}>
+ <Section title={cell_line.desc}>
+ <Box my={1}>
+ Reduces growth of other cell lines when not suppressed by
+ Spaceacillin.
+ </Box>
+ </Section>
+ </Stack.Item>
+ </Stack>
+ );
+ });
+};
+
+const GroupTitle = (props) => {
+ const { title } = props;
+ return (
+ <Stack my={1}>
+ <Stack.Item grow>
+ <Divider />
+ </Stack.Item>
+ <Stack.Item
+ style={{
+ textTransform: 'capitalize',
+ }}
+ color={'gray'}
+ >
+ {title}
+ </Stack.Item>
+ <Stack.Item grow>
+ <Divider />
+ </Stack.Item>
+ </Stack>
+ ) as any;
+};
diff --git a/tgui/packages/tgui/interfaces/NtosCursor.tsx b/tgui/packages/tgui/interfaces/NtosCursor.tsx
new file mode 100644
index 0000000000000..6c62df26a1762
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/NtosCursor.tsx
@@ -0,0 +1,63 @@
+import { useState } from 'react';
+
+import { useBackend } from '../backend';
+import { Button, DmIcon, NoticeBox, Section, Stack } from '../components';
+import { NtosWindow } from '../layouts';
+
+type Data = {
+ dmi: {
+ icon: string;
+ icon_state: string;
+ };
+};
+
+export const NtosCursor = () => {
+ const { data } = useBackend<Data>();
+
+ const { dmi } = data;
+
+ const [numClicked, incrementClicked] = useState(0);
+
+ const NoticeBoxText = () => {
+ if (numClicked <= 2) {
+ return `There's only one option... It's the sword.`;
+ } else if (numClicked === 3) {
+ return `You clicked the sword. It's still the sword.`;
+ } else if (numClicked === 4) {
+ return `You clicked the sword again. It's still the sword.`;
+ } else if (numClicked === 5) {
+ return `Trying to click the sword again? It's still the sword.`;
+ }
+ return `You clicked the sword ${numClicked} times... It's still the sword.`;
+ };
+
+ return (
+ <NtosWindow width={350} height={300}>
+ <NtosWindow.Content scrollable>
+ <Section title="Select Cursor">
+ <Stack vertical>
+ <Stack.Item align={'center'}>
+ <Button
+ height="100px"
+ width="100px"
+ color={numClicked >= 1 ? 'green' : null}
+ onClick={() => incrementClicked(numClicked + 1)}
+ >
+ <DmIcon
+ icon={dmi.icon}
+ icon_state={dmi.icon_state}
+ style={{
+ transform: `scale(3) translateX(4px) translateY(8px)`,
+ }}
+ />
+ </Button>
+ </Stack.Item>
+ <Stack.Item>
+ <NoticeBox>{NoticeBoxText()}</NoticeBox>
+ </Stack.Item>
+ </Stack>
+ </Section>
+ </NtosWindow.Content>
+ </NtosWindow>
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx b/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx
index 295c41c3c72d3..bb7f7d1d527a2 100644
--- a/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx
+++ b/tgui/packages/tgui/interfaces/NtosPowerMonitor.tsx
@@ -4,7 +4,7 @@ import { PowerMonitorContent } from './PowerMonitor';
export const NtosPowerMonitor = (props) => {
return (
<NtosWindow width={550} height={700}>
- <NtosWindow.Content scrollable>
+ <NtosWindow.Content>
<PowerMonitorContent />
</NtosWindow.Content>
</NtosWindow>
diff --git a/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx b/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
index f102927e9bcba..2d584bfc6b13d 100644
--- a/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
+++ b/tgui/packages/tgui/interfaces/Orbit/JobIcon.tsx
@@ -37,20 +37,15 @@ export function JobIcon(props: Props) {
return (
<div className="JobIcon">
{icon === 'borg' ? (
- <Icon color="lightblue" name={JOB2ICON[job]} mr={0.5} />
+ <Icon color="lightblue" name={JOB2ICON[job]} ml={0.3} mt={0.4} />
) : (
- <div
+ <DmIcon
+ icon={iconSettings.dmi}
+ icon_state={icon}
style={{
- height: '17px',
- width: '18px',
+ transform: iconSettings.transform,
}}
- >
- <DmIcon
- icon={iconSettings.dmi}
- icon_state={icon}
- style={{ transform: iconSettings.transform }}
- />
- </div>
+ />
)}
</div>
);
diff --git a/tgui/packages/tgui/interfaces/PipeScrubber.tsx b/tgui/packages/tgui/interfaces/PipeScrubber.tsx
new file mode 100644
index 0000000000000..b18d80a9a06c8
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/PipeScrubber.tsx
@@ -0,0 +1,175 @@
+import { toFixed } from 'common/math';
+import { BooleanLike } from 'common/react';
+
+import { useBackend } from '../backend';
+import {
+ Box,
+ Button,
+ Icon,
+ LabeledControls,
+ RoundGauge,
+ Section,
+ Tooltip,
+} from '../components';
+import { getGasLabel } from '../constants';
+import { formatSiUnit } from '../format';
+import { Window } from '../layouts';
+
+type Data = {
+ on: BooleanLike;
+ direction: BooleanLike;
+ connected: BooleanLike;
+ pressureTank: number;
+ pressureLimitTank: number;
+ pressurePump: number;
+ pressureLimitPump: number;
+ pumpMaxPressure: number;
+ hasHypernobCrystal: BooleanLike;
+ reactionSuppressionEnabled: BooleanLike;
+ filterTypes: Filter[];
+};
+
+type Filter = {
+ id: string;
+ enabled: BooleanLike;
+ gasId: string;
+ gasName: string;
+};
+
+const formatPressure = (value) => {
+ if (value < 10000) {
+ return toFixed(value) + ' kPa';
+ }
+ return formatSiUnit(value * 1000, 1, 'Pa');
+};
+
+export const PipeScrubber = (props) => {
+ const { act, data } = useBackend<Data>();
+ const {
+ on,
+ connected,
+ direction,
+ pressureTank,
+ pressureLimitTank,
+ pressurePump,
+ pressureLimitPump,
+ hasHypernobCrystal,
+ reactionSuppressionEnabled,
+ filterTypes = [],
+ } = data;
+
+ return (
+ <Window width={400} height={350}>
+ <Window.Content>
+ <Section
+ title="Status"
+ buttons={
+ !!hasHypernobCrystal && (
+ <Button
+ icon={reactionSuppressionEnabled ? 'snowflake' : 'times'}
+ selected={reactionSuppressionEnabled}
+ onClick={() => act('reaction_suppression')}
+ >
+ {reactionSuppressionEnabled
+ ? 'Reaction Suppression Enabled'
+ : 'Reaction Suppression Disabled'}
+ </Button>
+ )
+ }
+ >
+ <LabeledControls p={1}>
+ <LabeledControls.Item label="Buffer Port">
+ <Box position="relative">
+ <Tooltip
+ position="top"
+ content={connected ? 'Connected' : 'Disconnected'}
+ >
+ <Icon
+ size={2}
+ name={connected ? 'plug-circle-check' : 'plug-circle-xmark'}
+ color={connected ? 'good' : 'bad'}
+ />
+ </Tooltip>
+ </Box>
+ </LabeledControls.Item>
+ <LabeledControls.Item label="Buffer">
+ <RoundGauge
+ size={1.75}
+ value={pressurePump}
+ minValue={0}
+ maxValue={pressureLimitPump}
+ alertAfter={pressureLimitPump * 0.7}
+ ranges={{
+ good: [0, pressureLimitPump * 0.7],
+ average: [pressureLimitPump * 0.7, pressureLimitPump * 0.85],
+ bad: [pressureLimitPump * 0.85, pressureLimitPump],
+ }}
+ format={formatPressure}
+ />
+ </LabeledControls.Item>
+ <LabeledControls.Item label="Tank">
+ <RoundGauge
+ size={1.75}
+ value={pressureTank}
+ minValue={0}
+ maxValue={pressureLimitTank}
+ alertAfter={pressureLimitTank * 0.7}
+ ranges={{
+ good: [0, pressureLimitTank * 0.7],
+ average: [pressureLimitTank * 0.7, pressureLimitTank * 0.85],
+ bad: [pressureLimitTank * 0.85, pressureLimitTank],
+ }}
+ format={formatPressure}
+ />
+ </LabeledControls.Item>
+ <LabeledControls.Item label="Pump">
+ <Button
+ my={0.5}
+ width={6}
+ lineHeight={2}
+ fontSize="18px"
+ icon="power-off"
+ selected={on}
+ onClick={() => act('power')}
+ >
+ {on ? 'On' : 'Off'}
+ </Button>
+ </LabeledControls.Item>
+ </LabeledControls>
+ </Section>
+ <Section
+ title="Direction"
+ buttons={
+ <Button onClick={() => act('direction')}>
+ {direction ? 'Buffer → Tank' : 'Tank → Buffer'}
+ </Button>
+ }
+ >
+ {!!direction && (
+ <>
+ <Box>Filtering gases from the buffer into the internal tank.</Box>
+ <Section>
+ {filterTypes.map((filter) => (
+ <Button
+ key={filter.id}
+ icon={filter.enabled ? 'check-square-o' : 'square-o'}
+ content={getGasLabel(filter.gasId, filter.gasName)}
+ selected={filter.enabled}
+ onClick={() =>
+ act('toggle_filter', {
+ val: filter.gasId,
+ })
+ }
+ />
+ ))}
+ </Section>
+ </>
+ )}
+ {!direction && (
+ <Box>Dumping internal tank gases into the buffer.</Box>
+ )}
+ </Section>
+ </Window.Content>
+ </Window>
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.jsx b/tgui/packages/tgui/interfaces/PowerMonitor.jsx
deleted file mode 100644
index 039e700f68cea..0000000000000
--- a/tgui/packages/tgui/interfaces/PowerMonitor.jsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { map, sortBy } from 'common/collections';
-import { flow } from 'common/fp';
-import { toFixed } from 'common/math';
-import { useState } from 'react';
-
-import { useBackend } from '../backend';
-import {
- Box,
- Button,
- Chart,
- ColorBox,
- Dimmer,
- Flex,
- Icon,
- LabeledList,
- ProgressBar,
- Section,
- Stack,
- Table,
-} from '../components';
-import { Window } from '../layouts';
-
-const PEAK_DRAW = 500000;
-
-export const powerRank = (str) => {
- const unit = String(str.split(' ')[1]).toLowerCase();
- return ['w', 'kw', 'mw', 'gw'].indexOf(unit);
-};
-
-export const PowerMonitor = () => {
- return (
- <Window width={550} height={700}>
- <Window.Content scrollable>
- <PowerMonitorContent />
- </Window.Content>
- </Window>
- );
-};
-
-export const PowerMonitorContent = (props) => {
- const { data } = useBackend();
- const { history = { supply: [], demand: [] } } = data;
- const [sortByField, setSortByField] = useState(null);
- const supply = history.supply[history.supply.length - 1] || 0;
- const demand = history.demand[history.demand.length - 1] || 0;
- const supplyData = history.supply.map((value, i) => [i, value]);
- const demandData = history.demand.map((value, i) => [i, value]);
- const maxValue = Math.max(PEAK_DRAW, ...history.supply, ...history.demand);
- // Process area data
- const areas = flow([
- (areas) =>
- map(areas, (area, i) => ({
- ...area,
- // Generate a unique id
- id: area.name + i,
- })),
- sortByField === 'name' && ((areas) => sortBy(areas, (area) => area.name)),
- sortByField === 'charge' &&
- ((areas) => sortBy(areas, (area) => -area.charge)),
- sortByField === 'draw' &&
- ((areas) =>
- sortBy(
- areas,
- (area) => -powerRank(area.load),
- (area) => -parseFloat(area.load),
- )),
- ])(data.areas);
- return (
- <>
- {areas.length === 0 && (
- <Dimmer>
- <Stack>
- <Stack.Item>
- <Icon name="plug-circle-exclamation" size={2} />
- </Stack.Item>
- <Stack.Item>
- <h1>No APCs found!</h1>
- </Stack.Item>
- </Stack>
- </Dimmer>
- )}
- <Flex mx={-0.5} mb={1}>
- <Flex.Item mx={0.5} width="200px">
- <Section>
- <LabeledList>
- <LabeledList.Item label="Supply">
- <ProgressBar
- value={supply}
- minValue={0}
- maxValue={maxValue}
- color="teal"
- >
- {toFixed(supply / 1000) + ' kW'}
- </ProgressBar>
- </LabeledList.Item>
- <LabeledList.Item label="Draw">
- <ProgressBar
- value={demand}
- minValue={0}
- maxValue={maxValue}
- color="pink"
- >
- {toFixed(demand / 1000) + ' kW'}
- </ProgressBar>
- </LabeledList.Item>
- </LabeledList>
- </Section>
- </Flex.Item>
- <Flex.Item mx={0.5} grow={1}>
- <Section position="relative" height="100%" fill="true">
- <Chart.Line
- fillPositionedParent
- data={supplyData}
- rangeX={[0, supplyData.length - 1]}
- rangeY={[0, maxValue]}
- strokeColor="rgba(0, 181, 173, 1)"
- fillColor="rgba(0, 181, 173, 0.25)"
- />
- <Chart.Line
- fillPositionedParent
- data={demandData}
- rangeX={[0, demandData.length - 1]}
- rangeY={[0, maxValue]}
- strokeColor="rgba(224, 57, 151, 1)"
- fillColor="rgba(224, 57, 151, 0.25)"
- />
- </Section>
- </Flex.Item>
- </Flex>
- <Section>
- <Box mb={1}>
- <Box inline mr={2} color="label">
- Sort by:
- </Box>
- <Button.Checkbox
- checked={sortByField === 'name'}
- content="Name"
- onClick={() => setSortByField(sortByField !== 'name' && 'name')}
- />
- <Button.Checkbox
- checked={sortByField === 'charge'}
- content="Charge"
- onClick={() => setSortByField(sortByField !== 'charge' && 'charge')}
- />
- <Button.Checkbox
- checked={sortByField === 'draw'}
- content="Draw"
- onClick={() => setSortByField(sortByField !== 'draw' && 'draw')}
- />
- </Box>
- <Table>
- <Table.Row header>
- <Table.Cell>Area</Table.Cell>
- <Table.Cell collapsing>Charge</Table.Cell>
- <Table.Cell textAlign="right">Draw</Table.Cell>
- <Table.Cell collapsing title="Equipment">
- Eqp
- </Table.Cell>
- <Table.Cell collapsing title="Lighting">
- Lgt
- </Table.Cell>
- <Table.Cell collapsing title="Environment">
- Env
- </Table.Cell>
- </Table.Row>
- {areas.map((area, i) => (
- <tr key={area.id} className="Table__row candystripe">
- <td>{area.name}</td>
- <td className="Table__cell text-right text-nowrap">
- <AreaCharge charging={area.charging} charge={area.charge} />
- </td>
- <td className="Table__cell text-right text-nowrap">
- {area.load}
- </td>
- <td className="Table__cell text-center text-nowrap">
- <AreaStatusColorBox status={area.eqp} />
- </td>
- <td className="Table__cell text-center text-nowrap">
- <AreaStatusColorBox status={area.lgt} />
- </td>
- <td className="Table__cell text-center text-nowrap">
- <AreaStatusColorBox status={area.env} />
- </td>
- </tr>
- ))}
- </Table>
- </Section>
- </>
- );
-};
-
-export const AreaCharge = (props) => {
- const { charging, charge } = props;
- return (
- <>
- <Icon
- width="18px"
- textAlign="center"
- name={
- (charging === 0 &&
- (charge > 50 ? 'battery-half' : 'battery-quarter')) ||
- (charging === 1 && 'bolt') ||
- (charging === 2 && 'battery-full')
- }
- color={
- (charging === 0 && (charge > 50 ? 'yellow' : 'red')) ||
- (charging === 1 && 'yellow') ||
- (charging === 2 && 'green')
- }
- />
- <Box inline width="36px" textAlign="right">
- {toFixed(charge) + '%'}
- </Box>
- </>
- );
-};
-
-const AreaStatusColorBox = (props) => {
- const { status } = props;
- const power = Boolean(status & 2);
- const mode = Boolean(status & 1);
- const tooltipText = (power ? 'On' : 'Off') + ` [${mode ? 'auto' : 'manual'}]`;
- return (
- <ColorBox
- color={power ? 'good' : 'bad'}
- content={mode ? undefined : 'M'}
- title={tooltipText}
- />
- );
-};
diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.tsx b/tgui/packages/tgui/interfaces/PowerMonitor.tsx
new file mode 100644
index 0000000000000..b311ae15ede54
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/PowerMonitor.tsx
@@ -0,0 +1,318 @@
+import { useState } from 'react';
+import {
+ Box,
+ Button,
+ Chart,
+ ColorBox,
+ Flex,
+ Icon,
+ LabeledList,
+ ProgressBar,
+ Section,
+ Stack,
+ Table,
+} from 'tgui-core/components';
+import { toFixed } from 'tgui-core/math';
+
+import { useBackend } from '../backend';
+import { Tooltip } from '../components';
+import { Window } from '../layouts';
+import { LoadingScreen } from './common/LoadingToolbox';
+
+type Data = {
+ areas: Area[];
+ history: PowerHistory;
+};
+
+type Area = {
+ charge: number;
+ charging: number;
+ env: number;
+ eqp: number;
+ lgt: number;
+ load: string;
+ name: string;
+};
+
+type PowerHistory = {
+ demand: number[];
+ supply: number[];
+};
+
+export function powerRank(str: string): number {
+ const unit = String(str.split(' ')[1]).toLowerCase();
+ return ['w', 'kw', 'mw', 'gw'].indexOf(unit);
+}
+
+// Oh no not another sorting algorithm
+function powerSort(a: Area, b: Area): number {
+ const sortedByRank = powerRank(a.load) - powerRank(b.load);
+ const sortedByLoad = parseFloat(a.load) - parseFloat(b.load);
+
+ if (sortedByRank !== 0) {
+ return sortedByRank;
+ }
+ return sortedByLoad;
+}
+
+function nameSort(a: Area, b: Area): number {
+ if (a.name < b.name) {
+ return -1;
+ }
+ if (a.name > b.name) {
+ return 1;
+ }
+ return 0;
+}
+
+export function PowerMonitor() {
+ return (
+ <Window width={550} height={700}>
+ <Window.Content>
+ <PowerMonitorContent />
+ </Window.Content>
+ </Window>
+ );
+}
+
+const PEAK_DRAW = 500000;
+
+export function PowerMonitorContent(props) {
+ const { data } = useBackend<Data>();
+ const { history } = data;
+
+ if (!history) {
+ return <>Loading...</>;
+ }
+
+ const supply = history.supply[history.supply.length - 1] || 0;
+ const demand = history.demand[history.demand.length - 1] || 0;
+
+ const supplyData = history.supply.map((value, i) => [i, value]);
+ const demandData = history.demand.map((value, i) => [i, value]);
+
+ const maxValue = Math.max(PEAK_DRAW, ...history.supply, ...history.demand);
+
+ if (supplyData.length === 0 || demandData.length === 0) {
+ return <LoadingScreen />;
+ }
+
+ return (
+ <Stack fill vertical>
+ <Stack.Item>
+ <Flex mx={-0.5}>
+ <Flex.Item mx={0.5} width="200px">
+ <Section>
+ <LabeledList>
+ <LabeledList.Item label="Supply">
+ <ProgressBar
+ value={supply}
+ minValue={0}
+ maxValue={maxValue}
+ color="teal"
+ >
+ {toFixed(supply / 1000) + ' kW'}
+ </ProgressBar>
+ </LabeledList.Item>
+ <LabeledList.Item label="Draw">
+ <ProgressBar
+ value={demand}
+ minValue={0}
+ maxValue={maxValue}
+ color="pink"
+ >
+ {toFixed(demand / 1000) + ' kW'}
+ </ProgressBar>
+ </LabeledList.Item>
+ </LabeledList>
+ </Section>
+ </Flex.Item>
+ <Flex.Item mx={0.5} grow>
+ <Section position="relative" fill>
+ <Chart.Line
+ fillPositionedParent
+ data={supplyData}
+ rangeX={[0, supplyData.length - 1]}
+ rangeY={[0, maxValue]}
+ strokeColor="rgba(0, 181, 173, 1)"
+ fillColor="rgba(0, 181, 173, 0.25)"
+ />
+ <Chart.Line
+ fillPositionedParent
+ data={demandData}
+ rangeX={[0, demandData.length - 1]}
+ rangeY={[0, maxValue]}
+ strokeColor="rgba(224, 57, 151, 1)"
+ fillColor="rgba(224, 57, 151, 0.25)"
+ />
+ </Section>
+ </Flex.Item>
+ </Flex>
+ </Stack.Item>
+ <Stack.Item grow>
+ <StationAreas />
+ </Stack.Item>
+ </Stack>
+ );
+}
+
+function StationAreas(props) {
+ const { data } = useBackend<Data>();
+
+ const [sortByField, setSortByField] = useState('');
+
+ const areas = data.areas
+ .map((area, i) => ({
+ ...area,
+ // Generate a unique id
+ id: area.name + i,
+ }))
+ .sort((a, b) => {
+ if (sortByField === 'name') {
+ return nameSort(a, b);
+ }
+ if (sortByField === 'charge') {
+ return a.charge - b.charge;
+ }
+ if (sortByField === 'draw') {
+ return powerSort(b, a);
+ }
+ return 0;
+ });
+
+ return (
+ <Stack fill vertical>
+ <Section height={3}>
+ <Box>
+ <Box inline mr={2} color="label">
+ Sort by:
+ </Box>
+ <Button.Checkbox
+ checked={sortByField === 'name'}
+ onClick={() => setSortByField(sortByField !== 'name' ? 'name' : '')}
+ >
+ Name
+ </Button.Checkbox>
+ <Button.Checkbox
+ checked={sortByField === 'charge'}
+ onClick={() =>
+ setSortByField(sortByField !== 'charge' ? 'charge' : '')
+ }
+ >
+ Charge
+ </Button.Checkbox>
+ <Button.Checkbox
+ checked={sortByField === 'draw'}
+ onClick={() => setSortByField(sortByField !== 'draw' ? 'draw' : '')}
+ >
+ Draw
+ </Button.Checkbox>
+ </Box>
+ </Section>
+
+ <Stack.Item grow mt={-1}>
+ <Section fill scrollable>
+ <Table>
+ <Table.Row header>
+ <Table.Cell>Area</Table.Cell>
+ <Table.Cell collapsing>Charge</Table.Cell>
+ <Table.Cell textAlign="right" width={7}>
+ Draw
+ </Table.Cell>
+ <Tooltip content="Equipment power">
+ <Table.Cell collapsing>Eqp</Table.Cell>
+ </Tooltip>
+ <Tooltip content="Lighting power">
+ <Table.Cell collapsing>Lgt</Table.Cell>
+ </Tooltip>
+ <Tooltip content="Environment power">
+ <Table.Cell collapsing>Env</Table.Cell>
+ </Tooltip>
+ </Table.Row>
+ {areas.map((area) => (
+ <tr key={area.id} className="Table__row candystripe">
+ <td>{area.name}</td>
+ <td className="Table__cell text-right text-nowrap">
+ <AreaCharge charging={area.charging} charge={area.charge} />
+ </td>
+ <td className="Table__cell text-right text-nowrap">
+ {area.load}
+ </td>
+ <td className="Table__cell text-center text-nowrap">
+ <AreaStatusColorBox status={area.eqp} />
+ </td>
+ <td className="Table__cell text-center text-nowrap">
+ <AreaStatusColorBox status={area.lgt} />
+ </td>
+ <td className="Table__cell text-center text-nowrap">
+ <AreaStatusColorBox status={area.env} />
+ </td>
+ </tr>
+ ))}
+ </Table>
+ </Section>
+ </Stack.Item>
+ </Stack>
+ );
+}
+
+type AreaChargeProps = {
+ charge: number;
+ charging: number;
+};
+
+const NOT_CHARGING = 0;
+const CHARGING = 1;
+const CHARGED = 2;
+
+export function AreaCharge(props: AreaChargeProps) {
+ const { charging, charge } = props;
+
+ let name: string;
+ if (charging === NOT_CHARGING) {
+ name = charge > 50 ? 'battery-half' : 'battery-quarter';
+ } else if (charging === CHARGING) {
+ name = 'bolt';
+ } else {
+ name = 'battery-full';
+ }
+
+ return (
+ <>
+ <Icon
+ width="18px"
+ textAlign="center"
+ name={name}
+ color={
+ (charging === NOT_CHARGING && (charge > 50 ? 'yellow' : 'red')) ||
+ (charging === CHARGING && 'yellow') ||
+ (charging === CHARGED && 'green')
+ }
+ />
+ <Box inline width="36px" textAlign="right">
+ {toFixed(charge) + '%'}
+ </Box>
+ </>
+ );
+}
+
+type AreaStatusColorBoxProps = {
+ status: number;
+};
+
+function AreaStatusColorBox(props: AreaStatusColorBoxProps) {
+ const { status } = props;
+
+ const power = Boolean(status & 2);
+ const mode = Boolean(status & 1);
+ const tooltipText = (power ? 'On' : 'Off') + ` [${mode ? 'auto' : 'manual'}]`;
+
+ return (
+ <Tooltip content={tooltipText}>
+ <ColorBox
+ color={power ? 'good' : 'bad'}
+ content={mode ? undefined : 'M'}
+ />
+ </Tooltip>
+ );
+}
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
index 3f1c50c16f9f1..6f0f81237e495 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/sounds.tsx
@@ -14,6 +14,13 @@ export const sound_ambience: FeatureToggle = {
component: CheckboxInput,
};
+export const sound_breathing: FeatureToggle = {
+ name: 'Enable breathing sounds',
+ category: 'SOUND',
+ description: 'When enabled, hear breathing sounds when using internals.',
+ component: CheckboxInput,
+};
+
export const sound_announcements: FeatureToggle = {
name: 'Enable announcement sounds',
category: 'SOUND',
diff --git a/tgui/packages/tgui/interfaces/QuantumConsole.tsx b/tgui/packages/tgui/interfaces/QuantumConsole.tsx
index bba1d85801933..08ec428bc4dbd 100644
--- a/tgui/packages/tgui/interfaces/QuantumConsole.tsx
+++ b/tgui/packages/tgui/interfaces/QuantumConsole.tsx
@@ -1,6 +1,4 @@
import { BooleanLike } from 'common/react';
-
-import { useBackend, useSharedState } from '../backend';
import {
Button,
Collapsible,
@@ -12,7 +10,9 @@ import {
Table,
Tabs,
Tooltip,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend, useSharedState } from '../backend';
import { TableCell, TableRow } from '../components/Table';
import { Window } from '../layouts';
import { LoadingScreen } from './common/LoadingToolbox';
@@ -47,6 +47,7 @@ type Avatar = {
};
type Domain = {
+ announce_ghosts: BooleanLike;
cost: number;
desc: string;
difficulty: number;
@@ -74,10 +75,11 @@ enum Difficulty {
High,
}
-const isConnected = (data: Data): data is Data & { connected: 1 } =>
- data.connected === 1;
+function isConnected(data: Data): data is Data & { connected: 1 } {
+ return data.connected === 1;
+}
-const getColor = (difficulty: number) => {
+function getColor(difficulty: number) {
switch (difficulty) {
case Difficulty.Low:
return 'yellow';
@@ -88,9 +90,9 @@ const getColor = (difficulty: number) => {
default:
return 'green';
}
-};
+}
-export const QuantumConsole = (props) => {
+export function QuantumConsole(props) {
const { data } = useBackend<Data>();
return (
@@ -101,9 +103,9 @@ export const QuantumConsole = (props) => {
</Window.Content>
</Window>
);
-};
+}
-const AccessView = (props) => {
+function AccessView(props) {
const { act, data } = useBackend<Data>();
const [tab, setTab] = useSharedState('tab', 0);
@@ -228,22 +230,24 @@ const AccessView = (props) => {
</Stack.Item>
<Stack.Item>
<Button.Confirm
- content="Stop Domain"
disabled={!ready || !generated_domain}
onClick={() => act('stop_domain')}
tooltip="Begins shutdown. Will notify anyone connected."
- />
+ >
+ Stop Domain
+ </Button.Confirm>
</Stack.Item>
</Stack>
</Section>
</Stack.Item>
</Stack>
);
-};
+}
-const DomainEntry = (props: DomainEntryProps) => {
+function DomainEntry(props: DomainEntryProps) {
const {
domain: {
+ announce_ghosts,
cost,
desc,
difficulty,
@@ -275,6 +279,8 @@ const DomainEntry = (props: DomainEntryProps) => {
buttonName = 'Deploy';
}
+ const canView = name !== '???';
+
return (
<Collapsible
buttons={
@@ -291,10 +297,9 @@ const DomainEntry = (props: DomainEntryProps) => {
title={
<>
{name}
- {!!is_modular && name !== '???' && <Icon name="cubes" ml={1} />}
- {!!has_secondary_objectives && name !== '???' && (
- <Icon name="gem" ml={1} />
- )}
+ {!!is_modular && canView && <Icon name="cubes" ml={1} />}
+ {!!has_secondary_objectives && canView && <Icon name="gem" ml={1} />}
+ {!!announce_ghosts && canView && <Icon name="ghost" ml={1} />}
</>
}
>
@@ -303,6 +308,7 @@ const DomainEntry = (props: DomainEntryProps) => {
{desc}
{!!is_modular && ' (Modular)'}
{!!has_secondary_objectives && ' (Secondary Objective Available)'}
+ {!!announce_ghosts && ' (Ghost Interaction)'}
</Stack.Item>
<Stack.Divider />
<Stack.Item grow>
@@ -322,7 +328,7 @@ const DomainEntry = (props: DomainEntryProps) => {
</Stack>
</Collapsible>
);
-};
+}
const AvatarDisplay = (props) => {
const { act, data } = useBackend<Data>();
diff --git a/tgui/packages/tgui/interfaces/TankDispenser.jsx b/tgui/packages/tgui/interfaces/TankDispenser.jsx
deleted file mode 100644
index ea94a5f3148c1..0000000000000
--- a/tgui/packages/tgui/interfaces/TankDispenser.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useBackend } from '../backend';
-import { Button, LabeledList, Section } from '../components';
-import { Window } from '../layouts';
-
-export const TankDispenser = (props) => {
- const { act, data } = useBackend();
- return (
- <Window width={275} height={103}>
- <Window.Content>
- <Section>
- <LabeledList>
- <LabeledList.Item
- label="Plasma"
- buttons={
- <Button
- icon={data.plasma ? 'square' : 'square-o'}
- content="Dispense"
- disabled={!data.plasma}
- onClick={() => act('plasma')}
- />
- }
- >
- {data.plasma}
- </LabeledList.Item>
- <LabeledList.Item
- label="Oxygen"
- buttons={
- <Button
- icon={data.oxygen ? 'square' : 'square-o'}
- content="Dispense"
- disabled={!data.oxygen}
- onClick={() => act('oxygen')}
- />
- }
- >
- {data.oxygen}
- </LabeledList.Item>
- </LabeledList>
- </Section>
- </Window.Content>
- </Window>
- );
-};
diff --git a/tgui/packages/tgui/interfaces/Vending.tsx b/tgui/packages/tgui/interfaces/Vending.tsx
index 2f8cd42dade95..28c7a788fa6a2 100644
--- a/tgui/packages/tgui/interfaces/Vending.tsx
+++ b/tgui/packages/tgui/interfaces/Vending.tsx
@@ -1,7 +1,6 @@
import { classes } from 'common/react';
import { capitalizeAll } from 'common/string';
import { useState } from 'react';
-import { useBackend } from 'tgui/backend';
import {
Box,
Button,
@@ -11,8 +10,12 @@ import {
Section,
Stack,
Table,
-} from 'tgui/components';
-import { Window } from 'tgui/layouts';
+} from 'tgui-core/components';
+
+import { createSearch } from '../../common/string';
+import { useBackend } from '../backend';
+import { Input } from '../components';
+import { Window } from '../layouts';
type VendingData = {
onstation: boolean;
@@ -24,7 +27,7 @@ type VendingData = {
coin_records: CoinRecord[];
hidden_records: HiddenRecord[];
user: UserData;
- stock: StockItem[];
+ stock: Record<string, StockItem>[];
extended_inventory: boolean;
access: boolean;
vending_machine_input: CustomInput[];
@@ -81,11 +84,17 @@ export const Vending = (props) => {
product_records = [],
coin_records = [],
hidden_records = [],
- stock,
+ categories,
} = data;
const [selectedCategory, setSelectedCategory] = useState(
- Object.keys(data.categories)[0],
+ Object.keys(categories)[0],
+ );
+
+ const [stockSearch, setStockSearch] = useState('');
+ const stockSearchFn = createSearch(
+ stockSearch,
+ (item: ProductRecord | CustomInput) => item.name,
);
let inventory: (ProductRecord | CustomInput)[];
@@ -100,9 +109,12 @@ export const Vending = (props) => {
}
}
- inventory = inventory
- // Just in case we still have undefined values in the list
- .filter((item) => !!item);
+ // Just in case we still have undefined values in the list
+ inventory = inventory.filter((item) => !!item);
+
+ if (stockSearch.length >= 2) {
+ inventory = inventory.filter(stockSearchFn);
+ }
const filteredCategories = Object.fromEntries(
Object.entries(data.categories).filter(([categoryName]) => {
@@ -129,19 +141,23 @@ export const Vending = (props) => {
<ProductDisplay
custom={custom}
inventory={inventory}
+ stockSearch={stockSearch}
+ setStockSearch={setStockSearch}
selectedCategory={selectedCategory}
+ setSelectedCategory={setSelectedCategory}
/>
</Stack.Item>
- {Object.keys(filteredCategories).length > 1 && (
- <Stack.Item>
- <CategorySelector
- categories={filteredCategories}
- selectedCategory={selectedCategory!}
- onSelect={setSelectedCategory}
- />
- </Stack.Item>
- )}
+ {stockSearch.length < 2 &&
+ Object.keys(filteredCategories).length > 1 && (
+ <Stack.Item>
+ <CategorySelector
+ categories={filteredCategories}
+ selectedCategory={selectedCategory!}
+ onSelect={setSelectedCategory}
+ />
+ </Stack.Item>
+ )}
</Stack>
</Window.Content>
</Window>
@@ -155,7 +171,9 @@ export const UserDetails = (props) => {
if (!user) {
return (
- <NoticeBox>No ID detected! Contact the Head of Personnel.</NoticeBox>
+ <Section>
+ <NoticeBox>No ID detected! Contact the Head of Personnel.</NoticeBox>
+ </Section>
);
} else {
return (
@@ -181,11 +199,21 @@ export const UserDetails = (props) => {
/** Displays products in a section, with user balance at top */
const ProductDisplay = (props: {
custom: boolean;
- selectedCategory: string | null;
inventory: (ProductRecord | CustomInput)[];
+ stockSearch: string;
+ setStockSearch: (search: string) => void;
+ selectedCategory: string | null;
+ setSelectedCategory: (category: string) => void;
}) => {
const { data } = useBackend<VendingData>();
- const { custom, inventory, selectedCategory } = props;
+ const {
+ custom,
+ inventory,
+ stockSearch,
+ setStockSearch,
+ selectedCategory,
+ setSelectedCategory,
+ } = props;
const {
stock,
onstation,
@@ -200,20 +228,28 @@ const ProductDisplay = (props: {
scrollable
title="Products"
buttons={
- !!onstation &&
- user && (
- <Box fontSize="16px" color="green">
- {(user && user.cash) || 0}
- {displayed_currency_name}{' '}
- <Icon name={displayed_currency_icon} color="gold" />
- </Box>
- )
+ <Stack>
+ {!!onstation && user && (
+ <Stack.Item fontSize="16px" color="green">
+ {(user && user.cash) || 0}
+ {displayed_currency_name}{' '}
+ <Icon name={displayed_currency_icon} color="gold" />
+ </Stack.Item>
+ )}
+ <Stack.Item>
+ <Input
+ onInput={(_, value) => setStockSearch(value)}
+ placeholder="Search..."
+ value={stockSearch}
+ />
+ </Stack.Item>
+ </Stack>
}
>
<Table>
{inventory
.filter((product) => {
- if ('category' in product) {
+ if (!stockSearch && 'category' in product) {
return product.category === selectedCategory;
} else {
return true;
diff --git a/tgui/packages/tgui/interfaces/VotePanel.tsx b/tgui/packages/tgui/interfaces/VotePanel.tsx
index 2cb9c91ff8249..949751f2226db 100644
--- a/tgui/packages/tgui/interfaces/VotePanel.tsx
+++ b/tgui/packages/tgui/interfaces/VotePanel.tsx
@@ -1,6 +1,4 @@
import { BooleanLike } from 'common/react';
-
-import { useBackend } from '../backend';
import {
Box,
Button,
@@ -11,7 +9,9 @@ import {
NoticeBox,
Section,
Stack,
-} from '../components';
+} from 'tgui-core/components';
+
+import { useBackend } from '../backend';
import { Window } from '../layouts';
enum VoteConfig {
diff --git a/tgui/packages/tgui/layouts/Window.tsx b/tgui/packages/tgui/layouts/Window.tsx
index aa91370bfc31e..abf35d8a31142 100644
--- a/tgui/packages/tgui/layouts/Window.tsx
+++ b/tgui/packages/tgui/layouts/Window.tsx
@@ -53,30 +53,32 @@ export const Window = (props: Props) => {
const { debugLayout = false } = useDebug();
useEffect(() => {
- const updateGeometry = () => {
- const options = {
- ...config.window,
- size: DEFAULT_SIZE,
+ if (!suspended) {
+ const updateGeometry = () => {
+ const options = {
+ ...config.window,
+ size: DEFAULT_SIZE,
+ };
+
+ if (width && height) {
+ options.size = [width, height];
+ }
+ if (config.window?.key) {
+ setWindowKey(config.window.key);
+ }
+ recallWindowGeometry(options);
};
- if (width && height) {
- options.size = [width, height];
- }
- if (config.window?.key) {
- setWindowKey(config.window.key);
- }
- recallWindowGeometry(options);
- };
-
- Byond.winset(Byond.windowId, {
- 'can-close': Boolean(canClose),
- });
- logger.log('mounting');
- updateGeometry();
-
- return () => {
- logger.log('unmounting');
- };
+ Byond.winset(Byond.windowId, {
+ 'can-close': Boolean(canClose),
+ });
+ logger.log('mounting');
+ updateGeometry();
+
+ return () => {
+ logger.log('unmounting');
+ };
+ }
}, [width, height]);
const dispatch = globalStore.dispatch;
diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
index efe74af8123b0..82a3222f75066 100644
--- a/tgui/packages/tgui/package.json
+++ b/tgui/packages/tgui/package.json
@@ -16,6 +16,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-popper": "^2.3.0",
+ "tgui-core": "^1.1.3",
"tgui-dev-server": "workspace:*",
"tgui-polyfill": "workspace:*"
}
diff --git a/tgui/packages/tgui/styles/interfaces/Orbit.scss b/tgui/packages/tgui/styles/interfaces/Orbit.scss
index 3bed71d3f0cd7..892dac500d8f4 100644
--- a/tgui/packages/tgui/styles/interfaces/Orbit.scss
+++ b/tgui/packages/tgui/styles/interfaces/Orbit.scss
@@ -1,8 +1,9 @@
.JobIcon {
- height: 20px;
background: black;
+ height: 20px;
+ overflow: clip;
padding: 1px 1px 0 1px;
- overflow: hidden;
+ width: 20px;
}
.OrbitItem__selected {
diff --git a/tgui/webpack.config.js b/tgui/webpack.config.js
index fa1782eb073b2..6ff3d1bf4a06a 100644
--- a/tgui/webpack.config.js
+++ b/tgui/webpack.config.js
@@ -60,7 +60,7 @@ module.exports = (env = {}, argv) => {
],
},
{
- test: /\.scss$/,
+ test: /\.(s)?css$/,
use: [
{
loader: ExtractCssPlugin.loader,
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index 1caeb0d24e853..817834e7a221f 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -8281,6 +8281,16 @@ __metadata:
languageName: unknown
linkType: soft
+"tgui-core@npm:^1.1.3":
+ version: 1.1.3
+ resolution: "tgui-core@npm:1.1.3"
+ peerDependencies:
+ react: ^18.2.0
+ react-dom: ^18.2.0
+ checksum: 10c0/e4dccbf3f49d4fd46c9146bc21c586b739f562cc75cc86bf3d8c183e026bacbb04719f60a2dcaf937d05dfe084d9b69cc3208a0323462b28f62945fef94c5d01
+ languageName: node
+ linkType: hard
+
"tgui-dev-server@workspace:*, tgui-dev-server@workspace:packages/tgui-dev-server":
version: 0.0.0-use.local
resolution: "tgui-dev-server@workspace:packages/tgui-dev-server"
@@ -8389,6 +8399,7 @@ __metadata:
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
react-popper: "npm:^2.3.0"
+ tgui-core: "npm:^1.1.3"
tgui-dev-server: "workspace:*"
tgui-polyfill: "workspace:*"
languageName: unknown
diff --git a/tools/UpdatePaths/Scripts/82942_cigs_vape_repath.txt b/tools/UpdatePaths/Scripts/82942_cigs_vape_repath.txt
new file mode 100644
index 0000000000000..22cf75332bfee
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/82942_cigs_vape_repath.txt
@@ -0,0 +1,2 @@
+/obj/item/clothing/mask/cigarette/@SUBTYPES : /obj/item/cigarette/@SUBTYPES{@OLD}
+/obj/item/clothing/mask/vape/@SUBTYPES : /obj/item/vape/@SUBTYPES{@OLD}
\ No newline at end of file
diff --git a/tools/UpdatePaths/Scripts/83861_firebots.txt b/tools/UpdatePaths/Scripts/83861_firebots.txt
new file mode 100644
index 0000000000000..152220c38b2d3
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/83861_firebots.txt
@@ -0,0 +1 @@
+/mob/living/simple_animal/bot/firebot/@SUBTYPES : /mob/living/basic/bot/firebot/@SUBTYPES{@OLD}
\ No newline at end of file
diff --git a/tools/UpdatePaths/Scripts/84235_vatgrower_machine.txt b/tools/UpdatePaths/Scripts/84235_vatgrower_machine.txt
new file mode 100644
index 0000000000000..527312e2c8826
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/84235_vatgrower_machine.txt
@@ -0,0 +1,3 @@
+#comment Replaces the plumbing vatgrower variant with a vatgrower machine https://github.com/tgstation/tgstation/pull/84235
+
+/obj/machinery/plumbing/growing_vat : /obj/machinery/vatgrower{@OLD}
diff --git a/tools/build/build.js b/tools/build/build.js
index 4d0926802fcf4..63ed236f0c668 100644
--- a/tools/build/build.js
+++ b/tools/build/build.js
@@ -216,7 +216,7 @@ export const DmTarget = new Juke.Target({
'html/**',
'icons/**',
'interface/**',
- 'massmeta/**', // MASSMETA EDIT ADDITION - Making the CBT work
+ 'massmeta/**', //MASSMETA EDIT ADDITION (Making the CBT work)
`${DME_NAME}.dme`,
NamedVersionFile,
],
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index c78e8fecf7c87..8a2b715502ff5 100644
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -21,12 +21,14 @@ if command -v rg >/dev/null 2>&1; then
fi
code_files="code/**/**.dm"
map_files="_maps/**/**.dmm"
+ shuttle_map_files="_maps/shuttles/**.dmm"
code_x_515="code/**/!(__byond_version_compat).dm"
else
pcre2_support=0
grep=grep
code_files="-r --include=code/**/**.dm"
map_files="-r --include=_maps/**/**.dmm"
+ shuttle_map_files="-r --include=_maps/shuttles/**.dmm"
code_x_515="-r --include=code/**/!(__byond_version_compat).dm"
fi
@@ -304,6 +306,12 @@ if [ "$pcre2_support" -eq 1 ]; then
echo -e "${RED}ERROR: Invalid pronoun helper found.${NC}"
st=1
fi;
+ part "shuttle area checker"
+ if $grep -PU '(},|\/obj|\/mob|\/turf\/(?!template_noop).+)[^()]+\/area\/template_noop\)' $shuttle_map_files; then
+ echo
+ echo -e "${RED}ERROR: Shuttle has objs or turfs in a template_noop area. Please correct their areas to a shuttle subtype.${NC}"
+ st=1
+fi;
else
echo -e "${RED}pcre2 not supported, skipping checks requiring pcre2"
echo -e "if you want to run these checks install ripgrep with pcre2 support.${NC}"
diff --git a/tools/maplint/lints/banned_obj_vars.yml b/tools/maplint/lints/banned_obj_vars.yml
new file mode 100644
index 0000000000000..076aa20386a87
--- /dev/null
+++ b/tools/maplint/lints/banned_obj_vars.yml
@@ -0,0 +1,4 @@
+help: "This var is obsolete/no longer in use. Please remove it."
+/obj:
+ banned_variables:
+ layer:
diff --git a/tools/maplint/lints/telescreen_varedits.yml b/tools/maplint/lints/telescreen_varedits.yml
new file mode 100644
index 0000000000000..37ea2d72b67c8
--- /dev/null
+++ b/tools/maplint/lints/telescreen_varedits.yml
@@ -0,0 +1,8 @@
+help: "Use the directional variants when possible."
+/obj/machinery/computer/security/telescreen:
+ banned_variables:
+ pixel_x:
+ pixel_y:
+ dir:
+ deny: [1, 2, 4, 8]
+ network:
diff --git a/tools/massmeta_check_grep.sh b/tools/massmeta_check_grep.sh
deleted file mode 100644
index 78041e8f48190..0000000000000
--- a/tools/massmeta_check_grep.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-#ANSI Escape Codes for colors to increase contrast of errors
-RED="\033[0;31m"
-GREEN="\033[0;32m"
-BLUE="\033[0;34m"
-NC="\033[0m" # No Color
-
-echo -e "${BLUE}Re-running grep checks, but looking in modular_meta...${NC}"
-
-# Run the linters again, but modular massmeta code.
-sed "s|code/\*\*/\*\.dm|massmeta/\*\*/\*\.dm|g" <tools/ci/check_grep.sh | bash