"
if(severity > WOUND_SEVERITY_MODERATE)
- if((limb.biological_state & BIO_BONE) && !(limb.biological_state & BIO_FLESH))
+ if((limb.biological_state & BIO_BONE) && !(limb.biological_state & (BIO_FLESH|BIO_CHITIN)))
if(!gelled)
. += "Recommended Treatment: Apply bone gel directly to injured limb. Creatures of pure bone don't seem to mind bone gel application nearly as much as fleshed individuals. Surgical tape will also be unnecessary.\n"
else
@@ -560,6 +567,6 @@
if(limb.body_zone == BODY_ZONE_HEAD)
. += "Cranial Trauma Detected: Patient will suffer random bouts of [severity == WOUND_SEVERITY_SEVERE ? "mild" : "severe"] brain traumas until bone is repaired."
- else if(limb.body_zone == BODY_ZONE_CHEST && victim.blood_volume)
+ else if(limb.body_zone == BODY_ZONE_CHEST && CAN_HAVE_BLOOD(victim))
. += "Ribcage Trauma Detected: Further trauma to chest is likely to worsen internal bleeding until bone is repaired."
. += "
"
diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm
index 334f820cc28706..7877f1b955c70a 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -18,33 +18,31 @@
default_scar_file = FLESH_SCAR_FILE
- treatable_by = list(/obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh) // sterilizer and alcohol will require reagent treatments, coming soon
-
// Flesh damage vars
- /// How much damage to our flesh we currently have. Once both this and infestation reach 0, the wound is considered healed
+ /// How much damage to our flesh we currently have. Once both this and infection reach 0, the wound is considered healed
var/flesh_damage = 5
/// Our current counter for how much flesh regeneration we have stacked from regenerative mesh/synthflesh/whatever, decrements each tick and lowers flesh_damage
var/flesh_healing = 0
- // Infestation vars (only for severe and critical)
+ // Infection vars (only for severe and critical)
/// How quickly infection breeds on this burn if we don't have disinfectant
- var/infestation_rate = 0
+ var/infection_rate = 0
/// Our current level of infection
- var/infestation = 0
- /// Our current level of sanitization/anti-infection, from disinfectants/alcohol/UV lights. While positive, totally pauses and slowly reverses infestation effects each tick
+ var/infection = 0
+ /// Our current level of sanitization/anti-infection, from disinfectants/alcohol/UV lights. While positive, totally pauses and slowly reverses infection effects each tick
var/sanitization = 0
- /// Once we reach infestation beyond WOUND_INFESTATION_SEPSIS, we get this many warnings before the limb is completely paralyzed (you'd have to ignore a really bad burn for a really long time for this to happen)
+ /// Once we reach infection beyond WOUND_INFECTION_SEPTIC, we get this many warnings before the limb is completely paralyzed (you'd have to ignore a really bad burn for a really long time for this to happen)
var/strikes_to_lose_limb = 3
-/datum/wound/burn/flesh/handle_process(seconds_per_tick, times_fired)
+/datum/wound/burn/flesh/handle_process(seconds_per_tick)
if (!victim || HAS_TRAIT(victim, TRAIT_STASIS))
return
. = ..()
if(strikes_to_lose_limb <= 0) // we've already hit sepsis, nothing more to do
- victim.adjustToxLoss(0.25 * seconds_per_tick)
+ victim.adjust_tox_loss(0.25 * seconds_per_tick)
if(SPT_PROB(0.5, seconds_per_tick))
victim.visible_message(span_danger("The infection on the remnants of [victim]'s [limb.plaintext_zone] shift and bubble nauseatingly!"), span_warning("You can feel the infection on the remnants of your [limb.plaintext_zone] coursing through your veins!"), vision_distance = COMBAT_MESSAGE_RANGE)
return
@@ -56,10 +54,10 @@
if(HAS_TRAIT(victim, TRAIT_VIRUS_RESISTANCE))
sanitization += 0.9
if(HAS_TRAIT(victim, TRAIT_IMMUNODEFICIENCY))
- infestation += 0.05
+ infection += 0.05
sanitization = max(sanitization - 0.15, 0)
- if(infestation_rate <= 0.15 && prob(50))
- infestation_rate += 0.001
+ if(infection_rate <= 0.15 && prob(50))
+ infection_rate += 0.001
if(limb.current_gauze)
limb.seep_gauze(WOUND_BURN_SANITIZATION_RATE * seconds_per_tick)
@@ -69,11 +67,11 @@
flesh_healing = max(flesh_healing - (0.5 * bandage_factor * seconds_per_tick), 0) // good bandages multiply the length of flesh healing
// if we have little/no infection, the limb doesn't have much burn damage, and our nutrition is good, heal some flesh
- if(infestation <= WOUND_INFECTION_MODERATE && (limb.burn_dam < 5) && (victim.nutrition >= NUTRITION_LEVEL_FED))
+ if(infection <= WOUND_INFECTION_MODERATE && (limb.burn_dam < 5) && (victim.nutrition >= NUTRITION_LEVEL_FED))
flesh_healing += 0.2
// here's the check to see if we're cleared up
- if((flesh_damage <= 0) && (infestation <= WOUND_INFECTION_MODERATE))
+ if((flesh_damage <= 0) && (infection <= WOUND_INFECTION_MODERATE))
to_chat(victim, span_green("The burns on your [limb.plaintext_zone] have cleared up!"))
qdel(src)
return
@@ -81,18 +79,18 @@
// sanitization is checked after the clearing check but before the actual ill-effects, because we freeze the effects of infection while we have sanitization
if(sanitization > 0)
var/bandage_factor = limb.current_gauze?.burn_cleanliness_bonus || 1
- infestation = max(infestation - (WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0)
+ infection = max(infection - (WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0)
sanitization = max(sanitization - (WOUND_BURN_SANITIZATION_RATE * bandage_factor * seconds_per_tick), 0)
return
- infestation += infestation_rate * seconds_per_tick
- switch(infestation)
+ infection += infection_rate * seconds_per_tick
+ switch(infection)
if(0 to WOUND_INFECTION_MODERATE)
return
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
if(SPT_PROB(15, seconds_per_tick))
- victim.adjustToxLoss(0.2)
+ victim.adjust_tox_loss(0.2)
if(prob(6))
to_chat(victim, span_warning("The blisters on your [limb.plaintext_zone] ooze a strange pus..."))
@@ -108,7 +106,7 @@
return
if(SPT_PROB(10, seconds_per_tick))
- victim.adjustToxLoss(0.5)
+ victim.adjust_tox_loss(0.5)
if(WOUND_INFECTION_CRITICAL to WOUND_INFECTION_SEPTIC)
if(!disabling)
@@ -124,12 +122,12 @@
if(SPT_PROB(2.48, seconds_per_tick))
if(prob(20))
to_chat(victim, span_warning("You contemplate life without your [limb.plaintext_zone]..."))
- victim.adjustToxLoss(0.75)
+ victim.adjust_tox_loss(0.75)
else
- victim.adjustToxLoss(1)
+ victim.adjust_tox_loss(1)
if(WOUND_INFECTION_SEPTIC to INFINITY)
- if(SPT_PROB(0.5 * infestation, seconds_per_tick))
+ if(SPT_PROB(0.5 * infection, seconds_per_tick))
strikes_to_lose_limb--
switch(strikes_to_lose_limb)
if(2 to INFINITY)
@@ -167,7 +165,7 @@
condition += " underneath a dressing of [bandage_condition] [limb.current_gauze.name]."
else
- switch(infestation)
+ switch(infection)
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
condition += ", [span_deadsay("with early signs of infection.")]"
if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL)
@@ -184,7 +182,7 @@
/datum/wound/burn/flesh/severity_text(simple = FALSE)
. = ..()
. += " Burn / "
- switch(infestation)
+ switch(infection)
if(-INFINITY to WOUND_INFECTION_MODERATE)
. += "No"
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
@@ -206,10 +204,10 @@
. = ..()
. += ""
- if(infestation <= sanitization && flesh_damage <= flesh_healing)
+ if(infection <= sanitization && flesh_damage <= flesh_healing)
. += "No further treatment required: Burns will heal shortly."
else
- switch(infestation)
+ switch(infection)
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
. += "Infection Level: Moderate\n"
if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL)
@@ -218,7 +216,7 @@
. += "Infection Level: [span_deadsay("CRITICAL")]\n"
if(WOUND_INFECTION_SEPTIC to INFINITY)
. += "Infection Level: [span_deadsay("LOSS IMMINENT")]\n"
- if(infestation > sanitization)
+ if(infection > sanitization)
. += "\tSurgical debridement, antibiotics/sterilizers, or regenerative mesh will rid infection. Paramedic UV penlights are also effective.\n"
if(flesh_damage > 0)
@@ -231,7 +229,7 @@
/// Checks if the wound is in a state that ointment or flesh will help
/datum/wound/burn/flesh/proc/can_be_ointmented_or_meshed()
- if(infestation > 0 && sanitization < infestation)
+ if(infection > 0 && sanitization < infection)
return TRUE
if(flesh_damage > 0 && flesh_healing <= flesh_damage)
return TRUE
@@ -241,22 +239,21 @@
/datum/wound/burn/flesh/proc/uv(obj/item/flashlight/pen/paramedic/I, mob/user)
if(!COOLDOWN_FINISHED(I, uv_cooldown))
to_chat(user, span_notice("[I] is still recharging!"))
- return TRUE
- if(infestation <= 0 || infestation < sanitization)
+ return
+ if(infection <= 0 || infection < sanitization)
to_chat(user, span_notice("There's no infection to treat on [victim]'s [limb.plaintext_zone]!"))
- return TRUE
+ return
user.visible_message(span_notice("[user] flashes the burns on [victim]'s [limb] with [I]."), span_notice("You flash the burns on [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone] with [I]."), vision_distance=COMBAT_MESSAGE_RANGE)
sanitization += I.uv_power
COOLDOWN_START(I, uv_cooldown, I.uv_cooldown_length)
- return TRUE
-/datum/wound/burn/flesh/treat(obj/item/I, mob/user)
- if(istype(I, /obj/item/flashlight/pen/paramedic))
- return uv(I, user)
+/datum/wound/burn/flesh/treat(obj/item/tool, mob/user)
+ if(istype(tool, /obj/item/flashlight/pen/paramedic))
+ uv(tool, user)
// people complained about burns not healing on stasis beds, so in addition to checking if it's cured, they also get the special ability to very slowly heal on stasis beds if they have the healing effects stored
-/datum/wound/burn/flesh/on_stasis(seconds_per_tick, times_fired)
+/datum/wound/burn/flesh/on_stasis(seconds_per_tick)
. = ..()
if(strikes_to_lose_limb <= 0) // we've already hit sepsis, nothing more to do
if(SPT_PROB(0.5, seconds_per_tick))
@@ -264,12 +261,12 @@
return
if(flesh_healing > 0)
flesh_damage = max(flesh_damage - (0.1 * seconds_per_tick), 0)
- if((flesh_damage <= 0) && (infestation <= 1))
+ if((flesh_damage <= 0) && (infection <= 1))
to_chat(victim, span_green("The burns on your [limb.plaintext_zone] have cleared up!"))
qdel(src)
return
if(sanitization > 0)
- infestation = max(infestation - (0.1 * WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0)
+ infection = max(infection - (0.1 * WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0)
/datum/wound/burn/flesh/on_synthflesh(reac_volume)
flesh_healing += reac_volume * 0.5 // 20u patch will heal 10 flesh standard
@@ -325,8 +322,8 @@
damage_multiplier_penalty = 1.2
series_threshold_penalty = 40
status_effect_type = /datum/status_effect/wound/burn/flesh/severe
- treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
- infestation_rate = 0.07 // appx 9 minutes to reach sepsis without any treatment
+ treatable_by = list(/obj/item/flashlight/pen/paramedic)
+ infection_rate = 0.07 // appx 9 minutes to reach sepsis without any treatment
flesh_damage = 12.5
scar_keyword = "burnsevere"
@@ -356,8 +353,8 @@
sound_effect = 'sound/effects/wounds/sizzle2.ogg'
threshold_penalty = 25
status_effect_type = /datum/status_effect/wound/burn/flesh/critical
- treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
- infestation_rate = 0.075 // appx 4.33 minutes to reach sepsis without any treatment
+ treatable_by = list(/obj/item/flashlight/pen/paramedic)
+ infection_rate = 0.075 // appx 4.33 minutes to reach sepsis without any treatment
flesh_damage = 20
scar_keyword = "burncritical"
diff --git a/code/datums/wounds/cranial_fissure.dm b/code/datums/wounds/cranial_fissure.dm
index 19aff387734cd0..e26e3a97d9d6fc 100644
--- a/code/datums/wounds/cranial_fissure.dm
+++ b/code/datums/wounds/cranial_fissure.dm
@@ -39,6 +39,10 @@
severity = WOUND_SEVERITY_CRITICAL
sound_effect = 'sound/effects/dismember.ogg'
+ surgery_states = SURGERY_SKIN_OPEN | SURGERY_BONE_SAWED // Literally a cracked open skull, no vessels as it... doesn't bleed?
+
+ /// If TRUE we have been prepped for surgery (to repair)
+ VAR_FINAL/prepped = FALSE
#define CRANIAL_FISSURE_FILTER_DISPLACEMENT "cranial_fissure_displacement"
@@ -50,7 +54,7 @@
RegisterSignal(victim, COMSIG_MOB_SLIPPED, PROC_REF(on_owner_slipped))
-/datum/wound/cranial_fissure/remove_wound(ignore_limb, replaced)
+/datum/wound/cranial_fissure/remove_wound(ignore_limb, replaced, destroying)
REMOVE_TRAIT(limb, TRAIT_IMMUNE_TO_CRANIAL_FISSURE, type)
if (!isnull(victim))
REMOVE_TRAIT(victim, TRAIT_HAS_CRANIAL_FISSURE, type)
diff --git a/code/datums/wounds/loss.dm b/code/datums/wounds/loss.dm
index 779c181474c461..ea6eefca691e03 100644
--- a/code/datums/wounds/loss.dm
+++ b/code/datums/wounds/loss.dm
@@ -49,7 +49,7 @@
set_limb(dismembered_part)
second_wind()
log_wound(victim, src)
- if(dismembered_part.can_bleed() && wounding_type != WOUND_BURN && victim.blood_volume)
+ if(dismembered_part.can_bleed() && wounding_type != WOUND_BURN && victim.get_blood_volume())
victim.spray_blood(attack_direction, severity)
dismembered_part.dismember(wounding_type == WOUND_BURN ? BURN : BRUTE, wounding_type = wounding_type)
qdel(src)
diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm
index 55fdf9ffbba9bf..87817682fb4b0b 100644
--- a/code/datums/wounds/pierce.dm
+++ b/code/datums/wounds/pierce.dm
@@ -24,7 +24,6 @@
name = "Piercing Wound"
sound_effect = 'sound/items/weapons/slice.ogg'
processes = TRUE
- treatable_by = list(/obj/item/stack/medical/suture)
treatable_tools = list(TOOL_CAUTERY)
base_treat_time = 3 SECONDS
wound_flags = (ACCEPTS_GAUZE | CAN_BE_GRASPED)
@@ -42,16 +41,18 @@
var/internal_bleeding_chance
/// If we let off blood when hit, the max blood lost is this * the incoming damage
var/internal_bleeding_coefficient
+ /// If TRUE we are ready to be mended in surgery
+ VAR_FINAL/mend_state = FALSE
/datum/wound/pierce/bleed/wound_injury(datum/wound/old_wound = null, attack_direction = null)
set_blood_flow(initial_flow)
- if(limb.can_bleed() && attack_direction && victim.blood_volume > BLOOD_VOLUME_OKAY)
+ if(limb.can_bleed() && attack_direction && victim.get_blood_volume() > BLOOD_VOLUME_OKAY)
victim.spray_blood(attack_direction, severity)
return ..()
/datum/wound/pierce/bleed/receive_damage(wounding_type, wounding_dmg, wound_bonus)
- if(victim.stat == DEAD || (wounding_dmg < 5) || !limb.can_bleed() || !victim.blood_volume || !prob(internal_bleeding_chance + wounding_dmg))
+ if(victim.stat == DEAD || (wounding_dmg < 5) || !limb.can_bleed() || !victim.get_blood_volume() || !prob(internal_bleeding_chance + wounding_dmg))
return
if(limb.current_gauze?.splint_factor)
wounding_dmg *= (1 - limb.current_gauze.splint_factor)
@@ -96,7 +97,7 @@
return BLOOD_FLOW_INCREASING
return BLOOD_FLOW_STEADY
-/datum/wound/pierce/bleed/handle_process(seconds_per_tick, times_fired)
+/datum/wound/pierce/bleed/handle_process(seconds_per_tick)
if (!victim || HAS_TRAIT(victim, TRAIT_STASIS))
return
@@ -131,13 +132,14 @@
to_chat(victim, span_green("The holes on your [limb.plaintext_zone] have [!limb.can_bleed() ? "healed up" : "stopped bleeding"]!"))
qdel(src)
-/datum/wound/pierce/bleed/check_grab_treatments(obj/item/I, mob/user)
- if(I.get_temperature()) // if we're using something hot but not a cautery, we need to be aggro grabbing them first, so we don't try treating someone we're eswording
- return TRUE
+/datum/wound/pierce/bleed/check_grab_treatments(obj/item/tool, mob/user)
+ // if we're using something hot but not a cautery, we need to be aggro grabbing them first,
+ // so we don't try treating someone we're eswording
+ return tool.get_temperature()
-/datum/wound/pierce/bleed/treat(obj/item/I, mob/user)
- if(I.tool_behaviour == TOOL_CAUTERY || I.get_temperature())
- return tool_cauterize(I, user)
+/datum/wound/pierce/bleed/treat(obj/item/tool, mob/user)
+ if(tool.tool_behaviour == TOOL_CAUTERY || tool.get_temperature())
+ tool_cauterize(tool, user)
/datum/wound/pierce/bleed/on_xadone(power)
. = ..()
@@ -179,13 +181,12 @@
adjust_blood_flow(-blood_cauterized)
if(blood_flow > 0)
- return try_treating(I, user)
- return TRUE
+ try_treating(I, user)
/datum/wound_pregen_data/flesh_pierce
abstract = TRUE
- required_limb_biostate = (BIO_FLESH)
+ required_limb_biostate = BIO_FLESH
required_wounding_type = WOUND_PIERCE
wound_series = WOUND_SERIES_FLESH_PUNCTURE_BLEED
@@ -204,8 +205,8 @@
occur_text = "spurts out a thin stream of blood"
sound_effect = 'sound/effects/wounds/pierce1.ogg'
severity = WOUND_SEVERITY_MODERATE
- initial_flow = 1.5
- gauzed_clot_rate = 0.8
+ initial_flow = 1.25
+ gauzed_clot_rate = 0.75
clot_rate = 0.03
internal_bleeding_chance = 30
internal_bleeding_coefficient = 1.25
@@ -283,8 +284,8 @@
occur_text = "looses a violent spray of blood, revealing a pierced wound"
sound_effect = 'sound/effects/wounds/pierce2.ogg'
severity = WOUND_SEVERITY_SEVERE
- initial_flow = 2.25
- gauzed_clot_rate = 0.6
+ initial_flow = 2
+ gauzed_clot_rate = 0.5
clot_rate = 0.02
internal_bleeding_chance = 60
internal_bleeding_coefficient = 1.5
@@ -340,7 +341,7 @@
RegisterSignal(limb, COMSIG_BODYPART_UPDATE_WOUND_OVERLAY, PROC_REF(wound_overlay))
limb.update_part_wound_overlay()
-/datum/wound/pierce/bleed/severe/eye/remove_wound(ignore_limb, replaced)
+/datum/wound/pierce/bleed/severe/eye/remove_wound(ignore_limb, replaced, destroying)
if (!isnull(limb))
UnregisterSignal(limb, COMSIG_BODYPART_UPDATE_WOUND_OVERLAY)
return ..()
@@ -396,13 +397,14 @@
occur_text = "blasts apart, sending chunks of viscera flying in all directions"
sound_effect = 'sound/effects/wounds/pierce3.ogg'
severity = WOUND_SEVERITY_CRITICAL
- initial_flow = 3
- gauzed_clot_rate = 0.4
+ initial_flow = 2.5
+ gauzed_clot_rate = 0.3
internal_bleeding_chance = 80
internal_bleeding_coefficient = 1.75
threshold_penalty = 15
status_effect_type = /datum/status_effect/wound/pierce/critical
scar_keyword = "piercecritical"
+ surgery_states = SURGERY_SKIN_CUT | SURGERY_VESSELS_UNCLAMPED // Bad enough to count
wound_flags = (ACCEPTS_GAUZE | MANGLES_EXTERIOR | CAN_BE_GRASPED)
simple_treat_text = "
Bandaging the wound is of utmost importance, as is seeking direct medical attention -
Death will ensue if treatment is delayed whatsoever, with lack of
oxygen killing the patient, thus
Food, Iron, and saline solution is always recommended after treatment. This wound will not naturally seal itself."
diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm
index 2ca36d2e5e5710..af172dab2ebed4 100644
--- a/code/datums/wounds/slash.dm
+++ b/code/datums/wounds/slash.dm
@@ -34,8 +34,6 @@
name = "Slashing (Cut) Flesh Wound"
threshold_penalty = 5
processes = TRUE
- treatable_by = list(/obj/item/stack/medical/suture)
- treatable_by_grabbed = list(/obj/item/gun/energy/laser)
treatable_tools = list(TOOL_CAUTERY)
base_treat_time = 3 SECONDS
wound_flags = (ACCEPTS_GAUZE|CAN_BE_GRASPED)
@@ -68,7 +66,7 @@
old_wound.clear_highest_scar()
else
set_blood_flow(initial_flow)
- if(limb.can_bleed() && attack_direction && victim.blood_volume > BLOOD_VOLUME_OKAY)
+ if(limb.can_bleed() && attack_direction && victim.get_blood_volume() > BLOOD_VOLUME_OKAY)
victim.spray_blood(attack_direction, severity)
if(!highest_scar)
@@ -89,7 +87,7 @@
SIGNAL_HANDLER
set_highest_scar(null)
-/datum/wound/slash/flesh/remove_wound(ignore_limb, replaced)
+/datum/wound/slash/flesh/remove_wound(ignore_limb, replaced, destroying)
if(!replaced && highest_scar)
already_scarred = TRUE
highest_scar.lazy_attach(limb)
@@ -145,7 +143,7 @@
if(clot_rate < 0)
return BLOOD_FLOW_INCREASING
-/datum/wound/slash/flesh/handle_process(seconds_per_tick, times_fired)
+/datum/wound/slash/flesh/handle_process(seconds_per_tick)
if (!victim || HAS_TRAIT(victim, TRAIT_STASIS))
return
@@ -166,17 +164,18 @@
/* BEWARE, THE BELOW NONSENSE IS MADNESS. bones.dm looks more like what I have in mind and is sufficiently clean, don't pay attention to this messiness */
-/datum/wound/slash/flesh/check_grab_treatments(obj/item/I, mob/user)
- if(istype(I, /obj/item/gun/energy/laser))
+/datum/wound/slash/flesh/check_grab_treatments(obj/item/tool, mob/user)
+ if(istype(tool, /obj/item/gun/energy/laser))
return TRUE
- if(I.get_temperature()) // if we're using something hot but not a cautery, we need to be aggro grabbing them first, so we don't try treating someone we're eswording
+ if(tool.get_temperature()) // if we're using something hot but not a cautery, we need to be aggro grabbing them first, so we don't try treating someone we're eswording
return TRUE
+ return FALSE
-/datum/wound/slash/flesh/treat(obj/item/I, mob/user)
- if(istype(I, /obj/item/gun/energy/laser))
- return las_cauterize(I, user)
- else if(I.tool_behaviour == TOOL_CAUTERY || I.get_temperature())
- return tool_cauterize(I, user)
+/datum/wound/slash/flesh/treat(obj/item/tool, mob/user)
+ if(istype(tool, /obj/item/gun/energy/laser))
+ las_cauterize(tool, user)
+ else if(tool.tool_behaviour == TOOL_CAUTERY || tool.get_temperature())
+ tool_cauterize(tool, user)
/datum/wound/slash/flesh/try_handling(mob/living/user)
if(user.pulling != victim || !HAS_TRAIT(user, TRAIT_WOUND_LICKER) || !victim.try_inject(user, injection_flags = INJECT_TRY_SHOW_ERROR_MESSAGE))
@@ -252,10 +251,9 @@
lasgun.chambered.loaded_projectile.damage *= self_penalty_mult
if(!lasgun.process_fire(victim, victim, TRUE, null, limb.body_zone))
return
- victim.painful_scream() // DOPPLER EDIT: check for painkilling before screaming
- adjust_blood_flow(-1 * (damage / (5 * self_penalty_mult))) // 20 / 5 = 4 bloodflow removed, p good
+ victim.painful_scream() // DOPPLER EDIT - Painkiller checks for screamings - ORIGINAL: victim.emote("scream")
victim.visible_message(span_warning("The cuts on [victim]'s [limb.plaintext_zone] scar over!"))
- return TRUE
+ adjust_blood_flow(-1 * (damage / (5 * self_penalty_mult))) // 20 / 5 = 4 bloodflow removed, p good
/// If someone is using either a cautery tool or something with heat to cauterize this cut
/datum/wound/slash/flesh/proc/tool_cauterize(obj/item/I, mob/user)
@@ -287,11 +285,10 @@
adjust_blood_flow(-blood_cauterized)
if(blood_flow > minimum_flow)
- return try_treating(I, user)
+ try_treating(I, user)
+
else if(demotes_to)
to_chat(user, span_green("You successfully lower the severity of [user == victim_stored ? "your" : "[victim_stored]'s"] cuts."))
- return TRUE
- return FALSE
/datum/wound/slash/get_limb_examine_description()
return span_warning("The flesh on this limb appears badly lacerated.")
@@ -306,9 +303,9 @@
occur_text = "is cut open, slowly leaking blood"
sound_effect = 'sound/effects/wounds/blood1.ogg'
severity = WOUND_SEVERITY_MODERATE
- initial_flow = 2
+ initial_flow = 1.75
minimum_flow = 0.5
- clot_rate = 0.05
+ clot_rate = 0.04
series_threshold_penalty = 10
status_effect_type = /datum/status_effect/wound/slash/flesh/moderate
scar_keyword = "slashmoderate"
@@ -338,13 +335,14 @@
occur_text = "is ripped open, veins spurting blood"
sound_effect = 'sound/effects/wounds/blood2.ogg'
severity = WOUND_SEVERITY_SEVERE
- initial_flow = 3.25
- minimum_flow = 2.75
- clot_rate = 0.03
+ initial_flow = 2.75
+ minimum_flow = 2
+ clot_rate = 0.02
series_threshold_penalty = 25
demotes_to = /datum/wound/slash/flesh/moderate
status_effect_type = /datum/status_effect/wound/slash/flesh/severe
scar_keyword = "slashsevere"
+ surgery_states = SURGERY_SKIN_CUT | SURGERY_VESSELS_UNCLAMPED
simple_treat_text = "
Bandaging the wound is essential, and will reduce blood loss. Afterwards, the wound can be
sutured shut, preferably while the patient is resting and/or grasping their wound."
homemade_treat_text = "Bed sheets can be ripped up to make
makeshift gauze.
Flour, table salt, or salt mixed with water can be applied directly to stem the flow, though unmixed salt will irritate the skin and worsen natural healing. Resting and grabbing your wound will also reduce bleeding."
@@ -371,13 +369,14 @@
occur_text = "is torn open, spraying blood wildly"
sound_effect = 'sound/effects/wounds/blood3.ogg'
severity = WOUND_SEVERITY_CRITICAL
- initial_flow = 4
- minimum_flow = 3.85
- clot_rate = -0.015 // critical cuts actively get worse instead of better
+ initial_flow = 3.75
+ minimum_flow = 3.5
+ clot_rate = -0.012 // critical cuts actively get worse instead of better
threshold_penalty = 15
demotes_to = /datum/wound/slash/flesh/severe
status_effect_type = /datum/status_effect/wound/slash/flesh/critical
scar_keyword = "slashcritical"
+ surgery_states = SURGERY_SKIN_OPEN | SURGERY_VESSELS_UNCLAMPED
wound_flags = (ACCEPTS_GAUZE | MANGLES_EXTERIOR | CAN_BE_GRASPED)
simple_treat_text = "
Bandaging the wound is of utmost importance, as is seeking direct medical attention -
Death will ensue if treatment is delayed whatsoever, with lack of
oxygen killing the patient, thus
Food, Iron, and saline solution is always recommended after treatment. This wound will not naturally seal itself."
homemade_treat_text = "Bed sheets can be ripped up to make
makeshift gauze.
Flour, salt, and saltwater topically applied will help. Dropping to the ground and grabbing your wound will reduce blood flow."
diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm
deleted file mode 100644
index f6559d344c4a54..00000000000000
--- a/code/game/area/ai_monitored.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/area/station/ai_monitored
- name = "\improper AI Monitored Area"
- sound_environment = SOUND_ENVIRONMENT_ROOM
- var/list/obj/machinery/camera/motioncameras
- var/list/datum/weakref/motionTargets = list()
-
-/area/station/ai_monitored/Initialize(mapload)
- . = ..()
- if(!mapload)
- return
- for (var/obj/machinery/camera/ai_camera in src)
- if(!ai_camera.isMotion())
- continue
- LAZYADD(motioncameras, ai_camera)
- ai_camera.set_area_motion(src)
-
-/area/station/ai_monitored/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
- . = ..()
- if (!ismob(arrived) || !LAZYLEN(motioncameras))
- return
- for(var/obj/machinery/camera/cam as anything in motioncameras)
- cam.newTarget(arrived)
- return
-
-/area/station/ai_monitored/Exited(atom/movable/gone, atom/old_loc, list/atom/old_locs)
- . = ..()
- if (!ismob(gone) || !LAZYLEN(motioncameras))
- return
- for(var/obj/machinery/camera/cam as anything in motioncameras)
- cam.lostTargetRef(WEAKREF(gone))
- return
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index cbe227905f3796..c9692021a01b38 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -24,7 +24,10 @@
/// This uses the same nested list format as turfs_by_zlevel
var/list/list/turf/turfs_to_uncontain_by_zlevel = list()
- var/area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ /// General flag for area properties
+ var/area_flags = VALID_TERRITORY | BLOBS_ALLOWED | CULT_PERMITTED
+ /// Flag for mapping related area properties (such as cavegen)
+ var/area_flags_mapping = UNIQUE_AREA
///Do we have an active fire alarm?
var/fire = FALSE
@@ -58,6 +61,8 @@
/// For space, the asteroid, lavaland, etc. Used with blueprints or with weather to determine if we are adding a new area (vs editing a station room)
var/outdoors = FALSE
+ /// Whether or not this area unifies all of its motion sensors.
+ var/motion_monitored = FALSE
/// Size of the area in open turfs, only calculated for indoors areas.
var/areasize = 0
@@ -163,7 +168,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/New()
// This interacts with the map loader, so it needs to be set immediately
// rather than waiting for atoms to initialize.
- if (area_flags & UNIQUE_AREA)
+ if (area_flags_mapping & UNIQUE_AREA)
GLOB.areas_by_type[type] = src
GLOB.areas += src
energy_usage = new /list(AREA_USAGE_LEN) // Some atoms would like to use power in Initialize()
@@ -210,6 +215,8 @@ GLOBAL_LIST_EMPTY(teleportlocs)
/area/LateInitialize()
power_change() // all machines set to current power level, also updates icon
update_beauty()
+ if(motion_monitored)
+ AddComponent(/datum/component/monitored_area)
/// Generate turfs, including cool cave wall gen
/area/proc/RunTerrainGeneration()
diff --git a/code/game/area/areas/ai_monitored.dm b/code/game/area/areas/ai_monitored.dm
deleted file mode 100644
index 4e63479987e855..00000000000000
--- a/code/game/area/areas/ai_monitored.dm
+++ /dev/null
@@ -1,129 +0,0 @@
-// Specific AI monitored areas
-
-// Stub defined ai_monitored.dm
-/area/station/ai_monitored
-
-/area/station/ai_monitored/turret_protected
-
-// AI
-/area/station/ai_monitored
- icon_state = "ai"
- sound_environment = SOUND_AREA_STANDARD_STATION
-
-/area/station/ai_monitored/aisat/exterior
- name = "\improper AI Satellite Exterior"
- icon_state = "ai"
- airlock_wires = /datum/wires/airlock/ai
-
-/area/station/ai_monitored/command/storage/satellite
- name = "\improper AI Satellite Maint"
- icon_state = "ai_storage"
- ambience_index = AMBIENCE_DANGER
- airlock_wires = /datum/wires/airlock/ai
-
-// Turret protected
-/area/station/ai_monitored/turret_protected
- ambientsounds = list('sound/ambience/engineering/ambitech.ogg', 'sound/ambience/engineering/ambitech2.ogg', 'sound/ambience/engineering/ambiatmos.ogg', 'sound/ambience/engineering/ambiatmos2.ogg')
- ///Some sounds (like the space jam) are terrible when on loop. We use this variable to add it to other AI areas, but override it to keep it from the AI's core.
- var/ai_will_not_hear_this = list('sound/ambience/misc/ambimalf.ogg')
- airlock_wires = /datum/wires/airlock/ai
-
-/area/station/ai_monitored/turret_protected/Initialize(mapload)
- . = ..()
- if(ai_will_not_hear_this)
- ambientsounds += ai_will_not_hear_this
-
-/area/station/ai_monitored/turret_protected/ai_upload
- name = "\improper AI Upload Chamber"
- icon_state = "ai_upload"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/station/ai_monitored/turret_protected/ai_upload_foyer
- name = "\improper AI Upload Access"
- icon_state = "ai_upload_foyer"
- sound_environment = SOUND_AREA_SMALL_ENCLOSED
-
-/area/station/ai_monitored/turret_protected/ai
- name = "\improper AI Chamber"
- icon_state = "ai_chamber"
- ai_will_not_hear_this = null
-
-/area/station/ai_monitored/turret_protected/aisat
- name = "\improper AI Satellite"
- icon_state = "ai"
- sound_environment = SOUND_ENVIRONMENT_ROOM
-
-/area/station/ai_monitored/turret_protected/aisat/atmos
- name = "\improper AI Satellite Atmos"
- icon_state = "ai"
-
-/area/station/ai_monitored/turret_protected/aisat/foyer
- name = "\improper AI Satellite Foyer"
- icon_state = "ai_foyer"
-
-/area/station/ai_monitored/turret_protected/aisat/service
- name = "\improper AI Satellite Service"
- icon_state = "ai"
-
-/area/station/ai_monitored/turret_protected/aisat/hallway
- name = "\improper AI Satellite Hallway"
- icon_state = "ai"
-
-/area/station/ai_monitored/turret_protected/aisat/teleporter
- name ="\improper AI Satellite Teleporter"
- icon_state = "ai"
-
-/area/station/ai_monitored/turret_protected/aisat/equipment
- name ="\improper AI Satellite Equipment"
- icon_state = "ai"
-
-/area/station/ai_monitored/turret_protected/aisat/maint
- name = "\improper AI Satellite Maintenance"
- icon_state = "ai_maint"
-
-/area/station/ai_monitored/turret_protected/aisat/uppernorth
- name = "\improper AI Satellite Upper Fore"
- icon_state = "ai"
-
-/area/station/ai_monitored/turret_protected/aisat/uppersouth
- name = "\improper AI Satellite Upper Aft"
- icon_state = "ai"
-
-/area/station/ai_monitored/turret_protected/aisat_interior
- name = "\improper AI Satellite Antechamber"
- icon_state = "ai_interior"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
-
-/area/station/ai_monitored/turret_protected/ai_sat_ext_as
- name = "\improper AI Sat Ext"
- icon_state = "ai_sat_east"
-
-/area/station/ai_monitored/turret_protected/ai_sat_ext_ap
- name = "\improper AI Sat Ext"
- icon_state = "ai_sat_west"
-
-// Station specific ai monitored rooms, move here for consistency
-
-//Command - AI Monitored
-/area/station/ai_monitored/command/storage/eva
- name = "EVA Storage"
- icon_state = "eva"
- ambience_index = AMBIENCE_DANGER
-
-/area/station/ai_monitored/command/storage/eva/upper
- name = "Upper EVA Storage"
-
-/area/station/ai_monitored/command/nuke_storage
- name = "\improper Vault"
- icon_state = "nuke_storage"
- airlock_wires = /datum/wires/airlock/command
-
-//Security - AI Monitored
-/area/station/ai_monitored/security/armory
- name = "\improper Armory"
- icon_state = "armory"
- ambience_index = AMBIENCE_DANGER
- airlock_wires = /datum/wires/airlock/security
-
-/area/station/ai_monitored/security/armory/upper
- name = "Upper Armory"
diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm
index 648ef4c8d31606..39d7ebce1dbe2a 100644
--- a/code/game/area/areas/away_content.dm
+++ b/code/game/area/areas/away_content.dm
@@ -11,7 +11,6 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
default_gravity = STANDARD_GRAVITY
ambience_index = AMBIENCE_AWAY
sound_environment = SOUND_ENVIRONMENT_ROOM
- area_flags = UNIQUE_AREA
/area/awaymission/museum
name = "Nanotrasen Museum"
@@ -33,11 +32,11 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
name = "Super Secret Room"
static_lighting = FALSE
base_lighting_alpha = 255
- area_flags = UNIQUE_AREA|NOTELEPORT
+ area_flags = NOTELEPORT
default_gravity = STANDARD_GRAVITY
/area/awaymission/secret
- area_flags = UNIQUE_AREA|NOTELEPORT|HIDDEN_AREA
+ area_flags = NOTELEPORT|HIDDEN_AREA
/area/awaymission/secret/unpowered
always_unpowered = TRUE
diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm
index 06a87345f9cf51..58d0439eed3377 100644
--- a/code/game/area/areas/centcom.dm
+++ b/code/game/area/areas/centcom.dm
@@ -8,7 +8,7 @@
static_lighting = TRUE
requires_power = FALSE
default_gravity = STANDARD_GRAVITY
- area_flags = UNIQUE_AREA | NOTELEPORT
+ area_flags = NOTELEPORT
flags_1 = NONE
// This is just to define the category
@@ -142,7 +142,6 @@
name = "Thunderdome Observation"
icon_state = "thunder_observe"
-
// ENEMY
// Wizard
@@ -152,16 +151,15 @@
static_lighting = TRUE
requires_power = FALSE
default_gravity = STANDARD_GRAVITY
- area_flags = UNIQUE_AREA | NOTELEPORT
+ area_flags = NOTELEPORT
flags_1 = NONE
-
//Abductors
/area/centcom/abductor_ship
name = "Abductor Ship"
icon_state = "abductor_ship"
requires_power = FALSE
- area_flags = UNIQUE_AREA | NOTELEPORT
+ area_flags = NOTELEPORT
static_lighting = FALSE
base_lighting_alpha = 255
default_gravity = STANDARD_GRAVITY
@@ -173,7 +171,7 @@
icon_state = "syndie-ship"
requires_power = FALSE
default_gravity = STANDARD_GRAVITY
- area_flags = UNIQUE_AREA | NOTELEPORT
+ area_flags = NOTELEPORT
flags_1 = NONE
ambience_index = AMBIENCE_DANGER
@@ -218,12 +216,11 @@
name = "Mafia Minigame"
icon_state = "mafia"
static_lighting = FALSE
-
base_lighting_alpha = 255
requires_power = FALSE
default_gravity = STANDARD_GRAVITY
flags_1 = NONE
- area_flags = BLOCK_SUICIDE | UNIQUE_AREA
+ area_flags = BLOCK_SUICIDE
//CAPTURE THE FLAG
/area/centcom/ctf
@@ -234,7 +231,7 @@
base_lighting_alpha = 255
default_gravity = STANDARD_GRAVITY
flags_1 = NONE
- area_flags = UNIQUE_AREA | NOTELEPORT | NO_DEATH_MESSAGE | BLOCK_SUICIDE
+ area_flags = NOTELEPORT | NO_DEATH_MESSAGE | BLOCK_SUICIDE
/area/centcom/ctf/control_room
name = "Control Room A"
@@ -278,7 +275,6 @@
icon_state = "asteroid"
requires_power = FALSE
default_gravity = STANDARD_GRAVITY
- area_flags = UNIQUE_AREA
ambience_index = AMBIENCE_MINING
flags_1 = CAN_BE_DIRTY_1
sound_environment = SOUND_AREA_ASTEROID
@@ -288,7 +284,7 @@
ambience_index = AMBIENCE_RUINS
always_unpowered = FALSE
requires_power = TRUE
- area_flags = UNIQUE_AREA | BLOBS_ALLOWED
+ area_flags = BLOBS_ALLOWED
/area/centcom/asteroid/nearstation/bomb_site
name = "\improper Bomb Testing Asteroid"
diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm
index 9f0bcfab8f6ddf..3d97da72c39a27 100644
--- a/code/game/area/areas/mining.dm
+++ b/code/game/area/areas/mining.dm
@@ -3,7 +3,8 @@
icon = 'icons/area/areas_station.dmi'
icon_state = "mining"
default_gravity = STANDARD_GRAVITY
- area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | CULT_PERMITTED
+ area_flags = VALID_TERRITORY | CULT_PERMITTED
+ area_flags_mapping = UNIQUE_AREA | FLORA_ALLOWED
ambient_buzz = 'sound/ambience/lavaland/magma.ogg'
/area/mine/lobby
@@ -132,7 +133,7 @@
icon_state = "mining"
default_gravity = STANDARD_GRAVITY
flags_1 = NONE
- area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED
+ area_flags = VALID_TERRITORY | FLORA_ALLOWED
sound_environment = SOUND_AREA_LAVALAND
ambient_buzz = 'sound/ambience/lavaland/magma.ogg'
allow_shuttle_docking = TRUE
@@ -146,7 +147,7 @@
power_light = FALSE
requires_power = TRUE
ambience_index = AMBIENCE_MINING
- area_flags = VALID_TERRITORY | UNIQUE_AREA
+ area_flags = VALID_TERRITORY
/area/lavaland/underground
name = "Lavaland Caves"
@@ -157,7 +158,6 @@
power_equip = FALSE
power_light = FALSE
ambience_index = AMBIENCE_MINING
- area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED
/area/lavaland/surface/outdoors
name = "Lavaland Wastes"
@@ -165,12 +165,14 @@
/area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here
icon_state = "unexplored"
- area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED
+ area_flags = VALID_TERRITORY
+ area_flags_mapping = UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED
map_generator = /datum/map_generator/cave_generator/lavaland
/area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here
icon_state = "danger"
- area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
+ area_flags = VALID_TERRITORY
+ area_flags_mapping = parent_type::area_flags_mapping | MEGAFAUNA_SPAWN_ALLOWED
/// Same thing as parent, but uses a different map generator for the icemoon ruin that needs it.
/area/lavaland/surface/outdoors/unexplored/danger/no_ruins
@@ -178,9 +180,7 @@
/area/lavaland/surface/outdoors/explored
name = "Lavaland Labor Camp"
- area_flags = VALID_TERRITORY | UNIQUE_AREA
-
-
+ area_flags = VALID_TERRITORY
/**********************Ice Moon Areas**************************/
@@ -189,7 +189,7 @@
icon_state = "mining"
default_gravity = STANDARD_GRAVITY
flags_1 = NONE
- area_flags = UNIQUE_AREA | FLORA_ALLOWED
+ area_flags_mapping = UNIQUE_AREA | FLORA_ALLOWED
ambience_index = AMBIENCE_ICEMOON
sound_environment = SOUND_AREA_ICEMOON
ambient_buzz = 'sound/ambience/lavaland/magma.ogg'
@@ -203,7 +203,6 @@
power_equip = FALSE
power_light = FALSE
requires_power = TRUE
- area_flags = UNIQUE_AREA | FLORA_ALLOWED
/area/icemoon/surface/outdoors // parent that defines if something is on the exterior of the station.
name = "Icemoon Wastes"
@@ -227,33 +226,33 @@
if(HAS_TRAIT(SSstation, STATION_TRAIT_FORESTED))
map_generator = /datum/map_generator/cave_generator/icemoon/surface/forested
// flip this on, the generator has already disabled dangerous fauna
- area_flags = MOB_SPAWN_ALLOWED | FLORA_ALLOWED
+ area_flags_mapping = MOB_SPAWN_ALLOWED | FLORA_ALLOWED
/area/icemoon/surface/outdoors/always_forested
icon_state = "forest"
map_generator = /datum/map_generator/cave_generator/icemoon/surface/forested
- area_flags = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
+ area_flags_mapping = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
/area/icemoon/surface/outdoors/rocky
icon_state = "rocky"
map_generator = /datum/map_generator/cave_generator/icemoon/surface/rocky
- area_flags = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
+ area_flags_mapping = MOB_SPAWN_ALLOWED | FLORA_ALLOWED | CAVES_ALLOWED
/area/icemoon/surface/outdoors/noteleport // for places like the cursed spring water
- area_flags = UNIQUE_AREA | FLORA_ALLOWED | NOTELEPORT
+ area_flags_mapping = parent_type::area_flags_mapping | NOTELEPORT
/area/icemoon/surface/outdoors/noruins // when you want random generation without the chance of getting ruins
icon_state = "noruins"
- area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
- map_generator = /datum/map_generator/cave_generator/icemoon/surface/noruins
+ area_flags_mapping = parent_type::area_flags_mapping | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
+ map_generator = /datum/map_generator/cave_generator/icemoon/surface/noruins
/area/icemoon/surface/outdoors/labor_camp
name = "Icemoon Labor Camp"
- area_flags = UNIQUE_AREA
+ area_flags_mapping = /area::area_flags_mapping
/area/icemoon/surface/outdoors/unexplored //monsters and ruins spawn here
icon_state = "unexplored"
- area_flags = UNIQUE_AREA | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
+ area_flags_mapping = parent_type::area_flags_mapping | MOB_SPAWN_ALLOWED | CAVES_ALLOWED
/area/icemoon/surface/outdoors/unexplored/rivers // rivers spawn here
icon_state = "danger"
@@ -263,10 +262,10 @@
. = ..()
if(HAS_TRAIT(SSstation, STATION_TRAIT_FORESTED))
map_generator = /datum/map_generator/cave_generator/icemoon/surface/forested
- area_flags |= MOB_SPAWN_ALLOWED //flip this on, the generator has already disabled dangerous fauna
+ area_flags_mapping |= MOB_SPAWN_ALLOWED //flip this on, the generator has already disabled dangerous fauna
/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters
- area_flags = UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED
+ area_flags_mapping = /area/icemoon/::area_flags_mapping | CAVES_ALLOWED
/area/icemoon/underground
name = "Icemoon Caves"
@@ -276,16 +275,15 @@
power_environ = FALSE
power_equip = FALSE
power_light = FALSE
- area_flags = UNIQUE_AREA | FLORA_ALLOWED
/area/icemoon/underground/unexplored // mobs and megafauna and ruins spawn here
name = "Icemoon Caves"
icon_state = "unexplored"
- area_flags = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
+ area_flags_mapping = CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED
/area/icemoon/underground/unexplored/no_rivers
icon_state = "norivers"
- area_flags = CAVES_ALLOWED | FLORA_ALLOWED // same rules as "shoreline" turfs since we might need this to pull double-duty
+ area_flags_mapping = CAVES_ALLOWED | FLORA_ALLOWED // same rules as "shoreline" turfs since we might need this to pull double-duty
map_generator = /datum/map_generator/cave_generator/icemoon
/area/icemoon/underground/unexplored/rivers // rivers spawn here
@@ -297,15 +295,15 @@
/area/icemoon/underground/unexplored/rivers/deep/shoreline //use this for when you don't want mobs to spawn in certain areas in the "deep" portions. Think adjacent to rivers or station structures.
icon_state = "shore"
- area_flags = UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED
+ area_flags_mapping = /area/icemoon/::area_flags_mapping | CAVES_ALLOWED
/area/icemoon/underground/explored // ruins can't spawn here
name = "Icemoon Underground"
- area_flags = UNIQUE_AREA
+ area_flags_mapping = /area::area_flags_mapping
/area/icemoon/underground/explored/graveyard
name = "Graveyard"
- area_flags = UNIQUE_AREA
+ area_flags_mapping = /area::area_flags_mapping
ambience_index = AMBIENCE_SPOOKY
icon = 'icons/area/areas_station.dmi'
icon_state = "graveyard"
diff --git a/code/game/area/areas/misc.dm b/code/game/area/areas/misc.dm
index de1cbff381bfc1..ac66943d5d1cd8 100644
--- a/code/game/area/areas/misc.dm
+++ b/code/game/area/areas/misc.dm
@@ -10,7 +10,7 @@
power_light = FALSE
power_equip = FALSE
power_environ = FALSE
- area_flags = UNIQUE_AREA|NO_GRAVITY
+ area_flags = NO_GRAVITY
outdoors = TRUE
ambience_index = AMBIENCE_SPACE
flags_1 = CAN_BE_DIRTY_1
diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm
index f2ecc7ac73e3eb..92fff19386da4d 100644
--- a/code/game/area/areas/ruins/_ruins.dm
+++ b/code/game/area/areas/ruins/_ruins.dm
@@ -5,7 +5,7 @@
icon = 'icons/area/areas_ruins.dmi'
icon_state = "ruins"
default_gravity = STANDARD_GRAVITY
- area_flags = HIDDEN_AREA | UNIQUE_AREA
+ area_flags = HIDDEN_AREA
ambience_index = AMBIENCE_RUINS
flags_1 = CAN_BE_DIRTY_1
sound_environment = SOUND_ENVIRONMENT_STONEROOM
diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm
index 7dff4bdba55182..80f8f6bb33ae7b 100644
--- a/code/game/area/areas/ruins/icemoon.dm
+++ b/code/game/area/areas/ruins/icemoon.dm
@@ -59,10 +59,10 @@
sound_environment = SOUND_AREA_SMALL_ENCLOSED
ambience_index = AMBIENCE_DANGER
area_flags = NOTELEPORT
+ area_flags_mapping = NONE
mood_bonus = -10
mood_message = "What the fuck."
-
/area/ruin/planetengi
name = "\improper Engineering Outpost"
@@ -115,11 +115,13 @@
/area/ruin/outpost31/lab
name = "\improper Outpost 31 Lab"
area_flags = NOTELEPORT //megafauna arena
+ area_flags_mapping = NONE
requires_power = FALSE
/area/ruin/outpost31/lootroom
name = "\improper Outpost 31 Secondary Storage"
area_flags = NOTELEPORT //megafauna loot room
+ area_flags_mapping = NONE
requires_power = FALSE
/area/ruin/outpost31/recroom
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index 4e806bf1c1030e..cef9e3d308a36b 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -43,6 +43,7 @@
/area/ruin/unpowered/cultaltar
name = "\improper Cult Altar"
area_flags = CULT_PERMITTED
+ area_flags_mapping = NONE
ambience_index = AMBIENCE_SPOOKY
/area/ruin/thelizardsgas_lavaland
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
index c2e32c86bee04b..24bd482633cee9 100644
--- a/code/game/area/areas/ruins/space.dm
+++ b/code/game/area/areas/ruins/space.dm
@@ -2,7 +2,8 @@
/area/ruin/space
default_gravity = ZERO_GRAVITY
- area_flags = UNIQUE_AREA
+ area_flags = NONE
+ area_flags_mapping = UNIQUE_AREA
/area/ruin/space/unpowered
always_unpowered = TRUE
@@ -16,11 +17,10 @@
/area/ruin/space/has_grav/powered
requires_power = FALSE
-
// Ruin solars define, /area/solars was moved to /area/station/solars, causing the solars specific areas to lose their properties
/area/ruin/space/solars
requires_power = FALSE
- area_flags = UNIQUE_AREA
+ area_flags = NONE
flags_1 = NONE
ambience_index = AMBIENCE_ENGI
airlock_wires = /datum/wires/airlock/engineering
@@ -310,7 +310,7 @@
icon = 'icons/area/areas_ruins.dmi' // Solars inheriet areas_misc.dmi, not areas_ruin.dmi
icon_state = "os_charlie_solars"
requires_power = FALSE
- area_flags = UNIQUE_AREA
+ area_flags = NONE
sound_environment = SOUND_AREA_SPACE
/area/ruin/space/ancientstation/charlie/storage
@@ -534,7 +534,7 @@
/area/ruin/space/djstation/solars
name = "\improper DJ Station Solars"
icon_state = "DJ"
- area_flags = UNIQUE_AREA
+ area_flags = NONE
default_gravity = ZERO_GRAVITY
/area/ruin/space/djstation/service
@@ -582,7 +582,7 @@
/area/ruin/space/has_grav/hellfactoryoffice
name = "\improper Hell Factory Office"
- area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | NOTELEPORT
+ area_flags = VALID_TERRITORY | BLOBS_ALLOWED | NOTELEPORT
//Ruin of Spinward Smoothies
@@ -600,7 +600,7 @@
/area/ruin/space/has_grav/powered/biooutpost
name = "\improper Bioresearch Outpost"
- area_flags = UNIQUE_AREA | NOTELEPORT
+ area_flags = NOTELEPORT
/area/ruin/space/has_grav/powered/biooutpost/vault
name = "\improper Bioresearch Outpost Secure Testing"
diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm
index c37d53de151794..9a651fb5e3dcff 100644
--- a/code/game/area/areas/shuttles.dm
+++ b/code/game/area/areas/shuttles.dm
@@ -10,6 +10,7 @@
always_unpowered = FALSE
// Loading the same shuttle map at a different time will produce distinct area instances.
area_flags = NONE
+ area_flags_mapping = NONE
icon = 'icons/area/areas_station.dmi'
icon_state = "shuttle"
flags_1 = CAN_BE_DIRTY_1
@@ -120,11 +121,9 @@
static_lighting = FALSE
base_lighting_alpha = 255
-
/area/shuttle/arrival
name = "Arrival Shuttle"
- area_flags = UNIQUE_AREA// SSjob refers to this area for latejoiners
-
+ area_flags_mapping = UNIQUE_AREA // SSjob refers to this area for latejoiners
/area/shuttle/arrival/on_joining_game(mob/living/boarder)
if(SSshuttle.arrivals?.mode == SHUTTLE_CALL)
@@ -133,22 +132,17 @@
boarder.playsound_local(get_turf(boarder), 'sound/announcer/ApproachingTG.ogg', 25)
boarder.update_parallax_teleport()
-
/area/shuttle/pod_1
name = "Escape Pod One"
- area_flags = NONE
/area/shuttle/pod_2
name = "Escape Pod Two"
- area_flags = NONE
/area/shuttle/pod_3
name = "Escape Pod Three"
- area_flags = NONE
/area/shuttle/pod_4
name = "Escape Pod Four"
- area_flags = NONE
/area/shuttle/mining
name = "Mining Shuttle"
@@ -166,10 +160,9 @@
/area/shuttle/escape
name = "Emergency Shuttle"
- area_flags = BLOBS_ALLOWED
+ area_flags = CULT_PERMITTED
area_limited_icon_smoothing = /area/shuttle/escape
flags_1 = CAN_BE_DIRTY_1
- area_flags = CULT_PERMITTED
/area/shuttle/escape/backup
name = "Backup Emergency Shuttle"
diff --git a/code/game/area/areas/station/ai.dm b/code/game/area/areas/station/ai.dm
new file mode 100644
index 00000000000000..ff12a728f282a8
--- /dev/null
+++ b/code/game/area/areas/station/ai.dm
@@ -0,0 +1,93 @@
+/area/station/ai
+ icon_state = "ai"
+ sound_environment = SOUND_AREA_STANDARD_STATION
+ airlock_wires = /datum/wires/airlock/ai
+ motion_monitored = TRUE
+
+ ambientsounds = list('sound/ambience/engineering/ambitech.ogg', 'sound/ambience/engineering/ambitech2.ogg', 'sound/ambience/engineering/ambiatmos.ogg', 'sound/ambience/engineering/ambiatmos2.ogg')
+ /// Disables ambientsounds if TRUE. Used for mundane AI locations like the exterior or storage room.
+ var/secure = TRUE
+ /// Some sounds (like the space jam) are terrible when on loop.
+ /// We use this variable to add it to other AI areas, but override it to keep it from the AI's core.
+ var/annoying_ambience = list('sound/ambience/misc/ambimalf.ogg')
+
+/area/station/ai/Initialize(mapload)
+ . = ..()
+ if(!secure)
+ ambientsounds = null
+ return
+ if(annoying_ambience)
+ ambientsounds += annoying_ambience
+
+/* --------- */
+
+/area/station/ai/upload
+ name = "\improper AI Upload Area"
+ icon_state = "unknown" // this is supposed to be for sorting, but if you want to make an upload hallway you can change this
+ sound_environment = SOUND_AREA_SMALL_ENCLOSED
+
+/area/station/ai/upload/chamber
+ name = "\improper AI Upload Chamber"
+ icon_state = "ai_upload"
+
+/area/station/ai/upload/foyer
+ name = "\improper AI Upload Access"
+ icon_state = "ai_upload_foyer"
+
+/* SATELLITE */
+
+/area/station/ai/satellite
+ name = "\improper AI Satellite"
+ sound_environment = SOUND_ENVIRONMENT_ROOM
+
+/area/station/ai/satellite/chamber
+ name = "\improper AI Chamber"
+ icon_state = "ai_chamber"
+ annoying_ambience = null
+
+/area/station/ai/satellite/exterior
+ name = "\improper AI Satellite Exterior"
+ secure = FALSE
+
+/area/station/ai/satellite/maintenance
+ name = "\improper AI Satellite Maintenance"
+ icon_state = "ai_maint"
+
+/area/station/ai/satellite/maintenance/storage
+ name = "\improper AI Satellite Storage"
+ icon_state = "ai_storage"
+ ambience_index = AMBIENCE_DANGER
+
+/* Interior */
+
+/area/station/ai/satellite/interior
+ name = "\improper AI Satellite Antechamber"
+ icon_state = "ai_interior"
+ sound_environment = SOUND_AREA_LARGE_ENCLOSED
+
+/area/station/ai/satellite/foyer
+ name = "\improper AI Satellite Foyer"
+ icon_state = "ai_foyer"
+
+/area/station/ai/satellite/hallway
+ name = "\improper AI Satellite Hallway"
+
+/area/station/ai/satellite/uppernorth
+ name = "\improper AI Satellite Upper Fore"
+
+/area/station/ai/satellite/uppersouth
+ name = "\improper AI Satellite Upper Aft"
+
+/* Functions */
+
+/area/station/ai/satellite/atmos
+ name = "\improper AI Satellite Atmospherics"
+
+/area/station/ai/satellite/service
+ name = "\improper AI Satellite Service"
+
+/area/station/ai/satellite/teleporter
+ name ="\improper AI Satellite Teleporter"
+
+/area/station/ai/satellite/equipment
+ name ="\improper AI Satellite Equipment"
diff --git a/code/game/area/areas/station/command.dm b/code/game/area/areas/station/command.dm
index ee4325d94aef82..30f126dc42cb2e 100644
--- a/code/game/area/areas/station/command.dm
+++ b/code/game/area/areas/station/command.dm
@@ -36,6 +36,22 @@
icon_state = "command"
sound_environment = SOUND_AREA_SMALL_ENCLOSED
+// Monitored areas
+
+/area/station/command/eva
+ name = "EVA Storage"
+ icon_state = "eva"
+ ambience_index = AMBIENCE_DANGER
+ motion_monitored = TRUE
+
+/area/station/command/eva/upper
+ name = "Upper EVA Storage"
+
+/area/station/command/vault
+ name = "\improper Vault"
+ icon_state = "nuke_storage" // someone should change this, not me though
+ motion_monitored = TRUE
+
/*
* Command Head Areas
*/
diff --git a/code/game/area/areas/station/common.dm b/code/game/area/areas/station/common.dm
index 2280215ab6ee46..1b6eba4dc25e31 100644
--- a/code/game/area/areas/station/common.dm
+++ b/code/game/area/areas/station/common.dm
@@ -2,7 +2,7 @@
name = "\improper Crew Facilities"
icon_state = "commons"
sound_environment = SOUND_AREA_STANDARD_STATION
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
/*
* Dorm Areas
diff --git a/code/game/area/areas/station/engineering.dm b/code/game/area/areas/station/engineering.dm
index 71fe6024d88780..feb565ecd53463 100644
--- a/code/game/area/areas/station/engineering.dm
+++ b/code/game/area/areas/station/engineering.dm
@@ -26,7 +26,7 @@
/*outside atmos*/
/area/station/engineering/atmos/space_catwalk
name = "\improper Atmospherics Space Catwalk"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
sound_environment = SOUND_AREA_SPACE
ambience_index = AMBIENCE_SPACE
@@ -63,7 +63,7 @@
/area/station/engineering/atmospherics_engine
name = "\improper Atmospherics Engine"
icon_state = "atmos_engine"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
/area/station/engineering/lobby
name = "\improper Engineering Lobby"
@@ -72,7 +72,7 @@
/area/station/engineering/supermatter
name = "\improper Supermatter Engine"
icon_state = "engine_sm"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
sound_environment = SOUND_AREA_SMALL_ENCLOSED
/area/station/engineering/supermatter/waste
@@ -119,7 +119,7 @@
/area/station/engineering/storage/tcomms
name = "Telecomms Storage"
icon_state = "tcom_storage"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
/*
* Construction Areas
diff --git a/code/game/area/areas/station/hallway.dm b/code/game/area/areas/station/hallway.dm
index 9512f20c709c1e..12a5ba6816b40f 100644
--- a/code/game/area/areas/station/hallway.dm
+++ b/code/game/area/areas/station/hallway.dm
@@ -83,7 +83,7 @@
/area/station/hallway/secondary/entry
name = "\improper Arrival Shuttle Hallway"
icon_state = "entry"
- area_flags = UNIQUE_AREA | EVENT_PROTECTED
+ area_flags = EVENT_PROTECTED
/area/station/hallway/secondary/dock
name = "\improper Secondary Station Dock Hallway"
diff --git a/code/game/area/areas/station/maintenance.dm b/code/game/area/areas/station/maintenance.dm
index 5e636719e7a092..a6fa76cd80e9ad 100644
--- a/code/game/area/areas/station/maintenance.dm
+++ b/code/game/area/areas/station/maintenance.dm
@@ -1,7 +1,7 @@
/area/station/maintenance
name = "Generic Maintenance"
ambience_index = AMBIENCE_MAINT
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
airlock_wires = /datum/wires/airlock/maint
sound_environment = SOUND_AREA_TUNNEL_ENCLOSED
forced_ambience = TRUE
@@ -94,7 +94,7 @@
/area/station/maintenance/department/science/xenobiology
name = "Xenobiology Maintenance"
icon_state = "xenomaint"
- area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | XENOBIOLOGY_COMPATIBLE | CULT_PERMITTED
+ area_flags = VALID_TERRITORY | BLOBS_ALLOWED | XENOBIOLOGY_COMPATIBLE | CULT_PERMITTED
/*
* Generic Maintenance Tunnels
@@ -165,6 +165,9 @@
name = "Central Starboard Maintenance"
icon_state = "centralstarboardmaint"
+/area/station/maintenance/starboard/central/upper
+ name = "Upper Central Starboard Maintenance"
+
/area/station/maintenance/starboard/greater
name = "Greater Starboard Maintenance"
icon_state = "greaterstarboardmaint"
@@ -177,10 +180,16 @@
name = "Aft Starboard Maintenance"
icon_state = "asmaint"
+/area/station/maintenance/starboard/aft/upper
+ name = "Upper Aft Starboard Maintenance"
+
/area/station/maintenance/starboard/fore
name = "Fore Starboard Maintenance"
icon_state = "fsmaint"
+/area/station/maintenance/starboard/fore/upper
+ name = "Upper Fore Starboard Maintenance"
+
/area/station/maintenance/port
name = "Port Maintenance"
icon_state = "portmaint"
diff --git a/code/game/area/areas/station/misc.dm b/code/game/area/areas/station/misc.dm
index be99950c7361e8..fde6b00bf5f2f0 100644
--- a/code/game/area/areas/station/misc.dm
+++ b/code/game/area/areas/station/misc.dm
@@ -30,6 +30,6 @@
power_light = FALSE
requires_power = TRUE
ambience_index = AMBIENCE_MINING
- area_flags = UNIQUE_AREA
+ area_flags = NONE
outdoors = TRUE
allow_shuttle_docking = TRUE
diff --git a/code/game/area/areas/station/science.dm b/code/game/area/areas/station/science.dm
index 57623ee6183dea..b64e7efe75a452 100644
--- a/code/game/area/areas/station/science.dm
+++ b/code/game/area/areas/station/science.dm
@@ -114,23 +114,23 @@
/area/station/science/ordnance/burnchamber
name = "\improper Ordnance Burn Chamber"
icon_state = "ord_burn"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
/area/station/science/ordnance/freezerchamber
name = "\improper Ordnance Freezer Chamber"
icon_state = "ord_freeze"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
// Room for equipments and such
/area/station/science/ordnance/testlab
name = "\improper Ordnance Testing Lab"
icon_state = "ord_test"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED
/area/station/science/ordnance/bomb
name = "\improper Ordnance Bomb Site"
icon_state = "ord_boom"
- area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED | NO_GRAVITY
+ area_flags = BLOBS_ALLOWED | CULT_PERMITTED | NO_GRAVITY
/area/station/science/ordnance/bomb/planet
area_flags = /area/station/science/ordnance/bomb::area_flags & ~NO_GRAVITY
diff --git a/code/game/area/areas/station/security.dm b/code/game/area/areas/station/security.dm
index 1faf889684cc58..8c15638c7f02b0 100644
--- a/code/game/area/areas/station/security.dm
+++ b/code/game/area/areas/station/security.dm
@@ -79,6 +79,15 @@
icon_state = "evidence"
sound_environment = SOUND_AREA_SMALL_ENCLOSED
+/area/station/security/armory
+ name = "\improper Armory"
+ icon_state = "armory"
+ ambience_index = AMBIENCE_DANGER
+ motion_monitored = TRUE
+
+/area/station/security/armory/upper
+ name = "Upper Armory"
+
/area/station/security/detectives_office
name = "\improper Detective's Office"
icon_state = "detective"
@@ -185,7 +194,7 @@
/area/station/security/prison
name = "\improper Prison Wing"
icon_state = "sec_prison"
- area_flags = VALID_TERRITORY | BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
+ area_flags = VALID_TERRITORY | BLOBS_ALLOWED | CULT_PERMITTED | PERSISTENT_ENGRAVINGS
//Rad proof
/area/station/security/prison/toilet
diff --git a/code/game/area/areas/station/service.dm b/code/game/area/areas/station/service.dm
index 23fe166616d48a..35540656326452 100644
--- a/code/game/area/areas/station/service.dm
+++ b/code/game/area/areas/station/service.dm
@@ -77,7 +77,7 @@
mood_bonus = 5
mood_message = "I love being in the library!"
mood_trait = TRAIT_INTROVERT
- area_flags = CULT_PERMITTED | BLOBS_ALLOWED | UNIQUE_AREA
+ area_flags = CULT_PERMITTED | BLOBS_ALLOWED
sound_environment = SOUND_AREA_LARGE_SOFTFLOOR
/area/station/service/library/garden
@@ -180,7 +180,7 @@
/area/station/service/janitor
name = "\improper Custodial Closet"
icon_state = "janitor"
- area_flags = CULT_PERMITTED | BLOBS_ALLOWED | UNIQUE_AREA
+ area_flags = CULT_PERMITTED | BLOBS_ALLOWED
sound_environment = SOUND_AREA_SMALL_ENCLOSED
/area/station/service/barber
diff --git a/code/game/area/areas/station/solars.dm b/code/game/area/areas/station/solars.dm
index 8d3a81420e7d76..569a7f0a169e8b 100644
--- a/code/game/area/areas/station/solars.dm
+++ b/code/game/area/areas/station/solars.dm
@@ -5,7 +5,7 @@
/area/station/solars
icon_state = "panels"
requires_power = FALSE
- area_flags = UNIQUE_AREA|NO_GRAVITY
+ area_flags = NO_GRAVITY
flags_1 = NONE
ambience_index = AMBIENCE_ENGI
airlock_wires = /datum/wires/airlock/engineering
@@ -44,7 +44,7 @@
/area/station/solars/starboard/fore/asteriod
name = "\improper Starboard Bow Asteriod Solar Array"
icon_state = "panelsFS"
- area_flags = UNIQUE_AREA // solar areas directly on asteriod have gravity
+ area_flags = NONE // solar areas directly on asteriod have gravity
/area/station/solars/port
name = "\improper Port Solar Array"
@@ -53,7 +53,7 @@
/area/station/solars/port/asteriod
name = "\improper Port Asteriod Solar Array"
icon_state = "panelsP"
- area_flags = UNIQUE_AREA // solar areas directly on asteriod have gravity
+ area_flags = NONE // solar areas directly on asteriod have gravity
/area/station/solars/port/aft
name = "\improper Port Quarter Solar Array"
diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm
index d0b550af4e9f49..e1167855f86029 100644
--- a/code/game/atom/_atom.dm
+++ b/code/game/atom/_atom.dm
@@ -346,8 +346,8 @@
/atom/proc/on_craft_completion(list/components, datum/crafting_recipe/current_recipe, atom/crafter)
SHOULD_CALL_PARENT(TRUE)
SEND_SIGNAL(src, COMSIG_ATOM_ON_CRAFT, components, current_recipe)
- var/list/remaining_parts = current_recipe?.parts?.Copy()
- var/list/parts_by_type = remaining_parts?.Copy()
+ var/list/remaining_parts = LAZYLISTDUPLICATE(current_recipe?.parts)
+ var/list/parts_by_type = LAZYLISTDUPLICATE(remaining_parts)
for(var/parttype in parts_by_type) //necessary for our is_type_in_list() call with the zebra arg set to true
parts_by_type[parttype] = parttype
for(var/atom/movable/movable as anything in components) // machinery or structure objects in the list are guaranteed to be used up. We only check items.
@@ -429,7 +429,7 @@
for(var/datum/reagent/current_reagent as anything in reagents)
. |= current_reagent.expose_atom(src, reagents[current_reagent], methods)
-/// Are you allowed to drop this atom
+/// Are you allowed to drop stuff inside this atom
/atom/proc/AllowDrop()
return FALSE
diff --git a/code/game/atom/alternate_appearance.dm b/code/game/atom/alternate_appearance.dm
index 270f26e1809801..e642de36fe3502 100644
--- a/code/game/atom/alternate_appearance.dm
+++ b/code/game/atom/alternate_appearance.dm
@@ -110,6 +110,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
)
/datum/atom_hud/alternate_appearance/basic/New(key, image/I, options = AA_TARGET_SEE_APPEARANCE)
+ signals_registering = string_list(signals_registering)
..()
transfer_overlays = options & AA_MATCH_TARGET_OVERLAYS
image = I
diff --git a/code/game/atom/atom_act.dm b/code/game/atom/atom_act.dm
index 703a485405d19f..2a0475302b4a9a 100644
--- a/code/game/atom/atom_act.dm
+++ b/code/game/atom/atom_act.dm
@@ -253,7 +253,7 @@
* Default behaviour is to send [COMSIG_ATOM_RCD_ACT] and return FALSE
*/
/atom/proc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- SEND_SIGNAL(src, COMSIG_ATOM_RCD_ACT, user, the_rcd, rcd_data["[RCD_DESIGN_MODE]"])
+ SEND_SIGNAL(src, COMSIG_ATOM_RCD_ACT, user, the_rcd, rcd_data[RCD_DESIGN_MODE])
return FALSE
///Return the values you get when an RCD eats you?
diff --git a/code/game/atom/atom_materials.dm b/code/game/atom/atom_materials.dm
index a5ce12853ac334..a4200fd418f15f 100644
--- a/code/game/atom/atom_materials.dm
+++ b/code/game/atom/atom_materials.dm
@@ -29,16 +29,28 @@
/atom/proc/initialize_materials(list/materials, multiplier = 1)
SHOULD_NOT_OVERRIDE(TRUE)
if(multiplier != 1)
- materials = materials.Copy() //avoid editing the list that was originally used as argument if it's ever going to be used again.
+ materials = materials.Copy() //avoid editing the original list since it may be cached somewhere (likely in the materials subsystem).
for(var/current_material in materials)
materials[current_material] *= multiplier
+ //Let's be sure that there are absolutely no materials in the list that aren't positive.
+ var/list/nonpos_mats
+ for(var/mat in materials)
+ if(materials[mat] <= 0)
+ LAZYADD(nonpos_mats, "[mat] = [materials[mat]]")
+ materials -= mat
+ if(length(nonpos_mats))
+ stack_trace("materials with non-positive values found in [type]: [english_list(nonpos_mats, and_text = ", ")]")
+ if(!length(materials))
+ return
+
sortTim(materials, GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE)
apply_material_effects(materials)
///proc responsible for applying material effects when setting materials.
/atom/proc/apply_material_effects(list/materials)
SHOULD_CALL_PARENT(TRUE)
+
if(material_flags & MATERIAL_EFFECTS)
var/list/material_effects = get_material_effects_list(materials)
finalize_material_effects(material_effects)
@@ -375,10 +387,7 @@
* Gets the most common material in the object.
*/
/atom/proc/get_master_material()
- var/list/cached_materials = custom_materials
- if(!length(cached_materials))
- return null
- return GET_MATERIAL_REF(cached_materials[1]) //materials are sorted by amount, the first is always the main one
+ return length(custom_materials) ? GET_MATERIAL_REF(custom_materials[1]) : null //materials are sorted by amount, the first is always the main one
/**
* Gets the total amount of materials in this atom.
@@ -387,6 +396,16 @@
return isnull(custom_materials) ? 0 : counterlist_sum(custom_materials)
+///A simple proc that iterates through each material that the object is made of and spawns some stacks based on their amount and associated sheet/ore type.
+/atom/proc/drop_costum_materials(multiplier = 1)
+ for(var/datum/material/material as anything in custom_materials)
+ var/stack_type = material.sheet_type || material.ore_type
+ if(!stack_type)
+ continue
+ var/amount_to_spawn = FLOOR(custom_materials[material] / SHEET_MATERIAL_AMOUNT * multiplier, 1)
+ if(amount_to_spawn > 0)
+ new stack_type(loc, amount_to_spawn)
+
/**
* A bit of leeway when comparing the amount of material of two items.
* This was made to test the material composition of items spawned via crafting/processable component and an items of the same type spawned
@@ -401,6 +420,8 @@
/// Compares the materials of two items to see if they're roughly the same. Primarily used in crafting and processing unit tests.
/atom/proc/compare_materials(atom/target)
+ if(custom_materials == target.custom_materials) // SSmaterials caches the combinations so we don't have to run more complex checks
+ return TRUE
if(length(custom_materials) != length(target.custom_materials))
return FALSE
for(var/mat in custom_materials)
@@ -412,22 +433,65 @@
return FALSE
return TRUE
-#undef COMPARISION_ACCEPTABLE_MATERIAL_DEVIATION
-
/**
- * Returns a string with the materials and their respective amounts in it (eg. [list(/datum/material/meat = 100, /datum/material/plastic = 10)] )
- * also used in several unit tests.
+ * Returns a string with the materials and their respective amounts written in a way that reflects how it's displayed in the code
+ * (eg. [list(/datum/material/meat = 100, /datum/material/plastic = 10)]). Also used in several unit tests.
+ * Not to be confused with get_material_english_list()
+ * Arguments:
+ * * as_sheets: returns the text in terms of sheets, e.g "[list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 2)]"
*/
-/atom/proc/get_materials_english_list()
- if(!custom_materials)
- return "null"
- var/text = "\[list("
+/atom/proc/transcribe_materials_list(list/mats_list, as_sheets = TRUE)
+ if(!mats_list)
+ if(!custom_materials)
+ return "null"
+ mats_list = custom_materials
+ var/text = "list("
var/index = 1
- var/mats_len = length(custom_materials)
- for(var/datum/material/mat as anything in custom_materials)
- text += "[mat.type] = [custom_materials[mat]]"
+ var/mats_len = length(mats_list)
+ for(var/datum/material/mat as anything in mats_list)
+ var/amount_string = ""
+ if(as_sheets)
+ var/amount = sheets_from_value(mats_list[mat])
+ switch(amount)
+ if(0 to 0.49)
+ amount_string = "SMALL_MATERIAL_AMOUNT * " + num2text(amount * 10)
+ if(0.5)
+ amount_string = "HALF_SHEET_MATERIAL_AMOUNT"
+ if(1)
+ amount_string = "SHEET_MATERIAL_AMOUNT"
+ else
+ amount_string = "SHEET_MATERIAL_AMOUNT * " + num2text(amount)
+ else
+ amount_string = "[mats_list[mat]]"
+ text += "[mat.type] = " + amount_string
if(index < mats_len)
text += ", "
index++
- text += ")\]"
+ text += ")"
return text
+
+/// Convert a raw material amount into
+/// "SHEET_MATERIAL_AMOUNT", or "* N", with rounding rules.
+/proc/sheets_from_value(value, sheet_amount = SHEET_MATERIAL_AMOUNT)
+ if(!value)
+ return 0
+
+ // If value is small, do NOT try rounding to nearest 0 or 5. percentage error becomes huge.
+ var/final_value
+
+ if(value < sheet_amount)
+ // Use exact amount for small-value materials (0.1, 0.25, 0.55, etc)
+ final_value = value
+ else
+ // Large values: round to nearest 0 or 5
+ var/nearest5_value = round(value / 5) * 5
+ var/max_error = value * COMPARISION_ACCEPTABLE_MATERIAL_DEVIATION // 3%
+ if(abs(nearest5_value - value) <= max_error)
+ final_value = nearest5_value
+ else
+ final_value = value
+
+ var/final_sheet_multiplier = final_value / sheet_amount
+ return final_sheet_multiplier
+
+#undef COMPARISION_ACCEPTABLE_MATERIAL_DEVIATION
diff --git a/code/game/atom/atom_vv.dm b/code/game/atom/atom_vv.dm
index 92f8be528c64a7..176ee8e5248f7a 100644
--- a/code/game/atom/atom_vv.dm
+++ b/code/game/atom/atom_vv.dm
@@ -214,7 +214,7 @@
* At the atom level, if you edit a var named "color" it will add the atom colour with
* admin level priority to the atom colours list
*
- * Also, if GLOB.Debug2 is FALSE, it sets the [ADMIN_SPAWNED_1] flag on [flags_1][/atom/var/flags_1], which signifies
+ * Also, if GLOB.debugging_enabled is FALSE, it sets the [ADMIN_SPAWNED_1] flag on [flags_1][/atom/var/flags_1], which signifies
* the object has been admin edited
*/
/atom/vv_edit_var(var_name, var_value)
@@ -287,7 +287,7 @@
datum_flags |= DF_VAR_EDITED
return
- if(!GLOB.Debug2)
+ if(!GLOB.debugging_enabled)
flags_1 |= ADMIN_SPAWNED_1
. = ..()
diff --git a/code/game/atom/atoms_initializing_EXPENSIVE.dm b/code/game/atom/atoms_initializing_EXPENSIVE.dm
index 7b0965beabbe59..f39b987990d12c 100644
--- a/code/game/atom/atoms_initializing_EXPENSIVE.dm
+++ b/code/game/atom/atoms_initializing_EXPENSIVE.dm
@@ -122,6 +122,9 @@
SET_PLANE_IMPLICIT(src, plane)
+ if(LAZYLEN(hud_possible))
+ hud_possible = string_assoc_list(hud_possible)
+
if(greyscale_config && greyscale_colors) //we'll check again at item/init for inhand/belt/worn configs.
update_greyscale()
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index fd47581d90aa1a..8b367194042ce7 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -177,6 +177,8 @@
blocker.dir = dir
blocker.appearance_flags = appearance_flags | EMISSIVE_APPEARANCE_FLAGS
blocker.plane = GET_NEW_PLANE(EMISSIVE_PLANE, PLANE_TO_OFFSET(plane)) // Takes a light path through the normal macro for a microop
+ if (IS_TOPDOWN_PLANE(plane))
+ blocker.layer = TOPDOWN_TO_EMISSIVE_LAYER(layer)
// Ok so this is really cursed, but I want to set with this blocker cheaply while
// Still allowing it to be removed from the overlays list later
// So I'm gonna flatten it, then insert the flattened overlay into overlays AND the managed overlays list, directly
@@ -580,7 +582,7 @@
if(pulling_mob.buckled && pulling_mob.buckled.buckle_prevents_pull) //if they're buckled to something that disallows pulling, prevent it
stop_pulling()
return FALSE
- if(moving_atom == loc && pulling.density)
+ if(get_turf(moving_atom) == loc && pulling.density)
return FALSE
var/move_dir = get_dir(pulling.loc, moving_atom)
if(!Process_Spacemove(move_dir))
@@ -1355,7 +1357,7 @@
//They are moving! Wouldn't it be cool if we calculated their momentum and added it to the throw?
if(ismob(thrower))
var/mob/thrower_mob = thrower
- if(thrower_mob.last_move && thrower_mob.client && thrower_mob.client.move_delay >= world.time + world.tick_lag*2)
+ if(thrower_mob.last_move && thrower_mob.client && thrower_mob.client.move_delay >= world.time)
var/user_momentum = thrower_mob.cached_multiplicative_slowdown
if (!user_momentum) //no movement_delay, this means they move once per byond tick, lets calculate from that instead.
user_momentum = world.tick_lag
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 672f079e966f58..68fc8da4b64385 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -8,12 +8,12 @@
/* DATA HUD DATUMS */
/atom/proc/add_to_all_human_data_huds()
- for(var/datum/atom_hud/data/human/hud in GLOB.huds)
- hud.add_atom_to_hud(src)
+ for(var/hud_key, hud_type in GLOB.huds)
+ astype(hud_type, /datum/atom_hud/data/human)?.add_atom_to_hud(src)
/atom/proc/remove_from_all_data_huds()
- for(var/datum/atom_hud/data/hud in GLOB.huds)
- hud.remove_atom_from_hud(src)
+ for(var/hud_key, hud_type in GLOB.huds)
+ astype(hud_type, /datum/atom_hud/data)?.remove_atom_from_hud(src)
/datum/atom_hud/data
@@ -367,11 +367,11 @@ Diagnostic HUDs!
//Borgie battery tracking!
/mob/living/silicon/robot/proc/diag_hud_set_borgcell()
- if(cell)
+ if(QDELETED(cell) || (cell.maxcharge == 0))
+ set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
+ else
var/chargelvl = (cell.charge/cell.maxcharge)
set_hud_image_state(DIAG_BATT_HUD, "hudbatt[RoundDiagBar(chargelvl)]")
- else
- set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
//borg-AI shell tracking
/mob/living/silicon/robot/proc/diag_hud_set_aishell() //Shows if AI is controlling a cyborg via a BORIS module
@@ -400,11 +400,11 @@ Diagnostic HUDs!
set_hud_image_state(DIAG_MECH_HUD, "huddiag[RoundDiagBar(atom_integrity/max_integrity)]")
/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechcell()
- if(cell)
+ if(QDELETED(cell) || (cell.maxcharge == 0))
+ set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
+ else
var/chargelvl = cell.charge/cell.maxcharge
set_hud_image_state(DIAG_BATT_HUD, "hudbatt[RoundDiagBar(chargelvl)]")
- else
- set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechstat()
if(!internal_damage)
@@ -471,11 +471,11 @@ Diagnostic HUDs!
set_hud_image_state(DIAG_BOT_HUD, "")
/mob/living/simple_animal/bot/mulebot/proc/diag_hud_set_mulebotcell()
- if(cell)
+ if(QDELETED(cell) || (cell.maxcharge == 0))
+ set_hud_image_state(DIAG_BATT_HUD, "hudnobatt")
+ else
var/chargelvl = (cell.charge/cell.maxcharge)
set_hud_image_state(DIAG_BATT_HUD, "hudbatt[RoundDiagBar(chargelvl)]")
- else
- set_hud_image_state(DIAG_STAT_HUD, "hudnobatt")
/*~~~~~~~~~~~~
Airlocks!
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index a98b03d9c83177..171086b06b65a3 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -10,7 +10,7 @@
priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", ANNOUNCER_POWEROFF)
var/list/all_smes = SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/power/smes)
for(var/obj/machinery/power/smes/smes as anything in all_smes)
- if(istype(get_area(smes), /area/station/ai_monitored/turret_protected) || !is_station_level(smes.z))
+ if(istype(get_area(smes), /area/station/ai) || !is_station_level(smes.z))
continue
smes.charge = 0
smes.output_level = 0
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index 5663243473bd0f..d79bd49890536e 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -401,15 +401,15 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
/datum/objective_item/steal/jetpack
name = "the Captain's jetpack"
- targetitem = /obj/item/tank/jetpack/oxygen/captain
+ targetitem = /obj/item/tank/jetpack/captain
excludefromjob = list(JOB_CAPTAIN)
item_owner = list(JOB_CAPTAIN)
exists_on_map = TRUE
difficulty = 3
steal_hint = "A special yellow jetpack found in the Suit Storage Unit in the Captain's Quarters."
-/obj/item/tank/jetpack/oxygen/captain/add_stealing_item_objective()
- return add_item_to_steal(src, /obj/item/tank/jetpack/oxygen/captain)
+/obj/item/tank/jetpack/captain/add_stealing_item_objective()
+ return add_item_to_steal(src, /obj/item/tank/jetpack/captain)
/datum/objective_item/steal/magboots
name = "the chief engineer's advanced magnetic boots"
@@ -916,6 +916,17 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
/obj/item/mod/control/pre_equipped/rescue/add_stealing_item_objective()
return add_item_to_steal(src, /obj/item/mod/control/pre_equipped/rescue)
+/datum/objective_item/steal/spy/cmo_defib
+ name = "Chief Medical Officer's Compact Defibrillator"
+ targetitem = /obj/item/defibrillator/compact/loaded/cmo
+ excludefromjob = list(JOB_CHIEF_MEDICAL_OFFICER)
+ exists_on_map = TRUE
+ difficulty = 2
+ steal_hint = "The Compact Defibrillator, found on their person, or in their closet."
+
+/obj/item/defibrillator/compact/loaded/cmo/add_stealing_item_objective()
+ return add_item_to_steal(src, /obj/item/defibrillator/compact/loaded/cmo)
+
/datum/objective_item/steal/spy/hos_modsuit
name = "the head of security's safeguard MOD control unit"
targetitem = /obj/item/mod/control/pre_equipped/safeguard
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 2023722ea352d6..c3fc2b6fbfa2a2 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -209,6 +209,8 @@
PROTECTED_PROC(TRUE)
SHOULD_CALL_PARENT(TRUE)
+ find_and_mount_on_atom(late_init = TRUE)
+
power_change()
if(use_power == NO_POWER_USE)
return
@@ -309,7 +311,11 @@
set waitfor = FALSE
return PROCESS_KILL
-/obj/machinery/proc/process_atmos()//If you dont use process why are you here
+/**
+ * Process but for machines interacting with atmospherics.
+ * Like process, anything sensitive to changes in the wait time between process ticks should account for seconds_per_tick.
+**/
+/obj/machinery/proc/process_atmos(seconds_per_tick)//If you dont touch atmos why are you here
set waitfor = FALSE
return PROCESS_KILL
@@ -738,7 +744,7 @@
var/mob/user = ui.user
add_fingerprint(user)
update_last_used(user)
- if(isAI(user) && !GLOB.cameranet.checkTurfVis(get_turf(src))) //We check if they're an AI specifically here, so borgs/adminghosts/human wand can still access off-camera stuff.
+ if(isAI(user) && !SScameras.is_visible_by_cameras(get_turf(src))) //We check if they're an AI specifically here, so borgs/adminghosts/human wand can still access off-camera stuff.
to_chat(user, span_warning("You can no longer connect to this device!"))
return FALSE
return ..()
diff --git a/code/game/machinery/ai_core/_core.dm b/code/game/machinery/ai_core/_core.dm
new file mode 100644
index 00000000000000..512e193ac1215f
--- /dev/null
+++ b/code/game/machinery/ai_core/_core.dm
@@ -0,0 +1,248 @@
+#define AI_CORE_BRAIN(X) X.braintype == "Android" ? "brain" : "MMI"
+
+/obj/structure/ai_core
+ name = "\improper AI core"
+ desc = "The framework for an artificial intelligence core."
+ icon = 'icons/mob/silicon/ai.dmi'
+ icon_state = "build_0"
+ base_icon_state = "build_"
+ density = TRUE
+ anchored = FALSE
+ max_integrity = 500
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 4)
+ var/state = CORE_STATE_EMPTY
+ var/datum/ai_laws/laws
+ var/obj/item/circuitboard/aicore/circuit
+ var/obj/item/mmi/core_mmi
+
+/obj/structure/ai_core/Initialize(mapload, state = src.state, obj/item/mmi/core_mmi = null)
+ . = ..()
+ laws = new
+ laws.set_laws_config()
+
+ if(core_mmi && state < CORE_STATE_CABLED)
+ stack_trace("supplied a core_mmi as constructor argument, but core state wouldn't have accepted it!")
+ state = CORE_STATE_FINISHED // just in case...
+ src.state = state
+ if(state >= CORE_STATE_CIRCUIT)
+ circuit = new(src)
+ if(state >= CORE_STATE_CABLED)
+ if(!core_mmi)
+ core_mmi = new /obj/item/mmi(src)
+ core_mmi.brain = new(core_mmi)
+ core_mmi.brain.organ_flags |= ORGAN_FROZEN
+ core_mmi.set_brainmob(new /mob/living/brain())
+ core_mmi.brainmob.container = core_mmi
+ core_mmi.update_appearance()
+ core_mmi.forceMove(src)
+ src.core_mmi = core_mmi
+ set_anchored(TRUE)
+
+ update_appearance(UPDATE_ICON_STATE)
+
+/obj/structure/ai_core/update_icon_state()
+ if(state != CORE_STATE_FINISHED)
+ icon_state = "[base_icon_state][state]"
+ if(state == CORE_STATE_CABLED && core_mmi)
+ icon_state += "b"
+ else
+ icon_state = "ai-empty"
+ return ..()
+
+/obj/structure/ai_core/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(gone == circuit)
+ circuit = null
+ if((state != CORE_STATE_GLASSED) && (state != CORE_STATE_FINISHED))
+ state = CORE_STATE_EMPTY
+ update_appearance()
+ if(gone == core_mmi)
+ core_mmi = null
+ update_appearance()
+
+/obj/structure/ai_core/atom_deconstruct(disassembled = TRUE)
+ if(state >= CORE_STATE_GLASSED)
+ new /obj/item/stack/sheet/rglass(drop_location(), 2)
+ if(state >= CORE_STATE_CABLED)
+ new /obj/item/stack/cable_coil(drop_location(), 5)
+ core_mmi?.forceMove(drop_location())
+ circuit?.forceMove(drop_location())
+ new /obj/item/stack/sheet/plasteel(drop_location(), 4)
+
+/obj/structure/ai_core/Destroy()
+ QDEL_NULL(circuit)
+ QDEL_NULL(core_mmi)
+ QDEL_NULL(laws)
+ return ..()
+
+/obj/structure/ai_core/examine(mob/user)
+ . = ..()
+ . += span_notice("It has some
bolts that look [anchored ? "tightened" : "loosened"].")
+
+ switch(state)
+ if(CORE_STATE_EMPTY)
+ . += span_notice("There is a
slot for a circuit board, the frame can be
melted down.")
+ if(CORE_STATE_CIRCUIT)
+ . += span_notice("The circuit board can be
screwed into place or
pried out.")
+ if(CORE_STATE_SCREWED)
+ . += span_notice("The frame can be
wired, the circuit board can be
unfastened.")
+ if(CORE_STATE_CABLED)
+ if(!core_mmi)
+ . += span_notice("There are wires which could be hooked up to an
MMI or positronic brain, or
cut.")
+ else
+ var/accept_laws = TRUE
+ if(core_mmi.laws.id != DEFAULT_AI_LAWID || !core_mmi.brainmob || !core_mmi.brainmob?.mind)
+ accept_laws = FALSE
+ . += span_notice("There is a
slot for a reinforced glass panel, the [AI_CORE_BRAIN(core_mmi)] could be
pried out.[accept_laws ? " A law module can be
swiped across." : ""]")
+ if(CORE_STATE_GLASSED)
+ . += span_notice("The monitor [core_mmi?.brainmob?.mind && !suicide_check() ? "and neural interface " : ""]can be
screwed in, the panel can be
pried out.")
+ if(CORE_STATE_FINISHED)
+ . += span_notice("The monitor's connection can be
cut[core_mmi?.brainmob?.mind && !suicide_check() ? " the neural interface can be
screwed in." : "."]")
+
+/obj/structure/ai_core/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(state < CORE_STATE_FINISHED)
+ return construction_item_interaction(user, tool, modifiers)
+
+ return NONE
+
+/// Exists to be used for callbacks.
+/obj/structure/ai_core/proc/check_state(state_to_check)
+ return (state == state_to_check)
+
+/obj/structure/ai_core/latejoin_inactive
+ name = "networked AI core"
+ desc = "This AI core is connected by bluespace transmitters to NTNet, allowing for an AI personality to be downloaded to it on the fly mid-shift."
+ anchored = TRUE
+ state = CORE_STATE_FINISHED
+ var/available = TRUE
+ var/safety_checks = TRUE
+ var/active = TRUE
+
+/obj/structure/ai_core/latejoin_inactive/Initialize(mapload, state, posibrain)
+ . = ..()
+ GLOB.latejoin_ai_cores += src
+
+/obj/structure/ai_core/latejoin_inactive/Destroy()
+ GLOB.latejoin_ai_cores -= src
+ return ..()
+
+/obj/structure/ai_core/latejoin_inactive/examine(mob/user)
+ . = ..()
+ . += "Its transmitter seems to be
[active? "on" : "off"]."
+ . += span_notice("You could [active? "deactivate" : "activate"] it with a multitool.")
+
+/obj/structure/ai_core/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them.
+ if(!available)
+ return FALSE
+ if(!safety_checks)
+ return TRUE
+ if(!active)
+ return FALSE
+ var/turf/T = get_turf(src)
+ var/area/A = get_area(src)
+ if(!(A.area_flags & BLOBS_ALLOWED))
+ return FALSE
+ if(!A.power_equip)
+ return FALSE
+ if(!SSmapping.level_trait(T.z,ZTRAIT_STATION))
+ return FALSE
+ if(!isfloorturf(T))
+ return FALSE
+ return TRUE
+
+/obj/structure/ai_core/latejoin_inactive/multitool_act(mob/living/user, obj/item/tool)
+ if(user.combat_mode)
+ return NONE
+
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50))
+ return ITEM_INTERACT_BLOCKING
+
+ active = !active
+ balloon_alert(user, "[active ? "activated" : "deactivated"] transmitters")
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/ai_core/proc/ai_structure_to_mob()
+ var/mob/living/brain/the_brainmob = core_mmi.brainmob
+ if(!the_brainmob.mind || suicide_check())
+ return FALSE
+ the_brainmob.mind.remove_antags_for_borging()
+ if(!the_brainmob.mind.has_ever_been_ai)
+ SSblackbox.record_feedback("amount", "ais_created", 1)
+ var/mob/living/silicon/ai/ai_mob = null
+
+ if(core_mmi.overrides_aicore_laws)
+ ai_mob = new /mob/living/silicon/ai(loc, core_mmi.laws, the_brainmob)
+ core_mmi.laws = null //MMI's law datum is being donated, so we need the MMI to let it go or the GC will eat it
+ else
+ ai_mob = new /mob/living/silicon/ai(loc, laws, the_brainmob)
+ laws = null //we're giving the new AI this datum, so let's not delete it when we qdel(src) 5 lines from now
+
+ var/datum/antagonist/malf_ai/malf_datum = IS_MALF_AI(ai_mob)
+ if(malf_datum)
+ malf_datum.add_law_zero()
+
+ if(!isnull(the_brainmob.client))
+ ai_mob.set_gender(the_brainmob.client)
+ if(core_mmi.force_replace_ai_name)
+ ai_mob.fully_replace_character_name(ai_mob.name, core_mmi.replacement_ai_name())
+ ai_mob.posibrain_inside = core_mmi.braintype == "Android"
+ deadchat_broadcast(" has been brought online at
[get_area_name(ai_mob, format_text = TRUE)].", span_name("[ai_mob]"), follow_target = ai_mob, message_type = DEADCHAT_ANNOUNCEMENT)
+ qdel(src)
+ return ai_mob
+
+/// Quick proc to call to see if the brainmob inside of us has suicided. Returns TRUE if we have, FALSE in any other scenario.
+/obj/structure/ai_core/proc/suicide_check()
+ if(isnull(core_mmi) || isnull(core_mmi.brainmob))
+ return FALSE
+ return HAS_TRAIT(core_mmi.brainmob, TRAIT_SUICIDED)
+
+/*
+This is a good place for AI-related object verbs so I'm sticking it here.
+If adding stuff to this, don't forget that an AI need to cancel_camera() whenever it physically moves to a different location.
+That prevents a few funky behaviors.
+*/
+//The type of interaction, the player performing the operation, the AI itself, and the card object, if any.
+
+
+/atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
+ SHOULD_CALL_PARENT(TRUE)
+ if(istype(card))
+ if(card.flush)
+ to_chat(user, span_alert("ERROR: AI flush is in progress, cannot execute transfer protocol."))
+ return FALSE
+ return TRUE
+
+/obj/structure/ai_core/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
+ if(state != CORE_STATE_FINISHED || !..())
+ return
+ if(core_mmi && core_mmi.brainmob)
+ if(core_mmi.brainmob.mind)
+ to_chat(user, span_warning("[src] already contains an active mind!"))
+ return
+ else if(suicide_check())
+ to_chat(user, span_warning("[AI_CORE_BRAIN(core_mmi)] installed in [src] is completely useless!"))
+ return
+ //Transferring a carded AI to a core.
+ if(interaction == AI_TRANS_FROM_CARD)
+ AI.set_control_disabled(FALSE)
+ AI.radio_enabled = TRUE
+ AI.forceMove(loc) // to replace the terminal.
+ to_chat(AI, span_notice("You have been uploaded to a stationary terminal. Remote device connection restored."))
+ to_chat(user, "[span_boldnotice("Transfer successful")]: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.")
+ card.AI = null
+ AI.battery = circuit.battery
+ AI.posibrain_inside = isnull(core_mmi) || core_mmi.braintype == "Android"
+ qdel(src)
+ else //If for some reason you use an empty card on an empty AI terminal.
+ to_chat(user, span_alert("There is no AI loaded on this terminal."))
+
+/obj/item/circuitboard/aicore
+ name = "AI core (AI Core Board)" //Well, duh, but best to be consistent
+ var/battery = 200 //backup battery for when the AI loses power. Copied to/from AI mobs when carding, and placed here to avoid recharge via deconning the core
+
+/obj/item/circuitboard/aicore/Initialize(mapload)
+ . = ..()
+ if(mapload && HAS_TRAIT(SSstation, STATION_TRAIT_HUMAN_AI))
+ return INITIALIZE_HINT_QDEL
+
+#undef AI_CORE_BRAIN
diff --git a/code/game/machinery/ai_core/core_construction.dm b/code/game/machinery/ai_core/core_construction.dm
new file mode 100644
index 00000000000000..df1a36782daacc
--- /dev/null
+++ b/code/game/machinery/ai_core/core_construction.dm
@@ -0,0 +1,253 @@
+#define AI_CORE_BRAIN(X) X.braintype == "Android" ? "brain" : "MMI"
+#define UPDATE_STATE(new_state) state = new_state; update_appearance(UPDATE_ICON_STATE)
+#define CHECK_STATE_CALLBACK(maintained_state) CALLBACK(src, PROC_REF(check_state), maintained_state)
+
+/obj/structure/ai_core/welder_act(mob/living/user, obj/item/tool)
+ if(state != CORE_STATE_EMPTY)
+ balloon_alert(user, "frame has to be empty!")
+ return ITEM_INTERACT_BLOCKING
+
+ if(!tool.tool_start_check(user, 1))
+ return ITEM_INTERACT_BLOCKING
+
+ if(!tool.use_tool(src, user, 2 SECONDS, 1, 50, CHECK_STATE_CALLBACK(CORE_STATE_EMPTY)))
+ return ITEM_INTERACT_BLOCKING
+
+ deconstruct(TRUE)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/ai_core/wrench_act(mob/living/user, obj/item/tool)
+ if(state >= CORE_STATE_FINISHED)
+ set_anchored(TRUE) //teehee
+ balloon_alert(user, "can't unanchor!")
+ return ITEM_INTERACT_BLOCKING
+
+ default_unfasten_wrench(user, tool)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/ai_core/screwdriver_act(mob/living/user, obj/item/tool)
+ switch(state)
+ if(CORE_STATE_EMPTY)
+ balloon_alert(user, "nothing to screw in there!")
+ return ITEM_INTERACT_BLOCKING
+ if(CORE_STATE_CIRCUIT)
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_CIRCUIT)))
+ return ITEM_INTERACT_BLOCKING
+ balloon_alert(user, "board secured")
+ UPDATE_STATE(CORE_STATE_SCREWED)
+ return ITEM_INTERACT_SUCCESS
+ if(CORE_STATE_SCREWED)
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_SCREWED)))
+ return ITEM_INTERACT_BLOCKING
+ balloon_alert(user, "board unsecured")
+ UPDATE_STATE(CORE_STATE_CIRCUIT)
+ return ITEM_INTERACT_SUCCESS
+ if(CORE_STATE_CABLED)
+ balloon_alert(user, "can't reach the board!")
+ return ITEM_INTERACT_BLOCKING
+ if(CORE_STATE_GLASSED)
+ if(!anchored)
+ balloon_alert(user, "isn't anchored!")
+ return ITEM_INTERACT_BLOCKING
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_GLASSED)))
+ return ITEM_INTERACT_BLOCKING
+ if(suicide_check())
+ balloon_alert(user, "processor is completely useless!")
+ return ITEM_INTERACT_BLOCKING
+
+ var/atom/movable/alert_source = src
+ if(core_mmi.brainmob?.mind)
+ alert_source = ai_structure_to_mob() || alert_source
+ else
+ UPDATE_STATE(CORE_STATE_FINISHED)
+ alert_source.balloon_alert(user, "connected monitor[core_mmi?.brainmob?.mind ? " and neural network" : ""]")
+ return ITEM_INTERACT_SUCCESS
+ if(CORE_STATE_FINISHED)
+ if(!core_mmi?.brainmob?.mind || suicide_check())
+ balloon_alert(user, "processor is inactive!")
+ return ITEM_INTERACT_BLOCKING
+
+ if(!anchored)
+ balloon_alert(user, "anchor it first!")
+ return ITEM_INTERACT_BLOCKING
+
+ balloon_alert(user, "connecting neural network...")
+ if(!tool.use_tool(src, user, 10 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_FINISHED)))
+ return ITEM_INTERACT_BLOCKING
+
+ var/atom/movable/alert_source = ai_structure_to_mob()
+ if(!alert_source)
+ balloon_alert(user, "processor is inactive!")
+ return ITEM_INTERACT_BLOCKING
+
+ alert_source.balloon_alert(user, "connected neural network")
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/ai_core/crowbar_act(mob/living/user, obj/item/tool)
+ switch(state)
+ if(CORE_STATE_EMPTY)
+ balloon_alert(user, "nothing to pry out!")
+ return ITEM_INTERACT_BLOCKING
+ if(CORE_STATE_CIRCUIT)
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_CIRCUIT)))
+ return ITEM_INTERACT_BLOCKING
+
+ circuit.forceMove(drop_location())
+ UPDATE_STATE(CORE_STATE_EMPTY)
+ return ITEM_INTERACT_SUCCESS
+ if(CORE_STATE_SCREWED)
+ balloon_alert(user, "won't budge!")
+ return ITEM_INTERACT_BLOCKING
+ if(CORE_STATE_CABLED)
+ if(!core_mmi)
+ balloon_alert(user, "nothing to pry out!")
+ return ITEM_INTERACT_BLOCKING
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_CABLED)) || !core_mmi)
+ return ITEM_INTERACT_BLOCKING
+
+ core_mmi.forceMove(drop_location())
+ UPDATE_STATE(CORE_STATE_CABLED)
+ return ITEM_INTERACT_SUCCESS
+ if(CORE_STATE_GLASSED)
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_GLASSED)))
+ return ITEM_INTERACT_BLOCKING
+
+ new /obj/item/stack/sheet/rglass(drop_location(), 2)
+ UPDATE_STATE(CORE_STATE_CABLED)
+ return ITEM_INTERACT_SUCCESS
+ if(CORE_STATE_FINISHED)
+ balloon_alert(user, "display is on!")
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/ai_core/wirecutter_act(mob/living/user, obj/item/tool)
+ switch(state)
+ if(CORE_STATE_EMPTY to CORE_STATE_CIRCUIT)
+ balloon_alert(user, "nothing to cut!")
+ return ITEM_INTERACT_BLOCKING
+ if(CORE_STATE_CABLED)
+ if(core_mmi)
+ balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] in the way!")
+ return ITEM_INTERACT_BLOCKING
+
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_CABLED)) || core_mmi)
+ return ITEM_INTERACT_BLOCKING
+
+ new /obj/item/stack/cable_coil(drop_location(), 5)
+ UPDATE_STATE(CORE_STATE_SCREWED)
+ return ITEM_INTERACT_SUCCESS
+ if(CORE_STATE_GLASSED)
+ balloon_alert(user, "nothing left to cut!")
+ return ITEM_INTERACT_BLOCKING
+ if(CORE_STATE_FINISHED)
+ if(!tool.use_tool(src, user, 0 SECONDS, 0, 50, CHECK_STATE_CALLBACK(CORE_STATE_FINISHED)))
+ return ITEM_INTERACT_BLOCKING
+
+ UPDATE_STATE(CORE_STATE_GLASSED)
+ return ITEM_INTERACT_SUCCESS
+
+/// Handles the interaction chain the same as item_interaction. Exists to isolate construction behaviour from other item behaviour.
+/obj/structure/ai_core/proc/construction_item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(istype(tool, /obj/item/circuitboard/aicore))
+ return install_board(user, tool) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+
+ if(istype(tool, /obj/item/stack/cable_coil))
+ return add_cabling(user, tool) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+
+ if(istype(tool, /obj/item/mmi))
+ return install_mmi(user, tool) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+ if(istype(tool, /obj/item/ai_module))
+ return update_laws(user, tool) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+ if(istype(tool, /obj/item/stack/sheet/rglass))
+ return install_glass(user, tool) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+
+ return NONE
+
+/obj/structure/ai_core/proc/install_board(mob/living/user, obj/item/circuitboard/aicore/circuit)
+ if(state != CORE_STATE_EMPTY)
+ return FALSE
+ if(!user.transferItemToLoc(circuit, src))
+ return FALSE
+
+ playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
+ src.circuit = circuit
+ UPDATE_STATE(CORE_STATE_CIRCUIT)
+ return TRUE
+
+/obj/structure/ai_core/proc/add_cabling(mob/living/user, obj/item/stack/cable_coil/cable)
+ if(state != CORE_STATE_SCREWED)
+ return FALSE
+
+ if(cable.get_amount() < 5)
+ balloon_alert(user, "not enough [cable::name]!")
+ return FALSE
+
+ balloon_alert(user, "adding cable...")
+ if(!cable.use_tool(src, user, 2 SECONDS, 5, 50, CHECK_STATE_CALLBACK(CORE_STATE_SCREWED)))
+ return FALSE
+
+ UPDATE_STATE(CORE_STATE_CABLED)
+ return TRUE
+
+/obj/structure/ai_core/proc/install_mmi(mob/living/user, obj/item/mmi/mmi)
+ if(state != CORE_STATE_CABLED)
+ return FALSE
+
+ if(!mmi.brain_check(user))
+ var/wants_install = (tgui_alert(user, "This [AI_CORE_BRAIN(mmi)] is inactive, would you like to make an inactive AI?", "Installing AI [AI_CORE_BRAIN(mmi)]", list("Yes", "No")) == "Yes")
+ if(!wants_install)
+ return FALSE
+ if(QDELETED(src) || QDELETED(user) || QDELETED(mmi) || !user.is_holding(mmi) || !Adjacent(user))
+ return FALSE
+ if(mmi.brainmob && HAS_TRAIT(mmi.brainmob, TRAIT_SUICIDED))
+ balloon_alert(user, "[AI_CORE_BRAIN(mmi)] is useless!")
+ return FALSE
+ else
+ var/mob/living/brain/mmi_brainmob = mmi.brainmob
+ if(!CONFIG_GET(flag/allow_ai) || (mmi_brainmob && is_banned_from(mmi_brainmob.ckey, JOB_AI)))
+ if(!QDELETED(src) && !QDELETED(user) && !QDELETED(mmi) && user.is_holding(mmi) && Adjacent(user))
+ balloon_alert(user, "[mmi] won't fit!")
+ return FALSE
+
+ if(state != CORE_STATE_CABLED)
+ return FALSE
+ if(!user.transferItemToLoc(mmi, src))
+ return FALSE
+
+ core_mmi = mmi
+ UPDATE_STATE(CORE_STATE_CABLED)
+ return TRUE
+
+/obj/structure/ai_core/proc/update_laws(mob/living/user, obj/item/ai_module/module)
+ if(!core_mmi)
+ balloon_alert(user, "no brain installed!")
+ return FALSE
+ if(!core_mmi.brainmob || !core_mmi.brainmob?.mind || suicide_check())
+ balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] is inactive!")
+ return FALSE
+ if(core_mmi.laws.id != DEFAULT_AI_LAWID)
+ balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] already has set laws!")
+ return FALSE
+
+ module.install(laws, user)
+ return TRUE
+
+/obj/structure/ai_core/proc/install_glass(mob/living/user, obj/item/stack/sheet/rglass/glass)
+ if(state != CORE_STATE_CABLED)
+ return FALSE
+
+ if(!core_mmi)
+ balloon_alert(user, "needs a processor!")
+ return FALSE
+ if(glass.get_amount() < 2)
+ balloon_alert(user, "not enough [glass::name]!")
+ return FALSE
+
+ if(!glass.use_tool(src, user, 2 SECONDS, 2, 50, CHECK_STATE_CALLBACK(CORE_STATE_CABLED)) || !core_mmi)
+ return FALSE
+
+ UPDATE_STATE(CORE_STATE_GLASSED)
+ return TRUE
+
+#undef CHECK_STATE_CALLBACK
+#undef UPDATE_STATE
+#undef AI_CORE_BRAIN
diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm
index e39e2e4fed6de3..a66cd3209a21f2 100644
--- a/code/game/machinery/announcement_system.dm
+++ b/code/game/machinery/announcement_system.dm
@@ -122,6 +122,13 @@ GLOBAL_LIST_EMPTY(announcement_systems)
))
return list("config_entries" = configs)
+/obj/machinery/announcement_system/ui_static_data(mob/user)
+ var/list/data = list()
+
+ data["max_announcement_len"] = MAX_AAS_LENGTH
+
+ return data
+
/obj/machinery/announcement_system/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
@@ -148,7 +155,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
message_admins("[ADMIN_LOOKUPFLW(usr)] tried to set announcement line for nonexisting line in the [config.name] for AAS. Probably href injection. Received line: [html_encode(params["lineKey"])]")
log_game("[key_name(usr)] tried to mess with AAS. For [config.name] he tried to edit nonexistend [params["lineKey"]]")
return
- var/new_message = trim(html_encode(params["newText"]), MAX_MESSAGE_LEN)
+ var/new_message = trim(html_encode(params["newText"]), MAX_AAS_LENGTH)
if(new_message)
config.announcement_lines_map[params["lineKey"]] = new_message
usr.log_message("updated [params["lineKey"]] line in the [config.name] to: [new_message]", LOG_GAME)
diff --git a/code/game/machinery/atmos_field_gen.dm b/code/game/machinery/atmos_field_gen.dm
index 72a0c4a9d05f69..004728d3914367 100644
--- a/code/game/machinery/atmos_field_gen.dm
+++ b/code/game/machinery/atmos_field_gen.dm
@@ -39,7 +39,7 @@
/obj/machinery/atmos_shield_gen/Initialize(mapload)
. = ..()
register_context()
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
set_wires(new /datum/wires/atmosshieldgen(src))
SSmachines.processing_early += src
if(on)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index a35b5931fd3244..efe1e6c76cf64c 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -26,7 +26,7 @@
///Designs imported from technology disks that we can print.
var/list/imported_designs = list()
///The container to hold materials
- var/datum/component/material_container/materials
+ var/datum/material_container/materials
///direction we output onto (if 0, on top of us)
var/drop_direction = 0
//looping sound for printing items
@@ -34,8 +34,8 @@
/obj/machinery/autolathe/Initialize(mapload)
print_sound = new(src, FALSE)
- materials = AddComponent( \
- /datum/component/material_container, \
+ materials = new ( \
+ src, \
SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], \
0, \
MATCONTAINER_EXAMINE|MATCONTAINER_ACCEPT_ALLOYS, \
@@ -52,7 +52,7 @@
/obj/machinery/autolathe/Destroy()
QDEL_NULL(print_sound)
- materials = null
+ QDEL_NULL(materials)
return ..()
/obj/machinery/autolathe/examine(mob/user)
diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm
index c6ff98ec371909..2c6f88fde4e98f 100644
--- a/code/game/machinery/bank_machine.dm
+++ b/code/game/machinery/bank_machine.dm
@@ -60,7 +60,7 @@
if(value)
if(synced_bank_account)
synced_bank_account.adjust_money(value)
- say("Credits deposited! The [synced_bank_account.account_holder] is now [synced_bank_account.account_balance] cr.")
+ say("[MONEY_NAME_CAPITALIZED] deposited! The [synced_bank_account.account_holder] is now [synced_bank_account.account_balance] [MONEY_SYMBOL].")
qdel(weapon)
return
return ..()
@@ -112,13 +112,13 @@
switch(action)
if("siphon")
if(is_station_level(src.z) || is_centcom_level(src.z))
- say("Siphon of station credits has begun!")
+ say("Siphon of station [MONEY_NAME] has begun!")
start_siphon(ui.user)
else
say("Error: Console not in reach of station, withdrawal cannot begin.")
. = TRUE
if("halt")
- say("Station credit withdrawal halted.")
+ say("Station [MONEY_NAME_SINGULAR] withdrawal halted.")
end_siphon()
. = TRUE
diff --git a/code/game/machinery/barsigns.dm b/code/game/machinery/barsigns.dm
index 1d0f7d8fbc9565..409d0226bc0b99 100644
--- a/code/game/machinery/barsigns.dm
+++ b/code/game/machinery/barsigns.dm
@@ -31,7 +31,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32)
change_area_name = mapload
set_sign(new /datum/barsign/hiddensigns/signoff)
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/barsign/proc/set_sign(datum/barsign/sign)
if(!istype(sign))
@@ -501,6 +501,30 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32)
desc = "LIVE MOTHS!"
neon_color = COLOR_RED
+/datum/barsign/coldones
+ name = "Cold Ones"
+ icon_state = "cold-ones"
+ desc = "That's what they call the yogurt effect."
+ neon_color = ""
+
+/datum/barsign/doctorsorders
+ name = "Doctor's Orders"
+ icon_state = "doctors-orders"
+ desc = "For over-the-counter painkillers."
+ neon_color = ""
+
+/datum/barsign/wrongturn
+ name = "Wrong Turn"
+ icon_state = "wrong-turn"
+ desc = "You don't feel lost. Nothing a few drinks cant fix, though."
+ neon_color = ""
+
+/datum/barsign/punpunspub
+ name = "Punpun's Pub"
+ icon_state = "pun-puns-pub"
+ desc = "After everything he's been through? I'd want to be near booze too."
+ neon_color = ""
+
// Hidden signs list below this point
/datum/barsign/hiddensigns
diff --git a/code/game/machinery/botlaunchpad.dm b/code/game/machinery/botlaunchpad.dm
index e044bb1e296880..9cd9c647accff2 100644
--- a/code/game/machinery/botlaunchpad.dm
+++ b/code/game/machinery/botlaunchpad.dm
@@ -48,7 +48,7 @@
launched_bot = WEAKREF(possible_bot)
podspawn(list(
"target" = get_turf(src),
- "path" = /obj/structure/closet/supplypod/botpod,
+ "path" = /obj/structure/closet/supplypod/transport/botpod,
"style" = /datum/pod_style/seethrough,
"reverse_dropoff_coords" = list(reverse_turf.x, reverse_turf.y, reverse_turf.z)
))
@@ -66,15 +66,6 @@
var/mob/living/simple_animal/bot/simple_bot = our_bot
simple_bot.call_bot(src, get_turf(src))
-/obj/structure/closet/supplypod/botpod
- style = /datum/pod_style/seethrough
- explosionSize = list(0,0,0,0)
- reversing = TRUE
+/obj/structure/closet/supplypod/transport/botpod
reverse_option_list = list("Mobs"=TRUE,"Objects"=FALSE,"Anchored"=FALSE,"Underfloor"=FALSE,"Wallmounted"=FALSE,"Floors"=FALSE,"Walls"=FALSE,"Mecha"=FALSE)
- delays = list(POD_TRANSIT = 0, POD_FALLING = 0, POD_OPENING = 0, POD_LEAVING = 0)
- reverse_delays = list(POD_TRANSIT = 15, POD_FALLING = 10, POD_OPENING = 0, POD_LEAVING = 0)
- custom_rev_delay = TRUE
- effectQuiet = TRUE
leavingSound = 'sound/vehicles/rocketlaunch.ogg'
- close_sound = null
- pod_flags = FIRST_SOUNDS
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index eb9661657fce44..c0a7ef8278c4bb 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -62,7 +62,7 @@
setup_device(mapload)
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
register_context()
/obj/machinery/button/Destroy()
@@ -523,3 +523,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/door, 24)
result_path = /obj/machinery/button
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
pixel_shift = 24
+
+/obj/item/wallframe/button/find_support_structure(atom/structure)
+ return istype(structure, /obj/structure/table) ? structure : ..()
+
+/obj/item/wallframe/button/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(istype(interacting_with, /obj/structure/table))
+ return user.combat_mode ? ..() : NONE
+ return ..()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index abf45157cf4660..b88acdcbc014ad 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -1,3 +1,12 @@
+/// Active power use of a regular default camera
+#define CAMERA_POWER_CONSUMPTION (BASE_MACHINE_ACTIVE_CONSUMPTION * 0.02)
+/// Active power multiplier of the xray camera upgrade
+#define XRAY_POWER_MOD (10)
+/// Active power multiplier of the motion camera upgrade
+#define MOTION_POWER_MOD (4)
+/// Active power multiplier of the EMP camera upgrade
+#define EMP_POWER_MOD (1.25)
+
/**
* Camera assembly frame
* Putting this on a wall will put a deconstructed camera machine on the wall.
@@ -7,13 +16,13 @@
desc = "The basic construction for Nanotrasen-Always-Watching-You cameras."
icon = 'icons/obj/machines/camera.dmi'
icon_state = "cameracase"
- custom_materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 4,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.5,
- )
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
result_path = /obj/machinery/camera/autoname/deconstructed
wall_external = TRUE
+/obj/item/wallframe/camera/find_support_structure(atom/structure)
+ return istype(structure, /obj/structure/window) ? structure : ..()
+
/obj/machinery/camera
name = "security camera"
desc = "It's used to monitor rooms."
@@ -21,7 +30,7 @@
icon_state = "camera"
base_icon_state = "camera"
use_power = ACTIVE_POWER_USE
- active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.02
+ active_power_usage = CAMERA_POWER_CONSUMPTION
layer = WALL_OBJ_LAYER
resistance_flags = FIRE_PROOF
damage_deflection = 12
@@ -85,7 +94,7 @@
var/list/datum/weakref/localMotionTargets = list()
var/detectTime = 0
- var/area/station/ai_monitored/area_motion = null
+ var/datum/motion_group/area_motion = null
var/alarm_delay = 30 // Don't forget, there's another 3 seconds in queueAlarm()
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera, 0)
@@ -110,12 +119,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
network -= network_name
network += LOWER_TEXT(network_name)
- GLOB.cameranet.cameras += src
+ SScameras.cameras += src
myarea = get_room_area()
if(camera_enabled)
- GLOB.cameranet.addCamera(src)
+ SScameras.add_camera_to_chunk(src)
LAZYADD(myarea.cameras, src)
#ifdef MAP_TEST
update_appearance()
@@ -125,16 +134,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
else //this is handled by toggle_camera, so no need to update it twice.
update_appearance()
#endif
-
alarm_manager = new(src)
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom(mark_for_late_init = TRUE)
+
+/obj/machinery/camera/get_turfs_to_mount_on()
+ return list(get_step(src, dir))
/obj/machinery/camera/Destroy(force)
if(can_use())
toggle_cam(null, 0) //kick anyone viewing out and remove from the camera chunks
- GLOB.cameranet.removeCamera(src)
- GLOB.cameranet.cameras -= src
+ SScameras.remove_camera_from_chunk(src)
+ SScameras.cameras -= src
cancelCameraAlarm()
if(isarea(myarea))
LAZYREMOVE(myarea.cameras, src)
@@ -178,8 +189,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
SIGNAL_HANDLER
proximity_monitor = null
-/obj/machinery/camera/proc/set_area_motion(area/A)
- area_motion = A
+/obj/machinery/camera/proc/set_area_motion(datum/motion_group/group)
+ area_motion = group
create_prox_monitor()
/obj/machinery/camera/examine(mob/user)
@@ -219,11 +230,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
if(!prob(150 / severity))
return
network = list()
- GLOB.cameranet.removeCamera(src)
+ SScameras.remove_camera_from_chunk(src)
set_machine_stat(machine_stat | EMPED)
set_light(0)
emped++ //Increase the number of consecutive EMP's
update_appearance()
+ calculate_active_power()
addtimer(CALLBACK(src, PROC_REF(post_emp_reset), emped, network), reset_time)
for(var/mob/M as anything in GLOB.player_list)
if (M.client?.eye == src)
@@ -246,9 +258,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
set_machine_stat(machine_stat & ~EMPED)
update_appearance()
if(can_use())
- GLOB.cameranet.addCamera(src)
+ SScameras.add_camera_to_chunk(src)
emped = 0 //Resets the consecutive EMP count
addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 10 SECONDS)
+ calculate_active_power()
/obj/machinery/camera/attack_ai(mob/living/silicon/ai/user)
if (!istype(user))
@@ -259,7 +272,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
/obj/machinery/camera/proc/setViewRange(num = 7)
src.view_range = num
- GLOB.cameranet.updateVisibility(src, 0)
+ SScameras.update_visibility(src)
/obj/machinery/camera/proc/shock(mob/living/user)
if(!istype(user))
@@ -336,7 +349,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE)
camera_enabled = !camera_enabled
if(can_use())
- GLOB.cameranet.addCamera(src)
+ SScameras.add_camera_to_chunk(src)
if (isturf(loc))
myarea = get_area(src)
LAZYADD(myarea.cameras, src)
@@ -344,12 +357,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
myarea = null
else
set_light(0)
- GLOB.cameranet.removeCamera(src)
+ SScameras.remove_camera_from_chunk(src)
if (isarea(myarea))
LAZYREMOVE(myarea.cameras, src)
// We are not guarenteed that the camera will be on a turf. account for that
- var/turf/our_turf = get_turf(src)
- GLOB.cameranet.updateChunk(our_turf.x, our_turf.y, our_turf.z)
var/change_msg = "deactivates"
if(camera_enabled)
change_msg = "reactivates"
@@ -365,6 +376,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
playsound(src, 'sound/items/tools/wirecutter.ogg', 100, TRUE)
update_appearance() //update Initialize() if you remove this.
+ calculate_active_power()
// now disconnect anyone using the camera
//Apparently, this will disconnect anyone even if the camera was re-activated.
@@ -389,6 +401,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
return FALSE
return TRUE
+/// Returns a list of turfs in this camera's view.
+/// This includes turfs that are "obscured by darkness" from the camera's POV.
/obj/machinery/camera/proc/can_see()
var/list/see = null
var/turf/pos = get_turf(src)
@@ -397,26 +411,22 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
var/check_higher = directly_above && istransparentturf(directly_above) && (pos != get_highest_turf(pos))
if(isXRay())
- see = range(view_range, pos)
+ see = RANGE_TURFS(view_range, pos)
else
- see = get_hear(view_range, pos)
+ see = get_hear_turfs(view_range, pos)
+
if(check_lower || check_higher)
// Haha datum var access KILL ME
- for(var/turf/seen in see)
+ for(var/turf/seen as anything in see)
if(check_lower)
- var/turf/visible = seen
- while(visible && istransparentturf(visible))
- var/turf/below = GET_TURF_BELOW(visible)
- for(var/turf/adjacent in range(1, below))
- see += adjacent
- see += adjacent.contents
- visible = below
+ var/turf/below = GET_TURF_BELOW(seen)
+ while(below && istransparentturf(below))
+ see += RANGE_TURFS(1, below)
+ below = GET_TURF_BELOW(below)
if(check_higher)
var/turf/above = GET_TURF_ABOVE(seen)
while(above && istransparentturf(above))
- for(var/turf/adjacent in range(1, above))
- see += adjacent
- see += adjacent.contents
+ see += RANGE_TURFS(1, above)
above = GET_TURF_ABOVE(above)
return see
@@ -449,3 +459,19 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
///Called when the camera stops being watched on a camera console.
/obj/machinery/camera/proc/on_stop_watching()
return
+
+/obj/machinery/camera/proc/calculate_active_power()
+ if(!can_use())
+ active_power_usage = 0
+ return
+
+ var/xray_power_mod = (camera_upgrade_bitflags & CAMERA_UPGRADE_XRAY) && !malf_xray_firmware_present ? XRAY_POWER_MOD : 1
+ var/motion_power_mod = (camera_upgrade_bitflags & CAMERA_UPGRADE_MOTION) ? MOTION_POWER_MOD : 1
+ var/EMP_power_mod = (camera_upgrade_bitflags & CAMERA_UPGRADE_EMP_PROOF) && !malf_emp_firmware_present ? EMP_POWER_MOD : 1
+
+ active_power_usage = CAMERA_POWER_CONSUMPTION * xray_power_mod * motion_power_mod * EMP_power_mod
+
+#undef CAMERA_POWER_CONSUMPTION
+#undef XRAY_POWER_MOD
+#undef MOTION_POWER_MOD
+#undef EMP_POWER_MOD
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
index ba5e793d68cef5..a9923b8117ec45 100644
--- a/code/game/machinery/camera/motion.dm
+++ b/code/game/machinery/camera/motion.dm
@@ -1,7 +1,7 @@
/obj/machinery/camera/process()
// motion camera event loop
if(!isMotion())
- return PROCESS_KILL
+ return PROCESS_KILL // FIXME: This is never undone if the camera gets upgraded to a motion camera
if(machine_stat & EMPED)
return
if (detectTime > 0)
@@ -13,14 +13,14 @@
var/mob/target = targetref.resolve()
if(QDELETED(target) || target.stat == DEAD || (!area_motion && !in_range(src, target)))
//If not part of a monitored area and the camera is not in range or the target is dead
- lostTargetRef(targetref)
+ lost_target(target)
/obj/machinery/camera/proc/getTargetList()
if(area_motion)
- return area_motion.motionTargets
+ return area_motion.motion_targets
return localMotionTargets
-/obj/machinery/camera/proc/newTarget(mob/target)
+/obj/machinery/camera/proc/new_target(mob/target)
if(isAI(target))
return FALSE
if (detectTime == 0)
@@ -29,19 +29,17 @@
targets |= WEAKREF(target)
return TRUE
+/obj/machinery/camera/proc/lost_target(mob/target)
+ var/list/targets = getTargetList()
+ targets -= WEAKREF(target)
+ if (!length(targets))
+ cancelAlarm()
+
/obj/machinery/camera/Destroy()
localMotionTargets = null
- if(area_motion)
- LAZYREMOVE(area_motion.motioncameras, src)
cancelAlarm()
return ..()
-/obj/machinery/camera/proc/lostTargetRef(datum/weakref/R)
- var/list/targets = getTargetList()
- targets -= R
- if (targets.len == 0)
- cancelAlarm()
-
/obj/machinery/camera/proc/cancelAlarm()
if (detectTime == -1 && camera_enabled)
alarm_manager.clear_alarm(ALARM_MOTION)
@@ -61,7 +59,7 @@
// Motion cameras outside of an "ai monitored" area will use this to detect stuff.
if (!area_motion)
if(isliving(AM))
- newTarget(AM)
+ new_target(AM)
/obj/machinery/camera/motion/thunderdome
name = "entertainment camera"
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 89af3fc1192411..45ec252b98dfd0 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -160,6 +160,7 @@
AddElement(/datum/element/empprotection, EMP_PROTECT_ALL)
camera_upgrade_bitflags |= CAMERA_UPGRADE_EMP_PROOF
+ calculate_active_power()
/obj/machinery/camera/proc/removeEmpProof(ignore_malf_upgrades)
if(ignore_malf_upgrades) //don't downgrade it if malf software is forced onto it.
@@ -167,6 +168,7 @@
RemoveElement(/datum/element/empprotection, EMP_PROTECT_ALL)
RemoveElement(/datum/element/empprotection, EMP_PROTECT_ALL|EMP_NO_EXAMINE)
camera_upgrade_bitflags &= ~CAMERA_UPGRADE_EMP_PROOF
+ calculate_active_power()
/obj/machinery/camera/proc/isXRay(ignore_malf_upgrades)
return (camera_upgrade_bitflags & CAMERA_UPGRADE_XRAY) && (!(ignore_malf_upgrades && malf_xray_firmware_active))
@@ -185,11 +187,14 @@
camera_upgrade_bitflags |= CAMERA_UPGRADE_XRAY
update_appearance()
+ SScameras.update_visibility(src)
+ calculate_active_power()
/obj/machinery/camera/proc/removeXRay(ignore_malf_upgrades)
if(!ignore_malf_upgrades) //don't downgrade it if malf software is forced onto it.
camera_upgrade_bitflags &= ~CAMERA_UPGRADE_XRAY
update_appearance()
+ calculate_active_power()
/obj/machinery/camera/proc/isMotion()
return camera_upgrade_bitflags & CAMERA_UPGRADE_MOTION
@@ -204,6 +209,7 @@
proximity_monitor = new(src)
camera_upgrade_bitflags |= CAMERA_UPGRADE_MOTION
create_prox_monitor()
+ calculate_active_power()
/obj/machinery/camera/proc/removeMotion()
if(name == "motion-sensitive security camera")
@@ -211,3 +217,4 @@
camera_upgrade_bitflags &= ~CAMERA_UPGRADE_MOTION
if(!area_motion)
QDEL_NULL(proximity_monitor)
+ calculate_active_power()
diff --git a/code/game/machinery/camera/silicon_camera.dm b/code/game/machinery/camera/silicon_camera.dm
index 62f59171134683..d573c59f6320a6 100644
--- a/code/game/machinery/camera/silicon_camera.dm
+++ b/code/game/machinery/camera/silicon_camera.dm
@@ -33,6 +33,7 @@
///The alert given to silicons being watched.
/atom/movable/screen/alert/being_recorded
- icon_state = "recording"
name = "Recorded"
desc = "Someone is currently watching your internal camera through a camera console."
+ use_user_hud_icon = TRUE
+ overlay_state = "recording"
diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm
index b917bed6c7d4cd..9f2254a28ce778 100644
--- a/code/game/machinery/civilian_bounties.dm
+++ b/code/game/machinery/civilian_bounties.dm
@@ -336,9 +336,9 @@
/obj/item/bounty_cube/examine()
. = ..()
if(speed_bonus)
- . += span_notice("
[time2text(next_nag_time - world.time,"mm:ss", NO_TIMEZONE)] remains until
[bounty_value * speed_bonus] credit speedy delivery bonus lost.")
+ . += span_notice("
[time2text(next_nag_time - world.time,"mm:ss", NO_TIMEZONE)] remains until
[bounty_value * speed_bonus] [MONEY_NAME_SINGULAR] speedy delivery bonus lost.")
if(handler_tip && !bounty_handler_account)
- . += span_notice("Scan this in the cargo shuttle with an export scanner to register your bank account for the
[bounty_value * handler_tip] credit handling tip.")
+ . += span_notice("Scan this in the cargo shuttle with an export scanner to register your bank account for the
[bounty_value * handler_tip] [MONEY_NAME_SINGULAR] handling tip.")
/obj/item/bounty_cube/process(seconds_per_tick)
//if our nag cooldown has finished and we aren't on Centcom or in transit, then nag
@@ -372,7 +372,7 @@
bounty_holder = holder_id.registered_name
bounty_holder_job = holder_id.assignment
bounty_holder_account = holder_id.registered_account
- name = "\improper [bounty_value] cr [name]"
+ name = "\improper [bounty_value] [MONEY_SYMBOL] [name]"
desc += " The sales tag indicates it was
[bounty_holder] ([bounty_holder_job])'s reward for completing the
[bounty_name] bounty."
AddComponent(/datum/component/pricetag, holder_id.registered_account, holder_cut, FALSE)
AddComponent(/datum/component/gps, "[src]")
diff --git a/code/game/machinery/computer/accounting.dm b/code/game/machinery/computer/accounting.dm
index 75a890d382ac0d..878c450e8194e7 100644
--- a/code/game/machinery/computer/accounting.dm
+++ b/code/game/machinery/computer/accounting.dm
@@ -71,7 +71,7 @@
bank_account.payday_modifier = clamp(round(text2num(params["pay_mod"]), 0.05), MIN_PAY_MOD, MAX_PAY_MOD)
var/new_check_total = bank_account.payday_modifier * bank_account.account_job.paycheck
var/raise_or_cut = new_check_total > old_modifier * bank_account.account_job.paycheck ? "raised" : "cut"
- bank_account.bank_card_talk("Paycheck [raise_or_cut] to [new_check_total]cr.")
+ bank_account.bank_card_talk("Paycheck [raise_or_cut] to [new_check_total][MONEY_SYMBOL].")
SSeconomy.add_audit_entry(bank_account, new_check_total, "Paycheck [raise_or_cut]")
return TRUE
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 6c6b41da72c59c..dd76cd1efb71e7 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -68,9 +68,9 @@
say("Not enough energy. Restoration cancelled.")
return FALSE
var/need_mob_update = FALSE
- need_mob_update += occupier.adjustOxyLoss(-5, updating_health = FALSE)
- need_mob_update += occupier.adjustFireLoss(-5, updating_health = FALSE)
- need_mob_update += occupier.adjustBruteLoss(-5, updating_health = FALSE)
+ need_mob_update += occupier.adjust_oxy_loss(-5, updating_health = FALSE)
+ need_mob_update += occupier.adjust_fire_loss(-5, updating_health = FALSE)
+ need_mob_update += occupier.adjust_brute_loss(-5, updating_health = FALSE)
if(need_mob_update)
occupier.updatehealth()
if(occupier.health >= 0 && occupier.stat == DEAD)
diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm
index 892113713617de..6c56f6e2aa608b 100644
--- a/code/game/machinery/computer/apc_control.dm
+++ b/code/game/machinery/computer/apc_control.dm
@@ -102,7 +102,7 @@
*/
/obj/machinery/computer/apc_control/proc/check_apc(obj/machinery/power/apc/checked_apc)
- return (is_on_station ? is_station_level(checked_apc.z) : checked_apc.z == z) && !checked_apc.malfhack && !checked_apc.aidisabled && !(checked_apc.obj_flags & EMAGGED) && !checked_apc.machine_stat && !istype(checked_apc.area, /area/station/ai_monitored)
+ return (is_on_station ? is_station_level(checked_apc.z) : checked_apc.z == z) && !checked_apc.malfhack && !checked_apc.aidisabled && !(checked_apc.obj_flags & EMAGGED) && !checked_apc.machine_stat && !istype(checked_apc.area, /area/station/ai)
/obj/machinery/computer/apc_control/ui_interact(mob/user, datum/tgui/ui)
. = ..()
diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
index ad870c9520b7fa..bb40f34fcf6c54 100644
--- a/code/game/machinery/computer/atmos_computers/_air_sensor.dm
+++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
@@ -167,7 +167,7 @@
desc = "A device designed to detect gases and their concentration in an area."
icon = 'icons/obj/wallmounts.dmi'
icon_state = "gsensor0"
- custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT + SMALL_MATERIAL_AMOUNT * 0.3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.2)
/obj/item/air_sensor/Initialize(mapload, inlet, outlet)
. = ..()
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 64a6495e3a16b2..d5f6b8210069d5 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -8,7 +8,7 @@
/obj/structure/frame/computer/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
register_context()
/obj/structure/frame/computer/atom_deconstruct(disassembled = TRUE)
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 8725bda22f5ec8..f33cff0c7ea0d3 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -89,7 +89,7 @@
var/list/data = list()
data["network"] = network
data["mapRef"] = cam_screen.assigned_map
- data["cameras"] = GLOB.cameranet.get_available_cameras_data(network)
+ data["cameras"] = SScameras.get_available_cameras_data(network)
return data
/obj/machinery/computer/security/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -99,7 +99,7 @@
if(action == "switch_camera")
active_camera?.on_stop_watching(src)
- var/obj/machinery/camera/selected_camera = locate(params["camera"]) in GLOB.cameranet.cameras
+ var/obj/machinery/camera/selected_camera = locate(params["camera"]) in SScameras.cameras
active_camera = selected_camera
if(isnull(active_camera))
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index bb034b1a32204d..42188e251a2631 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -55,9 +55,10 @@
actions += new move_down_action(src)
if(add_usb_port)
AddComponent(/datum/component/usb_port, \
- list(
+ typecacheof(list(
/obj/item/circuit_component/advanced_camera,
/obj/item/circuit_component/advanced_camera_intercept,
+ ), \
), \
extra_registration_callback = PROC_REF(register_usb_port), \
extra_unregistration_callback = PROC_REF(unregister_usb_port) \
@@ -183,10 +184,10 @@
else
camera_location = myturf
else
- if((!consider_zlock || (myturf.z in z_lock)) && GLOB.cameranet.checkTurfVis(myturf))
+ if((!consider_zlock || (myturf.z in z_lock)) && SScameras.is_visible_by_cameras(myturf))
camera_location = myturf
else
- for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
+ for(var/obj/machinery/camera/C as anything in SScameras.cameras)
if(!C.can_use() || consider_zlock && !(C.z in z_lock))
continue
var/list/network_overlap = networks & C.network
@@ -229,7 +230,7 @@
var/mob/eye/camera/remote/remote_eye = owner.remote_control
var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin_ref.resolve()
- var/list/cameras_by_tag = GLOB.cameranet.get_available_camera_by_tag_list(origin.networks, origin.z_lock)
+ var/list/cameras_by_tag = SScameras.get_available_camera_by_tag_list(origin.networks, origin.z_lock)
playsound(origin, 'sound/machines/terminal/terminal_prompt.ogg', 25, FALSE)
var/camera = tgui_input_list(usr, "Camera to view", "Cameras", cameras_by_tag)
@@ -403,7 +404,7 @@
var/turf/eye_turf = get_turf(source)
if(!eye_turf)
return
- if(!GLOB.cameranet.checkTurfVis(eye_turf))
+ if(!SScameras.is_visible_by_cameras(eye_turf))
return
eye_x.set_output(source.x)
eye_y.set_output(source.y)
@@ -490,7 +491,7 @@
var/turf/target_turf = get_turf(target)
if(!target_turf)
return
- if(!GLOB.cameranet.checkTurfVis(target_turf))
+ if(!SScameras.is_visible_by_cameras(target_turf))
return
if(TIMER_COOLDOWN_RUNNING(parent.shell, COOLDOWN_CIRCUIT_TARGET_INTERCEPT))
return
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index ab687c53805a1d..b590505a239a11 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -282,7 +282,7 @@
bank_account.adjust_money(-shuttle.credit_cost)
var/purchaser_name = (obj_flags & EMAGGED) ? scramble_message_replace_chars("AUTHENTICATION FAILURE: CVE-2018-17107", 60) : user.real_name
- minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] credits.[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase")
+ minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] [MONEY_NAME].[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase")
message_admins("[ADMIN_LOOKUPFLW(user)] purchased [shuttle.name].")
log_shuttle("[key_name(user)] has purchased [shuttle.name].")
@@ -292,7 +292,7 @@
// AIs cannot recall the shuttle
if (!authenticated(user) || HAS_SILICON_ACCESS(user) || syndicate)
return
- SSshuttle.cancelEvac(user)
+ SSshuttle.cancel_evac(user)
if ("requestNukeCodes")
if (!authenticated_as_non_silicon_captain(user))
return
@@ -575,7 +575,7 @@
if (SSshuttle.emergency.mode != SHUTTLE_IDLE && SSshuttle.emergency.mode != SHUTTLE_RECALL)
data["shuttleCalled"] = TRUE
- data["shuttleRecallable"] = SSshuttle.canRecall() || syndicate
+ data["shuttleRecallable"] = SSshuttle.can_recall(user) || syndicate
if (SSshuttle.emergencyCallAmount)
data["shuttleCalledPreviously"] = TRUE
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 4c3a10bad72ca4..74265831b77b85 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -13,9 +13,7 @@
/obj/machinery/computer/crew/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/medical_console_data,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/medical_console_data), only_root_path = TRUE))
/obj/item/circuit_component/medical_console_data
display_name = "Crew Monitoring Data"
@@ -277,16 +275,19 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
continue
// Current status
- if (sensor_mode >= SENSOR_LIVING)
+ if (sensor_mode >= SENSOR_VITALS)
entry["life_status"] = tracked_living_mob.stat
+ else if (sensor_mode == SENSOR_LIVING)
+ // binary sensors should only report alive or dead
+ entry["life_status"] = (tracked_living_mob.stat == DEAD) ? DEAD : CONSCIOUS
// Damage
if (sensor_mode >= SENSOR_VITALS)
entry += list(
- "oxydam" = round(tracked_living_mob.getOxyLoss(), 1),
- "toxdam" = round(tracked_living_mob.getToxLoss(), 1),
- "burndam" = round(tracked_living_mob.getFireLoss(), 1),
- "brutedam" = round(tracked_living_mob.getBruteLoss(), 1),
+ "oxydam" = round(tracked_living_mob.get_oxy_loss(), 1),
+ "toxdam" = round(tracked_living_mob.get_tox_loss(), 1),
+ "burndam" = round(tracked_living_mob.get_fire_loss(), 1),
+ "brutedam" = round(tracked_living_mob.get_brute_loss(), 1),
"health" = round(tracked_living_mob.health, 1),
)
diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm
index 1502e5af50621f..dcbd6499ec7f9a 100644
--- a/code/game/machinery/computer/launchpad_control.dm
+++ b/code/game/machinery/computer/launchpad_control.dm
@@ -12,9 +12,7 @@
/obj/machinery/computer/launchpad/Initialize(mapload)
launchpads = list()
. = ..()
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/bluespace_launchpad/console,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/bluespace_launchpad/console), only_root_path = TRUE))
/obj/item/circuit_component/bluespace_launchpad/console
display_name = "Bluespace Launchpad Console"
diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm
index 0c7498888a6d03..e31d028d95f1b6 100644
--- a/code/game/machinery/computer/operating_computer.dm
+++ b/code/game/machinery/computer/operating_computer.dm
@@ -9,12 +9,21 @@
circuit = /obj/item/circuitboard/computer/operating
interaction_flags_machine = parent_type::interaction_flags_machine | INTERACT_MACHINE_REQUIRES_STANDING
+ light_color = LIGHT_COLOR_GREEN
+
+ /// Linked operating table, if any
var/obj/structure/table/optable/table
+ /// List if surgery typepaths available on this computer
var/list/advanced_surgeries = list()
+ /// Techweb linked to this operating computer
var/datum/techweb/linked_techweb
- light_color = LIGHT_COLOR_BLUE
-
+ /// Currently selected body zone for surgery
+ var/target_zone = BODY_ZONE_CHEST
+ /// Experiment handler component reference
var/datum/component/experiment_handler/experiment_handler
+ /// Lazyassoclist of mob weakrefs to the zone they had selected when opening the UI
+ /// When closing the UI we try to revert their zone selector to that zone
+ var/list/datum/weakref/zone_on_open
/obj/machinery/computer/operating/Initialize(mapload)
. = ..()
@@ -26,6 +35,14 @@
if(!CONFIG_GET(flag/no_default_techweb_link) && !linked_techweb)
CONNECT_TO_RND_SERVER_ROUNDSTART(linked_techweb, src)
+ if(linked_techweb)
+ RegisterSignal(linked_techweb, COMSIG_TECHWEB_ADD_DESIGN, PROC_REF(on_techweb_research))
+ RegisterSignal(linked_techweb, COMSIG_TECHWEB_REMOVE_DESIGN, PROC_REF(on_techweb_unresearch))
+ RegisterSignal(linked_techweb, COMSIG_TECHWEB_EXPERIMENT_COMPLETED, PROC_REF(update_static_data_batched))
+
+ for(var/datum/design/surgery/design in linked_techweb.get_researched_design_datums())
+ advanced_surgeries |= design.surgery
+
var/list/operating_signals = list(
COMSIG_OPERATING_COMPUTER_AUTOPSY_COMPLETE = TYPE_PROC_REF(/datum/component/experiment_handler, try_run_autopsy_experiment),
)
@@ -50,25 +67,30 @@
linked_techweb = tool.buffer
return TRUE
-/obj/machinery/computer/operating/attackby(obj/item/O, mob/user, list/modifiers, list/attack_modifiers)
- if(istype(O, /obj/item/disk/surgery))
- user.visible_message(span_notice("[user] begins to load \the [O] in \the [src]..."), \
- span_notice("You begin to load a surgery protocol from \the [O]..."), \
- span_hear("You hear the chatter of a floppy drive."))
- var/obj/item/disk/surgery/D = O
- if(do_after(user, 1 SECONDS, target = src))
- advanced_surgeries |= D.surgeries
- return TRUE
- return ..()
+/obj/machinery/computer/operating/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(istype(tool, /obj/item/disk/surgery))
+ user.visible_message(
+ span_notice("[user] begins to load [tool] in [src]..."),
+ span_notice("You begin to load a surgery protocol from [tool]..."),
+ span_hear("You hear the chatter of a floppy drive."),
+ )
+ var/obj/item/disk/surgery/disky = tool
+ if(!do_after(user, 1 SECONDS, src))
+ return ITEM_INTERACT_BLOCKING
+ advanced_surgeries |= disky.surgeries
+ update_static_data_for_all_viewers()
+ playsound(src, 'sound/machines/compiler/compiler-stage2.ogg', 50, FALSE, SILENCED_SOUND_EXTRARANGE)
+ balloon_alert(user, "surgeries loaded")
+ return ITEM_INTERACT_SUCCESS
-/obj/machinery/computer/operating/proc/sync_surgeries()
- if(!linked_techweb)
- return
- for(var/i in linked_techweb.researched_designs)
- var/datum/design/surgery/D = SSresearch.techweb_design_by_id(i)
- if(!istype(D))
- continue
- advanced_surgeries |= D.surgery
+ if((tool.item_flags & SURGICAL_TOOL) && !user.combat_mode)
+ ui_interact(user)
+ return ITEM_INTERACT_SUCCESS
+
+ return NONE
+
+/obj/machinery/computer/operating/on_set_is_operational(old_value)
+ update_static_data_for_all_viewers()
/obj/machinery/computer/operating/proc/find_table()
for(var/direction in GLOB.alldirs)
@@ -77,36 +99,74 @@
table.computer = src
break
-/obj/machinery/computer/operating/ui_state(mob/user)
- return GLOB.standing_state
+/obj/machinery/computer/operating/ui_status(mob/user, datum/ui_state/state)
+ . = ..()
+ if(isliving(user))
+ . = min(., ui_check(user))
+
+/// Checks for special ui state conditions
+/obj/machinery/computer/operating/proc/ui_check(mob/living/user)
+ // lower states should be checked first
+
+ // normally machines revert to "disabled" when non-operational,
+ // but here we outright close it so people can't gleam extra info
+ if(!is_operational)
+ return UI_CLOSE
+ // if you're knocked out, ie anesthetic... definitely a no-go
+ if(user.stat >= UNCONSCIOUS || HAS_TRAIT(user, TRAIT_KNOCKEDOUT))
+ return UI_CLOSE
+ // the patient itself should be blocked from viewing the computer
+ if(user.body_position == LYING_DOWN)
+ return (user.loc == table?.loc) ? UI_CLOSE : UI_DISABLED
+ // we have a tight range check so people can't spy on surgeries from across the room
+ // likewise it'd be pretty lame if you could see what was going on while incapacitated
+ if(get_dist(user, src) > 2 || user.incapacitated)
+ return UI_DISABLED
+
+ return UI_INTERACTIVE
/obj/machinery/computer/operating/ui_interact(mob/user, datum/tgui/ui)
. = ..()
ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "OperatingComputer", name)
- ui.open()
+ if(ui)
+ return
+
+ if(ishuman(user))
+ // if you are the first human to open the ui, it changes to your active zone
+ if(!LAZYLEN(zone_on_open))
+ target_zone = user.zone_selected
+ // then we record what you were looking at for when you close it
+ LAZYSET(zone_on_open, WEAKREF(user), user.zone_selected)
+
+ ui = new(user, src, "OperatingComputer", name)
+ ui.open()
+
+/obj/machinery/computer/operating/ui_close(mob/user)
+ . = ..()
+ // reverts zone to whatever you had going into it, typically chest, so you don't have to mess around with it
+ var/zone_found = LAZYACCESS(zone_on_open, WEAKREF(user))
+ if(!zone_found)
+ return
+
+ var/atom/movable/screen/zone_sel/selector = user.hud_used?.zone_select
+ selector?.set_selected_zone(zone_found, user, FALSE)
+ LAZYREMOVE(zone_on_open, WEAKREF(user))
+ if(!LAZYLEN(zone_on_open))
+ zone_on_open = initial(zone_on_open)
+
+/obj/machinery/computer/operating/ui_assets(mob/user)
+ . = ..()
+ . += get_asset_datum(/datum/asset/simple/body_zones)
/obj/machinery/computer/operating/ui_data(mob/user)
var/list/data = list()
- var/list/all_surgeries = list()
- for(var/datum/surgery/surgeries as anything in advanced_surgeries)
- var/list/surgery = list()
- surgery["name"] = initial(surgeries.name)
- surgery["desc"] = initial(surgeries.desc)
- all_surgeries += list(surgery)
- data["surgeries"] = all_surgeries
-
- //If there's no patient just hop to it yeah?
- if(!table)
- data["patient"] = null
+
+ data["has_table"] = !!table
+ data["target_zone"] = target_zone
+ if(isnull(table?.patient))
return data
- data["table"] = table
data["patient"] = list()
- data["procedures"] = list()
- if(!table.patient)
- return data
var/mob/living/carbon/patient = table.patient
switch(patient.stat)
@@ -114,7 +174,7 @@
data["patient"]["stat"] = "Conscious"
data["patient"]["statstate"] = "good"
if(SOFT_CRIT)
- data["patient"]["stat"] = "Conscious"
+ data["patient"]["stat"] = "Critical Condition"
data["patient"]["statstate"] = "average"
if(UNCONSCIOUS, HARD_CRIT)
data["patient"]["stat"] = "Unconscious"
@@ -126,34 +186,84 @@
data["patient"]["blood_type"] = patient.get_bloodtype()?.name || "UNKNOWN"
data["patient"]["maxHealth"] = patient.maxHealth
data["patient"]["minHealth"] = HEALTH_THRESHOLD_DEAD
- data["patient"]["bruteLoss"] = patient.getBruteLoss()
- data["patient"]["fireLoss"] = patient.getFireLoss()
- data["patient"]["toxLoss"] = patient.getToxLoss()
- data["patient"]["oxyLoss"] = patient.getOxyLoss()
- if(patient.surgeries.len)
- for(var/datum/surgery/procedure in patient.surgeries)
- var/datum/surgery_step/surgery_step = GLOB.surgery_steps[procedure.steps[procedure.status]]
- var/chems_needed = surgery_step.get_chem_list()
- var/alternative_step
- var/alt_chems_needed = ""
- var/alt_chems_present = FALSE
- if(surgery_step.repeatable)
- var/datum/surgery_step/next_step = procedure.get_surgery_next_step()
- if(next_step)
- alternative_step = capitalize(next_step.name)
- alt_chems_needed = next_step.get_chem_list()
- alt_chems_present = next_step.chem_check(patient)
- else
- alternative_step = "Finish operation"
- data["procedures"] += list(list(
- "name" = capitalize("[patient.parse_zone_with_bodypart(procedure.location)] [procedure.name]"),
- "next_step" = capitalize(surgery_step.name),
- "chems_needed" = chems_needed,
- "alternative_step" = alternative_step,
- "alt_chems_needed" = alt_chems_needed,
- "chems_present" = surgery_step.chem_check(patient),
- "alt_chems_present" = alt_chems_present
+ data["patient"]["bruteLoss"] = patient.get_brute_loss()
+ data["patient"]["fireLoss"] = patient.get_fire_loss()
+ data["patient"]["toxLoss"] = patient.get_tox_loss()
+ data["patient"]["oxyLoss"] = patient.get_oxy_loss()
+ data["patient"]["blood_level"] = patient.blood_volume
+ data["patient"]["standard_blood_level"] = BLOOD_VOLUME_NORMAL
+ data["patient"]["surgery_state"] = patient.get_surgery_state_as_list(deprecise_zone(target_zone))
+ return data
+
+/obj/machinery/computer/operating/ui_static_data(mob/user)
+ var/list/data = list()
+
+ data["experiments"] = list()
+ data["techwebs"] = list()
+ data["surgeries"] = list()
+ if(!is_operational)
+ return data
+
+ if(linked_techweb)
+ data["techwebs"] += list(list(
+ "web_id" = linked_techweb.id,
+ "web_org" = linked_techweb.organization,
+ "selected" = TRUE,
+ "ref" = REF(linked_techweb),
+ "all_servers" = linked_techweb.techweb_servers,
+ ))
+
+ for(var/datum/experiment/experiment as anything in linked_techweb.available_experiments)
+ if(istype(experiment, /datum/experiment/autopsy))
+ data["experiments"] += list(experiment.to_ui_data())
+
+ var/list/operations = GLOB.operations.get_instances_from(GLOB.operations.unlocked | advanced_surgeries)
+ var/any_recommended = FALSE
+ for(var/datum/surgery_operation/operation as anything in operations)
+ var/recommend = FALSE
+ if(table?.patient && operation.show_as_next_step(table.patient, target_zone))
+ recommend = TRUE
+ any_recommended = TRUE
+
+ data["surgeries"] += list(list(
+ "name" = operation.rnd_name || operation.name,
+ "desc" = operation.rnd_desc || operation.desc,
+ "tool_rec" = operation.get_recommended_tool() || "error",
+ "requirements" = operation.get_requirements(),
+ "show_as_next" = recommend,
+ "show_in_list" = TRUE,
+ "priority" = operation.operation_flags & OPERATION_PRIORITY_NEXT_STEP,
+ "mechanic" = operation.operation_flags & OPERATION_MECHANIC,
+ ))
+
+ if(!any_recommended && table?.patient)
+ var/obj/item/part = table.patient.get_bodypart(deprecise_zone(target_zone))
+ var/just_drapes = FALSE
+ if(table.patient.has_limbs)
+ if(isnull(part))
+ data["surgeries"] += list(list(
+ "name" = "Prepare for [/datum/surgery_operation/prosthetic_replacement::name]",
+ "desc" = "Prepare the patient's chest for prosthetic limb attachment.",
+ "tool_rec" = "operate on chest",
+ "show_as_next" = TRUE,
+ "show_in_list" = FALSE,
+ ))
+
+ else if(!HAS_TRAIT(part, TRAIT_READY_TO_OPERATE))
+ just_drapes = TRUE
+
+ else if(!HAS_TRAIT(table.patient, TRAIT_READY_TO_OPERATE))
+ just_drapes = TRUE
+
+ if(just_drapes)
+ data["surgeries"] += list(list(
+ "name" = "Prepare for surgery",
+ "desc" = "Begin surgery by applying surgical drapes to the patient.",
+ "tool_rec" = /obj/item/surgical_drapes::name,
+ "show_as_next" = TRUE,
+ "show_in_list" = FALSE,
))
+
return data
/obj/machinery/computer/operating/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -161,11 +271,39 @@
if(.)
return
switch(action)
- if("sync")
- sync_surgeries()
if("open_experiments")
experiment_handler.ui_interact(usr)
+ if("change_zone")
+ if(params["new_zone"] in (GLOB.all_body_zones + GLOB.all_precise_body_zones))
+ target_zone = params["new_zone"]
+ var/atom/movable/screen/zone_sel/selector = ui.user.hud_used?.zone_select
+ selector?.set_selected_zone(params["new_zone"], ui.user, FALSE)
+ update_static_data_for_all_viewers()
return TRUE
+/obj/machinery/computer/operating/proc/on_techweb_research(datum/source, datum/design/surgery/design)
+ SIGNAL_HANDLER
+
+ if(!istype(design))
+ return
+
+ advanced_surgeries |= design.surgery
+ update_static_data_batched()
+
+/obj/machinery/computer/operating/proc/on_techweb_unresearch(datum/source, datum/design/surgery/design)
+ SIGNAL_HANDLER
+
+ if(!istype(design))
+ return
+
+ advanced_surgeries -= design.surgery
+ update_static_data_batched()
+
+/// Updates static data for all viewers after a miniscule delay (to batch multiple updates together)
+/obj/machinery/computer/operating/proc/update_static_data_batched(...)
+ SIGNAL_HANDLER
+
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, update_static_data_for_all_viewers)), 0.1 SECONDS, TIMER_UNIQUE)
+
#undef MENU_OPERATION
#undef MENU_SURGERIES
diff --git a/code/game/machinery/computer/orders/order_computer/mining_order.dm b/code/game/machinery/computer/orders/order_computer/mining_order.dm
index 97e9e74b5ce17f..b7082507a8701f 100644
--- a/code/game/machinery/computer/orders/order_computer/mining_order.dm
+++ b/code/game/machinery/computer/orders/order_computer/mining_order.dm
@@ -1,4 +1,4 @@
-#define CREDIT_TYPE_MINING "mp"
+
/obj/machinery/computer/order_console/mining
name = "mining equipment order console"
@@ -15,7 +15,7 @@
and hopefully get delivered by them.
35% cheaper than express delivery."}
express_tooltip = @{"Sends your purchases instantly."}
- credit_type = CREDIT_TYPE_MINING
+ credit_type = MONEY_MINING_SYMBOL
order_categories = list(
CATEGORY_MINING,
@@ -127,6 +127,5 @@
points += amount
to_chat(user, span_notice("You transfer [amount] mining points from [attacking_id] to [src]."))
-#undef CREDIT_TYPE_MINING
#undef TO_POINT_CARD
#undef TO_USER_ID
diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm
index 02b26438d50964..d89dd05c43495d 100644
--- a/code/game/machinery/computer/orders/order_computer/order_computer.dm
+++ b/code/game/machinery/computer/orders/order_computer/order_computer.dm
@@ -1,6 +1,5 @@
///List of all items that can be found in the different types of order consoles, to purchase.
GLOBAL_LIST_EMPTY(order_console_products)
-#define CREDIT_TYPE_CREDIT "credit"
/obj/machinery/computer/order_console
name = "Orders Console"
@@ -25,7 +24,7 @@ GLOBAL_LIST_EMPTY(order_console_products)
var/announcement_line
///The kind of cash does the console use.
- var/credit_type = CREDIT_TYPE_CREDIT
+ var/credit_type = MONEY_SYMBOL
///Whether the console can only use express mode ONLY
var/forced_express = FALSE
///Multiplied cost to use for cargo mode
@@ -250,5 +249,3 @@ GLOBAL_LIST_EMPTY(order_console_products)
announcement_lines_map["Error"] = "Unknown Error happened, while we tried to procceed an order, please report this to Nanotrasen."
. = ..()
-
-#undef CREDIT_TYPE_CREDIT
diff --git a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm
index 41c52d9b0a0e55..f9247d039ce729 100644
--- a/code/game/machinery/computer/orders/order_items/mining/order_mining.dm
+++ b/code/game/machinery/computer/orders/order_items/mining/order_mining.dm
@@ -38,10 +38,6 @@
purchase_path = /obj/item/clothing/gloves/fingerless/punch_mitts
cost_per_order = 1000
-/datum/orderable_item/mining/crusher_retool_kit
- purchase_path = /obj/item/crusher_trophy/retool_kit
- cost_per_order = 150
-
/datum/orderable_item/mining/resonator
purchase_path = /obj/item/resonator
cost_per_order = 710
diff --git a/code/game/machinery/computer/orders/order_items/mining/order_toys.dm b/code/game/machinery/computer/orders/order_items/mining/order_toys.dm
index 65bbee24ead6e7..c253b8d51bacba 100644
--- a/code/game/machinery/computer/orders/order_items/mining/order_toys.dm
+++ b/code/game/machinery/computer/orders/order_items/mining/order_toys.dm
@@ -34,6 +34,6 @@
cost_per_order = 525
/datum/orderable_item/toys_drones/drone_sentience
- purchase_path = /obj/item/slimepotion/slime/sentience/mining
+ purchase_path = /obj/item/slimepotion/sentience/mining
cost_per_order = 850
diff --git a/code/game/machinery/computer/records/security.dm b/code/game/machinery/computer/records/security.dm
index abf3f1b36643d8..4bfbf69629378b 100644
--- a/code/game/machinery/computer/records/security.dm
+++ b/code/game/machinery/computer/records/security.dm
@@ -35,10 +35,12 @@
/obj/machinery/computer/records/security/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/arrest_console_data,
- /obj/item/circuit_component/arrest_console_arrest,
- ))
+ AddComponent(/datum/component/usb_port, \
+ typecacheof(list(
+ /obj/item/circuit_component/arrest_console_data,
+ /obj/item/circuit_component/arrest_console_arrest,
+ ), only_root_path = TRUE) \
+ )
/obj/machinery/computer/records/security/emp_act(severity)
. = ..()
@@ -214,7 +216,7 @@
var/max = CONFIG_GET(number/maxfine)
if(params["fine"] > max)
- to_chat(usr, span_warning("The maximum fine is [max] credits."))
+ to_chat(usr, span_warning("The maximum fine is [max] [MONEY_NAME]."))
playsound(src, 'sound/machines/terminal/terminal_error.ogg', 75, TRUE)
return FALSE
@@ -236,7 +238,7 @@
var/datum/crime/citation/new_citation = new(name = input_name, details = input_details, author = usr, fine = params["fine"])
target.citations += new_citation
- new_citation.alert_owner(user, src, target.name, "You have been issued a [params["fine"]]cr citation for [input_name]. Fines are payable at Security.")
+ new_citation.alert_owner(user, src, target.name, "You have been issued a [params["fine"]][MONEY_SYMBOL] citation for [input_name]. Fines are payable at Security.")
investigate_log("New Citation:
[input_name] Fine: [params["fine"]] | Added to [target.name] by [key_name(user)]", INVESTIGATE_RECORDS)
SSblackbox.ReportCitation(REF(new_citation), user.ckey, user.real_name, target.name, input_name, input_details, params["fine"])
diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index 7e34dae7025727..b17589bb4baccc 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -24,9 +24,7 @@
id = "[rand(1000, 9999)]"
link_power_station()
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/teleporter_control_console,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/teleporter_control_console), only_root_path = TRUE))
/obj/machinery/computer/teleporter/Destroy()
if (power_station)
diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm
index 4e586fe81aed58..82e76a6bf14494 100644
--- a/code/game/machinery/computer/telescreen.dm
+++ b/code/game/machinery/computer/telescreen.dm
@@ -14,6 +14,11 @@
var/frame_type = /obj/item/wallframe/telescreen
projectiles_pass_chance = 100
+/obj/machinery/computer/security/telescreen/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ find_and_mount_on_atom()
+
/obj/item/wallframe/telescreen
name = "telescreen frame"
desc = "A wall-mountable telescreen frame. Apply to wall to use."
@@ -70,8 +75,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai
/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload)
. = ..()
- if(mapload)
- find_and_hang_on_wall()
register_context()
RegisterSignal(SSdcs, COMSIG_GLOB_NETWORK_BROADCAST_UPDATED, PROC_REF(on_network_broadcast_updated))
speakers = new(src)
@@ -299,6 +302,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/ordnance
/obj/item/wallframe/telescreen/engine
name = "engine telescreen frame"
result_path = /obj/machinery/computer/security/telescreen/engine
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/engine, 32)
@@ -311,6 +315,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/engine,
/obj/item/wallframe/telescreen/turbine
name = "turbine telescreen frame"
result_path = /obj/machinery/computer/security/telescreen/turbine
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/turbine, 32)
@@ -347,6 +352,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/prison,
/obj/item/wallframe/telescreen/auxbase
name = "auxiliary base telescreen frame"
result_path = /obj/machinery/computer/security/telescreen/auxbase
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/auxbase, 32)
@@ -552,3 +558,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/deep_sto
say("The [tv_show_name] show has [is_show_active ? "begun" : "ended"]")
var/announcement = is_show_active ? pick(tv_starters) : pick(tv_enders)
set_network_broadcast_status(tv_network_id, is_show_active, announcement)
+
+/obj/machinery/computer/security/telescreen/monastery
+ name = "monastery monitor"
+ desc = "A telescreen that connects to the monastery's camera network."
+ network = list(CAMERANET_NETWORK_MONASTERY)
+ frame_type = /obj/item/wallframe/telescreen/monastery
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/monastery, 32)
+
+/obj/item/wallframe/telescreen/monastery
+ name = "monastery telescreen frame"
+ result_path = /obj/machinery/computer/security/telescreen/monastery
+
diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm
index 7e66c748917b3d..dd85df26060a52 100644
--- a/code/game/machinery/computer/warrant.dm
+++ b/code/game/machinery/computer/warrant.dm
@@ -105,13 +105,13 @@
return FALSE
var/amount = params["amount"]
- if(!amount || !isnum(amount) || amount > warrant.fine || !account.adjust_money(-amount, "Paid fine for [target.name]"))
+ if(!amount || !isnum(amount) || amount <= 0 || amount > warrant.fine || !account.adjust_money(-amount, "Paid fine for [target.name]"))
to_chat(user, span_warning("ACCESS DENIED: Invalid amount."))
playsound(src, 'sound/machines/terminal/terminal_error.ogg', 100, TRUE)
return FALSE
- account.bank_card_talk("You have paid [amount]cr towards [target.name]'s fine of [warrant.fine]cr.")
- log_econ("[amount]cr was transferred from [user]'s transaction to [target.name]'s [warrant.fine]cr fine")
+ account.bank_card_talk("You have paid [amount][MONEY_SYMBOL] towards [target.name]'s fine of [warrant.fine][MONEY_SYMBOL].")
+ log_econ("[amount][MONEY_SYMBOL] was transferred from [user]'s transaction to [target.name]'s [warrant.fine][MONEY_SYMBOL] fine")
SSblackbox.record_feedback("amount", "credits_transferred", amount)
warrant.pay_fine(amount)
@@ -124,7 +124,7 @@
"A friendly face",
"A helpful stranger",
)
- warrant.alert_owner(user, src, target.name, "[pick(titles)] has paid [amount]cr towards your fine.")
+ warrant.alert_owner(user, src, target.name, "[pick(titles)] has paid [amount][MONEY_SYMBOL] towards your fine.")
var/datum/bank_account/sec_account = SSeconomy.get_dep_account(ACCOUNT_SEC)
sec_account.adjust_money(amount)
@@ -166,7 +166,7 @@
bounty_text += "
Issued to:[usr]
"
bounty_text += "
Issued on:[warrant.time]
"
bounty_text += "
Comments:[!target.security_note ? "None." : target.security_note]
"
- bounty_text += "
FINE: [warrant.fine] credits"
+ bounty_text += "
FINE: [warrant.fine] [MONEY_NAME]"
printing = TRUE
balloon_alert(user, "printing")
@@ -174,7 +174,7 @@
var/obj/item/paper/bounty = new(null)
bounty.name = "Bounty for [target.name]"
- bounty.desc = "A [warrant.fine]cr bounty for [target.name]."
+ bounty.desc = "A [warrant.fine][MONEY_SYMBOL] bounty for [target.name]."
bounty.add_raw_text(bounty_text)
bounty.update_icon()
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 880313d09fb119..5012c0eb1aa345 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -6,6 +6,7 @@
base_icon_state = "box_"
density = TRUE
max_integrity = 250
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
/// What board do we accept
var/board_type = /obj/item/circuitboard
/// Reference to the circuit inside the frame
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 29b2ea7cf980e5..dadc83331b40ae 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -337,7 +337,7 @@
glow.even_cycle = !glow.even_cycle
if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up
INVOKE_ASYNC(src, PROC_REF(hierofunk))
- sleep(music_player.selection.song_beat)
+ sleep(music_player.selection.song_beat_deciseconds || 1 SECONDS)
if(QDELETED(src))
return
diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm
index c2daea235455c1..d5ca3b4f766161 100644
--- a/code/game/machinery/defibrillator_mount.dm
+++ b/code/game/machinery/defibrillator_mount.dm
@@ -21,11 +21,14 @@
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28)
+/obj/machinery/defibrillator_mount/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ find_and_mount_on_atom()
+
/obj/machinery/defibrillator_mount/loaded/Initialize(mapload) //loaded subtype for mapping use
. = ..()
defib = new/obj/item/defibrillator/loaded(src)
- if(mapload)
- find_and_hang_on_wall()
/obj/machinery/defibrillator_mount/Destroy()
QDEL_NULL(defib)
@@ -228,11 +231,15 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/defibrillator_mount, 28)
icon_state = "mobile"
anchored = FALSE
density = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.15, /datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
/obj/machinery/defibrillator_mount/mobile/Initialize(mapload)
. = ..()
AddElement(/datum/element/noisy_movement)
+/obj/machinery/defibrillator_mount/mobile/find_and_mount_on_atom(mark_for_late_init, late_init)
+ return //its mobile
+
/obj/machinery/defibrillator_mount/mobile/wrench_act_secondary(mob/living/user, obj/item/tool)
if(user.combat_mode)
return ..()
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index e88fc78f408349..2fea89c4605018 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -70,6 +70,7 @@
icon_state = "woodenbarricade"
resistance_flags = FLAMMABLE
bar_material = WOOD
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 5)
/// When destroyed or deconstructed, how many planks of wood does our barricade drop? Also determines how many it takes to repair the barricade and by how much.
var/drop_amount = 3
diff --git a/code/game/machinery/digital_clock.dm b/code/game/machinery/digital_clock.dm
index dc6384b843f3e4..57c58083aae7c7 100644
--- a/code/game/machinery/digital_clock.dm
+++ b/code/game/machinery/digital_clock.dm
@@ -81,7 +81,7 @@
/obj/machinery/digital_clock/Initialize(mapload)
. = ..()
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
AddElement(/datum/element/beauty, 200)
/obj/machinery/digital_clock/process(seconds_per_tick)
diff --git a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
index 88eea823ec662a..2e3e8ef19e7a5c 100644
--- a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
@@ -89,16 +89,16 @@
head.unarmed_attack_effect = initial(head.unarmed_attack_effect)
head.unarmed_sharpness = initial(head.unarmed_sharpness)
-// DOPPLER REMOVAL START: carp infusion changes (don't cough up random carp teeth)
-/*/obj/item/organ/tongue/carp/on_life(seconds_per_tick, times_fired)
+/* DOPPLER REMOVAL START: carp infusion changes (don't cough up random carp teeth)
+/obj/item/organ/tongue/carp/on_life(seconds_per_tick)
. = ..()
if(owner.stat != CONSCIOUS || !prob(0.1))
return
owner.emote("cough")
var/turf/tooth_fairy = get_turf(owner)
if(tooth_fairy)
- new /obj/item/knife/carp(tooth_fairy)*/
-// DOPPLER REMOVAL END
+ new /obj/item/knife/carp(tooth_fairy)
+*/ // DOPPLER REMOVAL END
/obj/item/organ/tongue/carp/get_possible_languages()
. = ..()
@@ -121,6 +121,7 @@
greyscale_config = /datum/greyscale_config/mutant_organ
greyscale_colors = CARP_COLORS
can_smoothen_out = FALSE
+ shade_color = "blue"
///Timer counting down. When finished, the owner gets a bad moodlet.
var/cooldown_timer
diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
index 304dd5cc1f8595..f3df9f87fcbf9b 100644
--- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
@@ -134,7 +134,7 @@
if(!bonus_active || !HAS_TRAIT(owner, TRAIT_IS_WET))
return
owner.adjust_bodytemperature(-2 * seconds_between_ticks, min_temp = owner.get_body_temp_normal())
- owner.adjustStaminaLoss(-1.5 * seconds_between_ticks)
+ owner.adjust_stamina_loss(-1.5 * seconds_between_ticks)
/datum/status_effect/organ_set_bonus/fish/proc/update_wetness(datum/source)
SIGNAL_HANDLER
@@ -374,7 +374,7 @@
breathe_gas_volume(breath, /datum/gas/water_vapor, /datum/gas/carbon_dioxide)
// Heal mob if not in crit.
if(breather.health >= breather.crit_threshold && breather.oxyloss)
- breather.adjustOxyLoss(-5)
+ breather.adjust_oxy_loss(-5)
/// Called when there isn't enough water to breath
/obj/item/organ/lungs/proc/on_low_water(mob/living/carbon/breather, datum/gas_mixture/breath, water_pp) // DOPPLER EDIT, old code: /obj/item/organ/lungs/fish/proc/on_low_water(mob/living/carbon/breather, datum/gas_mixture/breath, water_pp)
@@ -467,6 +467,37 @@
icon = 'icons/obj/medical/organs/infuser_organs.dmi'
icon_state = "inky_tongue"
actions_types = list(/datum/action/cooldown/ink_spit)
+ /**
+ * This is probably the most complex tts filter that won't require external files to be added to the tts image.
+ * It works as follows:
+ * 1. Increase the pitch of the input audio. Pitch increase is lower for higher speaker pitch and vice-versa.
+ * 2. Apply a mid-heavy EQ curve.
+ * 3. Using an oscillating target frequency:
+ * - Apply a low pass filter with its cutoff at the target frequency
+ * - Boost frequencies very close to the target frequency
+ */
+ voice_filter = "\
+ rubberband=pitch='\
+ ifnot(%BLIPS%,\
+ 2-(%PITCH%+if(%FEMALE%,4))/16\
+ ,1)'\
+ :formant=preserved,\
+ highpass=f=1000:t=s:w=24,\
+ equalizer=f=1200:g=15,\
+ equalizer=f=4350:g=-15,\
+ highshelf=f=870:g=1,\
+ afftfilt=\
+ real='\
+ st(0,(b+0.5)/nb*sr);\
+ st(1,3000+1500*sin(9.3*2*PI*pts));\
+ st(2,ld(0)/ld(1));\
+ re*(1-ld(2)^2+2*gauss(log(ld(2)+1)))'\
+ :imag='\
+ st(0,(b+0.5)/nb*sr);\
+ st(1,3000+1500*sin(9.3*2*PI*pts));\
+ st(2,ld(0)/ld(1));\
+ im*(1-ld(2)^2+2*gauss(log(ld(2)+1)))'\
+ :win_size=1024"
// Seafood instead of meat, because it's a fish organ
foodtype_flags = RAW | SEAFOOD | GORE
@@ -497,7 +528,6 @@
organ_traits = list(TRAIT_TETRODOTOXIN_HEALING, TRAIT_ALCOHOL_TOLERANCE) //drink like a fish :^)
liver_resistance = parent_type::liver_resistance * 1.5
food_reagents = list(/datum/reagent/consumable/nutriment/organ_tissue = 5, /datum/reagent/iron = 5, /datum/reagent/toxin/tetrodotoxin = 5)
- grind_results = list(/datum/reagent/consumable/nutriment/peptides = 5, /datum/reagent/toxin/tetrodotoxin = 5)
// Seafood instead of meat, because it's a fish organ
foodtype_flags = RAW | SEAFOOD | GORE
@@ -508,6 +538,9 @@
. = ..()
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/fish)
+/obj/item/organ/liver/fish/grind_results()
+ return list(/datum/reagent/consumable/nutriment/peptides = 5, /datum/reagent/toxin/tetrodotoxin = 5)
+
#undef FISH_ORGAN_COLOR
#undef FISH_SCLERA_COLOR
#undef FISH_PUPIL_COLOR
diff --git a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm
index 1d9c8bdc743e2b..1af4ad7f2ee305 100644
--- a/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/fly_organs.dm
@@ -20,7 +20,7 @@
// so we need to delay species change until we're fully inserted
RegisterSignal(inserted_organ, COMSIG_ORGAN_BODYPART_INSERTED, PROC_REF(flyify))
-/datum/status_effect/organ_set_bonus/fly/proc/flyify(obj/item/organ/source, obj/item/bodypart/limb, movement_flags)
+/datum/status_effect/organ_set_bonus/fly/proc/flyify(obj/item/organ/source, obj/item/bodypart/limb)
SIGNAL_HANDLER
var/mob/living/carbon/human/new_fly = owner
// just in case?
diff --git a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm
index 900f566f0576dd..6f2e35b3219812 100644
--- a/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/goliath_organs.dm
@@ -63,6 +63,7 @@
greyscale_config = /datum/greyscale_config/mutant_organ
greyscale_colors = GOLIATH_COLORS
can_smoothen_out = FALSE
+ shade_color = "garnet"
var/obj/item/goliath_infuser_hammer/hammer
diff --git a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
index 7d17f1bb477e52..3b1e1b9f3bb9b7 100644
--- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
@@ -144,7 +144,7 @@
offerer.say("For you, it's on the mouse.")
taker.add_mood_event("it_was_on_the_mouse", /datum/mood_event/it_was_on_the_mouse)
-/obj/item/organ/tongue/rat/on_life(seconds_per_tick, times_fired)
+/obj/item/organ/tongue/rat/on_life(seconds_per_tick)
. = ..()
if(prob(5))
owner.emote("squeaks")
diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm
index ab14767479fede..1ad319486c8e52 100644
--- a/code/game/machinery/dna_scanner.dm
+++ b/code/game/machinery/dna_scanner.dm
@@ -159,6 +159,41 @@
SIGNAL_HANDLER
set_linked_console(null)
+// Disk skins
+/datum/atom_skin/dna_disk
+ abstract_type = /datum/atom_skin/dna_disk
+
+/datum/atom_skin/dna_disk/red
+ preview_name = "Red"
+ new_icon_state = "datadisk0"
+
+/datum/atom_skin/dna_disk/dark_blue
+ preview_name = "Dark Blue"
+ new_icon_state = "datadisk1"
+
+/datum/atom_skin/dna_disk/yellow
+ preview_name = "Yellow"
+ new_icon_state = "datadisk2"
+
+/datum/atom_skin/dna_disk/black
+ preview_name = "Black"
+ new_icon_state = "datadisk3"
+
+/datum/atom_skin/dna_disk/green
+ preview_name = "Green"
+ new_icon_state = "datadisk4"
+
+/datum/atom_skin/dna_disk/purple
+ preview_name = "Purple"
+ new_icon_state = "datadisk5"
+
+/datum/atom_skin/dna_disk/grey
+ preview_name = "Grey"
+ new_icon_state = "datadisk6"
+
+/datum/atom_skin/dna_disk/light_blue
+ preview_name = "Light Blue"
+ new_icon_state = "datadisk7"
//Just for transferring between genetics machines.
/obj/item/disk/data
@@ -168,20 +203,10 @@
var/list/mutations = list()
var/max_mutations = 6
var/read_only = FALSE //Well,it's still a floppy disk
- obj_flags = parent_type::obj_flags | INFINITE_RESKIN
- unique_reskin = list(
- "Red" = "datadisk0",
- "Dark Blue" = "datadisk1",
- "Yellow" = "datadisk2",
- "Black" = "datadisk3",
- "Green" = "datadisk4",
- "Purple" = "datadisk5",
- "Grey" = "datadisk6",
- "Light Blue" = "datadisk7",
- )
/obj/item/disk/data/Initialize(mapload)
. = ..()
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/dna_disk, infinite = TRUE)
icon_state = "datadisk[rand(0,7)]"
add_overlay("datadisk_gene")
if(length(genetic_makeup_buffer))
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 1dd119ffb3225c..d3fc1574cc67ca 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -179,8 +179,8 @@
damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R
prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
diag_hud_set_electrified()
@@ -314,8 +314,8 @@
close_others.Cut()
QDEL_NULL(note)
QDEL_NULL(seal)
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.remove_atom_from_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.remove_atom_from_hud(src)
return ..()
/obj/machinery/door/airlock/Exited(atom/movable/gone, direction)
@@ -509,7 +509,10 @@
/obj/machinery/door/airlock/proc/is_secure()
return (security_level > 0)
-/// Checks if this door would be affected by any currently active RETA grants
+/**
+ * Checks if this door would be affected by any currently active RETA grants
+ * If a grant is active, return the authorized department
+ */
/obj/machinery/door/airlock/proc/has_active_reta_access()
if(!CONFIG_GET(flag/reta_enabled))
return FALSE
@@ -527,11 +530,11 @@
for(var/required_access in req_access)
if(required_access in origin_dept_access)
- return TRUE
+ return LOWER_TEXT(target_dept)
for(var/required_access in req_one_access)
if(required_access in origin_dept_access)
- return TRUE
+ return LOWER_TEXT(target_dept)
return FALSE
@@ -742,6 +745,10 @@
else
. += "It looks very robust."
+ var/active_reta = has_active_reta_access()
+ if(active_reta)
+ . += span_nicegreen("Emergency Temporary Access is enabled for [EXAMINE_HINT(active_reta)] ID cards.")
+
if(issilicon(user) && !(machine_stat & BROKEN))
. += span_notice("Shift-click [src] to [ density ? "open" : "close"] it.")
. += span_notice("Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts.")
@@ -934,6 +941,9 @@
update_appearance()
return ITEM_INTERACT_SUCCESS
+/obj/machinery/door/airlock/screwdriver_act_secondary(mob/living/user, obj/item/tool)
+ return screwdriver_act(user, tool)
+
/obj/machinery/door/airlock/wirecutter_act(mob/living/user, obj/item/tool)
if(panel_open && security_level == AIRLOCK_SECURITY_PLASTEEL)
. = ITEM_INTERACT_SUCCESS // everything after this shouldn't result in attackby
@@ -1349,10 +1359,9 @@
set_airlock_state(AIRLOCK_OPENING, animated = TRUE, force_type = forced)
var/transparent_delay = animation_segment_delay(AIRLOCK_OPENING_TRANSPARENT)
sleep(transparent_delay)
- set_opacity(0)
+ set_opacity(FALSE)
if(multi_tile)
filler.set_opacity(FALSE)
- update_freelook_sight()
var/passable_delay = animation_segment_delay(AIRLOCK_OPENING_PASSABLE) - transparent_delay
sleep(passable_delay)
set_density(FALSE)
@@ -1439,7 +1448,6 @@
set_opacity(TRUE)
if(multi_tile)
filler.set_opacity(TRUE)
- update_freelook_sight()
var/close_delay = animation_segment_delay(AIRLOCK_CLOSING_FINISHED) - unpassable_delay - opaque_delay
sleep(close_delay)
set_airlock_state(AIRLOCK_CLOSED, animated = FALSE)
@@ -1523,10 +1531,10 @@
/obj/machinery/door/airlock/proc/finish_emag_act()
if(QDELETED(src))
return FALSE
- set_machine_stat(machine_stat & ~MAINT)
operating = FALSE
if(!open())
set_airlock_state(AIRLOCK_CLOSED)
+ set_machine_stat(machine_stat & ~MAINT)
obj_flags |= EMAGGED
feedback = FALSE
locked = TRUE
@@ -1677,7 +1685,7 @@
return FALSE
/obj/machinery/door/airlock/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- switch(rcd_data["[RCD_DESIGN_MODE]"])
+ switch(rcd_data[RCD_DESIGN_MODE])
if(RCD_DECONSTRUCT)
qdel(src)
return TRUE
@@ -2433,6 +2441,7 @@
aiControlDisabled = AI_WIRE_DISABLED
req_access = list(ACCESS_BLOODCULT)
damage_deflection = 10
+ custom_materials = list(/datum/material/runedmetal = SHEET_MATERIAL_AMOUNT)
var/openingoverlaytype = /obj/effect/temp_visual/cult/door
var/friendly = FALSE
var/stealthy = FALSE
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index 2973579153a84c..5e25742d4dc5c6 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -6,7 +6,7 @@
/// If the airlock should require ALL or only ONE of the listed accesses
var/one_access = 0
/// Checks to see if this airlock has an unrestricted helper (will set to TRUE if present).
- var/unres_sensor = FALSE
+ var/unres_latch = FALSE
/// Unrestricted sides, or sides of the airlock that will open regardless of access
var/unres_sides = NONE
///what name are we passing to the finished airlock
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 9620550f621633..a211e8f93ed8a5 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -1,4 +1,8 @@
-#define DOOR_CLOSE_WAIT 60 ///Default wait until doors autoclose
+///Default wait until doors autoclose
+#define DOOR_CLOSE_WAIT 60
+/// Trait for checking if a mob is currently activating an unrestricted airlock open and thus has pressure pushes blocked
+#define TRAIT_UNRESTRICTED_AIRLOCK_OPENING "trait_unrestricted_airlock_opening"
+
/obj/machinery/door
name = "door"
desc = "It opens and closes."
@@ -56,10 +60,7 @@
var/real_explosion_block
///if TRUE, this door will always open on red alert
var/red_alert_access = FALSE
- /// Checks to see if this airlock has an unrestricted "sensor" within (will set to TRUE if present).
- var/unres_sensor = FALSE
- /// Unrestricted sides. A bitflag for which direction (if any) can open the door with no access
- var/unres_sides = NONE
+
/// Whether or not the door can crush mobs.
var/can_crush = TRUE
/// Whether or not the door can be opened by hand (used for blast doors and shutters)
@@ -73,6 +74,19 @@
/// What specific lift ID do we link with?
var/transport_linked_id
+ /// Checks to see if this airlock has an unrestricted "latch" within (will set to TRUE if present).
+ var/unres_latch = FALSE
+ /// Unrestricted sides. A bitflag for which direction (if any) can open the door with no access
+ var/unres_sides = NONE
+ /// Delayed open for unrestricted users. If there is an unrestricted side, we want to know if the door opening should be delayed for a bit to add tension and what-not
+ var/delayed_unres_open = FALSE
+ /// Lower range for random time to open for unrestricted users
+ var/delayed_unres_time_lower = 2 SECONDS
+ /// Upper range for random time to open for unrestricted users
+ var/delayed_unres_time_upper = 3 SECONDS
+ /// Cooldown tracker to prevent message spam when resisting pressure while opening via unrestricted latch
+ COOLDOWN_DECLARE(pressure_push_cooldown)
+
/datum/armor/machinery_door
melee = 30
bullet = 30
@@ -98,7 +112,6 @@
set_bounds()
set_filler()
update_overlays()
- update_freelook_sight()
air_update_turf(TRUE, TRUE)
register_context()
if(elevator_mode)
@@ -163,7 +176,6 @@
layer = initial(layer)
/obj/machinery/door/Destroy()
- update_freelook_sight()
if(elevator_mode)
GLOB.elevator_doors -= src
if(spark_system)
@@ -336,16 +348,80 @@
if(density)
run_animation(DOOR_DENY_ANIMATION)
-/obj/machinery/door/allowed(mob/M)
+/obj/machinery/door/allowed(mob/accessor)
if(emergency)
return TRUE
- if(unrestricted_side(M))
+
+ . = ..() // let's see if this user has any funny way to access this before we try unrestricted stuff as that will have potential delays
+
+ if(. == TRUE)
return TRUE
- return ..()
-/obj/machinery/door/proc/unrestricted_side(mob/opener) //Allows for specific side of airlocks to be unrestrected (IE, can exit maint freely, but need access to enter)
+ if(unrestricted_side(accessor))
+ if(!delayed_unres_open)
+ return TRUE
+
+ return attempt_delayed_unres_open(accessor)
+
+ return FALSE
+
+
+
+/// Allows for specific side of airlocks to be unrestricted (IE, can exit maint freely, but need access to enter)
+/obj/machinery/door/proc/unrestricted_side(mob/opener)
return get_dir(src, opener) & unres_sides
+/// Initiates a do_after to open the door after a delay for unrestricted openers
+/// Returns TRUE if we successfully finished the do_after, FALSE otherwise
+/obj/machinery/door/proc/attempt_delayed_unres_open(mob/opener)
+ if(opener.do_after_count() > 0) // not allowed to do this if you're doing something else. just wait lad.
+ return FALSE
+
+ var/do_after_time = rand(delayed_unres_time_lower, delayed_unres_time_upper)
+ ADD_TRAIT(opener, TRAIT_UNRESTRICTED_AIRLOCK_OPENING, REF(src))
+ RegisterSignal(opener, COMSIG_ATOM_PRE_PRESSURE_PUSH, PROC_REF(stop_pressure_during_unres_open))
+ addtimer(CALLBACK(src, PROC_REF(deregister_pressure_push_signal), opener), do_after_time + 0.5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) // extra half-second to be safe, else this is just a guarantee we remove the signal.
+
+ SSblackbox.record_feedback("tally", "unrestricted_airlock_usage", 1, "open attempt ([type])") // statcollecting on how often people try to use this.
+ balloon_alert(opener, "activating unrestricted latch...")
+
+ if(istype(get_area(src), /area/station/maintenance))
+ playsound(get_turf(src), 'sound/machines/airlock/airlock_latch_hiss.ogg', 45, vary = TRUE, falloff_exponent = (SOUND_FALLOFF_EXPONENT * 2)) // sound travels further in maintenance muahaha
+ else
+ playsound(get_turf(src), 'sound/machines/airlock/airlock_latch_hiss.ogg', 30, vary = TRUE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, falloff_exponent = (SOUND_FALLOFF_EXPONENT * 1.5))
+
+ if(do_after(opener, do_after_time, target = src))
+ SSblackbox.record_feedback("tally", "unrestricted_airlock_usage", 1, "open success ([type])") // no need to tally failures as we can assume it as long as we have this + the total
+ return TRUE
+
+ deregister_pressure_push_signal(opener) // if you fail the do_after early then you lose your pressure immunity, womp.
+ return FALSE
+
+/// While activating the door, we are able to block pressure pushes since we're "grasping the override handle" or something similar to that.
+/// This basically exists to prevent the door's delay from being SUPREMELY annoying when you're trying to escape pressure-based damage during the unrestricted latch do_after.
+/obj/machinery/door/proc/stop_pressure_during_unres_open(mob/source)
+ SIGNAL_HANDLER
+ if(QDELETED(source))
+ return
+
+ if(!COOLDOWN_FINISHED(src, pressure_push_cooldown)) // avoid spam
+ return COMSIG_ATOM_BLOCKS_PRESSURE
+
+ // have both since this is a newer mechanic and i want it to be a bit more obvious why for the time being
+ balloon_alert(source, "resisting pressure!")
+ to_chat(source, span_warning("You're holding onto the unrestricted latch, preventing pressure from pushing you away!"))
+ COOLDOWN_START(src, pressure_push_cooldown, 5 SECONDS)
+ return COMSIG_ATOM_BLOCKS_PRESSURE
+
+/// Exists to ensure that we always deregister the pressure push blocking signal. Can be called multiple times safely as we check the trait.
+/obj/machinery/door/proc/deregister_pressure_push_signal(mob/opener)
+ if(!HAS_TRAIT_FROM(opener, TRAIT_UNRESTRICTED_AIRLOCK_OPENING, REF(src)))
+ return
+
+ UnregisterSignal(opener, COMSIG_ATOM_PRE_PRESSURE_PUSH)
+ REMOVE_TRAIT(opener, TRAIT_UNRESTRICTED_AIRLOCK_OPENING, REF(src))
+
+
/obj/machinery/door/proc/try_to_weld(obj/item/weldingtool/W, mob/user)
return
@@ -376,6 +452,9 @@
try_to_crowbar(tool, user, forced_open)
return ITEM_INTERACT_SUCCESS
+/obj/machinery/door/try_to_crowbar_secondary(obj/item/acting_object, mob/user)
+ try_to_crowbar(null, user, FALSE)
+
/obj/machinery/door/attackby(obj/item/weapon, mob/living/user, list/modifiers, list/attack_modifiers)
if(istype(weapon, /obj/item/access_key))
var/obj/item/access_key/key = weapon
@@ -508,7 +587,7 @@
operating = TRUE
use_energy(active_power_usage)
run_animation(DOOR_OPENING_ANIMATION)
- set_opacity(0)
+ set_opacity(FALSE)
var/passable_delay = animation_segment_delay(DOOR_OPENING_PASSABLE)
SLEEP_NOT_DEL(passable_delay)
set_density(FALSE)
@@ -517,10 +596,9 @@
SLEEP_NOT_DEL(open_delay)
layer = initial(layer)
update_appearance()
- set_opacity(0)
+ set_opacity(FALSE)
operating = FALSE
air_update_turf(TRUE, FALSE)
- update_freelook_sight()
if(autoclose)
autoclose_in(DOOR_CLOSE_WAIT)
return TRUE
@@ -556,10 +634,9 @@
SLEEP_NOT_DEL(close_delay)
update_appearance()
if(visible && !glass)
- set_opacity(1)
+ set_opacity(TRUE)
operating = FALSE
air_update_turf(TRUE, TRUE)
- update_freelook_sight()
if(!can_crush)
return TRUE
@@ -618,10 +695,6 @@
/obj/machinery/door/proc/hasPower()
return !(machine_stat & NOPOWER)
-/obj/machinery/door/proc/update_freelook_sight()
- if(!glass && GLOB.cameranet)
- GLOB.cameranet.updateVisibility(src, 0)
-
/obj/machinery/door/block_superconductivity() // All non-glass airlocks block heat, this is intended.
if(opacity || heat_proof)
return 1
@@ -712,3 +785,4 @@
return ..(0)
#undef DOOR_CLOSE_WAIT
+#undef TRAIT_UNRESTRICTED_AIRLOCK_OPENING
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index c3b1c0dd2a09cd..b14a54f2977773 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -743,13 +743,17 @@
/obj/machinery/door/firedoor/border_only/Initialize(mapload)
. = ..()
+ flags_1 &= ~PREVENT_CLICK_UNDER_1
adjust_lights_starting_offset()
var/static/list/loc_connections = list(
COMSIG_ATOM_EXIT = PROC_REF(on_exit),
)
-
AddElement(/datum/element/connect_loc, loc_connections)
+/obj/machinery/door/firedoor/border_only/close()
+ . = ..()
+ flags_1 &= ~PREVENT_CLICK_UNDER_1
+
/obj/machinery/door/firedoor/border_only/adjust_lights_starting_offset()
light_xoffset = 0
light_yoffset = 0
@@ -815,6 +819,7 @@
base_icon_state = "frame"
anchored = FALSE
density = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3)
var/constructionStep = CONSTRUCTION_NO_CIRCUIT
var/reinforced = 0
/// Is this a border_only firelock? Used in several checks during construction
@@ -951,7 +956,7 @@
return FALSE
/obj/structure/firelock_frame/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- switch(rcd_data["[RCD_DESIGN_MODE]"])
+ switch(rcd_data[RCD_DESIGN_MODE])
if(RCD_UPGRADE_SIMPLE_CIRCUITS)
user.balloon_alert(user, "circuit installed")
constructionStep = CONSTRUCTION_PANEL_OPEN
@@ -971,10 +976,11 @@
flags_1 = ON_BORDER_1
obj_flags = CAN_BE_HIT | IGNORE_DENSITY
directional = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/firelock_frame/border_only/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
+ AddElement(/datum/element/simple_rotation, ROTATION_NEEDS_ROOM)
var/static/list/loc_connections = list(
COMSIG_ATOM_EXIT = PROC_REF(on_exit),
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index b3804ff010b6e0..cfd1f99ba9b634 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -14,6 +14,7 @@
resistance_flags = FIRE_PROOF
damage_deflection = 70
can_open_with_hands = FALSE
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 15, /datum/material/iron = SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
/// The recipe for this door
var/datum/crafting_recipe/recipe_type = /datum/crafting_recipe/blast_doors
/// The current deconstruction step
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 52c12835c2797a..46370354003a2b 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -9,6 +9,7 @@
armor_type = /datum/armor/poddoor_shutters
max_integrity = 100
recipe_type = /datum/crafting_recipe/shutters
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 5, /datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT)
animation_sound = 'sound/machines/shutter.ogg'
show_nav_computer_icon = FALSE
@@ -37,6 +38,7 @@
/obj/machinery/door/poddoor/shutters/preopen/deconstructed
deconstruction = BLASTDOOR_NEEDS_WIRES
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 5)
/obj/machinery/door/poddoor/shutters/indestructible
name = "hardened shutters"
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 8ede2092a4c8b3..65fbe58e7e764f 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -256,7 +256,6 @@
var/open_delay = animation_segment_delay(DOOR_OPENING_FINISHED) - passable_delay
sleep(open_delay)
air_update_turf(TRUE, FALSE)
- update_freelook_sight()
if(operating == 1) //emag again
operating = FALSE
@@ -299,7 +298,6 @@
sleep(unpassable_delay)
set_density(TRUE)
air_update_turf(TRUE, TRUE)
- update_freelook_sight()
var/close_delay = animation_segment_delay(DOOR_CLOSING_FINISHED) - unpassable_delay
sleep(close_delay)
@@ -486,7 +484,7 @@
return FALSE
/obj/machinery/door/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT)
qdel(src)
return TRUE
return FALSE
@@ -549,8 +547,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/security/holding
operating = TRUE
set_density(FALSE)
+ set_opacity(FALSE)
air_update_turf(TRUE, FALSE)
- update_freelook_sight()
operating = FALSE
update_appearance()
@@ -564,8 +562,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/security/holding
operating = TRUE
set_density(TRUE)
+ set_opacity(TRUE)
air_update_turf(TRUE, TRUE)
- update_freelook_sight()
operating = FALSE
update_appearance()
diff --git a/code/game/machinery/drone_dispenser.dm b/code/game/machinery/drone_dispenser.dm
index f51ffc466b12f2..1bce7764543d98 100644
--- a/code/game/machinery/drone_dispenser.dm
+++ b/code/game/machinery/drone_dispenser.dm
@@ -66,12 +66,12 @@
/// Sound that the drone dispnser plays when it's broken.
var/break_sound = 'sound/machines/warning-buzzer.ogg'
/// Reference to the object's internal storage for materials.
- var/datum/component/material_container/materials
+ var/datum/material_container/materials
/obj/machinery/drone_dispenser/Initialize(mapload)
. = ..()
- materials = AddComponent( \
- /datum/component/material_container, \
+ materials = new ( \
+ src, \
list(/datum/material/iron, /datum/material/glass), \
SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, \
MATCONTAINER_EXAMINE, \
@@ -84,7 +84,7 @@
REGISTER_REQUIRED_MAP_ITEM(1, 1)
/obj/machinery/drone_dispenser/Destroy()
- materials = null
+ QDEL_NULL(materials)
return ..()
/obj/machinery/drone_dispenser/preloaded
diff --git a/code/game/machinery/ecto_sniffer.dm b/code/game/machinery/ecto_sniffer.dm
index 7f94df42b72ae5..6c7de7e5097674 100644
--- a/code/game/machinery/ecto_sniffer.dm
+++ b/code/game/machinery/ecto_sniffer.dm
@@ -61,15 +61,18 @@
tool.play_tool_sound(src, 15)
set_anchored(!anchored)
balloon_alert(user, "sniffer [anchored ? "anchored" : "unanchored"]")
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/ecto_sniffer/screwdriver_act(mob/living/user, obj/item/screwdrivertool)
+ if(default_deconstruction_screwdriver(user, "ecto_sniffer_open", "ecto_sniffer", screwdrivertool))
+ return ITEM_INTERACT_SUCCESS
+ return ITEM_INTERACT_BLOCKING
-/obj/machinery/ecto_sniffer/screwdriver_act(mob/living/user, obj/item/I)
- . = ..()
- if(!.)
- return default_deconstruction_screwdriver(user, "ecto_sniffer_open", "ecto_sniffer", I)
/obj/machinery/ecto_sniffer/crowbar_act(mob/living/user, obj/item/tool)
- if(!default_deconstruction_crowbar(tool))
- return ..()
+ if(default_deconstruction_crowbar(tool))
+ return ITEM_INTERACT_SUCCESS
+ return ITEM_INTERACT_BLOCKING
/obj/machinery/ecto_sniffer/Destroy()
ectoplasmic_residues = null
diff --git a/code/game/machinery/experimental_cloner/experimental_cloner_fuckup.dm b/code/game/machinery/experimental_cloner/experimental_cloner_fuckup.dm
index 96168a953ad2c3..cbd7fda5aba940 100644
--- a/code/game/machinery/experimental_cloner/experimental_cloner_fuckup.dm
+++ b/code/game/machinery/experimental_cloner/experimental_cloner_fuckup.dm
@@ -106,7 +106,7 @@
var/obj/item/bodypart/old_bodypart = victim.get_bodypart(target_zone)
var/obj/item/bodypart/new_bodypart = new part_type()
- new_bodypart.replace_limb(victim, TRUE)
+ new_bodypart.replace_limb(victim)
qdel(old_bodypart)
/// Contaminated sample
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index 4c452ea44f2210..74600bab384157 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -10,6 +10,13 @@
result_path = /obj/machinery/firealarm
pixel_shift = 26
+/obj/item/wallframe/firealarm/try_build(atom/support, mob/user)
+ var/area/A = get_area(user)
+ if(A.always_unpowered)
+ balloon_alert(user, "cannot place in this area!")
+ return FALSE
+ return ..()
+
/obj/machinery/firealarm
name = "fire alarm"
desc = "Pull this in case of emergency. Thus, keep pulling it forever."
@@ -65,9 +72,7 @@
soundloop = new(src, FALSE)
set_wires(new /datum/wires/firealarm(src))
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/firealarm,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/firealarm), only_root_path = TRUE))
AddComponent( \
/datum/component/redirect_attack_hand_from_turf, \
@@ -79,7 +84,7 @@
register_context()
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
update_appearance()
/obj/machinery/firealarm/Destroy()
@@ -506,7 +511,7 @@
return FALSE
/obj/machinery/firealarm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- switch(rcd_data["[RCD_DESIGN_MODE]"])
+ switch(rcd_data[RCD_DESIGN_MODE])
if(RCD_WALLFRAME)
balloon_alert_to_viewers("circuit installed")
buildstage = FIRE_ALARM_BUILD_NO_WIRES
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 91487035cc6175..f08fc0046820d8 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -28,7 +28,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26)
. = ..()
if(mapload)
bulb = new(src)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/flasher/vv_edit_var(vname, vval)
. = ..()
@@ -170,6 +170,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26)
. = ..()
proximity_monitor = new(src, 0)
+/obj/machinery/flasher/portable/find_and_mount_on_atom(mark_for_late_init, late_init)
+ return //its meant to be carried and mobile
+
/obj/machinery/flasher/portable/HasProximity(atom/movable/proximity_check_mob)
if(!COOLDOWN_FINISHED(src, flash_cooldown))
return
diff --git a/code/game/machinery/flatpacker.dm b/code/game/machinery/flatpacker.dm
index 8765ec716bda9e..011ddf7f1b1a53 100644
--- a/code/game/machinery/flatpacker.dm
+++ b/code/game/machinery/flatpacker.dm
@@ -16,7 +16,7 @@
/// Coefficient applied to consumed materials. Lower values result in lower material consumption.
var/creation_efficiency = 2
///The container to hold materials
- var/datum/component/material_container/materials
+ var/datum/material_container/materials
/// The inserted board
var/obj/item/circuitboard/machine/inserted_board
/// List of components that need to be packed along with the circuitboard
@@ -33,8 +33,8 @@
/obj/machinery/flatpacker/Initialize(mapload)
register_context()
- materials = AddComponent( \
- /datum/component/material_container, \
+ materials = new ( \
+ src, \
SSmaterials.materials_by_category[MAT_CATEGORY_SILO], \
0, \
MATCONTAINER_EXAMINE, \
@@ -44,10 +44,10 @@
return ..()
/obj/machinery/flatpacker/Destroy()
- materials = null
+ QDEL_NULL(materials)
QDEL_NULL(inserted_board)
QDEL_LIST(flatpacked_components)
- . = ..()
+ return ..()
/obj/machinery/flatpacker/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = NONE
@@ -219,7 +219,7 @@
return costs
/obj/machinery/flatpacker/base_item_interaction(mob/living/user, obj/item/attacking_item, list/modifiers)
- if(attacking_item.flags_1 & HOLOGRAM_1 || attacking_item.item_flags & ABSTRACT)
+ if(attacking_item.flags_1 & HOLOGRAM_1)
return ITEM_INTERACT_SKIP_TO_ATTACK
if(istype(attacking_item, /obj/item/circuitboard/machine))
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index e6d3b3b7ebcc69..285b19b6c4bb88 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -10,6 +10,7 @@
armor_type = /datum/armor/machinery_igniter
resistance_flags = FIRE_PROOF
processing_flags = NONE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5 + HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT / 2)
var/id = null
var/on = FALSE
@@ -164,7 +165,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/sparker, 26)
spark_system.attach(src)
register_context()
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/sparker/Destroy()
QDEL_NULL(spark_system)
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index d606556985b3cd..8e400fc964a0ce 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -1,7 +1,3 @@
-///IV drip operation mode when it sucks blood from the object
-#define IV_TAKING 0
-///IV drip operation mode when it injects reagents into the object
-#define IV_INJECTING 1
///What the transfer rate value is rounded to
#define IV_TRANSFER_RATE_STEP 0.01
///Minimum possible IV drip transfer rate in units per second
@@ -24,6 +20,7 @@
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
use_power = NO_POWER_USE
interaction_flags_mouse_drop = NEED_HANDS
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.1, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.2)
/// Information and effects about where the IV drip is attached to
var/datum/iv_drip_attachment/attachment
@@ -264,7 +261,7 @@
return
// If the human is losing too much blood, beep.
- if(attached_mob.blood_volume < BLOOD_VOLUME_SAFE && prob(5))
+ if(attached_mob.get_blood_volume(apply_modifiers = TRUE) < BLOOD_VOLUME_SAFE && prob(5))
audible_message(span_hear("[src] beeps loudly."))
playsound(loc, 'sound/machines/beep/twobeep_high.ogg', 50, TRUE)
var/atom/movable/target = use_internal_storage ? src : reagent_container
@@ -273,10 +270,12 @@
/obj/machinery/iv_drip/attack_hand_secondary(mob/user, list/modifiers)
. = ..()
- if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
- return
- if(!ishuman(user))
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || !ishuman(user))
return
+ if (quick_toggle(user))
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/iv_drip/proc/quick_toggle(mob/user)
if(attachment)
visible_message(span_notice("[attachment.attached_to] is detached from [src]."))
detach_iv()
@@ -284,7 +283,7 @@
eject_beaker(user)
else
toggle_mode()
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ return TRUE
///called when an IV is attached
/obj/machinery/iv_drip/proc/attach_iv(atom/target, mob/user)
@@ -456,10 +455,8 @@
/atom/movable/screen/alert/iv_connected
name = "IV Connected"
desc = "You have an IV connected to your arm. Remember to remove it or drag the IV stand with you before moving, or else it will rip out!"
- icon_state = ALERT_IV_CONNECTED
-
-#undef IV_TAKING
-#undef IV_INJECTING
+ use_user_hud_icon = TRUE
+ overlay_state = "iv_connected"
#undef MIN_IV_TRANSFER_RATE
#undef MAX_IV_TRANSFER_RATE
diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm
index 471e43f94130b4..e45daf7a98e502 100644
--- a/code/game/machinery/launch_pad.dm
+++ b/code/game/machinery/launch_pad.dm
@@ -38,8 +38,8 @@
/obj/machinery/launchpad/Initialize(mapload)
. = ..()
prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
update_hud()
@@ -57,8 +57,8 @@
return ..()
/obj/machinery/launchpad/Destroy()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.remove_atom_from_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.remove_atom_from_hud(src)
return ..()
/obj/machinery/launchpad/examine(mob/user)
@@ -104,9 +104,7 @@
update_indicator()
if(stationary)
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/bluespace_launchpad,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/bluespace_launchpad), only_root_path = TRUE))
/// Whether this launchpad can send or receive.
/obj/machinery/launchpad/proc/is_available()
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 00c1ceef188e5b..58e5bdf209e3e3 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -23,9 +23,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
AddComponent(/datum/component/redirect_attack_hand_from_turf)
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/light_switch,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/light_switch), only_root_path = TRUE))
if(istext(area))
area = text2path(area)
if(ispath(area))
@@ -35,7 +33,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
if(autoname)
name = "light switch ([area.name])"
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
register_context()
update_appearance()
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index f3d8e236c73c02..39564a41609cf8 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -33,7 +33,7 @@
stored_research = GLOB.autounlock_techwebs[/datum/techweb/autounlocking/limbgrower]
. = ..()
AddComponent(/datum/component/plumbing/simple_demand)
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
register_context()
/obj/machinery/limbgrower/add_context(atom/source, list/context, obj/item/held_item, mob/user)
diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm
index 65052a2e8338c4..3b8ef7cd22f720 100644
--- a/code/game/machinery/medical_kiosk.dm
+++ b/code/game/machinery/medical_kiosk.dm
@@ -225,10 +225,10 @@
var/patient_status = "Alive."
var/max_health = patient.maxHealth
var/total_health = patient.health
- var/brute_loss = patient.getBruteLoss()
- var/fire_loss = patient.getFireLoss()
- var/tox_loss = patient.getToxLoss()
- var/oxy_loss = patient.getOxyLoss()
+ var/brute_loss = patient.get_brute_loss()
+ var/fire_loss = patient.get_fire_loss()
+ var/tox_loss = patient.get_tox_loss()
+ var/oxy_loss = patient.get_oxy_loss()
var/chaos_modifier = 0
var/sickness = "Patient does not show signs of disease."
@@ -236,7 +236,7 @@
var/bleed_status = "Patient is not currently bleeding."
var/blood_status = " Patient either has no blood, or does not require it to function."
- var/blood_percent = round((patient.blood_volume / BLOOD_VOLUME_NORMAL) * 100)
+ var/blood_percent = round((patient.get_blood_volume(apply_modifiers = TRUE) / BLOOD_VOLUME_NORMAL) * 100)
var/datum/blood_type/blood_type = patient.get_bloodtype()
var/blood_name = "error"
var/blood_warning = " "
diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm
index 3f365ff3b1de7b..336554771f54fa 100644
--- a/code/game/machinery/medipen_refiller.dm
+++ b/code/game/machinery/medipen_refiller.dm
@@ -24,7 +24,7 @@
/obj/machinery/medipen_refiller/Initialize(mapload)
. = ..()
AddComponent(/datum/component/plumbing/simple_demand)
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
register_context()
/obj/machinery/medipen_refiller/add_context(atom/source, list/context, obj/item/held_item, mob/user)
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index a3f1859fe26e5b..a1e6726b129acb 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -25,7 +25,7 @@
/// codes as set on map: "tag1;tag2" or "tag1=value;tag2=value"
var/codes_txt = ""
- req_one_access = list(ACCESS_ENGINEERING, ACCESS_ROBOTICS)
+ req_one_access = list(ACCESS_CARGO, ACCESS_ENGINEERING, ACCESS_ROBOTICS)
/datum/armor/machinery_navbeacon
melee = 70
diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm
index b950e2c9136362..42fb331f099aac 100644
--- a/code/game/machinery/newscaster/newscaster_machine.dm
+++ b/code/game/machinery/newscaster/newscaster_machine.dm
@@ -78,7 +78,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
GLOB.allbountyboards += src
update_appearance()
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/newscaster/Destroy()
GLOB.allCasters -= src
@@ -879,7 +879,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
return TRUE
payment_target.transfer_money(current_user, active_request.value, "Bounty Request")
- say("Paid out [active_request.value] credits.")
+ say("Paid out [active_request.value] [MONEY_NAME].")
GLOB.request_list.Remove(active_request)
qdel(active_request)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 7f1f8de2c5bf50..172fbe8daa1061 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -19,6 +19,7 @@ Buildable meters
icon_state_preview = "manifold4w"
inhand_icon_state = "buildpipe"
w_class = WEIGHT_CLASS_NORMAL
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
///Piping layer that we are going to be on
var/piping_layer = PIPING_LAYER_DEFAULT
///Type of pipe-object made, selected from the RPD
@@ -42,65 +43,100 @@ Buildable meters
/obj/item/pipe/directional
RPD_type = PIPE_UNARY
+
/obj/item/pipe/directional/he_junction
icon_state_preview = "junction"
pipe_type = /obj/machinery/atmospherics/pipe/heat_exchanging/junction
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+
/obj/item/pipe/directional/vent
name = "air vent fitting"
icon_state_preview = "uvent"
pipe_type = /obj/machinery/atmospherics/components/unary/vent_pump
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6 + SMALL_MATERIAL_AMOUNT / 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT / 2)
+
/obj/item/pipe/directional/scrubber
name = "air scrubber fitting"
icon_state_preview = "scrubber"
pipe_type = /obj/machinery/atmospherics/components/unary/vent_scrubber
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6 + SMALL_MATERIAL_AMOUNT / 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT / 2)
+
/obj/item/pipe/directional/connector
icon_state_preview = "connector"
pipe_type = /obj/machinery/atmospherics/components/unary/portables_connector
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+
/obj/item/pipe/directional/passive_vent
icon_state_preview = "pvent"
pipe_type = /obj/machinery/atmospherics/components/unary/passive_vent
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+
/obj/item/pipe/directional/injector
icon_state_preview = "injector"
pipe_type = /obj/machinery/atmospherics/components/unary/outlet_injector
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT / 2)
+
/obj/item/pipe/directional/he_exchanger
icon_state_preview = "heunary"
pipe_type = /obj/machinery/atmospherics/components/unary/heat_exchanger
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT)
+
/obj/item/pipe/directional/airlock_pump
icon_state_preview = "airlock_pump"
pipe_type = /obj/machinery/atmospherics/components/unary/airlock_pump
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7)
+
/obj/item/pipe/binary
RPD_type = PIPE_STRAIGHT
+
/obj/item/pipe/binary/layer_adapter
icon_state_preview = "manifoldlayer"
pipe_type = /obj/machinery/atmospherics/pipe/layer_manifold
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+
/obj/item/pipe/binary/color_adapter
icon_state_preview = "adapter_center"
pipe_type = /obj/machinery/atmospherics/pipe/color_adapter
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+
/obj/item/pipe/binary/pressure_pump
icon_state_preview = "pump"
pipe_type = /obj/machinery/atmospherics/components/binary/pump
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT / 2)
+
/obj/item/pipe/binary/manual_valve
icon_state_preview = "mvalve"
pipe_type = /obj/machinery/atmospherics/components/binary/valve
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+
/obj/item/pipe/binary/bendable
RPD_type = PIPE_BENDABLE
+
/obj/item/pipe/trinary
RPD_type = PIPE_TRINARY
+
/obj/item/pipe/trinary/flippable
RPD_type = PIPE_TRIN_M
var/flipped = FALSE
+
/obj/item/pipe/trinary/flippable/filter
name = "gas filter fitting"
icon_state_preview = "filter"
pipe_type = /obj/machinery/atmospherics/components/trinary/filter
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT / 2)
+
/obj/item/pipe/trinary/flippable/mixer
icon_state_preview = "mixer"
pipe_type = /obj/machinery/atmospherics/components/trinary/mixer
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT / 2)
+
/obj/item/pipe/quaternary
RPD_type = PIPE_ONEDIR
+
/obj/item/pipe/quaternary/pipe
icon_state_preview = "manifold4w"
pipe_type = /obj/machinery/atmospherics/pipe/smart
+
/obj/item/pipe/quaternary/pipe/crafted
/obj/item/pipe/quaternary/pipe/crafted/Initialize(mapload, _pipe_type, _dir, obj/machinery/atmospherics/make_from, device_color, device_init_dir = SOUTH)
@@ -114,6 +150,7 @@ Buildable meters
/obj/item/pipe/quaternary/he_pipe
icon_state_preview = "he_manifold4w"
pipe_type = /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/obj/item/pipe/Initialize(mapload, _pipe_type, _dir, obj/machinery/atmospherics/make_from, device_color, device_init_dir = SOUTH)
if(make_from)
@@ -129,7 +166,7 @@ Buildable meters
pixel_y += rand(-5, 5)
//Flipping handled manually due to custom handling for trinary pipes
- AddComponent(/datum/component/simple_rotation, ROTATION_NO_FLIPPING)
+ AddElement(/datum/element/simple_rotation, ROTATION_NO_FLIPPING)
// Only 'normal' pipes
if(type != /obj/item/pipe/quaternary)
@@ -393,7 +430,7 @@ Buildable meters
if(prob(20))
C.spew_organ()
sleep(0.5 SECONDS)
- C.blood_volume = 0
+ C.set_blood_volume(0)
return(OXYLOSS|BRUTELOSS)
/obj/item/pipe/examine(mob/user)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index d971bf30f6fce5..e7a9826b1832cc 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -84,7 +84,7 @@ DEFINE_BITFIELD(turret_flags, list(
/// World.time the turret last fired
var/last_fired = 0
/// Ticks until next shot (1.5 ?)
- var/shot_delay = 15
+ var/shot_delay = 1.5 SECONDS
/// Turret flags about who is turret allowed to shoot
var/turret_flags = TURRET_FLAG_SHOOT_CRIMINALS | TURRET_FLAG_SHOOT_ANOMALOUS
/// Determines if the turret is on
@@ -830,7 +830,7 @@ DEFINE_BITFIELD(turret_flags, list(
/obj/machinery/porta_turret/syndicate/shuttle
scan_range = 9
- shot_delay = 3
+ shot_delay = 3 DECISECONDS
stun_projectile = /obj/projectile/bullet/p50/penetrator/shuttle
lethal_projectile = /obj/projectile/bullet/p50/penetrator/shuttle
lethal_projectile_sound = 'sound/items/weapons/gun/smg/shot.ogg'
@@ -928,213 +928,6 @@ DEFINE_BITFIELD(turret_flags, list(
stun_projectile = /obj/projectile/kinetic/miner
stun_projectile_sound = 'sound/items/weapons/kinetic_accel.ogg'
-////////////////////////
-//Turret Control Panel//
-////////////////////////
-
-/obj/machinery/turretid
- name = "turret control panel"
- desc = "Used to control a room's automated defenses."
- icon = 'icons/obj/machines/turret_control.dmi'
- icon_state = "control_standby"
- base_icon_state = "control"
- density = FALSE
- req_access = list(ACCESS_AI_UPLOAD)
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- interaction_flags_click = ALLOW_SILICON_REACH
- /// Variable dictating if linked turrets are active and will shoot targets
- var/enabled = TRUE
- /// Variable dictating if linked turrets will shoot lethal projectiles
- var/lethal = FALSE
- /// Variable dictating if the panel is locked, preventing changes to turret settings
- var/locked = TRUE
- /// An area in which linked turrets are located, it can be an area name, path or nothing
- var/control_area = null
- /// AI is unable to use this machine if set to TRUE
- var/ailock = FALSE
- /// Variable dictating if linked turrets will shoot cyborgs
- var/shoot_cyborgs = FALSE
- /// List of weakrefs to all turrets
- var/list/turrets = list()
-
-/obj/machinery/turretid/Initialize(mapload)
- . = ..()
- if(!mapload)
- locked = FALSE
- else
- find_and_hang_on_wall()
- power_change() //Checks power and initial settings
-
-/obj/machinery/turretid/Destroy()
- turrets.Cut()
- return ..()
-
-/obj/machinery/turretid/Initialize(mapload) //map-placed turrets autolink turrets
- . = ..()
- if(!mapload)
- return
-
- // The actual area that control_area refers to
- var/area/control_area_instance
-
- if(control_area)
- control_area_instance = get_area_instance_from_text(control_area)
- if(!control_area_instance)
- log_mapping("Bad control_area path for [src] at [AREACOORD(src)]: [control_area]")
- if(!control_area_instance)
- control_area_instance = get_area(src)
-
- for(var/obj/machinery/porta_turret/T in control_area_instance)
- turrets |= WEAKREF(T)
-
-/obj/machinery/turretid/examine(mob/user)
- . += ..()
- if(issilicon(user) && !(machine_stat & BROKEN))
- . += {"[span_notice("Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets.")]
- [span_notice("Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"].")]"}
-
-/obj/machinery/turretid/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
- . = NONE
- if(machine_stat & BROKEN)
- return
-
- if(multi_tool.buffer && istype(multi_tool.buffer, /obj/machinery/porta_turret))
- turrets |= WEAKREF(multi_tool.buffer)
- to_chat(user, span_notice("You link \the [multi_tool.buffer] with \the [src]."))
- return ITEM_INTERACT_SUCCESS
-
-/obj/machinery/turretid/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
- if(machine_stat & BROKEN)
- return
-
- if (issilicon(user))
- return attack_hand(user)
-
- var/id = attacking_item.GetID()
-
- if(isnull(id))
- return
-
- if (check_access(id))
- if(obj_flags & EMAGGED)
- to_chat(user, span_warning("The turret control is unresponsive!"))
- return
-
- locked = !locked
- to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the panel."))
- else
- to_chat(user, span_alert("Access denied."))
-
-/obj/machinery/turretid/emag_act(mob/user, obj/item/card/emag/emag_card)
- if(obj_flags & EMAGGED)
- return FALSE
- balloon_alert(user, "access analysis module shorted")
- obj_flags |= EMAGGED
- locked = FALSE
- return TRUE
-
-/obj/machinery/turretid/attack_ai(mob/user)
- if(!ailock || isAdminGhostAI(user))
- return attack_hand(user)
- else
- to_chat(user, span_warning("There seems to be a firewall preventing you from accessing this device!"))
-
-/obj/machinery/turretid/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "TurretControl", name)
- ui.open()
-
-/obj/machinery/turretid/ui_data(mob/user)
- var/list/data = list()
- data["locked"] = locked
- data["siliconUser"] = HAS_SILICON_ACCESS(user)
- data["enabled"] = enabled
- data["lethal"] = lethal
- data["shootCyborgs"] = shoot_cyborgs
- return data
-
-/obj/machinery/turretid/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- . = ..()
- if(.)
- return
-
- var/mob/user = ui.user
-
- switch(action)
- if("lock")
- if(!HAS_SILICON_ACCESS(user))
- return
- if((obj_flags & EMAGGED) || (machine_stat & BROKEN))
- to_chat(user, span_warning("The turret control is unresponsive!"))
- return
- locked = !locked
- return TRUE
- if("power")
- toggle_on(user)
- return TRUE
- if("mode")
- toggle_lethal(user)
- return TRUE
- if("shoot_silicons")
- shoot_silicons(user)
- return TRUE
-
-/obj/machinery/turretid/proc/toggle_lethal(mob/user)
- lethal = !lethal
- if (user)
- var/enabled_or_disabled = lethal ? "disabled" : "enabled"
- balloon_alert(user, "safeties [enabled_or_disabled]")
- add_hiddenprint(user)
- log_combat(user, src, "[enabled_or_disabled] lethals on")
- updateTurrets()
-
-/obj/machinery/turretid/proc/toggle_on(mob/user)
- enabled = !enabled
- if (user)
- var/enabled_or_disabled = enabled ? "enabled" : "disabled"
- balloon_alert(user, "[enabled_or_disabled]")
- add_hiddenprint(user)
- log_combat(user, src, "[enabled ? "enabled" : "disabled"]")
- updateTurrets()
-
-/obj/machinery/turretid/proc/shoot_silicons(mob/user)
- shoot_cyborgs = !shoot_cyborgs
- if (user)
- var/status = shoot_cyborgs ? "Shooting Borgs" : "Not Shooting Borgs"
- balloon_alert(user, LOWER_TEXT(status))
- add_hiddenprint(user)
- log_combat(user, src, "[status]")
- updateTurrets()
-
-/obj/machinery/turretid/proc/updateTurrets()
- for (var/datum/weakref/turret_ref in turrets)
- var/obj/machinery/porta_turret/turret = turret_ref.resolve()
- if(!turret)
- turrets -= turret_ref
- continue
- turret.setState(enabled, lethal, shoot_cyborgs)
- update_appearance()
-
-/obj/machinery/turretid/update_icon_state()
- if(machine_stat & NOPOWER)
- icon_state = "[base_icon_state]_off"
- return ..()
- if (enabled)
- icon_state = "[base_icon_state]_[lethal ? "kill" : "stun"]"
- return ..()
- icon_state = "[base_icon_state]_standby"
- return ..()
-
-/obj/item/wallframe/turret_control
- name = "turret control frame"
- desc = "Used for building turret control panels."
- icon = 'icons/obj/machines/turret_control.dmi'
- icon_state = "control_frame"
- result_path = /obj/machinery/turretid
- custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT)
- pixel_shift = 29
-
/obj/item/gun/proc/get_turret_properties()
. = list()
.["lethal_projectile"] = null
@@ -1176,7 +969,7 @@ DEFINE_BITFIELD(turret_flags, list(
.["stun_projectile"] = /obj/projectile/beam/lasertag/bluetag
.["lethal_projectile"] = /obj/projectile/beam/lasertag/bluetag
.["base_icon_state"] = "blue"
- .["shot_delay"] = 30
+ .["shot_delay"] = 3 SECONDS
.["team_color"] = "blue"
/obj/item/gun/energy/laser/redtag/get_turret_properties()
@@ -1184,7 +977,7 @@ DEFINE_BITFIELD(turret_flags, list(
.["stun_projectile"] = /obj/projectile/beam/lasertag/redtag
.["lethal_projectile"] = /obj/projectile/beam/lasertag/redtag
.["base_icon_state"] = "red"
- .["shot_delay"] = 30
+ .["shot_delay"] = 3 SECONDS
.["team_color"] = "red"
/obj/item/gun/energy/e_gun/turret/get_turret_properties()
diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm
index d84f7bee725430..6b06894e010670 100644
--- a/code/game/machinery/porta_turret/portable_turret_construct.dm
+++ b/code/game/machinery/porta_turret/portable_turret_construct.dm
@@ -17,6 +17,7 @@
density = TRUE
obj_flags = UNIQUE_RENAME | RENAME_NO_DESC
use_power = NO_POWER_USE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
var/build_step = PTURRET_UNSECURED //the current step in the building process
var/finish_name = "turret" //the name applied to the product turret
var/obj/item/gun/installed_gun = null
diff --git a/code/game/machinery/porta_turret/turret_control.dm b/code/game/machinery/porta_turret/turret_control.dm
new file mode 100644
index 00000000000000..c1b436f3dcc140
--- /dev/null
+++ b/code/game/machinery/porta_turret/turret_control.dm
@@ -0,0 +1,214 @@
+/obj/machinery/turretid
+ name = "turret control panel"
+ desc = "Used to control a room's automated defenses."
+ icon = 'icons/obj/machines/turret_control.dmi'
+ icon_state = "control"
+ base_icon_state = "control"
+ density = FALSE
+ req_access = list(ACCESS_AI_UPLOAD)
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ interaction_flags_click = ALLOW_SILICON_REACH
+ /// Variable dictating if linked turrets are active and will shoot targets
+ var/enabled = TRUE
+ /// Variable dictating if linked turrets will shoot lethal projectiles
+ var/lethal = FALSE
+ /// Variable dictating if the panel is locked, preventing changes to turret settings
+ var/locked = TRUE
+ /// An area in which linked turrets are located, it can be an area name, path or nothing
+ var/control_area = null
+ /// AI is unable to use this machine if set to TRUE
+ var/ailock = FALSE
+ /// Variable dictating if linked turrets will shoot cyborgs
+ var/shoot_cyborgs = FALSE
+ /// List of weakrefs to all turrets
+ var/list/turrets = list()
+
+/obj/machinery/turretid/Initialize(mapload)
+ . = ..()
+
+ if(mapload)
+ find_and_mount_on_atom()
+ else
+ locked = FALSE
+ power_change()
+
+ var/area/control_area_instance
+
+ if(control_area)
+ control_area_instance = get_area_instance_from_text(control_area)
+ if(!control_area_instance)
+ log_mapping("Bad control_area path for [src] at [AREACOORD(src)]: [control_area]")
+
+ if(!control_area_instance)
+ control_area_instance = get_area(src)
+
+ for(var/obj/machinery/porta_turret/T in control_area_instance)
+ turrets |= WEAKREF(T)
+
+/obj/machinery/turretid/Destroy()
+ turrets.Cut()
+ return ..()
+
+/obj/machinery/turretid/update_overlays()
+ . = ..()
+ if(machine_stat & NOPOWER)
+ if(enabled)
+ . += mutable_appearance(icon, "button_left")
+ if(lethal)
+ . += mutable_appearance(icon, "button_right")
+ return
+
+ if(enabled)
+ . += mutable_appearance(icon, "button_left")
+ . += emissive_appearance(icon, "emissive_button_left", src)
+ if(lethal)
+ . += mutable_appearance(icon, "kill")
+ . += mutable_appearance(icon, "button_right")
+ . += emissive_appearance(icon, "emissive_button_right", src)
+ else
+ . += mutable_appearance(icon, "stun")
+ else
+ . += mutable_appearance(icon, "standby")
+ . += emissive_appearance(icon, "emissive_screen", src)
+
+/obj/machinery/turretid/power_change()
+ . = ..()
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/machinery/turretid/examine(mob/user)
+ . += ..()
+ if(issilicon(user) && !(machine_stat & BROKEN))
+ . += span_notice("Ctrl-click [src] to [ enabled ? "disable" : "enable"] turrets.")
+ . += span_notice("Alt-click [src] to set turrets to [ lethal ? "stun" : "kill"].")
+
+/obj/machinery/turretid/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
+ . = NONE
+ if(machine_stat & BROKEN)
+ return
+
+ if(multi_tool.buffer && istype(multi_tool.buffer, /obj/machinery/porta_turret))
+ turrets |= WEAKREF(multi_tool.buffer)
+ to_chat(user, span_notice("You link \the [multi_tool.buffer] with \the [src]."))
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/turretid/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
+ if(machine_stat & BROKEN)
+ return
+
+ if (issilicon(user))
+ return attack_hand(user)
+
+ var/id = attacking_item.GetID()
+
+ if(isnull(id))
+ return
+
+ if (check_access(id))
+ if(obj_flags & EMAGGED)
+ to_chat(user, span_warning("The turret control is unresponsive!"))
+ return
+
+ locked = !locked
+ to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] the panel."))
+ else
+ to_chat(user, span_alert("Access denied."))
+
+/obj/machinery/turretid/emag_act(mob/user, obj/item/card/emag/emag_card)
+ if(obj_flags & EMAGGED)
+ return FALSE
+ balloon_alert(user, "access analysis module shorted")
+ obj_flags |= EMAGGED
+ locked = FALSE
+ return TRUE
+
+/obj/machinery/turretid/attack_ai(mob/user)
+ if(!ailock || isAdminGhostAI(user))
+ return attack_hand(user)
+ else
+ to_chat(user, span_warning("There seems to be a firewall preventing you from accessing this device!"))
+
+/obj/machinery/turretid/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "TurretControl", name)
+ ui.open()
+
+/obj/machinery/turretid/ui_data(mob/user)
+ var/list/data = list()
+ data["locked"] = locked
+ data["siliconUser"] = HAS_SILICON_ACCESS(user)
+ data["enabled"] = enabled
+ data["lethal"] = lethal
+ data["shootCyborgs"] = shoot_cyborgs
+ return data
+
+/obj/machinery/turretid/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ var/mob/user = ui.user
+
+ switch(action)
+ if("lock")
+ if(!HAS_SILICON_ACCESS(user))
+ return
+ if((obj_flags & EMAGGED) || (machine_stat & BROKEN))
+ to_chat(user, span_warning("The turret control is unresponsive!"))
+ return
+ locked = !locked
+ return TRUE
+ if("power")
+ toggle_on(user)
+ return TRUE
+ if("mode")
+ toggle_lethal(user)
+ return TRUE
+ if("shoot_silicons")
+ shoot_silicons(user)
+ return TRUE
+
+/obj/machinery/turretid/proc/toggle_lethal(mob/user)
+ lethal = !lethal
+ if (user)
+ var/enabled_or_disabled = lethal ? "disabled" : "enabled"
+ balloon_alert(user, "safeties [enabled_or_disabled]")
+ add_hiddenprint(user)
+ log_combat(user, src, "[enabled_or_disabled] lethals on")
+ updateTurrets()
+
+/obj/machinery/turretid/proc/toggle_on(mob/user)
+ enabled = !enabled
+ if (user)
+ var/enabled_or_disabled = enabled ? "enabled" : "disabled"
+ balloon_alert(user, "[enabled_or_disabled]")
+ add_hiddenprint(user)
+ log_combat(user, src, "[enabled ? "enabled" : "disabled"]")
+ updateTurrets()
+
+/obj/machinery/turretid/proc/shoot_silicons(mob/user)
+ shoot_cyborgs = !shoot_cyborgs
+ if (user)
+ var/status = shoot_cyborgs ? "Shooting Borgs" : "Not Shooting Borgs"
+ balloon_alert(user, LOWER_TEXT(status))
+ add_hiddenprint(user)
+ log_combat(user, src, "[status]")
+ updateTurrets()
+
+/obj/machinery/turretid/proc/updateTurrets()
+ for (var/datum/weakref/turret_ref in turrets)
+ var/obj/machinery/porta_turret/turret = turret_ref.resolve()
+ if(!turret)
+ turrets -= turret_ref
+ continue
+ turret.setState(enabled, lethal, shoot_cyborgs)
+ update_appearance()
+
+/obj/item/wallframe/turret_control
+ name = "turret control frame"
+ desc = "Used for building turret control panels."
+ icon = 'icons/obj/machines/turret_control.dmi'
+ icon_state = "control_frame"
+ result_path = /obj/machinery/turretid
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6)
+ pixel_shift = 30
diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm
index 4f13690290e1e9..d09f2af6e7a60a 100644
--- a/code/game/machinery/quantum_pad.dm
+++ b/code/game/machinery/quantum_pad.dm
@@ -23,9 +23,7 @@
if(map_pad_id)
mapped_quantum_pads[map_pad_id] = src
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/quantumpad,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/quantumpad), only_root_path = TRUE))
/obj/machinery/quantumpad/Destroy()
mapped_quantum_pads -= map_pad_id
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 1ea84c1f993c18..ad97f8ad4cdf0d 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -12,8 +12,6 @@
var/recharge_coeff = 1
/// Did we put power into "charging" last process()?
var/using_power = FALSE
- /// Did we finish recharging the currently inserted item?
- var/finished_recharging = FALSE
/// List of items that can be recharged
var/static/list/allowed_devices = typecacheof(list(
/obj/item/gun/energy,
@@ -72,7 +70,6 @@
charging = arrived
START_PROCESSING(SSmachines, src)
update_use_power(ACTIVE_POWER_USE)
- finished_recharging = FALSE
using_power = TRUE
update_appearance()
return ..()
@@ -157,17 +154,25 @@
if(charging_cell)
if(charging_cell.charge < charging_cell.maxcharge)
charge_cell(charging_cell.chargerate * recharge_coeff * seconds_per_tick, charging_cell)
- using_power = TRUE
+ if(charging_cell.charge >= charging_cell.maxcharge) //Inserted thing is at max charge/ammo, notify those around us
+ playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
+ say("[charging] has finished recharging!")
+ else
+ using_power = TRUE
update_appearance()
+ return
if(istype(charging, /obj/item/ammo_box/magazine/recharge)) //if you add any more snowflake ones, make sure to update the examine messages too.
var/obj/item/ammo_box/magazine/recharge/power_pack = charging
for(var/charge_iterations in 1 to recharge_coeff)
- if(power_pack.stored_ammo.len >= power_pack.max_ammo)
- break
- power_pack.stored_ammo += new power_pack.ammo_type(power_pack)
- use_energy(active_power_usage * seconds_per_tick)
- using_power = TRUE
+ if(power_pack.stored_ammo.len < power_pack.max_ammo)
+ power_pack.stored_ammo += new power_pack.ammo_type(power_pack)
+ use_energy(active_power_usage * seconds_per_tick)
+ if(power_pack.stored_ammo >= power_pack.max_ammo)
+ playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
+ say("[charging] has finished recharging!")
+ else
+ using_power = TRUE
update_appearance()
return
@@ -180,18 +185,16 @@
using_power = TRUE
else if(recalibrating_gun.shots_before_degradation < recalibrating_gun.max_shots_before_degradation)
- recalibrating_gun.attempt_recalibration(TRUE, 1 * recharge_coeff)
+ recalibrating_gun.attempt_recalibration(TRUE, recharge_coeff)
use_energy(active_power_usage * recharge_coeff * seconds_per_tick)
- using_power = TRUE
-
+ if(recalibrating_gun.shots_before_degradation == recalibrating_gun.max_shots_before_degradation)
+ playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
+ say("[charging] has finished recalibrating!")
+ else
+ using_power = TRUE
update_appearance()
return
- if(!using_power && !finished_recharging) //Inserted thing is at max charge/ammo, notify those around us
- finished_recharging = TRUE
- playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
- say("[charging] has finished recharging!")
-
/obj/machinery/recharger/emp_act(severity)
. = ..()
if (. & EMP_PROTECT_CONTENTS)
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index e8a0a823871be5..3eacf7b7f9f374 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -16,14 +16,14 @@
var/datum/callback/charge_cell
///Whether we're sending iron and glass to a cyborg. Requires Silo connection.
var/sendmats = FALSE
- var/datum/component/remote_materials/materials
+ var/datum/remote_materials/materials
/obj/machinery/recharge_station/Initialize(mapload)
. = ..()
- materials = AddComponent(
- /datum/component/remote_materials, \
+ materials = new (
+ src, \
mapload, \
mat_container_flags = MATCONTAINER_NO_INSERT, \
)
@@ -46,7 +46,7 @@
GLOB.roundstart_station_borgcharger_areas += area_name
/obj/machinery/recharge_station/Destroy()
- materials = null
+ QDEL_NULL(materials)
charge_cell = null
return ..()
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index c02be961a9ff58..fbcd2b5ab719f4 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -16,16 +16,16 @@
var/crush_damage = 1000
var/eat_victim_items = TRUE
var/item_recycle_sound = 'sound/items/tools/welder.ogg'
- var/datum/component/material_container/materials
+ var/datum/material_container/materials
/obj/machinery/recycler/Initialize(mapload)
- materials = AddComponent(
- /datum/component/material_container, \
+ materials = new (
+ src, \
SSmaterials.materials_by_category[MAT_CATEGORY_SILO], \
INFINITY, \
MATCONTAINER_NO_INSERT \
)
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
AddComponent(
/datum/component/butchering/recycler, \
speed = 0.1 SECONDS, \
@@ -45,7 +45,7 @@
AddElement(/datum/element/connect_loc, loc_connections)
/obj/machinery/recycler/Destroy()
- materials = null
+ QDEL_NULL(materials)
return ..()
/obj/machinery/recycler/RefreshParts()
@@ -76,7 +76,7 @@
return SUCCESSFUL_UNFASTEN
/obj/machinery/recycler/crowbar_act(mob/living/user, obj/item/tool)
- if(default_pry_open(tool, close_after_pry = TRUE))
+ if(default_deconstruction_crowbar(tool))
return ITEM_INTERACT_SUCCESS
return ITEM_INTERACT_BLOCKING
@@ -125,106 +125,91 @@
INVOKE_ASYNC(src, PROC_REF(eat), enterer)
/obj/machinery/recycler/proc/eat(atom/movable/morsel, sound=TRUE)
- if(machine_stat & (BROKEN|NOPOWER))
- return
- if(safety_mode)
- return
- if(iseffect(morsel))
+ if(machine_stat & (BROKEN|NOPOWER) || safety_mode)
return
if(!isturf(morsel.loc))
- return //I don't know how you called Crossed() but stop it.
- if(morsel.resistance_flags & INDESTRUCTIBLE)
+ stack_trace("on_entered() called with invalid location: [morsel.loc]") // I don't know how you called Entered() but stop it.
return
- if(morsel.flags_1 & HOLOGRAM_1)
- visible_message(span_notice("[morsel] fades away!"))
- qdel(morsel)
+ if(morsel.resistance_flags & INDESTRUCTIBLE)
return
+ /// Queue of objects to process.
var/list/atom/to_eat = list(morsel)
-
- var/living_detected = FALSE //technically includes silicons as well but eh
+ /// Regular items to be recycled.
var/list/nom = list()
- var/list/crunchy_nom = list() //Mobs have to be handled differently so they get a different list instead of checking them multiple times.
+ /// Living mobs to be crushed.
+ var/list/crunchy_nom = list() // Mobs have to be handled differently so they get a different list instead of checking them multiple times.
+ /// Count of items that couldn't be processed.
var/not_eaten = 0
- while (to_eat.len)
- var/atom/movable/thing = to_eat[1]
- to_eat -= thing
+ while(LAZYLEN(to_eat))
+ var/atom/movable/thing = popleft(to_eat)
- if (thing.flags_1 & HOLOGRAM_1)
- qdel(thing)
- continue
+ if(triggers_safety_shutdown(thing))
+ emergency_stop()
+ return
- if (thing.resistance_flags & INDESTRUCTIBLE)
- if (!isturf(thing.loc) && !recursive_loc_check(thing, /mob/living))
+ if(thing.resistance_flags & INDESTRUCTIBLE)
+ if(!isturf(thing.loc) && !recursive_loc_check(thing, /mob/living))
thing.forceMove(loc)
- not_eaten += 1
+ not_eaten++
continue
- if (isliving(thing))
- living_detected = TRUE
- crunchy_nom += thing
- if (!issilicon(thing))
- to_eat |= thing.contents
+ if(thing.flags_1 & HOLOGRAM_1)
+ for(var/atom/movable/hologram_content as anything in thing.contents)
+ hologram_content.forceMove(loc) // we shouldn't qdel() the non-holographic content of the hologram.
+ visible_message(span_notice("[thing] fades away!"))
+ qdel(thing)
continue
- if (!isobj(thing))
- not_eaten += 1
+ if(isliving(thing))
+ LAZYADD(crunchy_nom, thing)
+ if(!issilicon(thing))
+ LAZYOR(to_eat, thing.contents)
continue
- if (isitem(thing))
- var/obj/item/as_item = thing
- if (as_item.item_flags & ABSTRACT)
- not_eaten += 1
- continue
+ if(!isobj(thing))
+ not_eaten++
+ continue
- // Prevent blindly deconstructing locked secure closets (head closets, important departmental orders, etc.)
- // unless they have already been unlocked to prevent exploiting the recycler to bypass closet access.
- if (iscloset(thing))
- var/obj/structure/closet/as_closet = thing
- if (as_closet.secure && as_closet.locked)
- not_eaten += 1
+ if(isitem(thing))
+ var/obj/item/item_thing = thing
+ if(item_thing.item_flags & ABSTRACT)
+ not_eaten++
continue
- if (istype(thing, /obj/item/organ/brain) || istype(thing, /obj/item/dullahan_relay))
- living_detected = TRUE
-
- if (istype(thing, /obj/item/mmi))
- var/obj/item/mmi/mmi = thing
- if (!isnull(mmi.brain))
- living_detected = TRUE
+ if(iscloset(thing))
+ var/obj/structure/closet/closet_thing = thing
+ if(closet_thing.secure && closet_thing.locked) // Prevent blindly deconstructing locked secure closets (head closets, important departmental orders, etc.)
+ not_eaten++ // unless they have already been unlocked to prevent exploiting the recycler to bypass closet access.
+ continue
- nom += thing
- to_eat |= thing.contents
+ LAZYADD(nom, thing)
+ LAZYOR(to_eat, thing.contents)
- if(living_detected) // First, check if we have any living beings detected.
- if(obj_flags & EMAGGED)
- for(var/CRUNCH in crunchy_nom) // Eat them and keep going because we don't care about safety.
- if(!isliving(CRUNCH)) // MMIs and brains will get eaten like normal items
- continue
+ for(var/mob/living/living_mob in crunchy_nom)
+ if(!is_operational) //we ran out of power after recycling a large amount to living stuff, time to stop
+ break
+ if(living_mob.incorporeal_move)
+ continue
- var/mob/living/living_mob = CRUNCH
- if(living_mob.incorporeal_move)
- continue
+ crush_living(living_mob)
+ use_energy(active_power_usage)
- if(!is_operational) //we ran out of power after recycling a large amount to living stuff, time to stop
- break
- crush_living(CRUNCH)
- use_energy(active_power_usage)
- else // Stop processing right now without eating anything.
- emergency_stop()
- return
+ var/nom_length = LAZYLEN(nom)
/**
* we process the list in reverse so that atoms without parents/contents are deleted first & their parents are deleted next & so on.
* this is the reverse order in which get_all_contents() returns its list
* if we delete an atom containing stuff then all its stuff are deleted with it as well so we will end recycling deleted items down the list and gain nothing from them
*/
- for(var/i = length(nom); i >= 1; i--)
+ for(var/i = nom_length; i >= 1; i--)
if(!is_operational) //we ran out of power after recycling a large amount to items, time to stop
break
+
var/full_power_usage = TRUE
var/obj/nom_obj = nom[i]
+
if(isitem(nom_obj) || HAS_TRAIT(nom_obj, TRAIT_RECYCLE_LIKE_ITEM)) // DOPPLER EDIT CHANGE - Lets non-items get their custom materials recycled - ORIGINAL: if (isitem(nom_obj))
// Whether or not items consume full power depends on if they produced a material when recycled.
full_power_usage = recycle_item(nom_obj)
@@ -232,28 +217,52 @@
// When a non-item is eaten, we deconstruct it with dismantled = FALSE so that
// it and its contents aren't just deleted. These always consume full power.
nom_obj.deconstruct(FALSE)
+
use_energy(active_power_usage / (full_power_usage ? 1 : 2))
- if(nom.len && sound)
- playsound(src, item_recycle_sound, (50 + nom.len * 5), TRUE, nom.len, ignore_walls = (nom.len - 10)) // As a substitute for playing 50 sounds at once.
+ if(nom_length && sound)
+ var/sound_volume = clamp(nom_length * 5, 50, 100)
+ var/walls_ignoring = max(nom_length - 10, 0)
+ playsound(src, item_recycle_sound, sound_volume, TRUE, nom_length, ignore_walls = walls_ignoring) // As a substitute for playing 50 sounds at once.
+
if(not_eaten)
- playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', (50 + not_eaten * 5), FALSE, not_eaten, ignore_walls = (not_eaten - 10)) // Ditto.
-
-/obj/machinery/recycler/proc/recycle_item(obj/item/weapon)
- . = FALSE
- var/obj/item/grown/log/wood = weapon
- if(istype(wood))
- var/seed_modifier = 0
- if(wood.seed)
- seed_modifier = round(wood.seed.potency / 25)
+ var/sound_volume = clamp(not_eaten * 5, 50, 100)
+ var/walls_ignoring = max(not_eaten - 10, 0)
+ playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', sound_volume, FALSE, not_eaten, ignore_walls = walls_ignoring) // Ditto.
+
+/// Determines if the target should trigger an emergency stop due to safety concerns.
+/obj/machinery/recycler/proc/triggers_safety_shutdown(atom/movable/target)
+ if(obj_flags & EMAGGED)
+ return FALSE // Emagged recycler ignores all safety checks.
+
+ if(isliving(target))
+ return TRUE
+
+ if(isbrain(target) || istype(target, /obj/item/dullahan_relay))
+ return TRUE
+
+ if(istype(target, /obj/item/mmi))
+ var/obj/item/mmi/mmi_thing = target
+ return !!(mmi_thing.brain)
+
+ return FALSE
+
+/obj/machinery/recycler/proc/recycle_item(obj/item/target)
+ if(istype(target, /obj/item/grown/log))
+ var/obj/item/grown/log/wood = target
+ var/seed_modifier = wood.seed ? round(wood.seed.potency / 25) : 0
new wood.plank_type(loc, 1 + seed_modifier)
- . = TRUE
- else
- var/retrieved = materials.insert_item(weapon, multiplier = (amount_produced / 100))
- if(retrieved > 0) //item was salvaged i.e. deleted
- materials.retrieve_all()
- return TRUE
- qdel(weapon)
+ qdel(target)
+ return TRUE
+
+ var/retrieved = materials.insert_item(target, multiplier = (amount_produced / 100))
+ if(retrieved > 0) //item was salvaged i.e. deleted
+ materials.retrieve_all()
+ qdel(target)
+ return TRUE
+
+ qdel(target)
+ return FALSE
/obj/machinery/recycler/proc/emergency_stop()
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
@@ -267,16 +276,13 @@
update_appearance()
/obj/machinery/recycler/proc/crush_living(mob/living/living_mob)
- living_mob.forceMove(loc)
-
if(issilicon(living_mob))
playsound(src, 'sound/items/tools/welder.ogg', 50, TRUE)
else
playsound(src, 'sound/effects/splat.ogg', 50, TRUE)
- if(iscarbon(living_mob))
- if(living_mob.stat == CONSCIOUS)
- living_mob.say("ARRRRRRRRRRRGH!!!", forced= "recycler grinding")
+ if(iscarbon(living_mob) && living_mob.stat == CONSCIOUS)
+ living_mob.say("ARRRRRRRRRRRGH!!!", forced= "recycler grinding")
if(!issilicon(living_mob))
add_mob_blood(living_mob)
@@ -284,7 +290,7 @@
// Instantly lie down, also go unconscious from the pain, before you die.
living_mob.Unconscious(100)
- living_mob.adjustBruteLoss(crush_damage)
+ living_mob.adjust_brute_loss(crush_damage)
update_appearance()
/obj/machinery/recycler/on_deconstruction(disassembled)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 350aaa43be233f..018bfd65e5002f 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -129,7 +129,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
LAZYADD(GLOB.reta_consoles_by_origin[dept_key], src)
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/requests_console/Destroy()
QDEL_LIST(messages)
@@ -547,6 +547,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/requests_console/auto_name, 30)
icon_state = "req_comp_off"
result_path = /obj/machinery/requests_console/auto_name
pixel_shift = 30
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
/datum/aas_config_entry/rc_emergency
name = "RC Alert: Emergency Request"
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index e31c72a53b09e2..e9e94686f7f2a5 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -263,7 +263,7 @@
var/account_balance = my_card?.registered_account?.account_balance
potential_payout = (account_balance >= potential_payout) ? potential_payout : account_balance
- say("You have won [potential_payout] credits! Congratulations!")
+ say("You have won [potential_payout] [MONEY_NAME]! Congratulations!")
playsound(src, 'sound/machines/synth/synth_yes.ogg', 50)
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
diff --git a/code/game/machinery/scanner_gate.dm b/code/game/machinery/scanner_gate.dm
index 49475d53f951ea..27271f3c4b164f 100644
--- a/code/game/machinery/scanner_gate.dm
+++ b/code/game/machinery/scanner_gate.dm
@@ -87,7 +87,7 @@
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
- AddComponent(/datum/component/simple_rotation, ROTATION_IGNORE_ANCHORED|ROTATION_REQUIRE_WRENCH|ROTATION_NEEDS_UNBLOCKED)
+ AddElement(/datum/element/simple_rotation, ROTATION_IGNORE_ANCHORED|ROTATION_REQUIRE_WRENCH|ROTATION_NEEDS_UNBLOCKED)
register_context()
/obj/machinery/scanner_gate/Destroy(force)
diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm
index 815b35213b9e57..c689318ddc479a 100644
--- a/code/game/machinery/sheetifier.dm
+++ b/code/game/machinery/sheetifier.dm
@@ -7,12 +7,12 @@
circuit = /obj/item/circuitboard/machine/sheetifier
layer = BELOW_OBJ_LAYER
var/busy_processing = FALSE
- var/datum/component/material_container/materials
+ var/datum/material_container/materials
/obj/machinery/sheetifier/Initialize(mapload)
. = ..()
- materials = AddComponent( \
- /datum/component/material_container, \
+ materials = new ( \
+ src, \
list(/datum/material/meat, /datum/material/hauntium), \
SHEET_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, \
MATCONTAINER_EXAMINE, \
@@ -24,7 +24,7 @@
)
/obj/machinery/sheetifier/Destroy()
- materials = null
+ QDEL_NULL(materials)
return ..()
/obj/machinery/sheetifier/update_overlays()
diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm
index 9b843cd5506126..1715ead996807d 100644
--- a/code/game/machinery/sleepers.dm
+++ b/code/game/machinery/sleepers.dm
@@ -218,10 +218,10 @@
data["occupant"]["health"] = mob_occupant.health
data["occupant"]["maxHealth"] = mob_occupant.maxHealth
data["occupant"]["minHealth"] = HEALTH_THRESHOLD_DEAD
- data["occupant"]["bruteLoss"] = mob_occupant.getBruteLoss()
- data["occupant"]["oxyLoss"] = mob_occupant.getOxyLoss()
- data["occupant"]["toxLoss"] = mob_occupant.getToxLoss()
- data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
+ data["occupant"]["bruteLoss"] = mob_occupant.get_brute_loss()
+ data["occupant"]["oxyLoss"] = mob_occupant.get_oxy_loss()
+ data["occupant"]["toxLoss"] = mob_occupant.get_tox_loss()
+ data["occupant"]["fireLoss"] = mob_occupant.get_fire_loss()
data["occupant"]["brainLoss"] = mob_occupant.get_organ_loss(ORGAN_SLOT_BRAIN)
data["occupant"]["reagents"] = list()
if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len)
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index a5c6bfdc1a87aa..ded188b82bd1bd 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -122,7 +122,7 @@
var/obj/item/holochip/inserted_chip = inserted
if(!user.temporarilyRemoveItemFromInventory(inserted_chip))
return ITEM_INTERACT_BLOCKING
- balloon_alert(user, "[inserted_chip.credits] credit[inserted_chip.credits == 1 ? "" : "s"] inserted")
+ balloon_alert(user, "[inserted_chip.credits] [MONEY_NAME_AUTOPURAL(inserted_chip.credits)] inserted")
balance += inserted_chip.credits
qdel(inserted_chip)
return ITEM_INTERACT_SUCCESS
@@ -309,7 +309,7 @@
else if(check_jackpot(JACKPOT_SEVENS))
var/prize = money + JACKPOT
- visible_message("
[src] says, 'JACKPOT! You win [prize] credits!'")
+ visible_message("
[src] says, 'JACKPOT! You win [prize] [MONEY_NAME]!'")
priority_announce("Congratulations to [user ? user.real_name : usrname] for winning the jackpot at the slot machine in [get_area(src)]!")
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
@@ -327,14 +327,14 @@
sleep(REEL_DEACTIVATE_DELAY)
else if(linelength == 5)
- visible_message("
[src] says, 'Big Winner! You win a thousand credits!'")
+ visible_message("
[src] says, 'Big Winner! You win a thousand [MONEY_NAME]!'")
give_money(BIG_PRIZE)
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
living_user.add_mood_event("slots", /datum/mood_event/slots/win/big)
else if(linelength == 4)
- visible_message("
[src] says, 'Winner! You win four hundred credits!'")
+ visible_message("
[src] says, 'Winner! You win four hundred [MONEY_NAME]!'")
give_money(SMALL_PRIZE)
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 0e1f8ae06298e3..3010b84b19ea9a 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -39,8 +39,8 @@
var/settable_temperature_median = 30 + T0C
///Range of temperatures above and below the median that we can set our target temperature (increase by upgrading the capacitors)
var/settable_temperature_range = 30
- ///Should we add an overlay for open spaceheaters
- var/display_panel = TRUE
+ /// The icon_state of the emissive, because improvised heaters are special and don't follow along with the modes
+ var/emissive_state
/datum/armor/machinery_space_heater
fire = 80
@@ -118,8 +118,12 @@
/obj/machinery/space_heater/update_overlays()
. = ..()
- if(panel_open && display_panel)
+
+ if(on)
+ . += emissive_appearance(icon, "[emissive_state ? emissive_state : base_icon_state + "-" + mode]-emissive", src, alpha = src.alpha)
+ if(panel_open)
. += "[base_icon_state]-open"
+ . += emissive_blocker(icon, "[base_icon_state]-open", src, alpha = src.alpha)
/obj/machinery/space_heater/on_set_panel_open()
update_appearance()
@@ -313,16 +317,14 @@
///For use with heating reagents in a ghetto way
/obj/machinery/space_heater/improvised_chem_heater
- icon = 'icons/obj/medical/chemical.dmi'
- icon_state = "sheater-off"
name = "improvised chem heater"
desc = "A space heater fashioned to reroute heating to a water bath on top."
panel_open = TRUE //This is always open - since we've injected wires in the panel
//We inherit the cell from the heater prior
cell = null
interaction_flags_click = FORBID_TELEKINESIS_REACH
- display_panel = FALSE
settable_temperature_range = 50
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 3, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
///The beaker within the heater
var/obj/item/reagent_containers/beaker = null
/// How quickly it delivers heat to the reagents. In watts per joule of the thermal energy difference of the reagent from the temperature difference of the current and target temperatures.
@@ -479,14 +481,24 @@
. = ..()
if(!on || !beaker || !cell)
icon_state = "sheater-off"
+ emissive_state = null
return
if(target_temperature < beaker.reagents.chem_temp)
icon_state = "sheater-cool"
+ emissive_state = icon_state
return
if(target_temperature > beaker.reagents.chem_temp)
icon_state = "sheater-heat"
+ emissive_state = icon_state
return
icon_state = "sheater-off"
+ emissive_state = null
+
+/obj/machinery/space_heater/improvised_chem_heater/update_overlays()
+ . += ..()
+ . += "[icon_state]-beaker"
+ . += "[base_icon_state]-rigged"
+ . += emissive_blocker(icon, "[base_icon_state]-rigged", src, alpha = src.alpha)
/obj/machinery/space_heater/improvised_chem_heater/RefreshParts()
. = ..()
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index b925baf894fd96..69a8555f3e1ab5 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -403,12 +403,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/evac, 32)
// register for radio system
SSradio.add_object(src, frequency)
// Circuit USB
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/status_display,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/status_display), only_root_path = TRUE))
RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(on_sec_level_change))
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/status_display/evac/Destroy()
SSradio.remove_object(src,frequency)
@@ -744,7 +742,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/ai, 32)
. = ..()
// register for radio system to receive AI emote signals
SSradio.add_object(src, frequency)
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/machinery/status_display/ai/Destroy()
SSradio.remove_object(src, frequency)
@@ -776,7 +775,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/ai, 32)
icon_state = GLOB.ai_status_display_emotes[emotion]
// Default fallback
else
- icon_state = "ai_neutral"
+ icon_state = "ai_download"
set_picture(icon_state)
return PROCESS_KILL
@@ -1030,7 +1029,7 @@ GLOBAL_LIST_EMPTY_TYPED(greenscreen_displays, /obj/effect/abstract/greenscreen_d
/obj/machinery/greenscreen_camera/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation, ROTATION_IGNORE_ANCHORED)
+ AddElement(/datum/element/simple_rotation, ROTATION_IGNORE_ANCHORED)
update_appearance(UPDATE_OVERLAYS)
/obj/machinery/greenscreen_camera/Destroy()
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index ea9e9383aa33d4..860bacc37e46fd 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -80,12 +80,12 @@
/obj/machinery/suit_storage_unit/captain
mask_type = /obj/item/clothing/mask/gas/atmos/captain
- storage_type = /obj/item/tank/jetpack/oxygen/captain
+ storage_type = /obj/item/tank/jetpack/captain
mod_type = /obj/item/mod/control/pre_equipped/magnate
/obj/machinery/suit_storage_unit/centcom
mask_type = /obj/item/clothing/mask/gas/atmos/centcom
- storage_type = /obj/item/tank/jetpack/oxygen/captain
+ storage_type = /obj/item/tank/jetpack/captain
mod_type = /obj/item/mod/control/pre_equipped/corporate
/obj/machinery/suit_storage_unit/engine
@@ -137,7 +137,7 @@
/obj/machinery/suit_storage_unit/syndicate
mask_type = /obj/item/clothing/mask/gas/syndicate
- storage_type = /obj/item/tank/jetpack/oxygen/harness
+ storage_type = /obj/item/tank/jetpack/harness
mod_type = /obj/item/mod/control/pre_equipped/nuclear
/obj/machinery/suit_storage_unit/syndicate/lavaland
@@ -493,9 +493,9 @@
update_appearance()
if(mob_occupant)
if(uv_super)
- mob_occupant.adjustFireLoss(rand(20, 36))
+ mob_occupant.adjust_fire_loss(rand(20, 36))
else
- mob_occupant.adjustFireLoss(rand(10, 16))
+ mob_occupant.adjust_fire_loss(rand(10, 16))
if(iscarbon(mob_occupant) && mob_occupant.stat < UNCONSCIOUS)
//Awake, organic and screaming
mob_occupant.painful_scream() // DOPPLER EDIT: check for painkilling before screaming
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 726338848ecde1..d28b9b5694ca37 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -15,6 +15,7 @@
subsystem_type = /datum/controller/subsystem/processing/fastprocess
interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_OFFLINE
use_power = NO_POWER_USE
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 10)
/// What is the lowest amount of time we can set the timer to?
var/minimum_timer = SYNDIEBOMB_MIN_TIMER_SECONDS
@@ -276,7 +277,7 @@
activate()
add_fingerprint(user)
// We don't really concern ourselves with duds or fakes after this
- if(isnull(payload) || istype(payload, /obj/machinery/syndicatebomb/training))
+ if(isnull(payload) || istype(payload, /obj/item/bombcore/training))
return
notify_ghosts(
@@ -356,6 +357,7 @@
w_class = WEIGHT_CLASS_NORMAL
flags_1 = PREVENT_CONTENTS_EXPLOSION_1 // We detonate upon being exploded.
resistance_flags = FLAMMABLE //Burnable (but the casing isn't)
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.05)
var/adminlog = null
var/range_heavy = 3
var/range_medium = 9
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 7a606d42641957..9b733931db20ad 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -322,7 +322,7 @@
info["name"] = new_name
// No color changing for channels with theme settings
if(!GLOB.freqtospan["[freq]"])
- var/new_color = input(usr, "Choose color for frequency", "Modifying Frequency Information", info["color"]) as color|null
+ var/new_color = tgui_color_picker(usr, "Choose color for frequency", "Modifying Frequency Information", info["color"])
if(new_color)
info["color"] = new_color
frequency_infos[params["freq"]] = info
@@ -341,7 +341,7 @@
for(var/list/channel in get_channels())
if(channel["freq"] == freq || channel["name"] == name)
return
- var/color = input(usr, "Choose color for frequency", "Adding Frequency Information") as color|null
+ var/color = tgui_color_picker(usr, "Choose color for frequency", "Adding Frequency Information")
if(!color)
return
frequency_infos[num2text(freq)] = list(
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index f9c31487234e52..8a0b8c60c1752d 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -91,8 +91,8 @@
update_appearance()
playsound(src.loc, 'sound/items/tools/welder.ogg', 50, TRUE)
- victim.painful_scream() // DOPPLER EDIT: check for painkilling before screaming // It is painful
- victim.adjustBruteLoss(max(0, 80 - victim.getBruteLoss())) // Hurt the human, don't try to kill them though.
+ victim.painful_scream() // DOPPLER EDIT - Check painkiller for screams - ORIGINAL: victim.emote("scream") // It is painful
+ victim.adjust_brute_loss(max(0, 80 - victim.get_brute_loss())) // Hurt the human, don't try to kill them though.
// Sleep for a couple of ticks to allow the human to see the pain
sleep(0.5 SECONDS)
diff --git a/code/game/machinery/wall_healer.dm b/code/game/machinery/wall_healer.dm
index cde06ebb98aa8d..3bcef5c124aef7 100644
--- a/code/game/machinery/wall_healer.dm
+++ b/code/game/machinery/wall_healer.dm
@@ -70,7 +70,7 @@
init_payment()
register_context()
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/wall_healer/Destroy()
clear_using_mob()
@@ -487,10 +487,10 @@
add_mob_blood(current_user)
return
- var/brute_healing_now = round(min(initial(brute_healing) * 0.1, brute_healing, current_user.getBruteLoss()), DAMAGE_PRECISION)
- var/burn_healing_now = round(min(initial(burn_healing) * 0.1, burn_healing, current_user.getFireLoss()), DAMAGE_PRECISION)
- var/tox_healing_now = round(min(initial(tox_healing) * 0.1, tox_healing, current_user.getToxLoss()), DAMAGE_PRECISION)
- var/blood_healing_now = HAS_TRAIT(current_user, TRAIT_NOBLOOD) ? 0 : round(min(initial(blood_healing) * 0.1, blood_healing, max(BLOOD_VOLUME_OKAY - current_user.blood_volume, 0)), 0.1)
+ var/brute_healing_now = round(min(initial(brute_healing) * 0.1, brute_healing, current_user.get_brute_loss()), DAMAGE_PRECISION)
+ var/burn_healing_now = round(min(initial(burn_healing) * 0.1, burn_healing, current_user.get_fire_loss()), DAMAGE_PRECISION)
+ var/tox_healing_now = round(min(initial(tox_healing) * 0.1, tox_healing, current_user.get_tox_loss()), DAMAGE_PRECISION)
+ var/blood_healing_now = round(min(initial(blood_healing) * 0.1, blood_healing, max(0, BLOOD_VOLUME_OKAY - current_user.get_blood_volume())), 0.1)
var/cost = round(per_heal_cost * (brute_healing_now + burn_healing_now + tox_healing_now + blood_healing_now), 1)
if(attempt_charge(src, current_user, extra_fees = cost) & COMPONENT_OBJ_CANCEL_CHARGE)
@@ -502,18 +502,17 @@
var/amount_healed = 0
if(brute_healing_now)
- amount_healed += current_user.adjustBruteLoss(-brute_healing_now, required_bodytype = BODYTYPE_ORGANIC)
+ amount_healed += current_user.adjust_brute_loss(-brute_healing_now, required_bodytype = BODYTYPE_ORGANIC)
brute_healing -= brute_healing_now
add_mob_blood(current_user)
if(burn_healing_now)
- amount_healed += current_user.adjustFireLoss(-burn_healing_now, required_bodytype = BODYTYPE_ORGANIC)
+ amount_healed += current_user.adjust_fire_loss(-burn_healing_now, required_bodytype = BODYTYPE_ORGANIC)
burn_healing -= burn_healing_now
if(tox_healing_now)
- amount_healed += current_user.adjustToxLoss(-tox_healing_now, required_biotype = MOB_ORGANIC)
+ amount_healed += current_user.adjust_tox_loss(-tox_healing_now, required_biotype = MOB_ORGANIC)
tox_healing -= tox_healing_now
if(blood_healing_now)
- current_user.blood_volume += blood_healing_now
- amount_healed += blood_healing_now
+ amount_healed += current_user.adjust_blood_volume(blood_healing_now, maximum = BLOOD_VOLUME_OKAY)
blood_healing -= blood_healing_now
add_mob_blood(current_user)
@@ -528,10 +527,10 @@
playsound(src, 'sound/machines/defib/defib_saftyOff.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE)
if(antispam_counter % 3 != 1)
return
- var/missed_brute_healing = brute_healing_now > 0 && !current_user.getBruteLoss()
- var/missed_burn_healing = burn_healing_now > 0 && !current_user.getFireLoss()
- var/missed_tox_healing = tox_healing_now > 0 && !current_user.getToxLoss()
- var/missed_blood_healing = blood_healing_now > 0 && current_user.blood_volume >= BLOOD_VOLUME_OKAY
+ var/missed_brute_healing = brute_healing_now > 0 && !current_user.get_brute_loss()
+ var/missed_burn_healing = burn_healing_now > 0 && !current_user.get_fire_loss()
+ var/missed_tox_healing = tox_healing_now > 0 && !current_user.get_tox_loss()
+ var/missed_blood_healing = blood_healing_now > 0 && current_user.get_blood_volume() >= BLOOD_VOLUME_OKAY
if(missed_brute_healing || missed_burn_healing || missed_tox_healing || missed_blood_healing)
to_chat(current_user, span_notice("Nothing happens. Seems like [src] needs to recharge."))
return
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index e52ea36acec7bf..f251dfb41fc968 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -180,16 +180,33 @@ GLOBAL_LIST_INIT(dye_registry, list(
icon_state = "wm_1_0"
density = TRUE
state_open = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT)
+ circuit = /obj/item/circuitboard/machine/washing_machine
var/busy = FALSE
var/bloody_mess = FALSE
var/obj/item/color_source
- var/max_wash_capacity = 5
+ /// The max amount of items that can be washed per load
+ var/max_wash_capacity
+ /// The time it takes to wash a load of laundry
+ var/time_to_wash
+ /// The current number of items inserted
+ var/total_load = 0
/obj/machinery/washing_machine/examine(mob/user)
. = ..()
if(!busy)
. += span_notice("
Right-click with an empty hand to start a wash cycle.")
+/obj/machinery/washing_machine/RefreshParts()
+ . = ..()
+ var/total_volume = 0
+ for(var/obj/item/reagent_containers/cup/beaker/beaker in component_parts)
+ total_volume += beaker.reagents.maximum_volume
+ max_wash_capacity = floor(total_volume/20)
+
+ for(var/datum/stock_part/servo/servo in component_parts)
+ time_to_wash = 20 SECONDS / servo.tier
+
/obj/machinery/washing_machine/process(seconds_per_tick)
if(!busy)
animate(src, transform=matrix(), time=2)
@@ -290,7 +307,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
/mob/living/carbon/human/machine_wash(obj/machinery/washing_machine/washer, mob/user)
adjust_wet_stacks(8)
adjust_disgust(40, DISGUST_LEVEL_VERYDISGUSTED)
- adjustOxyLoss(12)
+ adjust_oxy_loss(12)
log_combat(user, src, "machine washed (oxy)")
/obj/item/machine_wash(obj/machinery/washing_machine/washer)
@@ -329,7 +346,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
icon_state = "wm_[state_open]_blood"
return ..()
- var/full = contents.len ? 1 : 0
+ var/full = total_load ? 1 : 0
icon_state = "wm_[state_open]_[full]"
return ..()
@@ -361,7 +378,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
if(bloody_mess)
to_chat(user, span_warning("[src] must be cleaned up first!"))
return ITEM_INTERACT_BLOCKING
- if(contents.len >= max_wash_capacity)
+ if(total_load >= max_wash_capacity)
to_chat(user, span_warning("The washing machine is full!"))
return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(item, src))
@@ -369,6 +386,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
return ITEM_INTERACT_BLOCKING
if(item.dye_color)
color_source = item
+ total_load++
update_appearance()
return ITEM_INTERACT_SUCCESS
@@ -431,7 +449,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
if(HAS_TRAIT(user, TRAIT_BRAINWASHING))
ADD_TRAIT(src, TRAIT_BRAINWASHING, SKILLCHIP_TRAIT)
update_appearance()
- addtimer(CALLBACK(src, PROC_REF(wash_cycle), user), 20 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(wash_cycle), user), time_to_wash)
START_PROCESSING(SSfastprocess, src)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
@@ -445,3 +463,4 @@ GLOBAL_LIST_INIT(dye_registry, list(
. = ..()
set_density(TRUE) //because machinery/open_machine() sets it to FALSE
color_source = null
+ total_load = 0
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 2b1fdbf73897cf..567f0933d12489 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -9,6 +9,8 @@
var/buckle_requires_restraints = FALSE
/// The mobs currently buckled to this atom
var/list/mob/living/buckled_mobs = null //list()
+ /// How much time it takes to buckle a mob to us?
+ var/buckle_delay = 2 SECONDS
/// The maximum number of mob/livings allowed to be buckled to this atom at once
var/max_buckled_mobs = 1
/// Whether things buckled to this atom can be pulled while they're buckled
@@ -104,7 +106,14 @@
RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(on_set_anchored))
M.set_buckled(src)
buckled_mobs |= M
- M.throw_alert(ALERT_BUCKLED, /atom/movable/screen/alert/buckled)
+
+ ///If the icon is too big, don't add it to the screen alert
+ var/add_src_icon = TRUE
+ var/list/dim = get_icon_dimensions(icon)
+ if(dim["height"] > ICON_SIZE_Y || dim["width"] > ICON_SIZE_X)
+ add_src_icon = FALSE
+
+ M.throw_alert(ALERT_BUCKLED, /atom/movable/screen/alert/buckled, new_master = add_src_icon ? src : null)
M.set_glide_size(glide_size)
M.Move(loc)
@@ -314,7 +323,7 @@
M.visible_message(span_warning("[user] starts buckling [M] to [src]!"),\
span_userdanger("[user] starts buckling you to [src]!"),\
span_hear("You hear metal clanking."))
- if(!do_after(user, 2 SECONDS, M))
+ if(!do_after(user, buckle_delay, M))
return FALSE
// Sanity check before we attempt to buckle. Is everything still in a kosher state for buckling after the 3 seconds have elapsed?
diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
index 75b07ba9c1e421..0b1e620abdcf14 100644
--- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
+++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
@@ -155,7 +155,8 @@
if(istype(object, /obj/machinery/door/airlock))
if(istype(new_object, /obj/machinery/door/airlock)) //carry over access-related and adjacent variables. The rest is not as important
var/obj/machinery/door/airlock/airlock = object
- var/obj/machinery/door/new_airlock = new_object
+ var/obj/machinery/door/airlock/new_airlock = new_object
+ new_airlock.closeOtherId = airlock.closeOtherId
new_airlock.unres_sides = airlock.unres_sides
new_airlock.req_access = airlock.req_access?.Copy()
new_airlock.req_one_access = airlock.req_one_access?.Copy()
diff --git a/code/game/objects/effects/anomalies/anomalies_flux.dm b/code/game/objects/effects/anomalies/anomalies_flux.dm
index 1d823d00b60b5b..ddf7b0367336a3 100644
--- a/code/game/objects/effects/anomalies/anomalies_flux.dm
+++ b/code/game/objects/effects/anomalies/anomalies_flux.dm
@@ -44,10 +44,10 @@
/obj/effect/anomaly/flux/detonate()
switch(emp_zap)
if(FLUX_EMP)
- empulse(src, 4, 16)
+ empulse(src, 4, 16, emp_source = src)
explosion(src, heavy_impact_range = 1, light_impact_range = 4, flash_range = 6) //Trashes the room a bit, might blow a small hole in the hull.
if(FLUX_LIGHT_EMP)
- empulse(src, 4, 6)
+ empulse(src, 4, 6, emp_source = src)
explosion(src, light_impact_range = 3, flash_range = 6)
if(FLUX_NO_EMP)
new /obj/effect/particle_effect/sparks(loc)
diff --git a/code/game/objects/effects/anomalies/anomalies_weather.dm b/code/game/objects/effects/anomalies/anomalies_weather.dm
new file mode 100644
index 00000000000000..ea407acfa3af19
--- /dev/null
+++ b/code/game/objects/effects/anomalies/anomalies_weather.dm
@@ -0,0 +1,100 @@
+/obj/effect/anomaly/weather
+ name = "weather anomaly"
+ anomaly_core = /obj/item/assembly/signaler/anomaly/weather
+ lifespan = ANOMALY_COUNTDOWN_TIMER * 2.5
+
+ /// Chance per turf per second that we will produce thunder. Use the defines
+ var/thunder_chance = 0
+ /// The type of weather this anomaly will produce. If unset, will be picked from select_weather()
+ var/datum/weather/weather_type
+ /// List of active weathers spawned by this anomaly
+ VAR_PRIVATE/list/active_weathers
+
+/obj/effect/anomaly/weather/Initialize(mapload, new_lifespan, drops_core, forced_anomaly_type = src.weather_type, forced_thunder_chance = src.thunder_chance)
+ . = ..()
+
+ add_atom_colour(COLOR_MATRIX_INVERT, FIXED_COLOUR_PRIORITY)
+
+ weather_type = forced_anomaly_type || select_weather()
+ thunder_chance = forced_thunder_chance
+
+ active_weathers = list()
+
+ var/telegraph = lifespan / 5 // 1/5th of the time is dedicated to telegraphing, to give people time to find and defuse it
+ var/end_dur = lifespan / 15 // then 1/15th of the time is dedicated to winding down
+ var/total_dur = lifespan - telegraph - end_dur
+
+ var/list/affected_areas = list(impact_area)
+ var/list/num_turfs = length(impact_area.get_turfs_from_all_zlevels())
+ for(var/spread_dir in GLOB.alldirs)
+ var/area/nearby = find_adjacent_impacted_area(spread_dir)
+ // prevents nearby the central hallway from basically always being included
+ if(isnull(nearby) || length(nearby.get_turfs_from_all_zlevels()) > num_turfs * 1.5)
+ continue
+ affected_areas |= nearby
+
+ var/datum/weather/weather = SSweather.run_weather(
+ weather_datum_type = weather_type,
+ z_levels = z,
+ weather_data = list(
+ WEATHER_FORCED_AREAS = affected_areas,
+ WEATHER_FORCED_FLAGS = weather_type::weather_flags | WEATHER_INDOORS | WEATHER_THUNDER | WEATHER_STRICT_ALERT,
+ WEATHER_FORCED_THUNDER = thunder_chance,
+ WEATHER_FORCED_TELEGRAPH = telegraph,
+ WEATHER_FORCED_END = end_dur,
+ WEATHER_FORCED_DURATION = total_dur,
+ )
+ )
+ RegisterSignal(weather, COMSIG_QDELETING, PROC_REF(clear_ref))
+ active_weathers += weather
+
+/obj/effect/anomaly/weather/proc/clear_ref(datum/weather/weather_datum)
+ SIGNAL_HANDLER
+ active_weathers -= weather_datum
+ UnregisterSignal(weather_datum, COMSIG_QDELETING)
+
+/obj/effect/anomaly/weather/proc/select_weather()
+ return pick(
+ /datum/weather/rain_storm,
+ /datum/weather/snow_storm,
+ /datum/weather/sand_storm,
+ )
+
+/// steps outward from src to find an area that is not the impact_area.
+/obj/effect/anomaly/weather/proc/find_adjacent_impacted_area(check_dir)
+ var/limit = 9
+ var/turf/next_turf = get_step(src, check_dir)
+ while(next_turf.loc == impact_area && limit > 0)
+ next_turf = get_step(next_turf, check_dir)
+ if(isnull(next_turf))
+ return null
+ limit -= 1
+
+ return next_turf.loc
+
+/obj/effect/anomaly/weather/anomalyNeutralize()
+ for(var/datum/weather/weather_datum as anything in active_weathers)
+ weather_datum?.wind_down()
+ return ..()
+
+/obj/effect/anomaly/weather/detonate()
+ playsound(src, 'sound/effects/magic/repulse.ogg', 100, TRUE)
+ for(var/atom/movable/repulsed in range(src, 5))
+ if(repulsed == src || repulsed.anchored)
+ continue
+ var/throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(repulsed, src)))
+ repulsed.safe_throw_at(throwtarget, 6, 2, src, force = MOVE_FORCE_EXTREMELY_STRONG)
+
+/obj/effect/anomaly/weather/Destroy()
+ for(var/datum/weather/weather_datum as anything in active_weathers)
+ clear_ref(weather_datum)
+ return ..()
+
+/obj/effect/anomaly/weather/thundering
+ name = "thundering weather anomaly"
+
+ thunder_chance = THUNDER_CHANCE_HIGH
+ // maybe we can put acid rain in this later?
+ // though it'd feel unfair if it showed up and immediately dumped acid on people.
+ // we would need an even longer telegraphing time for that
+ weather_type = /datum/weather/rain_storm
diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm
index 540be85db4ed55..f4f9ea3814001f 100644
--- a/code/game/objects/effects/blessing.dm
+++ b/code/game/objects/effects/blessing.dm
@@ -6,16 +6,22 @@
anchored = TRUE
density = FALSE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ /// Is this blessing visible to those with the ability to see blessed tiles? (chaplains)
+ var/invisible
/obj/effect/blessing/Initialize(mapload)
. = ..()
+
+ RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORTING, PROC_REF(block_cult_teleport))
+
+ if(invisible)
+ return
+
var/image/blessing_icon = image(icon = 'icons/effects/effects.dmi', icon_state = "blessed", layer = ABOVE_NORMAL_TURF_LAYER, loc = src)
blessing_icon.alpha = 64
blessing_icon.appearance_flags = RESET_ALPHA
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessed_aware, "blessing", blessing_icon)
- RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORTING, PROC_REF(block_cult_teleport))
-
/obj/effect/blessing/Destroy()
UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORTING)
return ..()
@@ -26,3 +32,6 @@
if(channel == TELEPORT_CHANNEL_CULT)
return TRUE
+
+/obj/effect/blessing/invisible
+ invisible = TRUE
diff --git a/code/game/objects/effects/decals/cleanable/blood.dm b/code/game/objects/effects/decals/cleanable/blood.dm
index 1433d3451caba9..c6b342cb7bc5fe 100644
--- a/code/game/objects/effects/decals/cleanable/blood.dm
+++ b/code/game/objects/effects/decals/cleanable/blood.dm
@@ -739,11 +739,10 @@
. += bloodstep_overlay
if(emissive_alpha && emissive_alpha < alpha && !dried)
- var/enter_emissive_state = "[enter_state]_emissive-[emissive_alpha]"
- var/mutable_appearance/emissive_overlay = bloody_footprints_cache[enter_emissive_state]
+ var/enter_emissive_state = "[enter_state]_emissive-[Ddir]-[emissive_alpha]"
+ var/image/emissive_overlay = bloody_footprints_cache[enter_emissive_state]
if(!emissive_overlay)
- emissive_overlay = blood_emissive(icon, "[icon_state_to_use]1")
- emissive_overlay.dir = Ddir
+ emissive_overlay = image(blood_emissive(icon, "[icon_state_to_use]1"), dir = Ddir)
bloody_footprints_cache[enter_emissive_state] = emissive_overlay
. += emissive_overlay
@@ -756,11 +755,10 @@
. += bloodstep_overlay
if(emissive_alpha && emissive_alpha < alpha && !dried)
- var/exit_emissive_state = "[exit_state]_emissive-[emissive_alpha]"
- var/mutable_appearance/emissive_overlay = bloody_footprints_cache[exit_emissive_state]
+ var/exit_emissive_state = "[exit_state]_emissive-[Ddir]-[emissive_alpha]"
+ var/image/emissive_overlay = bloody_footprints_cache[exit_emissive_state]
if(!emissive_overlay)
- emissive_overlay = blood_emissive(icon, "[icon_state_to_use]2")
- emissive_overlay.dir = Ddir
+ emissive_overlay = image(blood_emissive(icon, "[icon_state_to_use]2"), dir = Ddir)
bloody_footprints_cache[exit_emissive_state] = emissive_overlay
. += emissive_overlay
diff --git a/code/game/objects/effects/decals/cleanable/fuel.dm b/code/game/objects/effects/decals/cleanable/fuel.dm
index e372e93c43d67a..ced0b5376b1b7d 100644
--- a/code/game/objects/effects/decals/cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/cleanable/fuel.dm
@@ -78,8 +78,9 @@
/obj/effect/decal/cleanable/fuel_pool/bullet_act(obj/projectile/hit_proj)
. = ..()
- ignite()
- log_combat(hit_proj.firer, src, "used [hit_proj] to ignite")
+ if(hit_proj.damage > 0)
+ ignite()
+ log_combat(hit_proj.firer, src, "used [hit_proj] to ignite")
/obj/effect/decal/cleanable/fuel_pool/attackby(obj/item/item, mob/user, list/modifiers, list/attack_modifiers)
if(item.ignition_effect(src, user))
diff --git a/code/game/objects/effects/decals/cleanable/mess.dm b/code/game/objects/effects/decals/cleanable/mess.dm
index 1a2e307c1b3bc5..1d250034609be0 100644
--- a/code/game/objects/effects/decals/cleanable/mess.dm
+++ b/code/game/objects/effects/decals/cleanable/mess.dm
@@ -82,7 +82,7 @@
if(!isnull(broken_flooring))
return
var/turf/T = get_turf(src)
- if(T.tiled_dirt && is_tileable)
+ if(T.tiled_turf && is_tileable)
icon = 'icons/effects/dirt.dmi'
icon_state = "dirt-0"
smoothing_flags = SMOOTH_BITMASK
@@ -383,3 +383,7 @@ GLOBAL_LIST_EMPTY(nebula_vomits)
flick("rubble_bounce", src)
icon_state = "rubble"
update_appearance(UPDATE_ICON_STATE)
+
+/obj/effect/decal/cleanable/can_bits
+ name = "shredded can"
+ desc = "This story doesn't hold water anymore."
diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
index be3e03d5e6e672..b8069b0ab41a44 100644
--- a/code/game/objects/effects/decals/decal.dm
+++ b/code/game/objects/effects/decals/decal.dm
@@ -19,6 +19,7 @@
while(isopenspaceturf(loc) && can_z_move(DOWN, z_move_flags = ZMOVE_ALLOW_ANCHORED))
zMove(DOWN, z_move_flags = ZMOVE_ALLOW_ANCHORED)
AddElement(/datum/element/connect_loc, loc_connections)
+ AddElement(/datum/element/force_move_pulled)
/obj/effect/decal/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm
index a527317b476693..16254e9610c64a 100644
--- a/code/game/objects/effects/decals/remains.dm
+++ b/code/game/objects/effects/decals/remains.dm
@@ -48,7 +48,7 @@
///Releases a cloud of smoke based on the randomly generated reagent in Initialize().
/obj/effect/decal/remains/human/smokey/proc/release_smoke(mob/living/smoke_releaser)
- visible_message(span_warning("[smoke_releaser] disturbs the [src], which releases a huge cloud of gas!"))
+ visible_message(span_warning("[smoke_releaser] disturbs [src], which releases a huge cloud of gas!"))
var/datum/effect_system/fluid_spread/smoke/chem/cigarette_puff = new()
cigarette_puff.chemholder.add_reagent(that_shit_that_killed_saddam, 15)
cigarette_puff.attach(get_turf(src))
diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm
index 53815dd6457f66..ccca8d281f3a62 100644
--- a/code/game/objects/effects/decals/turfdecal/markings.dm
+++ b/code/game/objects/effects/decals/turfdecal/markings.dm
@@ -187,8 +187,7 @@
//Bottom
-/obj/effect/turf_decal/syndicateemblem/bottom/left/obj/effect/turf_decal/raven/nine
- icon_state = "RAVEN9"
+/obj/effect/turf_decal/syndicateemblem/bottom/left
icon_state = "synd1,1"
/obj/effect/turf_decal/syndicateemblem/bottom/middle
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 6ddd65f12cfcae..73ffc52a2bdbf0 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -12,14 +12,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
pass_flags = PASSTABLE | PASSGRILLE
anchored = TRUE
-/obj/effect/particle_effect/Initialize(mapload)
- . = ..()
- GLOB.cameranet.updateVisibility(src)
-
-/obj/effect/particle_effect/Destroy()
- GLOB.cameranet.updateVisibility(src)
- return ..()
-
// Prevents effects from getting registered for SSnewtonian_movement
/obj/effect/particle_effect/newtonian_move(inertia_angle, instant = FALSE, start_delay = 0, drift_force = 0, controlled_cap = null)
return TRUE
diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
index 6d71edad180bd3..83ef6e552938e2 100644
--- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm
@@ -207,7 +207,7 @@
return
smoker.drop_all_held_items()
- smoker.adjustOxyLoss(1)
+ smoker.adjust_oxy_loss(1)
smoker.emote("cough")
/**
diff --git a/code/game/objects/effects/info.dm b/code/game/objects/effects/info.dm
index c9295a090c184e..9ffb49a84f79a5 100644
--- a/code/game/objects/effects/info.dm
+++ b/code/game/objects/effects/info.dm
@@ -18,7 +18,7 @@
/obj/effect/abstract/info/Click()
. = ..()
- to_chat(usr, info_text)
+ to_chat(usr, boxed_message("[span_boldnotice(name)]
[span_info(info_text)]"))
/obj/effect/abstract/info/MouseEntered(location, control, params)
. = ..()
diff --git a/code/game/objects/effects/poster_motivational.dm b/code/game/objects/effects/poster_motivational.dm
index 5306a3fb972436..702cdfdde8a31f 100644
--- a/code/game/objects/effects/poster_motivational.dm
+++ b/code/game/objects/effects/poster_motivational.dm
@@ -152,6 +152,8 @@
When people read this poster they'll feel better!"
icon_state = "bike"
+// Departmental posters
+
/obj/item/poster/quirk/cargo_logo
poster_type = /obj/structure/sign/poster/quirk/cargo_logo
quirk_poster_department = ACCOUNT_CAR
diff --git a/code/game/objects/effects/posters/contraband.dm b/code/game/objects/effects/posters/contraband.dm
index ff6e1e74b64669..75fadc26340e1b 100644
--- a/code/game/objects/effects/posters/contraband.dm
+++ b/code/game/objects/effects/posters/contraband.dm
@@ -845,3 +845,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/bojack, 32)
icon_state = "double_rainbow"
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/double_rainbow, 32)
+
+/obj/structure/sign/poster/contraband/vodka
+ name = "Vodka"
+ desc = "The text is written entirely in Russian. You can barely read anything except the word 'BODKA'."
+ icon_state = "vodka"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/vodka, 32)
+
+/obj/structure/sign/poster/contraband/ninja
+ name = "Ninja"
+ desc = "Greetings from the Spider Clan."
+ icon_state = "ninja"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/ninja, 32)
diff --git a/code/game/objects/effects/posters/official.dm b/code/game/objects/effects/posters/official.dm
index 47b360476ee44c..ca4646631bb057 100644
--- a/code/game/objects/effects/posters/official.dm
+++ b/code/game/objects/effects/posters/official.dm
@@ -430,3 +430,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/boombox, 32)
icon_state = "download_gun"
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/download, 32)
+
+/obj/structure/sign/poster/official/mining
+ name = "Undiscovered Species"
+ desc = "A poster showing one of the Ash Walker species. We still know very little about them, be a pioneer! \
+ When people read this poster they'll feel better!"
+ icon_state = "ashwalkers"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/official/mining, 32)
diff --git a/code/game/objects/effects/posters/poster.dm b/code/game/objects/effects/posters/poster.dm
index d93c5ada83c1c4..1fe4e365691794 100644
--- a/code/game/objects/effects/posters/poster.dm
+++ b/code/game/objects/effects/posters/poster.dm
@@ -18,13 +18,9 @@
force = 0
resistance_flags = FLAMMABLE
w_class = WEIGHT_CLASS_SMALL
- var/poster_type
+ var/obj/structure/sign/poster/poster_type = /obj/structure/sign/poster/random
var/obj/structure/sign/poster/poster_structure
-/obj/item/poster/examine(mob/user)
- . = ..()
- . += span_notice("You can booby-trap the poster by using a glass shard on it before you put it up.")
-
/obj/item/poster/Initialize(mapload, obj/structure/sign/poster/new_poster_structure)
. = ..()
@@ -36,53 +32,104 @@
AddElement(/datum/element/contextual_screentip_item_typechecks, hovering_item_typechecks)
if(new_poster_structure && (new_poster_structure.loc != src))
- new_poster_structure.forceMove(src) //The poster structure *must* be in the item's contents for the exited() proc to properly clean up when placing the poster
+ qdel(new_poster_structure.GetComponent(/datum/component/atom_mounted))
+ new_poster_structure.forceMove(src)
poster_structure = new_poster_structure
- if(!new_poster_structure && poster_type)
- poster_structure = new poster_type(src)
+ if(!poster_type) // If we weren't already assigned a poster_type, we infer from the contained poster_structure
+ if(istype(poster_structure, /obj/structure/sign/poster)) // Make sure our poster structure is valid
+ poster_type = poster_structure.type
+ else
+ stack_trace("Rolled poster [type] was created without either a valid poster_type [poster_type] or poster_structure [poster_structure]")
+ poster_type = /obj/structure/sign/poster/random // Panic, do something random
+ if(ispath(poster_type, /obj/structure/sign/poster)) // Make sure we have a valid poster_type before using it
+ name = "[poster_type::poster_item_name] - [poster_type::name]"
+ desc = poster_type::poster_item_desc
+ icon_state = poster_type::poster_item_icon_state
+ else // We did not have a valid poster_type, light the beacons
+ CRASH("Rolled poster [type] has an invalid or null poster_type [poster_type]")
- // posters store what name and description they would like their
- // rolled up form to take.
- if(poster_structure)
- if(QDELETED(poster_structure))
- stack_trace("A poster was initialized with a qdeleted poster_structure, something's gone wrong")
- return INITIALIZE_HINT_QDEL
- name = poster_structure.poster_item_name
- desc = poster_structure.poster_item_desc
- icon_state = poster_structure.poster_item_icon_state
+/obj/item/poster/Destroy(force)
+ QDEL_NULL(poster_structure)
+ return ..()
- name = "[name] - [poster_structure.original_name]"
+/obj/item/poster/examine(mob/user)
+ . = ..()
+ . += span_notice("You can booby-trap the poster by using a glass shard on it before you put it up.")
/obj/item/poster/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
if(!istype(I, /obj/item/shard))
return ..()
- if (poster_structure.trap?.resolve())
+ if (locate(/obj/item/shard) in (poster_structure?.contents || contents))
balloon_alert(user, "already trapped!")
return
- if(!user.transferItemToLoc(I, poster_structure))
+ if(!user.transferItemToLoc(I, src))
return
- poster_structure.trap = WEAKREF(I)
to_chat(user, span_notice("You conceal \the [I] inside the rolled up poster."))
-/obj/item/poster/Exited(atom/movable/gone, direction)
- . = ..()
- if(gone == poster_structure)
- poster_structure = null
- if(!QDELING(src))
- qdel(src) //we're now a poster, huzzah!
+/obj/item/poster/interact_with_atom(turf/closed/wall_structure, mob/living/user, list/modifiers)
+ if(!isclosedturf(wall_structure))
+ return NONE
-/obj/item/poster/Destroy(force)
- QDEL_NULL(poster_structure)
- return ..()
+ var/turf/user_turf = get_turf(user)
+ var/dir = get_dir(user_turf, wall_structure)
+ if(!(dir in GLOB.cardinals))
+ balloon_alert(user, "stand in line with wall!")
+ return ITEM_INTERACT_BLOCKING
+
+ // Deny placing posters on currently-diagonal walls, although the wall may change in the future.
+ if (wall_structure.smoothing_flags & SMOOTH_DIAGONAL_CORNERS)
+ for(var/overlay in wall_structure.overlays)
+ var/image/new_image = overlay
+ if(copytext(new_image.icon_state, 1, 3) == "d-") //3 == length("d-") + 1
+ to_chat(user, span_warning("Cannot place on diagonal wall!"))
+ return ITEM_INTERACT_FAILURE
+
+ var/stuff_on_wall = 0
+ for(var/obj/contained_object in wall_structure.contents) //Let's see if it already has a poster on it or too much stuff
+ if(istype(contained_object, /obj/structure/sign/poster))
+ balloon_alert(user, "no room!")
+ return ITEM_INTERACT_FAILURE
+ stuff_on_wall++
+ if(stuff_on_wall == 3)
+ balloon_alert(user, "no room!")
+ return ITEM_INTERACT_FAILURE
+
+ balloon_alert(user, "hanging poster...")
+ var/obj/structure/sign/poster/placed_poster = poster_structure || new poster_type(src)
+ placed_poster.forceMove(user_turf)
+ placed_poster.setDir(dir)
+ switch(dir)
+ if(NORTH)
+ placed_poster.pixel_y = 32
+ if(SOUTH)
+ placed_poster.pixel_y = -32
+ if(EAST)
+ placed_poster.pixel_x = 32
+ if(WEST)
+ placed_poster.pixel_x = -32
+ var/obj/item/shard/trap = locate() in contents
+ if(trap)
+ trap.forceMove(placed_poster)
+ placed_poster.poster_item_type = type
+ poster_structure = null
+ flick("poster_being_set", placed_poster)
+ playsound(src, 'sound/items/poster/poster_being_created.ogg', 100, TRUE)
+ qdel(src)
-// The poster sign/structure
+ var/turf/user_drop_location = get_turf(user)
+ if(!do_after(user, PLACE_SPEED, placed_poster, extra_checks = CALLBACK(placed_poster, TYPE_PROC_REF(/obj/structure/sign/poster, snowflake_closed_turf_check), wall_structure)))
+ placed_poster.roll_and_drop(user_drop_location, user)
+ return ITEM_INTERACT_FAILURE
+
+ placed_poster.AddComponent(/datum/component/atom_mounted, wall_structure)
+ placed_poster.on_placed_poster(user)
+ return ITEM_INTERACT_SUCCESS
/**
* The structure form of a poster.
- *
* These are what get placed on maps as posters. They are also what gets created when a player places a poster on a wall.
* For the item form that can be spawned for players, see [/obj/item/poster]
*/
@@ -98,18 +145,19 @@
var/never_random = FALSE // used for the 'random' subclasses.
///Exclude posters of these types from being added to the random pool
var/list/blacklisted_types = list()
- ///Whether the poster should be printable from library management computer. Mostly exists to keep directionals from being printed.
+ ///Whether the poster should be printable from library management computer.
var/printable = FALSE
+ ///What type should we put back in the rolled poster when we get cut down
+ var/cutdown_type
var/poster_item_name = "hypothetical poster"
var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here."
var/poster_item_icon_state = "rolled_poster"
var/poster_item_type = /obj/item/poster
- ///A sharp shard of material can be hidden inside of a poster, attempts to embed when it is torn down.
- var/datum/weakref/trap
/obj/structure/sign/poster/Initialize(mapload)
. = ..()
+ cutdown_type = type
if(random_basetype)
randomise(random_basetype)
if(!ruined)
@@ -142,7 +190,8 @@
poster_types -= typesof(iterated_type)
var/list/approved_types = list()
for(var/obj/structure/sign/poster/type_of_poster as anything in poster_types)
- if(initial(type_of_poster.icon_state) && !initial(type_of_poster.never_random))
+ // It must have an icon state, not be banned from the random pool, and not be pixel shifted (eliminates directional subtypes)
+ if(initial(type_of_poster.icon_state) && !initial(type_of_poster.never_random) && !initial(type_of_poster.pixel_x) && !initial(type_of_poster.pixel_y))
approved_types |= type_of_poster
var/obj/structure/sign/poster/selected = pick(approved_types)
@@ -155,6 +204,7 @@
poster_item_desc = initial(selected.poster_item_desc)
poster_item_icon_state = initial(selected.poster_item_icon_state)
ruined = initial(selected.ruined)
+ cutdown_type = initial(selected.type)
if(length(GLOB.holidays) && prob(30)) // its the holidays! lets get festive
apply_holiday()
update_appearance()
@@ -172,15 +222,15 @@
desc = holi_data.poster_desc
icon_state = holi_data.poster_icon
-/obj/structure/sign/poster/attackby(obj/item/tool, mob/user, list/modifiers, list/attack_modifiers)
- if(tool.tool_behaviour == TOOL_WIRECUTTER)
- tool.play_tool_sound(src, 100)
- if(ruined)
- to_chat(user, span_notice("You remove the remnants of the poster."))
- qdel(src)
- else
- to_chat(user, span_notice("You carefully remove the poster from the wall."))
- roll_and_drop(Adjacent(user) ? get_turf(user) : loc, user)
+/obj/structure/sign/poster/wirecutter_act(mob/living/user, obj/item/tool)
+ tool.play_tool_sound(src, 100)
+ if(ruined)
+ to_chat(user, span_notice("You remove the remnants of the poster."))
+ qdel(src)
+ else
+ to_chat(user, span_notice("You carefully remove the poster from the wall."))
+ roll_and_drop(Adjacent(user) ? get_turf(user) : loc, user)
+ return ITEM_INTERACT_SUCCESS
/obj/structure/sign/poster/attack_hand(mob/user, list/modifiers)
. = ..()
@@ -197,7 +247,7 @@
// HO-HO-HOHOHO HU HU-HU HU-HU
/obj/structure/sign/poster/proc/spring_trap(mob/user)
- var/obj/item/shard/payload = trap?.resolve()
+ var/obj/item/shard/payload = locate() in contents
if (!payload)
return
@@ -222,46 +272,9 @@
/// Re-creates the poster item from the poster structure
/obj/structure/sign/poster/proc/return_to_poster_item(atom/location)
- return new poster_item_type(location, src)
-
-//separated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
-/turf/closed/proc/place_poster(obj/item/poster/rolled_poster, mob/user)
- if(!rolled_poster.poster_structure)
- to_chat(user, span_warning("[rolled_poster] has no poster... inside it? Inform a coder!"))
- return
-
- // Deny placing posters on currently-diagonal walls, although the wall may change in the future.
- if (smoothing_flags & SMOOTH_DIAGONAL_CORNERS)
- for (var/overlay in overlays)
- var/image/new_image = overlay
- if(copytext(new_image.icon_state, 1, 3) == "d-") //3 == length("d-") + 1
- return
-
- var/stuff_on_wall = 0
- for(var/obj/contained_object in contents) //Let's see if it already has a poster on it or too much stuff
- if(istype(contained_object, /obj/structure/sign/poster))
- balloon_alert(user, "no room!")
- return
- stuff_on_wall++
- if(stuff_on_wall == 3)
- balloon_alert(user, "no room!")
- return
-
- balloon_alert(user, "hanging poster...")
- var/obj/structure/sign/poster/placed_poster = rolled_poster.poster_structure
-
- flick("poster_being_set", placed_poster)
- placed_poster.forceMove(src) //deletion of the poster is handled in poster/Exited(), so don't have to worry about P anymore.
- placed_poster.find_and_hang_on_wall()
- playsound(src, 'sound/items/poster/poster_being_created.ogg', 100, TRUE)
-
- var/turf/user_drop_location = get_turf(user) //cache this so it just falls to the ground if they move. also no tk memes allowed.
- if(!do_after(user, PLACE_SPEED, placed_poster, extra_checks = CALLBACK(placed_poster, TYPE_PROC_REF(/obj/structure/sign/poster, snowflake_closed_turf_check), src)))
- placed_poster.roll_and_drop(user_drop_location, user)
- return
-
- placed_poster.on_placed_poster(user)
- return TRUE
+ . = new poster_item_type(location, new cutdown_type)
+ qdel(src)
+ return .
/obj/structure/sign/poster/proc/snowflake_closed_turf_check(atom/hopefully_still_a_closed_turf) //since turfs never get deleted but instead change type, make sure we're still being placed on a wall.
return isclosedturf(hopefully_still_a_closed_turf)
diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm
index 32f5bcd4fc8fad..a679783c4b2bf0 100644
--- a/code/game/objects/effects/spawners/costume.dm
+++ b/code/game/objects/effects/spawners/costume.dm
@@ -30,7 +30,7 @@
/obj/effect/spawner/costume/madscientist
name = "mad scientist costume spawner"
items = list(
- /obj/item/clothing/under/rank/captain/suit,
+ /obj/item/clothing/under/costume/captain,
/obj/item/clothing/head/flatcap,
/obj/item/clothing/suit/toggle/labcoat/mad,
)
@@ -38,7 +38,7 @@
/obj/effect/spawner/costume/elpresidente
name = "el presidente costume spawner"
items = list(
- /obj/item/clothing/under/rank/captain/suit,
+ /obj/item/clothing/under/costume/captain,
/obj/item/clothing/head/flatcap,
/obj/item/cigarette/cigar/havana,
/obj/item/clothing/shoes/jackboots,
diff --git a/code/game/objects/effects/spawners/random/armory.dm b/code/game/objects/effects/spawners/random/armory.dm
index d4a14240539925..3661a510ad0601 100644
--- a/code/game/objects/effects/spawners/random/armory.dm
+++ b/code/game/objects/effects/spawners/random/armory.dm
@@ -62,6 +62,33 @@
icon_state = "laser_gun"
loot = list(/obj/item/gun/energy/laser)
+/obj/effect/spawner/random/armory/laser_pistol
+ name = "laser pistol spawner"
+ icon_state = "laser_gun"
+ spawn_loot_count = 6
+ loot = list(/obj/item/gun/energy/laser/pistol)
+
+/obj/effect/spawner/random/armory/laser_carbine
+ name = "laser_carbine spawner"
+ icon_state = "laser_gun"
+ loot = list(/obj/item/gun/energy/laser/carbine)
+
+/obj/effect/spawner/random/armory/assault_laser
+ name = "assault laser gun spawner"
+ icon_state = "laser_gun"
+ spawn_loot_count = 1
+ loot = list(/obj/item/gun/energy/laser/assault)
+
+/obj/effect/spawner/random/armory/pick_laser_loadout
+ name = "laser gun type randomizer"
+ icon_state = "laser_gun"
+ spawn_loot_count = 1
+ loot = list(
+ /obj/effect/spawner/random/armory/laser_gun = 30,
+ /obj/effect/spawner/random/armory/laser_carbine = 30,
+ /obj/effect/spawner/random/armory/laser_pistol = 10,
+ )
+
/obj/effect/spawner/random/armory/e_gun
name = "energy gun spawner"
icon_state = "e_gun"
diff --git a/code/game/objects/effects/spawners/random/bureaucracy.dm b/code/game/objects/effects/spawners/random/bureaucracy.dm
index 583d3ad95a1b2d..ea66c109a10ac5 100644
--- a/code/game/objects/effects/spawners/random/bureaucracy.dm
+++ b/code/game/objects/effects/spawners/random/bureaucracy.dm
@@ -19,7 +19,7 @@
name = "stamp spawner"
icon_state = "stamp"
loot = list(
- /obj/item/stamp = 3,
+ /obj/item/stamp/granted = 3,
/obj/item/stamp/denied = 1,
)
diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm
index 9ec343953f5497..c4e89a169dd45b 100644
--- a/code/game/objects/effects/spawners/random/food_or_drink.dm
+++ b/code/game/objects/effects/spawners/random/food_or_drink.dm
@@ -110,7 +110,7 @@
/obj/item/food/grown/onion,
/obj/item/food/grown/peanut,
/obj/item/food/grown/pineapple,
- /obj/item/seeds/plum,
+ /obj/item/food/grown/plum,
/obj/item/food/grown/potato,
/obj/item/food/grown/pumpkin,
/obj/item/food/grown/carrot,
diff --git a/code/game/objects/effects/spawners/random/lavaland_mobs.dm b/code/game/objects/effects/spawners/random/lavaland_mobs.dm
index 4c6cf035324592..4fa771c7d77877 100644
--- a/code/game/objects/effects/spawners/random/lavaland_mobs.dm
+++ b/code/game/objects/effects/spawners/random/lavaland_mobs.dm
@@ -55,11 +55,41 @@
desc = "Chance to spawn a rare shiny version."
icon = 'icons/mob/simple/lavaland/raptor_big.dmi'
icon_state = "raptor_red"
+ pixel_x = -12
loot = list(
- /mob/living/basic/raptor/red = 20,
- /mob/living/basic/raptor/white = 20,
- /mob/living/basic/raptor/purple = 20,
- /mob/living/basic/raptor/green = 20,
- /mob/living/basic/raptor/yellow = 20,
+ /mob/living/basic/raptor/red = 25,
+ /mob/living/basic/raptor/white = 25,
+ /mob/living/basic/raptor/purple = 25,
+ /mob/living/basic/raptor/green = 25,
+ /mob/living/basic/raptor/yellow = 25,
+ /mob/living/basic/raptor/blue = 25,
/mob/living/basic/raptor/black = 1,
)
+
+/obj/effect/spawner/random/lavaland_mob/raptor/young
+ name = "random raptor youngling"
+ icon_state = "young_red"
+ loot = list(
+ /mob/living/basic/raptor/young/red = 25,
+ /mob/living/basic/raptor/young/white = 25,
+ /mob/living/basic/raptor/young/purple = 25,
+ /mob/living/basic/raptor/young/green = 25,
+ /mob/living/basic/raptor/young/yellow = 25,
+ /mob/living/basic/raptor/young/blue = 25,
+ /mob/living/basic/raptor/young/black = 1,
+ )
+
+/obj/effect/spawner/random/lavaland_mob/raptor/baby
+ name = "random raptor chick"
+ icon = 'icons/mob/simple/lavaland/raptor_baby.dmi'
+ icon_state = "baby_red"
+ pixel_x = 0
+ loot = list(
+ /mob/living/basic/raptor/baby/red = 25,
+ /mob/living/basic/raptor/baby/white = 25,
+ /mob/living/basic/raptor/baby/purple = 25,
+ /mob/living/basic/raptor/baby/green = 25,
+ /mob/living/basic/raptor/baby/yellow = 25,
+ /mob/living/basic/raptor/baby/blue = 25,
+ /mob/living/basic/raptor/baby/black = 1,
+ )
diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm
index a83b88c3a98631..3e2b642122727f 100644
--- a/code/game/objects/effects/spawners/random/structure.dm
+++ b/code/game/objects/effects/spawners/random/structure.dm
@@ -116,6 +116,7 @@
icon_state = "crate"
loot = list(
/obj/structure/closet/crate = 20,
+ /obj/structure/closet/crate/cardboard = 5,
/obj/structure/closet/crate/wooden = 1,
/obj/structure/closet/crate/internals = 1,
/obj/structure/closet/crate/medical = 1,
diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm
index 642d370463206a..409429aa8860b5 100644
--- a/code/game/objects/effects/spawners/random/trash.dm
+++ b/code/game/objects/effects/spawners/random/trash.dm
@@ -363,7 +363,8 @@
name = "box spawner"
icon_state = "box"
loot = list(
- /obj/structure/closet/cardboard = 9,
+ /obj/structure/closet/cardboard = 5,
+ /obj/structure/closet/crate/cardboard = 4,
/obj/structure/closet/cardboard/metal = 1,
)
diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm
index 6dd8729cf97737..271cdaaf69ea83 100644
--- a/code/game/objects/effects/spawners/structure.dm
+++ b/code/game/objects/effects/spawners/structure.dm
@@ -371,11 +371,16 @@ again.
return ..()
/obj/effect/spawner/structure/electrified_grille
- name = "electrified grill spawner"
+ name = "electrified grille spawner"
icon = 'icons/obj/structures_spawners.dmi'
icon_state = "electrified_grille"
spawn_list = list(/obj/structure/grille, /obj/structure/cable)
+/obj/effect/spawner/structure/electrified_grille/layer1
+ name = "layer 1 electrified grille spawner"
+ icon_state = "red_electrified_grille"
+ spawn_list = list(/obj/structure/grille, /obj/structure/cable/layer1)
+
///flipped tables
/obj/effect/spawner/structure/flipped_table
name = "flipped table spawner"
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 4065a78104e75d..55239756339cdc 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -807,3 +807,21 @@
/obj/effect/temp_visual/circle_wave/star_blast
color = COLOR_VOID_PURPLE
+
+/obj/effect/temp_visual/focus_ring
+ randomdir = FALSE
+ name = "ring"
+ icon_state = "focus_ring"
+ layer = BELOW_MOB_LAYER
+ duration = 2.5 SECONDS
+ pixel_y = -4
+ alpha = 0
+
+/obj/effect/temp_visual/focus_ring/Initialize(mapload)
+ . = ..()
+ animate(src, alpha = 100, time = 2 SECONDS, easing = QUAD_EASING|EASE_IN)
+ addtimer(CALLBACK(src, PROC_REF(dissipate)), 2 SECONDS)
+
+
+/obj/effect/temp_visual/focus_ring/proc/dissipate()
+ animate(src, alpha = 0, time = 0.5 SECONDS, easing = QUAD_EASING|EASE_OUT)
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index e7246fd04ef6e9..640e08da102f0d 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -1,13 +1,13 @@
-/proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
+/proc/empulse(turf/epicenter, heavy_range, light_range, emp_source)
if(!epicenter)
return
if(!isturf(epicenter))
epicenter = get_turf(epicenter.loc)
- if(log)
- message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
- log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+ if(emp_source)
+ message_admins("EMP with size ([heavy_range], [light_range]) in [ADMIN_VERBOSEJMP(epicenter)], caused by [emp_source] ")
+ log_game("EMP with size ([heavy_range], [light_range]) in [ADMIN_VERBOSEJMP(epicenter)], caused by [emp_source] ")
if(heavy_range > 1)
new /obj/effect/temp_visual/emp/pulse(epicenter)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 87313ba7bdfdfb..c7056feb4319c0 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -209,7 +209,7 @@
VAR_PROTECTED/datum/embedding/embed_data
///for flags such as [GLASSESCOVERSEYES]
- var/flags_cover = 0
+ var/flags_cover = NONE
var/heat = 0
/// All items with sharpness of SHARP_EDGED or higher will automatically get the butchering component.
var/sharpness = NONE
@@ -250,11 +250,6 @@
///What dye registry should be looked at when dying this item; see washing_machine.dm
var/dying_key
- ///Grinder var:A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
- var/list/grind_results
- ///A reagent the nutriments are converted into when the item is juiced.
- var/datum/reagent/consumable/juice_typepath
-
/// Used in obj/item/examine to give additional notes on what the weapon does, separate from the predetermined output variables
var/offensive_notes
/// Used in obj/item/examine to determines whether or not to detail an item's statistics even if it does not meet the force requirements
@@ -265,14 +260,6 @@
/// A lazylist used for applying fantasy values, contains the actual modification applied to a variable.
var/list/fantasy_modifications = null
- /// Has the item been reskinned?
- var/current_skin
- /// List of options to reskin.
- var/list/unique_reskin
- /// If reskins change base icon state as well
- var/unique_reskin_changes_base_icon_state = FALSE
- /// If reskins change inhands as well
- var/unique_reskin_changes_inhand = FALSE
/// Do we apply a click cooldown when resisting this object if it is restraining them?
var/resist_cooldown = CLICK_CD_BREAKOUT
@@ -308,9 +295,6 @@
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_ITEM, src)
- setup_reskinning()
-
-
/obj/item/Destroy(force)
// This var exists as a weird proxy "owner" ref
// It's used in a few places. Stop using it, and optimially replace all uses please
@@ -325,19 +309,6 @@
return ..()
-
-/obj/item/add_context(atom/source, list/context, obj/item/held_item, mob/user)
- . = ..()
-
- if(!unique_reskin)
- return
-
- if(current_skin && !(obj_flags & INFINITE_RESKIN))
- return
-
- context[SCREENTIP_CONTEXT_ALT_LMB] = "Reskin"
- return CONTEXTUAL_SCREENTIP_SET
-
/obj/item/click_ctrl(mob/user)
SHOULD_NOT_OVERRIDE(TRUE)
@@ -492,9 +463,6 @@
else if (siemens_coefficient <= 0.5)
.["partially insulated"] = "It is made from a poor insulator that will dampen (but not fully block) electric shocks passing through it."
- if(LAZYLEN(unique_reskin) && !current_skin)
- .["reskinnable"] = "This item is able to be reskinned! Alt-Click to do so!"
-
/obj/item/examine_descriptor(mob/user)
return "item"
@@ -777,7 +745,6 @@
if(item_flags & DROPDEL && !QDELETED(src))
qdel(src)
- item_flags &= ~IN_INVENTORY
UnregisterSignal(src, list(SIGNAL_ADDTRAIT(TRAIT_NO_WORN_ICON), SIGNAL_REMOVETRAIT(TRAIT_NO_WORN_ICON)))
SEND_SIGNAL(src, COMSIG_ITEM_DROPPED, user)
SEND_SIGNAL(user, COMSIG_MOB_DROPPED_ITEM, src)
@@ -789,7 +756,6 @@
SHOULD_CALL_PARENT(TRUE)
SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user)
SEND_SIGNAL(user, COMSIG_LIVING_PICKED_UP_ITEM, src)
- item_flags |= IN_INVENTORY
/// called when "found" in pockets and storage items. Returns 1 if the search should end.
/obj/item/proc/on_found(mob/finder)
@@ -850,7 +816,6 @@
for(var/datum/action/action as anything in actions)
give_item_action(action, user, slot)
- item_flags |= IN_INVENTORY
RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_NO_WORN_ICON), SIGNAL_REMOVETRAIT(TRAIT_NO_WORN_ICON)), PROC_REF(update_slot_icon), override = TRUE)
if(!initial && (slot_flags & slot) && (play_equip_sound()))
@@ -956,7 +921,6 @@
. = ..()
if(!isliving(hit_atom)) //Living mobs handle hit sounds differently.
-
throw_drop_sound_chain(YEET_SOUND_VOLUME)
return
@@ -1097,6 +1061,12 @@
/obj/item/proc/blend_requirements(obj/machinery/reagentgrinder/R)
return TRUE
+///Returns a reagent list containing the reagents this item produces when ground up in a grinder
+/obj/item/proc/grind_results()
+ RETURN_TYPE(/list/datum/reagent)
+
+ return null
+
///Called BEFORE the object is ground up - use this to change grind results based on conditions. Return "-1" to prevent the grinding from occurring
/obj/item/proc/on_grind()
PROTECTED_PROC(TRUE)
@@ -1130,18 +1100,26 @@
/obj/item/proc/grind_atom(datum/reagents/target_holder, mob/user)
PROTECTED_PROC(TRUE)
+ var/list/datum/reagent/grind_reagents = grind_results()
+
. = FALSE
- if(length(grind_results))
- target_holder.add_reagent_list(grind_results)
+ if(length(grind_reagents))
+ target_holder.add_reagent_list(grind_reagents)
. = TRUE
if(reagents?.trans_to(target_holder, reagents.total_volume, transferred_by = user))
. = TRUE
+///Returns A reagent the nutriments are converted into when the item is juiced.
+/obj/item/proc/juice_typepath()
+ RETURN_TYPE(/datum/reagent)
+
+ return null
+
///Called BEFORE the object is ground up - use this to change grind results based on conditions. Return "-1" to prevent the grinding from occurring
/obj/item/proc/on_juice()
PROTECTED_PROC(TRUE)
- if(!juice_typepath)
+ if(!juice_typepath())
return -1
return SEND_SIGNAL(src, COMSIG_ITEM_ON_JUICE)
@@ -1175,9 +1153,11 @@
. = FALSE
- if(ispath(juice_typepath))
- reagents.convert_reagent(/datum/reagent/consumable/nutriment, juice_typepath, include_source_subtypes = FALSE)
- reagents.convert_reagent(/datum/reagent/consumable/nutriment/vitamin, juice_typepath, include_source_subtypes = FALSE)
+ var/juice_result = juice_typepath()
+
+ if(ispath(juice_result))
+ reagents.convert_reagent(/datum/reagent/consumable/nutriment, juice_result, include_source_subtypes = FALSE)
+ reagents.convert_reagent(/datum/reagent/consumable/nutriment/vitamin, juice_result, include_source_subtypes = FALSE)
. = TRUE
if(!QDELETED(target_holder))
@@ -1257,9 +1237,13 @@
if("operative")
outline_color = COLOR_THEME_OPERATIVE
if("clockwork")
- outline_color = COLOR_THEME_CLOCKWORK //if you want free gbp go fix the fact that clockwork's tooltip css is glass'
+ outline_color = COLOR_THEME_CLOCKWORK
if("glass")
outline_color = COLOR_THEME_GLASS
+ if("trasen-knox")
+ outline_color = COLOR_THEME_TRASENKNOX
+ if("detective")
+ outline_color = COLOR_THEME_DETECTIVE
else //this should never happen, hopefully
outline_color = COLOR_WHITE
if(color)
@@ -1362,28 +1346,26 @@
/obj/item/proc/get_part_rating()
return 0
+/**
+ * this proc override makes sure that even if DoUnEquip is not properly called through the appropriate channels,
+ * it'll still be called if we find that the item has the IN_INVENTORY flag.
+ *
+ * THIS IS BY NO MEAN AN EXCUSE TO KNOWINGLY AVOID CALLING THE RIGHT PROCS FOR INVENTORY MANAGEMENT,
+ * BUT A FALLBACK IN THE CASE WE MISTAKINGLY DON'T, TO MAKE SURE THINGS WORK AS INTENDED SINCE
+ * INVENTORY MANAGEMENT HAS A LOT MORE TO IT THAN JUST CALLING A PROC OR TWO MANUALLY.
+ */
/obj/item/doMove(atom/destination)
- if (!ismob(loc))
+ if (!(item_flags & IN_INVENTORY))
return ..()
- var/mob/owner = loc
- var/hand_index = owner.get_held_index_of_item(src)
- if(!hand_index)
+ if(!ismob(loc))
+ stack_trace("[src] had the IN_INVENTORY flag but the location was not a mob!")
+ item_flags &= ~IN_INVENTORY
return ..()
- owner.held_items[hand_index] = null
- owner.update_held_items()
- if(owner.client)
- owner.client.screen -= src
- if(owner.observers?.len)
- for(var/mob/dead/observe as anything in owner.observers)
- if(observe.client)
- observe.client.screen -= src
- layer = initial(layer)
- SET_PLANE_IMPLICIT(src, initial(plane))
- appearance_flags &= ~NO_CLIENT_COLOR
- dropped(owner, FALSE)
- return ..()
+ var/mob/owner = loc
+ // This should remove the IN_INVENTORY flag. Otherwise we'll end up having a loop
+ owner.transferItemToLoc(src, destination, force = TRUE, silent = TRUE, animated = FALSE)
/obj/item/proc/canStrip(mob/stripper, mob/owner)
SHOULD_BE_PURE(TRUE)
@@ -1823,7 +1805,7 @@
/// Common proc used by painting tools like spraycans and palettes that can access the entire 24 bits color space.
/obj/item/proc/pick_painting_tool_color(mob/user, default_color)
- var/chosen_color = input(user,"Pick new color", "[src]", default_color) as color|null
+ var/chosen_color = tgui_color_picker(user, "Pick new color", "[src]", default_color)
if(!chosen_color || QDELETED(src) || IS_DEAD_OR_INCAP(user) || !user.is_holding(src))
return
set_painting_tool_color(chosen_color)
@@ -2138,3 +2120,11 @@
target_limb = victim.get_bodypart(target_limb) || victim.bodyparts[1]
return get_embed()?.embed_into(victim, target_limb)
+
+/// Checks if user can insert a valid container into the chemistry machine.
+/obj/item/proc/can_insert_container(mob/living/user, obj/machinery/chem_machine)
+ return is_chem_container() && chem_machine.can_interact(user) && user.can_perform_action(chem_machine, ALLOW_SILICON_REACH | FORBID_TELEKINESIS_REACH)
+
+/// Checks if this container is valid for use with chemistry machinery.
+/obj/item/proc/is_chem_container()
+ return FALSE
diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm
index f8824861dba0f8..ce9d9be368605e 100644
--- a/code/game/objects/items/apc_frame.dm
+++ b/code/game/objects/items/apc_frame.dm
@@ -6,34 +6,21 @@
result_path = /obj/machinery/power/apc/auto_name
/obj/item/wallframe/apc/try_build(turf/on_wall, user)
- if(!..())
- return
var/turf/T = get_turf(on_wall) //the user is not where it needs to be.
var/area/A = get_area(user)
if(A.apc)
to_chat(user, span_warning("This area already has an APC!"))
- return //only one APC per area
- if(!A.requires_power)
+ return FALSE //only one APC per area
+ if(!A.requires_power || A.always_unpowered)
to_chat(user, span_warning("You cannot place [src] in this area!"))
- return //can't place apcs in areas with no power requirement
+ return FALSE //can't place apcs in areas with no power requirement
for(var/obj/machinery/power/terminal/E in T)
if(E.master)
to_chat(user, span_warning("There is another network terminal here!"))
- return
- else
- new /obj/item/stack/cable_coil(T, 10)
- to_chat(user, span_notice("You cut the cables and disassemble the unused power terminal."))
- qdel(E)
- return TRUE
-
-/obj/item/wallframe/apc/screwdriver_act(mob/living/user, obj/item/tool)
- //overriding the wallframe parent screwdriver act with this one which allows applying to existing apc frames.
+ return FALSE
+ return ..()
- var/turf/turf = get_step(get_turf(user), user.dir)
- if(iswallturf(turf))
- if(locate(/obj/machinery/power/apc) in get_turf(user))
- var/obj/machinery/power/apc/mounted_apc = locate(/obj/machinery/power/apc) in get_turf(user)
- mounted_apc.wallframe_act(user, src)
- return ITEM_INTERACT_SUCCESS
- turf.item_interaction(user, src)
- return ITEM_INTERACT_SUCCESS
+/obj/item/wallframe/apc/after_attach(obj/machinery/power/apc/attached_to)
+ for(var/obj/machinery/power/terminal/E in attached_to.loc)
+ attached_to.make_terminal()
+ return
diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm
index d95a9e2f96333e..05eabac2872296 100644
--- a/code/game/objects/items/body_egg.dm
+++ b/code/game/objects/items/body_egg.dm
@@ -33,17 +33,17 @@
egg_owner.med_hud_set_status()
INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), egg_owner)
-/obj/item/organ/body_egg/on_death(seconds_per_tick, times_fired)
+/obj/item/organ/body_egg/on_death(seconds_per_tick)
. = ..()
if(!owner)
return
- egg_process(seconds_per_tick, times_fired)
+ egg_process(seconds_per_tick)
-/obj/item/organ/body_egg/on_life(seconds_per_tick, times_fired)
+/obj/item/organ/body_egg/on_life(seconds_per_tick)
. = ..()
- egg_process(seconds_per_tick, times_fired)
+ egg_process(seconds_per_tick)
-/obj/item/organ/body_egg/proc/egg_process(seconds_per_tick, times_fired)
+/obj/item/organ/body_egg/proc/egg_process(seconds_per_tick)
return
/obj/item/organ/body_egg/proc/RefreshInfectionImage()
diff --git a/code/game/objects/items/busts_and_figurines.dm b/code/game/objects/items/busts_and_figurines.dm
index 592302cab67788..660fffa2d833b0 100644
--- a/code/game/objects/items/busts_and_figurines.dm
+++ b/code/game/objects/items/busts_and_figurines.dm
@@ -109,7 +109,7 @@
// Bully the guy for fucking up.
/obj/item/statuebust/hippocratic/proc/fuck_it_up(mob/living/carbon/user)
to_chat(user, span_warning("You forget what comes next like a dumbass. The Hippocrates bust looks down on you, disappointed."))
- user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2)
+ user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2)
COOLDOWN_RESET(src, oath_cd)
/obj/item/maneki_neko
diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm
index 36efc61481d623..89f9a14d99cb8b 100644
--- a/code/game/objects/items/cardboard_cutouts.dm
+++ b/code/game/objects/items/cardboard_cutouts.dm
@@ -8,6 +8,7 @@
resistance_flags = FLAMMABLE
obj_flags = CAN_BE_HIT
item_flags = NO_PIXEL_RANDOM_DROP
+ custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT * 5)
/// If the cutout is pushed over and has to be righted
var/pushed_over = FALSE
/// If the cutout actually appears as what it portray and not a discolored version
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 8662957d4b70a2..8661424856d23e 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -165,7 +165,7 @@
/obj/item/card/id/Destroy()
if (registered_account)
- registered_account.bank_cards -= src
+ LAZYREMOVE(registered_account.bank_cards, src)
if (my_store)
QDEL_NULL(my_store)
if (isitem(loc))
@@ -550,7 +550,7 @@
if(isnull(registered_account) || registered_account.replaceable) //Same check we use when we check if we can assign an account
context[SCREENTIP_CONTEXT_ALT_RMB] = "Assign account"
else if(registered_account.account_balance > 0)
- context[SCREENTIP_CONTEXT_ALT_LMB] = "Withdraw credits"
+ context[SCREENTIP_CONTEXT_ALT_LMB] = "Withdraw [MONEY_NAME]"
if(trim && length(trim.honorifics))
context[SCREENTIP_CONTEXT_CTRL_LMB] = "Toggle honorific"
return CONTEXTUAL_SCREENTIP_SET
@@ -676,7 +676,7 @@
var/money_added = mass_insert_money(money_contained, user)
if(!money_added)
return ITEM_INTERACT_BLOCKING
- to_chat(user, span_notice("You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account."))
+ to_chat(user, span_notice("You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of [MONEY_NAME] to the linked account."))
return ITEM_INTERACT_SUCCESS
return NONE
@@ -703,13 +703,13 @@
return FALSE
registered_account.adjust_money(cash_money, "System: Deposit")
SSblackbox.record_feedback("amount", "credits_inserted", cash_money)
- log_econ("[cash_money] credits were inserted into [src] owned by [src.registered_name]")
+ log_econ("[cash_money] [MONEY_NAME] were inserted into [src] owned by [src.registered_name]")
if(physical_currency)
- to_chat(user, span_notice("You stuff [money] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account."))
+ to_chat(user, span_notice("You stuff [money] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] [MONEY_NAME] to the linked account."))
else
- to_chat(user, span_notice("You insert [money] into [src], adding [cash_money] credits to the linked account."))
+ to_chat(user, span_notice("You insert [money] into [src], adding [cash_money] [MONEY_NAME] to the linked account."))
- to_chat(user, span_notice("The linked account now reports a balance of [registered_account.account_balance] cr."))
+ to_chat(user, span_notice("The linked account now reports a balance of [registered_account.account_balance] [MONEY_SYMBOL]."))
qdel(money)
return TRUE
@@ -736,7 +736,7 @@
registered_account.adjust_money(total, "System: Deposit")
SSblackbox.record_feedback("amount", "credits_inserted", total)
- log_econ("[total] credits were inserted into [src] owned by [src.registered_name]")
+ log_econ("[total] [MONEY_NAME] were inserted into [src] owned by [src.registered_name]")
QDEL_LIST(money)
return total
@@ -768,11 +768,11 @@
to_chat(user, span_warning("The account ID number provided is invalid."))
return FALSE
if(old_account)
- old_account.bank_cards -= src
+ LAZYREMOVE(old_account.bank_cards, src)
account.account_balance += old_account.account_balance
- account.bank_cards += src
+ LAZYADD(account.bank_cards, src)
registered_account = account
- to_chat(user, span_notice("The provided account has been linked to this ID card. It contains [account.account_balance] credits."))
+ to_chat(user, span_notice("The provided account has been linked to this ID card. It contains [account.account_balance] [MONEY_NAME]."))
return TRUE
/obj/item/card/id/click_alt(mob/living/user)
@@ -798,20 +798,20 @@
if(choice == "Link Account")
set_new_account(user)
return CLICK_ACTION_SUCCESS
- var/amount_to_remove = tgui_input_number(user, "How much do you want to withdraw? (Max: [registered_account.account_balance] cr)", "Withdraw Funds", max_value = registered_account.account_balance)
+ var/amount_to_remove = tgui_input_number(user, "How much do you want to withdraw? (Max: [registered_account.account_balance] [MONEY_SYMBOL])", "Withdraw Funds", max_value = registered_account.account_balance)
if(!amount_to_remove || QDELETED(user) || QDELETED(src) || issilicon(user) || loc != user)
return CLICK_ACTION_BLOCKING
if(!alt_click_can_use_id(user))
return CLICK_ACTION_BLOCKING
if(!registered_account.adjust_money(-amount_to_remove, "System: Withdrawal"))
var/difference = amount_to_remove - registered_account.account_balance
- registered_account.bank_card_talk(span_warning("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal."), TRUE)
+ registered_account.bank_card_talk(span_warning("ERROR: The linked account requires [difference] more [MONEY_NAME_AUTOPURAL(difference)] to perform that withdrawal."), TRUE)
return CLICK_ACTION_BLOCKING
var/obj/item/holochip/holochip = new (user.drop_location(), amount_to_remove)
user.put_in_hands(holochip)
- to_chat(user, span_notice("You withdraw [amount_to_remove] credits into a holochip."))
+ to_chat(user, span_notice("You withdraw [amount_to_remove] [MONEY_NAME] into a holochip."))
SSblackbox.record_feedback("amount", "credits_removed", amount_to_remove)
- log_econ("[amount_to_remove] credits were removed from [src] owned by [registered_name]")
+ log_econ("[amount_to_remove] [MONEY_NAME] were removed from [src] owned by [registered_name]")
return CLICK_ACTION_SUCCESS
@@ -822,15 +822,15 @@
set_new_account(user)
/obj/item/card/id/proc/pay_debt(user)
- var/amount_to_pay = tgui_input_number(user, "How much do you want to pay? (Max: [registered_account.account_balance] cr)", "Debt Payment", max_value = min(registered_account.account_balance, registered_account.account_debt))
+ var/amount_to_pay = tgui_input_number(user, "How much do you want to pay? (Max: [registered_account.account_balance] [MONEY_SYMBOL])", "Debt Payment", max_value = min(registered_account.account_balance, registered_account.account_debt))
if(!amount_to_pay || QDELETED(src) || loc != user || !alt_click_can_use_id(user))
return
var/prev_debt = registered_account.account_debt
var/amount_paid = registered_account.pay_debt(amount_to_pay)
if(amount_paid)
- var/message = span_notice("You pay [amount_to_pay] credits of a [prev_debt] cr debt. [registered_account.account_debt] cr to go.")
+ var/message = span_notice("You pay [amount_to_pay] [MONEY_NAME] of a [prev_debt] [MONEY_SYMBOL] debt. [registered_account.account_debt] [MONEY_SYMBOL] to go.")
if(!registered_account.account_debt)
- message = span_nicegreen("You pay the last [amount_to_pay] credits of your debt, extinguishing it. Congratulations!")
+ message = span_nicegreen("You pay the last [amount_to_pay] [MONEY_NAME] of your debt, extinguishing it. Congratulations!")
to_chat(user, message)
/obj/item/card/id/examine(mob/user)
@@ -839,10 +839,10 @@
return
if(registered_account && !isnull(registered_account.account_id))
- . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
+ . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] [MONEY_SYMBOL]."
if(ACCESS_COMMAND in access)
var/datum/bank_account/linked_dept = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department)
- . += "The [linked_dept.account_holder] linked to the ID reports a balance of [linked_dept.account_balance] cr."
+ . += "The [linked_dept.account_holder] linked to the ID reports a balance of [linked_dept.account_balance] [MONEY_SYMBOL]."
else
. += span_notice("Alt-Right-Click the ID to set the linked bank account.")
@@ -882,15 +882,15 @@
if(registered_account)
if(registered_account.mining_points)
. += "There's [registered_account.mining_points] mining point\s loaded onto the card's bank account."
- . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
+ . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] [MONEY_SYMBOL]."
if(registered_account.account_debt)
- . += span_warning("The account is currently indebted for [registered_account.account_debt] cr. [100*DEBT_COLLECTION_COEFF]% of all earnings will go towards extinguishing it.")
+ . += span_warning("The account is currently indebted for [registered_account.account_debt] [MONEY_SYMBOL]. [100*DEBT_COLLECTION_COEFF]% of all earnings will go towards extinguishing it.")
if(registered_account.account_job)
var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department)
if(D)
- . += "The [D.account_holder] reports a balance of [D.account_balance] cr."
+ . += "The [D.account_holder] reports a balance of [D.account_balance] [MONEY_SYMBOL]."
. += span_info("Alt-Click the ID to pull money from the linked account in the form of holochips.")
- . += span_info("You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.")
+ . += span_info("You can insert [MONEY_NAME] into the linked account by pressing holochips, cash, or coins against the ID.")
if(registered_account.replaceable)
. += span_info("Alt-Right-Click the ID to change the linked bank account.")
if(registered_account.civilian_bounty)
@@ -1095,11 +1095,10 @@
/obj/item/card/id/departmental_budget/Initialize(mapload)
. = ..()
- var/datum/bank_account/B = SSeconomy.get_dep_account(department_ID)
- if(B)
- registered_account = B
- if(!B.bank_cards.Find(src))
- B.bank_cards += src
+ var/datum/bank_account/department_account = SSeconomy.get_dep_account(department_ID)
+ if(department_account)
+ registered_account = department_account
+ LAZYOR(department_account.bank_cards, src)
name = "departmental card ([department_name])"
desc = "Provides access to the [department_name]."
SSeconomy.dep_cards += src
@@ -1974,7 +1973,7 @@
var/datum/bank_account/account = SSeconomy.bank_accounts_by_id["[owner.account_id]"]
if(account)
- account.bank_cards += src
+ LAZYADD(account.bank_cards, src)
registered_account = account
to_chat(user, span_notice("Your account number has been automatically assigned."))
@@ -2060,6 +2059,7 @@
worn_icon_state = "nothing"
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_ID
+ custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT)
///The "name" of the "owner" of this "ID"
var/scribbled_name
///The assignment written on this card.
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm
index d316725fbfea54..ed5a62cc562a4a 100644
--- a/code/game/objects/items/chainsaw.dm
+++ b/code/game/objects/items/chainsaw.dm
@@ -24,6 +24,7 @@
actions_types = list(/datum/action/item_action/startchainsaw)
tool_behaviour = TOOL_SAW
toolspeed = 1.5 //Turn it on first you dork
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3)
var/force_on = 24
/// The looping sound for our chainsaw when running
var/datum/looping_sound/chainsaw/chainsaw_loop
diff --git a/code/game/objects/items/cigarettes.dm b/code/game/objects/items/cigarettes.dm
index c791ecb97655da..08bbb551b2ccc0 100644
--- a/code/game/objects/items/cigarettes.dm
+++ b/code/game/objects/items/cigarettes.dm
@@ -22,7 +22,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
base_icon_state = "match"
w_class = WEIGHT_CLASS_TINY
heat = 1000
- grind_results = list(/datum/reagent/phosphorus = 2)
/// Whether this match has been lit.
var/lit = FALSE
/// Whether this match has burnt out.
@@ -32,6 +31,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/// If the match is broken
var/broken = FALSE
+/obj/item/match/grind_results()
+ return list(/datum/reagent/phosphorus = 2)
+
/obj/item/match/process(seconds_per_tick)
smoketime -= seconds_per_tick * (1 SECONDS)
if(smoketime <= 0)
@@ -163,8 +165,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
name = "firebrand"
desc = "An unlit firebrand. It makes you wonder why it's not just called a stick."
smoketime = 40 SECONDS
- custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/carbon = 2)
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
+
+/obj/item/match/firebrand/grind_results()
+ return list(/datum/reagent/carbon = 2)
/obj/item/match/firebrand/Initialize(mapload)
. = ..()
@@ -175,6 +179,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A budget lighter done by using a battery and some aluminium. Hold tightly to ignite."
icon_state = "battery_unlit"
base_icon_state = "battery"
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
/obj/item/match/battery/attack_self(mob/living/user, modifiers)
. = ..()
@@ -197,7 +202,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
throw_speed = 0.5
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_MASK
- grind_results = list()
heat = 1000
light_range = 1
light_color = LIGHT_COLOR_FIRE
@@ -564,7 +568,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/obj/item/organ/lungs/lungs = smoker.get_organ_slot(ORGAN_SLOT_LUNGS)
if(lungs && IS_ORGANIC_ORGAN(lungs))
var/smoker_resistance = HAS_TRAIT(smoker, TRAIT_SMOKER) ? 0.5 : 1
- smoker.adjustOrganLoss(ORGAN_SLOT_LUNGS, lung_harm * smoker_resistance)
+ smoker.adjust_organ_loss(ORGAN_SLOT_LUNGS, lung_harm * smoker_resistance)
if(!reagents.trans_to(smoker, to_smoke, methods = INHALE, ignore_stomach = TRUE))
reagents.remove_all(to_smoke)
@@ -908,7 +912,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "cigbutt"
w_class = WEIGHT_CLASS_TINY
throwforce = 0
- grind_results = list(/datum/reagent/carbon = 2)
+
+/obj/item/cigbutt/grind_results()
+ return list(/datum/reagent/carbon = 2)
/obj/item/cigbutt/cigarbutt
name = "cigar butt"
@@ -932,6 +938,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
list_reagents = null
w_class = WEIGHT_CLASS_SMALL
choke_forever = TRUE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
///name of the stuff packed inside this pipe
var/packeditem
@@ -1009,7 +1016,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
inhand_icon_on = null
inhand_icon_off = null
lung_harm = 2
- custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 3)
///////////
//ROLLING//
diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm
index 97b2a1441b9f95..df4d122332130a 100644
--- a/code/game/objects/items/circuitboards/circuitboard.dm
+++ b/code/game/objects/items/circuitboards/circuitboard.dm
@@ -15,7 +15,6 @@
abstract_type = /obj/item/circuitboard
custom_materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
w_class = WEIGHT_CLASS_SMALL
- grind_results = list(/datum/reagent/silicon = 20)
greyscale_colors = CIRCUIT_COLOR_GENERIC
var/build_path = null
/// whether or not the circuit board will build into a vendor whose products cost nothing (used for offstation vending machines mostly)
@@ -30,6 +29,9 @@
set_greyscale(new_config = /datum/greyscale_config/circuit)
return ..()
+/obj/item/circuitboard/grind_results()
+ return list(/datum/reagent/silicon = 20)
+
/obj/item/circuitboard/proc/apply_default_parts(obj/machinery/machine)
if(LAZYLEN(machine.component_parts))
// This really shouldn't happen. If it somehow does, print out a stack trace and gracefully handle it.
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 99308f05d9e3e3..b1a7e0bb445c58 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -429,12 +429,20 @@
name = "R&D Console"
greyscale_colors = CIRCUIT_COLOR_SCIENCE
build_path = /obj/machinery/computer/rdconsole
+ req_access = list(ACCESS_RESEARCH) // Research access is required to toggle the lock.
+
var/silence_announcements = FALSE
+ var/locked = TRUE
+
+// An unlocked subtype of the board for mapping.
+/obj/item/circuitboard/computer/rdconsole/unlocked
+ locked = FALSE
/obj/item/circuitboard/computer/rdconsole/examine(mob/user)
. = ..()
. += span_info("The board is configured to [silence_announcements ? "silence" : "announce"] researched nodes on radio.")
. += span_notice("The board mode can be changed with a [EXAMINE_HINT("multitool")].")
+ . += span_notice("The board is [locked ? "locked" : "unlocked"], and can be [locked ? "unlocked" : "locked"] with an ID that has research access.")
/obj/item/circuitboard/computer/rdconsole/multitool_act(mob/living/user)
. = ..()
@@ -445,6 +453,10 @@
balloon_alert(user, "announcements [silence_announcements ? "enabled" : "disabled"]")
/obj/item/circuitboard/computer/rdconsole/emag_act(mob/user, obj/item/card/emag/emag_card)
+ if (locked)
+ locked = FALSE
+ to_chat(user, span_notice("You magnetically trigger the locking mechanism, causing it to unlock."))
+
if (obj_flags & EMAGGED)
return FALSE
@@ -453,6 +465,20 @@
to_chat(user, span_notice("You overload the node announcement chip, forcing every node to be announced on the common channel."))
return TRUE
+/obj/item/circuitboard/computer/rdconsole/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
+ if (user.combat_mode || !isidcard(attacking_item))
+ return ..()
+ if (check_access(attacking_item))
+ locked = !locked
+ balloon_alert(user, locked ? "locked" : "unlocked")
+ user.visible_message(
+ message = span_notice("\The [user] unlock[user.p_s()] \the [src] with \the [attacking_item]."),
+ self_message = span_notice("You unlock \the [src] with \the [attacking_item]."),
+ blind_message = span_hear("You hear a soft beep."),
+ )
+ else
+ balloon_alert(user, "no access!")
+
/obj/item/circuitboard/computer/rdservercontrol
name = "R&D Server Control"
greyscale_colors = CIRCUIT_COLOR_SCIENCE
diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
index b472f732abdae0..d955ce114cb77f 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -1888,3 +1888,14 @@
req_components = list(
/datum/stock_part/micro_laser = 1,
)
+
+/obj/item/circuitboard/machine/washing_machine
+ name = "Washing Machine"
+ greyscale_colors = CIRCUIT_COLOR_SERVICE
+ build_path = /obj/machinery/washing_machine
+ req_components = list(
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/reagent_containers/cup/beaker = 2,
+ /datum/stock_part/water_recycler = 1,
+ /datum/stock_part/servo = 1,
+ )
diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm
index 7d8b4da6a4195f..a3d41245399f8c 100644
--- a/code/game/objects/items/clown_items.dm
+++ b/code/game/objects/items/clown_items.dm
@@ -25,7 +25,6 @@
throwforce = 0
throw_speed = 3
throw_range = 7
- grind_results = list(/datum/reagent/lye = 10)
var/cleanspeed = 3.5 SECONDS //slower than mop
force_string = "robust... against germs"
var/uses = 100
@@ -35,6 +34,9 @@
AddComponent(/datum/component/slippery, 80)
AddComponent(/datum/component/cleaner, cleanspeed, 0.1, pre_clean_callback=CALLBACK(src, PROC_REF(should_clean)), on_cleaned_callback=CALLBACK(src, PROC_REF(decreaseUses))) //less scaling for soapies
+/obj/item/soap/grind_results()
+ return list(/datum/reagent/lye = 10)
+
/obj/item/soap/examine(mob/user)
. = ..()
var/max_uses = initial(uses)
@@ -56,37 +58,45 @@
/obj/item/soap/homemade
desc = "A homemade bar of soap. Smells of... well...."
- grind_results = list(/datum/reagent/consumable/liquidgibs = 9, /datum/reagent/lye = 9)
icon_state = "soapgibs"
inhand_icon_state = "soapgibs"
worn_icon_state = "soapgibs"
cleanspeed = 3 SECONDS // faster than base soap to reward chemists for going to the effort
+/obj/item/soap/homemade/grind_results()
+ return list(/datum/reagent/consumable/liquidgibs = 9, /datum/reagent/lye = 9)
+
/obj/item/soap/nanotrasen
desc = "A heavy duty bar of Nanotrasen brand soap. Smells of plasma."
- grind_results = list(/datum/reagent/toxin/plasma = 10, /datum/reagent/lye = 10)
icon_state = "soapnt"
inhand_icon_state = "soapnt"
worn_icon_state = "soapnt"
cleanspeed = 2.8 SECONDS //janitor gets this
uses = 300
+/obj/item/soap/nanotrasen/grind_results()
+ return list(/datum/reagent/toxin/plasma = 10, /datum/reagent/lye = 10)
+
/obj/item/soap/deluxe
desc = "A deluxe Waffle Corporation brand bar of soap. Smells of high-class luxury."
- grind_results = list(/datum/reagent/consumable/aloejuice = 10, /datum/reagent/lye = 10)
icon_state = "soapdeluxe"
inhand_icon_state = "soapdeluxe"
worn_icon_state = "soapdeluxe"
cleanspeed = 2 SECONDS //captain gets one of these
+/obj/item/soap/deluxe/grind_results()
+ return list(/datum/reagent/consumable/aloejuice = 10, /datum/reagent/lye = 10)
+
/obj/item/soap/syndie
desc = "An untrustworthy bar of soap made of strong chemical agents that dissolve blood faster."
- grind_results = list(/datum/reagent/toxin/acid = 10, /datum/reagent/lye = 10)
icon_state = "soapsyndie"
inhand_icon_state = "soapsyndie"
worn_icon_state = "soapsyndie"
cleanspeed = 0.5 SECONDS //faster than mops so it's useful for traitors who want to clean crime scenes
+/obj/item/soap/syndie/grind_results()
+ return list(/datum/reagent/toxin/acid = 10, /datum/reagent/lye = 10)
+
/obj/item/soap/drone
name = "\improper integrated soap module"
inhand_icon_state = "soapnt"
@@ -97,13 +107,26 @@
/obj/item/soap/omega
name = "\improper Omega soap"
desc = "The most advanced soap known to mankind. The beginning of the end for germs."
- grind_results = list(/datum/reagent/consumable/potato_juice = 9, /datum/reagent/consumable/ethanol/lizardwine = 9, /datum/reagent/monkey_powder = 9, /datum/reagent/drug/krokodil = 9, /datum/reagent/toxin/acid/nitracid = 9, /datum/reagent/baldium = 9, /datum/reagent/consumable/ethanol/hooch = 9, /datum/reagent/bluespace = 9, /datum/reagent/drug/pumpup = 9, /datum/reagent/consumable/space_cola = 9)
icon_state = "soapomega"
inhand_icon_state = "soapomega"
worn_icon_state = "soapomega"
cleanspeed = 0.3 SECONDS //Only the truest of mind soul and body get one of these
uses = 800 //In the Greek numeric system, Omega has a value of 800
+/obj/item/soap/omega/grind_results()
+ return list(
+ /datum/reagent/consumable/potato_juice = 9,
+ /datum/reagent/consumable/ethanol/lizardwine = 9,
+ /datum/reagent/monkey_powder = 9,
+ /datum/reagent/drug/krokodil = 9,
+ /datum/reagent/toxin/acid/nitracid = 9,
+ /datum/reagent/baldium = 9,
+ /datum/reagent/consumable/ethanol/hooch = 9,
+ /datum/reagent/bluespace = 9,
+ /datum/reagent/drug/pumpup = 9,
+ /datum/reagent/consumable/space_cola = 9
+ )
+
/obj/item/soap/omega/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is using [src] to scrub themselves from the timeline! It looks like [user.p_theyre()] trying to commit suicide!"))
new /obj/structure/chrono_field(user.loc, user)
@@ -229,6 +252,7 @@
inhand_icon_state = "gold_horn"
worn_icon_state = "horn_gold"
COOLDOWN_DECLARE(golden_horn_cooldown)
+ custom_materials = list(/datum/material/bananium = SHEET_MATERIAL_AMOUNT * 5)
/obj/item/bikehorn/golden/attack()
flip_mobs()
diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm
index cea7044427ec56..06604a872fdf67 100644
--- a/code/game/objects/items/control_wand.dm
+++ b/code/game/objects/items/control_wand.dm
@@ -30,10 +30,9 @@
var/static/list/area/restricted_areas = list(
/area/station/command/bridge, /*so Captain's remote isn't totally useless*/
/area/station/security, /*so antag RD/HoP/QM/CMO can't easily screw up the brig doors*/
- /area/station/ai_monitored/command/nuke_storage, /*aka Vault since it's QM's special thing*/
- /area/station/ai_monitored/turret_protected/ai, // these are areas exclusive to RD
- /area/station/ai_monitored/turret_protected/ai_upload_foyer, // but sometimes mappers might misconfig
- /area/station/ai_monitored/turret_protected/ai_upload, // their doors with our several dozen access helpers
+ /area/station/command/vault, /*aka Vault since it's QM's special thing*/
+ /area/station/ai/satellite/chamber, // these are areas exclusive to RD
+ /area/station/ai/upload, // but sometimes mappers might misconfig their doors with our several dozen access helpers
)
COOLDOWN_DECLARE(shock_cooldown)
/// sound played when mode is switched
@@ -127,9 +126,8 @@
region_access = REGION_RESEARCH
owner_trim = /datum/id_trim/job/research_director
our_domain = list(
- /area/station/ai_monitored/turret_protected/ai,
- /area/station/ai_monitored/turret_protected/ai_upload_foyer,
- /area/station/ai_monitored/turret_protected/ai_upload,
+ /area/station/ai/satellite/chamber,
+ /area/station/ai/upload,
)
/obj/item/door_remote/head_of_security
@@ -147,7 +145,7 @@
department = "cargo"
region_access = REGION_SUPPLY
owner_trim = /datum/id_trim/job/quartermaster
- our_domain = list( /area/station/ai_monitored/command/nuke_storage )
+ our_domain = list( /area/station/command/vault )
/obj/item/door_remote/chief_medical_officer
name = "medical door remote"
diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm
index 4550b7cf6b897d..c0834a6d459551 100644
--- a/code/game/objects/items/cosmetics.dm
+++ b/code/game/objects/items/cosmetics.dm
@@ -232,8 +232,9 @@
var/new_style = tgui_input_list(user, "Select a facial hairstyle", "Grooming", SSaccessories.facial_hairstyles_list)
if(isnull(new_style))
return
- if(!get_location_accessible(human_target, location))
- to_chat(user, span_warning("The headgear is in the way!"))
+ var/covering = human_target.is_mouth_covered()
+ if(covering)
+ to_chat(user, span_warning("[covering] is in the way!"))
return
if(!(noggin.head_flags & HEAD_FACIAL_HAIR))
to_chat(user, span_warning("There is no facial hair to style!"))
@@ -250,8 +251,9 @@
else
return
else
- if(!get_location_accessible(human_target, location))
- to_chat(user, span_warning("The mask is in the way!"))
+ var/covering = human_target.is_mouth_covered()
+ if(covering)
+ to_chat(user, span_warning("[covering] is in the way!"))
return
if(!(noggin.head_flags & HEAD_FACIAL_HAIR))
to_chat(user, span_warning("There is no facial hair to shave!"))
@@ -288,7 +290,7 @@
var/new_style = tgui_input_list(user, "Select a hairstyle", "Grooming", SSaccessories.hairstyles_list)
if(isnull(new_style))
return
- if(!get_location_accessible(human_target, location))
+ if(!human_target.is_location_accessible(location))
to_chat(user, span_warning("The headgear is in the way!"))
return
if(!(noggin.head_flags & HEAD_HAIR))
@@ -304,7 +306,7 @@
human_target.set_hairstyle(new_style, update = TRUE)
return
else
- if(!get_location_accessible(human_target, location))
+ if(!human_target.is_location_accessible(location))
to_chat(user, span_warning("The headgear is in the way!"))
return
if(!(noggin.head_flags & HEAD_HAIR))
diff --git a/code/game/objects/items/courtroom.dm b/code/game/objects/items/courtroom.dm
index d605a3b05f1010..bd57a8f83f6ee7 100644
--- a/code/game/objects/items/courtroom.dm
+++ b/code/game/objects/items/courtroom.dm
@@ -14,6 +14,7 @@
attack_verb_continuous = list("bashes", "batters", "judges", "whacks")
attack_verb_simple = list("bash", "batter", "judge", "whack")
resistance_flags = FLAMMABLE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
/obj/item/gavelhammer/Initialize(mapload)
. = ..()
@@ -33,6 +34,7 @@
throwforce = 2
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
/obj/item/gavelblock/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
if(istype(I, /obj/item/gavelhammer))
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 07938d1d0d8cd8..f055aa108bd7cb 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -30,7 +30,6 @@
w_class = WEIGHT_CLASS_TINY
attack_verb_continuous = list("attacks", "colours")
attack_verb_simple = list("attack", "colour")
- grind_results = list()
interaction_flags_atom = parent_type::interaction_flags_atom | INTERACT_ATOM_IGNORE_MOBILITY
/// Icon state to use when capped
@@ -215,8 +214,10 @@
drawtype = pick(all_drawables)
AddElement(/datum/element/venue_price, FOOD_PRICE_EXOTIC)
- AddElement(/datum/element/tool_renaming)
- if(can_change_colour)
+ //This makes sure that spraycans do not rename stuff instead of painting
+ if(!can_change_colour)
+ AddElement(/datum/element/tool_renaming)
+ else
AddComponent(/datum/component/palette, AVAILABLE_SPRAYCAN_SPACE, paint_color)
refill()
diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm
index 59c5339c3140ba..8da91ef371aff1 100644
--- a/code/game/objects/items/credit_holochip.dm
+++ b/code/game/objects/items/credit_holochip.dm
@@ -16,7 +16,7 @@
if(!credits && amount)
credits = amount
if(credits <= 0 && !mapload)
- stack_trace("Holochip created with 0 or less credits in [get_area_name(src)]!")
+ stack_trace("Holochip created with 0 or less [MONEY_NAME] in [get_area_name(src)]!")
return INITIALIZE_HINT_QDEL
add_traits(list(TRAIT_FISHING_BAIT, TRAIT_BAIT_ALLOW_FISHING_DUD), INNATE_TRAIT)
update_appearance()
@@ -24,20 +24,20 @@
/obj/item/holochip/examine(mob/user)
. = ..()
- . += "[span_notice("It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]")]\n"+\
+ . += "[span_notice("It's loaded with [credits] [MONEY_NAME_AUTOPURAL(credits)]")]\n"+\
span_notice("Alt-Click to split.")
/obj/item/holochip/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
if(istype(held_item, /obj/item/holochip))
context[SCREENTIP_CONTEXT_LMB] = "Merge Into"
- context[SCREENTIP_CONTEXT_ALT_LMB] = "Extract Credits"
+ context[SCREENTIP_CONTEXT_ALT_LMB] = "Extract [MONEY_NAME_CAPITALIZED]"
return CONTEXTUAL_SCREENTIP_SET
/obj/item/holochip/get_item_credit_value()
return credits
/obj/item/holochip/update_name()
- name = "\improper [credits] credit holochip"
+ name = "\improper [credits] [MONEY_NAME_SINGULAR] holochip"
return ..()
/obj/item/holochip/update_icon_state()
@@ -117,7 +117,7 @@
if(loc != user)
to_chat(user, span_warning("You must be holding the holochip to continue!"))
return CLICK_ACTION_BLOCKING
- var/split_amount = tgui_input_number(user, "How many credits do you want to extract from the holochip? (Max: [credits] cr)", "Holochip", max_value = credits)
+ var/split_amount = tgui_input_number(user, "How many [MONEY_NAME] do you want to extract from the holochip? (Max: [credits] [MONEY_SYMBOL])", "Holochip", max_value = credits)
if(!split_amount || QDELETED(user) || QDELETED(src) || issilicon(user) || !usr.can_perform_action(src, NEED_DEXTERITY|FORBID_TELEKINESIS_REACH) || loc != user)
return CLICK_ACTION_BLOCKING
var/new_credits = spend(split_amount, TRUE)
@@ -126,7 +126,7 @@
if(!user.put_in_hands(chip))
chip.forceMove(user.drop_location())
add_fingerprint(user)
- to_chat(user, span_notice("You extract [split_amount] credits into a new holochip."))
+ to_chat(user, span_notice("You extract [split_amount] [MONEY_NAME] into a new holochip."))
return CLICK_ACTION_SUCCESS
/obj/item/holochip/emp_act(severity)
diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm
index 354e628895d01c..a382733560d7b4 100644
--- a/code/game/objects/items/debug_items.dm
+++ b/code/game/objects/items/debug_items.dm
@@ -59,72 +59,10 @@
/obj/item/debug/omnitool/attack_self(mob/user)
if(!user)
return
- var/list/tool_list = list(
- "Crowbar" = image(icon = 'icons/obj/tools.dmi', icon_state = "crowbar"),
- "Multitool" = image(icon = 'icons/obj/devices/tool.dmi', icon_state = "multitool"),
- "Screwdriver" = image(icon = 'icons/map_icons/items/_item.dmi', icon_state = "/obj/item/screwdriver"),
- "Wirecutters" = image(icon = 'icons/obj/tools.dmi', icon_state = "cutters_map"),
- "Wrench" = image(icon = 'icons/obj/tools.dmi', icon_state = "wrench"),
- "Welding Tool" = image(icon = 'icons/obj/tools.dmi', icon_state = "miniwelder"),
- "Analyzer" = image(icon = 'icons/obj/devices/scanner.dmi', icon_state = "analyzer"),
- "Pickaxe" = image(icon = 'icons/obj/mining.dmi', icon_state = "minipick"),
- "Shovel" = image(icon = 'icons/obj/mining.dmi', icon_state = "shovel"),
- "Retractor" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "retractor"),
- "Hemostat" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "hemostat"),
- "Cautery" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "cautery"),
- "Drill" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "drill"),
- "Scalpel" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "scalpel"),
- "Saw" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "saw"),
- "Bonesetter" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "bonesetter"),
- "Knife" = image(icon = 'icons/obj/service/kitchen.dmi', icon_state = "knife"),
- "Blood Filter" = image(icon = 'icons/obj/medical/surgery_tools.dmi', icon_state = "bloodfilter"),
- "Rolling Pin" = image(icon = 'icons/obj/service/kitchen.dmi', icon_state = "rolling_pin"),
- "Wire Brush" = image(icon = 'icons/obj/tools.dmi', icon_state = "wirebrush"),
- )
- var/tool_result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
+ var/tool_result = show_radial_menu(user, src, GLOB.tool_to_image, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
- switch(tool_result)
- if("Crowbar")
- tool_behaviour = TOOL_CROWBAR
- if("Multitool")
- tool_behaviour = TOOL_MULTITOOL
- if("Screwdriver")
- tool_behaviour = TOOL_SCREWDRIVER
- if("Wirecutters")
- tool_behaviour = TOOL_WIRECUTTER
- if("Wrench")
- tool_behaviour = TOOL_WRENCH
- if("Welding Tool")
- tool_behaviour = TOOL_WELDER
- if("Analyzer")
- tool_behaviour = TOOL_ANALYZER
- if("Pickaxe")
- tool_behaviour = TOOL_MINING
- if("Shovel")
- tool_behaviour = TOOL_SHOVEL
- if("Retractor")
- tool_behaviour = TOOL_RETRACTOR
- if("Hemostat")
- tool_behaviour = TOOL_HEMOSTAT
- if("Cautery")
- tool_behaviour = TOOL_CAUTERY
- if("Drill")
- tool_behaviour = TOOL_DRILL
- if("Scalpel")
- tool_behaviour = TOOL_SCALPEL
- if("Saw")
- tool_behaviour = TOOL_SAW
- if("Bonesetter")
- tool_behaviour = TOOL_BONESET
- if("Knife")
- tool_behaviour = TOOL_KNIFE
- if("Blood Filter")
- tool_behaviour = TOOL_BLOODFILTER
- if("Rolling Pin")
- tool_behaviour = TOOL_ROLLINGPIN
- if("Wire Brush")
- tool_behaviour = TOOL_RUSTSCRAPER
+ tool_behaviour = tool_result
/obj/item/debug/omnitool/item_spawner
name = "spawntool"
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 1dc026665a5991..1d4cf790f66d48 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -121,17 +121,10 @@
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/defibrillator/attack_hand(mob/user, list/modifiers)
if(loc == user)
- if(slot_flags & ITEM_SLOT_BACK)
- if(user.get_item_by_slot(ITEM_SLOT_BACK) == src)
- ui_action_click()
- else
- to_chat(user, span_warning("Put the defibrillator on your back first!"))
-
- else if(slot_flags & ITEM_SLOT_BELT)
- if(user.get_item_by_slot(ITEM_SLOT_BELT) == src)
- ui_action_click()
- else
- to_chat(user, span_warning("Strap the defibrillator's belt on first!"))
+ if(user.get_slot_by_item(src) & slot_flags)
+ ui_action_click()
+ else
+ balloon_alert(user, "equip the unit first!")
return
else if(istype(loc, /obj/machinery/defibrillator_mount))
ui_action_click() //checks for this are handled in defibrillator.mount.dm
@@ -266,9 +259,10 @@
desc = "A belt-equipped defibrillator that can be rapidly deployed."
icon_state = "defibcompact"
inhand_icon_state = null
+ slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_SUITSTORE|ITEM_SLOT_DEX_STORAGE
+ worn_icon = 'icons/mob/clothing/belt.dmi'
worn_icon_state = "defibcompact"
w_class = WEIGHT_CLASS_NORMAL
- slot_flags = ITEM_SLOT_BELT
paddle_state = "defibcompact-paddles"
powered_state = "defibcompact-powered"
charge_state = "defibcompact-charge"
@@ -280,6 +274,11 @@
cell = new(src)
update_power()
+/obj/item/defibrillator/compact/loaded/cmo // subtype for the spy steal objective
+ name = "chief medical officer's compact defibrillator"
+ icon_state = "defibcmo"
+ resistance_flags = INDESTRUCTIBLE // So no cheesy getting rid of like other steal/head items
+
/obj/item/defibrillator/compact/combat
name = "combat defibrillator"
desc = "A belt-equipped blood-red defibrillator. Can revive through thick clothing, has an experimental self-recharging battery, and can be utilized as a weapon via applying the paddles while in a combat stance."
@@ -341,6 +340,7 @@
. = ..()
AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_BACK)
AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12)
+ RegisterSignal(src, COMSIG_HUMAN_NON_STORAGE_HOTKEY, PROC_REF(on_non_storage_hotkey))
/obj/item/shockpaddles/Destroy()
defib = null
@@ -508,7 +508,7 @@
busy = TRUE
M.visible_message(span_danger("[user] touches [M] with [src]!"), \
span_userdanger("[user] touches [M] with [src]!"))
- M.adjustStaminaLoss(60)
+ M.adjust_stamina_loss(60)
M.Knockdown(75)
M.set_jitter_if_lower(100 SECONDS)
M.apply_status_effect(/datum/status_effect/convulsing)
@@ -608,25 +608,27 @@
fail_reason = "Patient's brain is missing. Further attempts futile."
if (DEFIB_FAIL_BLACKLISTED)
fail_reason = "Patient has been blacklisted from revival. Further attempts futile."
+ if (DEFIB_FAIL_GOLEM)
+ fail_reason = "Patient is constructed from inorganic materials. Further attempts futile, though manual reconstruction is possible."
if(fail_reason)
user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - [fail_reason]"))
playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
else
- var/total_brute = H.getBruteLoss()
- var/total_burn = H.getFireLoss()
+ var/total_brute = H.get_brute_loss()
+ var/total_burn = H.get_fire_loss()
var/need_mob_update = FALSE
//If the body has been fixed so that they would not be in crit when defibbed, give them oxyloss to put them back into crit
if (H.health > HALFWAYCRITDEATH)
- need_mob_update += H.adjustOxyLoss(H.health - HALFWAYCRITDEATH, updating_health = FALSE)
+ need_mob_update += H.adjust_oxy_loss(H.health - HALFWAYCRITDEATH, updating_health = FALSE)
else
- var/overall_damage = total_brute + total_burn + H.getToxLoss() + H.getOxyLoss()
+ var/overall_damage = total_brute + total_burn + H.get_tox_loss() + H.get_oxy_loss()
var/mobhealth = H.health
- need_mob_update += H.adjustOxyLoss((mobhealth - HALFWAYCRITDEATH) * (H.getOxyLoss() / overall_damage), updating_health = FALSE)
- need_mob_update += H.adjustToxLoss((mobhealth - HALFWAYCRITDEATH) * (H.getToxLoss() / overall_damage), updating_health = FALSE, forced = TRUE) // force tox heal for toxin lovers too
- need_mob_update += H.adjustFireLoss((mobhealth - HALFWAYCRITDEATH) * (total_burn / overall_damage), updating_health = FALSE)
- need_mob_update += H.adjustBruteLoss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), updating_health = FALSE)
+ need_mob_update += H.adjust_oxy_loss((mobhealth - HALFWAYCRITDEATH) * (H.get_oxy_loss() / overall_damage), updating_health = FALSE)
+ need_mob_update += H.adjust_tox_loss((mobhealth - HALFWAYCRITDEATH) * (H.get_tox_loss() / overall_damage), updating_health = FALSE, forced = TRUE) // force tox heal for toxin lovers too
+ need_mob_update += H.adjust_fire_loss((mobhealth - HALFWAYCRITDEATH) * (total_burn / overall_damage), updating_health = FALSE)
+ need_mob_update += H.adjust_brute_loss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), updating_health = FALSE)
if(need_mob_update)
H.updatehealth() // Previous "adjust" procs don't update health, so we do it manually.
user.visible_message(span_notice("[req_defib ? "[defib]" : "[src]"] pings: Resuscitation successful."))
@@ -669,6 +671,13 @@
/obj/item/shockpaddles/proc/is_wielded()
return HAS_TRAIT(src, TRAIT_WIELDED)
+/obj/item/shockpaddles/proc/on_non_storage_hotkey(datum/source, mob/living/carbon/human/user, obj/item/possible_storage)
+ SIGNAL_HANDLER
+ if(possible_storage == defib)
+ user.dropItemToGround(src)
+ return COMPONENT_STORAGE_HOTKEY_HANDLED
+ return NONE
+
/obj/item/shockpaddles/cyborg
name = "cyborg defibrillator paddles"
icon = 'icons/obj/medical/defib.dmi'
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 62ff966c91c9ae..1f9a78e3f3fb3c 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -35,12 +35,14 @@
desc = "A stylish upgrade (?) to the intelliCard."
icon_state = "aitater"
base_icon_state = "aitater"
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
/obj/item/aicard/aispook
name = "intelliLantern"
desc = "A spoOoOoky upgrade to the intelliCard."
icon_state = "aispook"
base_icon_state = "aispook"
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
/obj/item/aicard/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is trying to upload [user.p_them()]self into [src]! That's not going to work out well!"))
@@ -159,7 +161,7 @@
if(AI && AI.loc == src)
to_chat(AI, span_userdanger("Your core files are being wiped!"))
while(AI.stat != DEAD && flush)
- AI.adjustOxyLoss(5)
+ AI.adjust_oxy_loss(5)
AI.updatehealth()
sleep(0.5 SECONDS)
flush = FALSE
diff --git a/code/game/objects/items/devices/aicard_evil.dm b/code/game/objects/items/devices/aicard_evil.dm
index b63ecf25870c21..0c9f0c6f9c486d 100644
--- a/code/game/objects/items/devices/aicard_evil.dm
+++ b/code/game/objects/items/devices/aicard_evil.dm
@@ -69,7 +69,7 @@
// Transfer the AI from the core we created into the card, then delete the core
capture_ai(new_ai, user)
- var/obj/structure/ai_core/deactivated/detritus = locate() in get_turf(src)
+ var/obj/structure/ai_core/detritus = locate() in get_turf(src)
qdel(detritus)
AI.set_control_disabled(FALSE)
AI.radio_enabled = TRUE
diff --git a/code/game/objects/items/devices/blood_scanner.dm b/code/game/objects/items/devices/blood_scanner.dm
index 5add88050f514a..4a32545b0a4516 100644
--- a/code/game/objects/items/devices/blood_scanner.dm
+++ b/code/game/objects/items/devices/blood_scanner.dm
@@ -56,13 +56,13 @@
/obj/item/blood_scanner/proc/scan_blood(mob/living/scanner, mob/living/carbon/scanned_person)
var/render_list = list()
- var/oxy_loss = scanned_person.getOxyLoss()
- var/tox_loss = scanned_person.getToxLoss()
+ var/oxy_loss = scanned_person.get_oxy_loss()
+ var/tox_loss = scanned_person.get_tox_loss()
render_list += span_info("You read the [src]'s screen:\n")
render_list += "
Blood Type: [scanned_person?.dna?.blood_type]\n"
if(oxy_loss > 50)//if they have knockout levels of suffocation damage
render_list += "
Warning: Hypoxic blood oxygen levels.\n"
- if(scanned_person.blood_volume <= BLOOD_VOLUME_SAFE)
+ if(scanned_person.get_blood_volume(apply_modifiers = TRUE) <= BLOOD_VOLUME_SAFE)
render_list += "
Warning: Dangerously low blood flow.\n"
if(tox_loss > 10)
render_list += "
Warning: Toxic buildup detected in bloodstream.\n"
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index f38aa9147cfe04..6228e6c1e3a589 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -17,7 +17,10 @@
w_class = WEIGHT_CLASS_SMALL
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BELT
- custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.2)
+ custom_materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.2,
+ )
actions_types = list(/datum/action/item_action/toggle_light)
action_slots = ALL
light_system = OVERLAY_LIGHT_DIRECTIONAL
@@ -231,7 +234,7 @@
. += span_notice_ml("[patient] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [patient.p_their()] teeth.\n")
//assess any suffocation damage
- var/hypoxia_status = patient.getOxyLoss() > 20
+ var/hypoxia_status = patient.get_oxy_loss() > 20
if(patient == user)
if(hypoxia_status)
@@ -250,9 +253,11 @@
else
. += span_info_ml("You press a finger to [patient.p_their()] gums:\n")
- if(patient.blood_volume <= BLOOD_VOLUME_SAFE && patient.blood_volume > BLOOD_VOLUME_OKAY)
+ var/cached_blood_volume = patient.get_blood_volume(apply_modifiers = TRUE)
+
+ if(cached_blood_volume <= BLOOD_VOLUME_SAFE && cached_blood_volume > BLOOD_VOLUME_OKAY)
. += span_danger_ml("Color returns slowly!\n")//low blood
- else if(patient.blood_volume <= BLOOD_VOLUME_OKAY)
+ else if(cached_blood_volume <= BLOOD_VOLUME_OKAY)
. += span_danger_ml("Color does not return!\n")//critical blood
else
. += span_notice_ml("Color returns quickly.\n")//they're okay :D
@@ -442,7 +447,6 @@
light_color = LIGHT_COLOR_FLARE
light_system = OVERLAY_LIGHT
light_power = 2
- grind_results = list(/datum/reagent/sulfur = 15)
sound_on = 'sound/items/match_strike.ogg'
toggle_context = FALSE
has_closed_handle = FALSE
@@ -456,7 +460,11 @@
var/trash_type = /obj/item/trash/flare
/// If the light source can be extinguished
var/can_be_extinguished = FALSE
- custom_materials = list(/datum/material/plastic= SMALL_MATERIAL_AMOUNT * 0.5)
+ custom_materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5,
+ /datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.5,
+ /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.5,
+ )
/obj/item/flashlight/flare/Initialize(mapload)
. = ..()
@@ -470,6 +478,9 @@
damtype = BURN
update_brightness()
+/obj/item/flashlight/flare/grind_results()
+ return list(/datum/reagent/sulfur = 15)
+
/obj/item/flashlight/flare/init_slapcrafting()
return
@@ -713,6 +724,7 @@
slot_flags = null
trash_type = /obj/effect/decal/cleanable/ash
can_be_extinguished = TRUE
+ custom_materials = list(/datum/material/wood = SMALL_MATERIAL_AMOUNT*0.5)
/obj/item/flashlight/flare/torch/on
start_on = TRUE
@@ -724,6 +736,7 @@
fuel = INFINITY
randomize_fuel = FALSE
start_on = TRUE
+ custom_materials = null
/obj/item/flashlight/flare/torch/red
color = "#ff0000"
@@ -853,11 +866,11 @@
base_icon_state = "glowstick"
inhand_icon_state = null
worn_icon_state = "lightstick"
- grind_results = list(/datum/reagent/phenol = 15, /datum/reagent/hydrogen = 10, /datum/reagent/oxygen = 5) //Meth-in-a-stick
sound_on = 'sound/effects/wounds/crack2.ogg' // the cracking sound isn't just for wounds silly
toggle_context = FALSE
ignore_base_color = TRUE
has_closed_handle = FALSE
+ custom_materials = null
/// How much max fuel we have
var/max_fuel = 0
/// How much oxygen gets added upon cracking the stick. Doesn't actually produce a reaction with the fluid but it does allow for bootleg chemical "grenades"
@@ -886,6 +899,11 @@
)
RegisterSignal(reagents, COMSIG_REAGENTS_HOLDER_UPDATED, PROC_REF(on_reagent_change))
+/obj/item/flashlight/glowstick/grind_results()
+ . = list(/datum/reagent/phenol = 15, /datum/reagent/hydrogen = 10)
+ if(!light_on)
+ .[/datum/reagent/oxygen] = 5
+
/obj/item/flashlight/glowstick/proc/get_fuel()
return reagents.get_reagent_amount(fuel_type)
@@ -925,7 +943,6 @@
/obj/item/flashlight/glowstick/proc/turn_on()
reagents.add_reagent(/datum/reagent/oxygen, oxygen_added)
- grind_results -= /datum/reagent/oxygen
set_light_on(TRUE) // Just in case
var/datum/action/toggle = locate(/datum/action/item_action/toggle_light) in actions
// No sense having a toggle light action that we don't use eh?
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index e724449142329d..626c42d65a44e1 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -295,10 +295,10 @@
for(var/x = x1; x <= x2; x += CHUNK_SIZE)
for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(x, y, epicenter.z)
+ var/datum/camerachunk/chunk = SScameras.generate_chunk(x, y, epicenter.z)
// removing cameras in build mode didnt affect it and i guess it needs an AI eye to update so we have to do this manually
// unless we only want to see static in a jank manner only if an eye updates it
- chunk?.update() // UPDATE THE FUCK NOW
+ chunk?.force_update(only_if_necessary = FALSE) // UPDATE THE FUCK NOW
. |= chunk
/obj/item/multitool/ai_detect/proc/cleanup_static()
diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm
index d75682d72a4cd8..d1bff2e7432872 100644
--- a/code/game/objects/items/devices/pressureplates.dm
+++ b/code/game/objects/items/devices/pressureplates.dm
@@ -9,6 +9,7 @@
icon_state = "pressureplate"
layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.75, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7)
var/trigger_mob = TRUE
var/trigger_item = FALSE
var/specific_item = null
diff --git a/code/game/objects/items/devices/quantum_keycard.dm b/code/game/objects/items/devices/quantum_keycard.dm
index 44cd9fbe6eaed9..abe5d99b55d882 100644
--- a/code/game/objects/items/devices/quantum_keycard.dm
+++ b/code/game/objects/items/devices/quantum_keycard.dm
@@ -22,7 +22,7 @@
/area/station/service = COLOR_SERVICE_LIME,
/area/centcom = COLOR_CENTCOM_BLUE, // how?
/area/station/command = COLOR_COMMAND_BLUE,
- /area/station/ai_monitored = COLOR_COMMAND_BLUE,
+ /area/station/ai = COLOR_COMMAND_BLUE,
/area/station/medical = COLOR_MEDICAL_BLUE,
/area/station/science = COLOR_SCIENCE_PINK,
/area/station/engineering = COLOR_ENGINEERING_ORANGE,
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 9e81f9b9d2b0b9..6206003e3acc21 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -268,12 +268,12 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/heads
command = TRUE
+ icon_state = "com_headset"
+ worn_icon_state = "com_headset"
/obj/item/radio/headset/heads/captain
name = "\proper the captain's headset"
desc = "The headset of the king."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/heads/captain/alt
@@ -289,22 +289,16 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/heads/rd
name = "\proper the research director's headset"
desc = "Headset of the fellow who keeps society marching towards technological singularity."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/rd
/obj/item/radio/headset/heads/hos
name = "\proper the head of security's headset"
desc = "The headset of the man in charge of keeping order and protecting the station."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/heads/hos/advisor
name = "\proper the veteran security advisor headset"
desc = "The headset of the man who was in charge of keeping order and protecting the station..."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/hos
command = FALSE
@@ -321,29 +315,21 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/heads/ce
name = "\proper the chief engineer's headset"
desc = "The headset of the guy in charge of keeping the station powered and undamaged."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/ce
/obj/item/radio/headset/heads/cmo
name = "\proper the chief medical officer's headset"
desc = "The headset of the highly trained medical chief."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/cmo
/obj/item/radio/headset/heads/hop
name = "\proper the head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/heads/qm
name = "\proper the quartermaster's headset"
desc = "The headset of the guy who runs the cargo department."
- icon_state = "com_headset"
- worn_icon_state = "com_headset"
keyslot = /obj/item/encryptionkey/heads/qm
/obj/item/radio/headset/headset_cargo
@@ -469,25 +455,23 @@ GLOBAL_LIST_INIT(channel_tokens, list(
return TRUE
/obj/item/radio/headset/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
- if(istype(W, /obj/item/encryptionkey))
- if(keyslot && keyslot2)
- to_chat(user, span_warning("The headset can't hold another key!"))
- return
-
- if(!keyslot)
- if(!user.transferItemToLoc(W, src))
- return
- keyslot = W
-
- else
- if(!user.transferItemToLoc(W, src))
- return
- keyslot2 = W
+ if(!istype(W, /obj/item/encryptionkey))
+ return ..()
+ if(keyslot && keyslot2)
+ to_chat(user, span_warning("The headset can't hold another key!"))
+ return
- recalculateChannels()
+ if(!keyslot)
+ if(!user.transferItemToLoc(W, src))
+ return
+ keyslot = W
else
- return ..()
+ if(!user.transferItemToLoc(W, src))
+ return
+ keyslot2 = W
+
+ recalculateChannels()
/obj/item/radio/headset/recalculateChannels()
. = ..()
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 1b33ba5b49ac70..796ccbe3b20a1f 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -39,7 +39,7 @@
return
RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(AreaPowerCheck))
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
GLOB.intercoms_list += src
/obj/item/radio/intercom/Destroy()
@@ -197,7 +197,7 @@
icon_state = "intercom"
result_path = /obj/item/radio/intercom/unscrewed
pixel_shift = 26
- custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.75, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.25)
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 27)
@@ -231,8 +231,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 27)
desc = "A custom-made Syndicate-issue intercom used to transmit on all Nanotrasen frequencies. Particularly expensive."
freerange = TRUE
+/obj/item/radio/intercom/mi13
+ name = "intercom"
+ desc = "Talk through this to talk to whoever is in this facility with you."
+ freerange = TRUE
+
MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/prison, 27)
MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/chapel, 27)
MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/command, 27)
MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/syndicate, 27)
MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/syndicate/freerange, 27)
+MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom/mi13, 27)
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index 95e4a8fdeb9d2b..93b80fdb67ff84 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -101,7 +101,7 @@
if(!do_after(user, 3 SECONDS, target = target) || target.get_item_by_slot(ITEM_SLOT_HEAD))
return
target.visible_message(span_warning("[user] forces and locks [src] onto [target]'s head!"), \
- span_userdanger("[target] locks [src] onto your head!"), "
You hear a click, and then a timer ticking down.")
+ span_userdanger("[user] locks [src] onto your head!"), "
You hear a click, and then a timer ticking down.")
to_chat(user, span_danger("You force [src] onto [target]'s head and click the padlock shut."))
user.dropItemToGround(src)
diff --git a/code/game/objects/items/devices/scanners/autopsy_scanner.dm b/code/game/objects/items/devices/scanners/autopsy_scanner.dm
index d407ce6b8e30b5..c541e513a0d899 100644
--- a/code/game/objects/items/devices/scanners/autopsy_scanner.dm
+++ b/code/game/objects/items/devices/scanners/autopsy_scanner.dm
@@ -67,10 +67,10 @@
autopsy_information += "Time of Death -
[scanned.station_timestamp_timeofdeath]"
autopsy_information += "Subject has been dead for
[DisplayTimeText(round(world.time - scanned.timeofdeath))].
"
- var/oxy_loss = scanned.getOxyLoss()
- var/tox_loss = scanned.getToxLoss()
- var/fire_loss = scanned.getFireLoss()
- var/brute_loss = scanned.getBruteLoss()
+ var/oxy_loss = scanned.get_oxy_loss()
+ var/tox_loss = scanned.get_tox_loss()
+ var/fire_loss = scanned.get_fire_loss()
+ var/brute_loss = scanned.get_brute_loss()
/// "Body Data" portion of the autopsy - damage, wounds, and limbs
var/dmgreport = "
Body Data:\
\
@@ -91,7 +91,7 @@
dmgreport += ""
dmgreport += "| ↳ Physical trauma: Dismembered |
"
continue
- var/has_any_embeds = length(limb.embedded_objects) >= 1
+ var/has_any_embeds = LAZYLEN(limb.embedded_objects) >= 1
var/has_any_wounds = length(limb.wounds) >= 1
dmgreport += ""
dmgreport += "| [capitalize(limb.name)]: | "
@@ -187,31 +187,34 @@
// Blood Info
if(HAS_TRAIT(scanned, TRAIT_HUSK))
- autopsy_information += "Blood can't be found, subject is husked by: "
- if(HAS_TRAIT_FROM(scanned, TRAIT_HUSK, BURN))
- autopsy_information += "Severe burns."
- else if (HAS_TRAIT_FROM(scanned, TRAIT_HUSK, CHANGELING_DRAIN))
+ autopsy_information += "Subject is husked by: "
+ if(HAS_TRAIT_FROM(scanned, TRAIT_HUSK, CHANGELING_DRAIN))
autopsy_information += "Desiccation, commonly caused by Changelings."
- else
+ else if(HAS_TRAIT_FROM(scanned, TRAIT_HUSK, SKELETON_TRAIT))
+ autopsy_information += "Stripped flesh."
+ else if(!HAS_TRAIT_FROM(scanned, TRAIT_HUSK, BURN)) // prioritize showing unknown causes over burns
autopsy_information += "Unknown causes."
- else
- var/datum/blood_type/blood_type = scanned.get_bloodtype()
- if(blood_type)
- var/blood_percent = round((scanned.blood_volume / BLOOD_VOLUME_NORMAL) * 100)
- var/blood_type_format
- var/level_format
- if(scanned.blood_volume <= BLOOD_VOLUME_SAFE && scanned.blood_volume > BLOOD_VOLUME_OKAY)
- level_format = "LOW [blood_percent]%, [scanned.blood_volume] cl"
- else if(scanned.blood_volume <= BLOOD_VOLUME_OKAY)
- level_format = "CRITICAL [blood_percent]%, [scanned.blood_volume] cl"
- else
- level_format = "[blood_percent]%, [scanned.blood_volume] cl"
- if(blood_type.get_type())
- blood_type_format = "type: [blood_type.get_type()]"
- autopsy_information += "[blood_type.get_blood_name()] level: [level_format], [blood_type_format]"
- var/blood_alcohol_content = scanned.get_blood_alcohol_content()
- if(blood_alcohol_content > 0)
- autopsy_information += "↳ [blood_type?.get_blood_name() || "Blood"] alcohol content: [blood_alcohol_content]%"
+ else
+ autopsy_information += "Severe burns."
+
+ var/datum/blood_type/blood_type = scanned.get_bloodtype()
+ if(blood_type)
+ var/cached_blood_volume = scanned.get_blood_volume(apply_modifiers = TRUE)
+ var/blood_percent = round((cached_blood_volume / BLOOD_VOLUME_NORMAL) * 100)
+ var/blood_type_format
+ var/level_format
+ if(cached_blood_volume <= BLOOD_VOLUME_SAFE && cached_blood_volume > BLOOD_VOLUME_OKAY)
+ level_format = "LOW [blood_percent]%, [cached_blood_volume] cl"
+ else if(cached_blood_volume <= BLOOD_VOLUME_OKAY)
+ level_format = "CRITICAL [blood_percent]%, [cached_blood_volume] cl"
+ else
+ level_format = "[blood_percent]%, [cached_blood_volume] cl"
+ if(blood_type.get_type())
+ blood_type_format = "type: [blood_type.get_type()]"
+ autopsy_information += "[blood_type.get_blood_name()] level: [level_format], [blood_type_format]"
+ var/blood_alcohol_content = scanned.get_blood_alcohol_content()
+ if(blood_alcohol_content > 0)
+ autopsy_information += "↳ [blood_type?.get_blood_name() || "Blood"] alcohol content: [blood_alcohol_content]%"
autopsy_information += "
"
autopsy_information += "Chemical Data:"
diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm
index 605d106c1f9aa3..a04788ac5327d4 100644
--- a/code/game/objects/items/devices/scanners/gas_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm
@@ -16,7 +16,6 @@
throw_range = 7
tool_behaviour = TOOL_ANALYZER
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 0.2)
- grind_results = list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
interaction_flags_click = NEED_LITERACY|NEED_LIGHT|ALLOW_RESTING
pickup_sound = 'sound/items/handling/gas_analyzer/gas_analyzer_pickup.ogg'
drop_sound = 'sound/items/handling/gas_analyzer/gas_analyzer_drop.ogg'
@@ -44,6 +43,9 @@
slapcraft_recipes = slapcraft_recipe_list,\
)
+/obj/item/analyzer/grind_results()
+ return list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
+
/obj/item/analyzer/equipped(mob/user, slot, initial)
. = ..()
ADD_TRAIT(user, TRAIT_DETECT_STORM, CLOTHING_TRAIT)
@@ -234,5 +236,7 @@
worn_icon_state = "analyzer"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.2, /datum/material/gold = SMALL_MATERIAL_AMOUNT*3, /datum/material/bluespace=SMALL_MATERIAL_AMOUNT*2)
- grind_results = list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
ranged_scan_distance = 15
+
+/obj/item/analyzer/ranged/grind_results()
+ return list(/datum/reagent/mercury = 5, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm
index 9050174585c4ed..bfedb580407e59 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -156,10 +156,10 @@
var/list/render_list = list()
// Damage specifics
- var/oxy_loss = target.getOxyLoss()
- var/tox_loss = target.getToxLoss()
- var/fire_loss = target.getFireLoss()
- var/brute_loss = target.getBruteLoss()
+ var/oxy_loss = target.get_oxy_loss()
+ var/tox_loss = target.get_tox_loss()
+ var/fire_loss = target.get_fire_loss()
+ var/brute_loss = target.get_brute_loss()
var/mob_status = (!target.appears_alive() ? span_alert("Deceased") : "[round(target.health / target.maxHealth, 0.01) * 100]% healthy")
if(HAS_TRAIT(target, TRAIT_FAKEDEATH) && target.stat != DEAD)
@@ -178,19 +178,21 @@
// Husk detection
if(HAS_TRAIT(target, TRAIT_HUSK))
if(advanced)
- if(HAS_TRAIT_FROM(target, TRAIT_HUSK, BURN))
- render_list += "Subject has been husked by [conditional_tooltip("severe burns", "Tend burns and apply a de-husking agent, such as [/datum/reagent/medicine/c2/synthflesh::name].", tochat)].
"
- else if (HAS_TRAIT_FROM(target, TRAIT_HUSK, CHANGELING_DRAIN))
+ if(HAS_TRAIT_FROM(target, TRAIT_HUSK, CHANGELING_DRAIN))
render_list += "Subject has been husked by [conditional_tooltip("desiccation", "Irreparable. Under normal circumstances, revival can only proceed via brain transplant.", tochat)].
"
- else
+ else if(HAS_TRAIT_FROM(target, TRAIT_HUSK, SKELETON_TRAIT))
+ render_list += "Subject has been husked due to severe flesh loss.
"
+ else if(!HAS_TRAIT_FROM(target, TRAIT_HUSK, BURN)) // prioritize showing unknown causes over burns
render_list += "Subject has been husked by mysterious causes.
"
+ else
+ render_list += "Subject has been husked by [conditional_tooltip("severe burns", "Tend burns and apply a de-husking agent, such as [/datum/reagent/medicine/c2/synthflesh::name].", tochat)].
"
else
render_list += "Subject has been husked.
"
- if(target.getStaminaLoss())
+ if(target.get_stamina_loss())
if(advanced)
- render_list += "Fatigue level: [target.getStaminaLoss()]%.
"
+ render_list += "Fatigue level: [target.get_stamina_loss()]%.
"
else
render_list += "Subject appears to be suffering from fatigue.
"
@@ -263,7 +265,7 @@
dmgreport += "
"
dmgreport += "| ↳ Physical trauma: [conditional_tooltip("Dismembered", "Reattach or replace surgically.", tochat)] |
"
continue
- var/has_any_embeds = length(limb.embedded_objects) >= 1
+ var/has_any_embeds = LAZYLEN(limb.embedded_objects) >= 1
var/has_any_wounds = length(limb.wounds) >= 1
var/is_damaged = limb.burn_dam > 0 || limb.brute_dam > 0
if(!is_damaged && (zone != BODY_ZONE_CHEST || (tox_loss <= 0 && oxy_loss <= 0)) && !has_any_embeds && !has_any_wounds)
@@ -382,15 +384,16 @@
// Blood Level
var/datum/blood_type/blood_type = target.get_bloodtype()
if(blood_type)
- var/blood_percent = round((target.blood_volume / BLOOD_VOLUME_NORMAL) * 100)
+ var/cached_blood_volume = target.get_blood_volume(apply_modifiers = TRUE)
+ var/blood_percent = round((cached_blood_volume / BLOOD_VOLUME_NORMAL) * 100)
var/blood_type_format
var/level_format
- if(target.blood_volume <= BLOOD_VOLUME_SAFE && target.blood_volume > BLOOD_VOLUME_OKAY)
- level_format = "LOW [blood_percent]%, [target.blood_volume] cl"
+ if(cached_blood_volume <= BLOOD_VOLUME_SAFE && cached_blood_volume > BLOOD_VOLUME_OKAY)
+ level_format = "LOW [blood_percent]%, [cached_blood_volume] cl"
if (blood_type.restoration_chem)
level_format = conditional_tooltip(level_format, "Recommendation: [blood_type.restoration_chem::name] supplement.", tochat)
- else if(target.blood_volume <= BLOOD_VOLUME_OKAY)
- level_format = "CRITICAL [blood_percent]%, [target.blood_volume] cl"
+ else if(cached_blood_volume <= BLOOD_VOLUME_OKAY)
+ level_format = "CRITICAL [blood_percent]%, [cached_blood_volume] cl"
var/recommendation = list()
if (blood_type.restoration_chem)
recommendation += "[blood_type.restoration_chem::name] supplement"
@@ -402,7 +405,7 @@
recommendation += "immediate [blood_type.get_blood_name()] transufion"
level_format = conditional_tooltip(level_format, "Recommendation: [english_list(recommendation, and_text = " or ")].", tochat)
else
- level_format = "[blood_percent]%, [target.blood_volume] cl"
+ level_format = "[blood_percent]%, [cached_blood_volume] cl"
if (blood_type.get_type())
blood_type_format = "type: [blood_type.get_type()]"
@@ -412,7 +415,7 @@
compatible_types_readable |= initial(comp_blood_type.name)
blood_type_format = span_tooltip("Can receive from types [english_list(compatible_types_readable)].", blood_type_format)
- render_list += "[blood_type.get_blood_name()] level: [level_format], [blood_type_format]
"
+ render_list += "[blood_type.get_blood_name()] level: [level_format], [blood_type_format]
"
var/blood_alcohol_content = target.get_blood_alcohol_content()
if(blood_alcohol_content > 0)
@@ -705,7 +708,7 @@
show_emotion(AID_EMOTION_HAPPY)
/obj/item/healthanalyzer/simple/proc/violence_damage(mob/living/user)
- user.adjustBruteLoss(4)
+ user.adjust_brute_loss(4)
/obj/item/healthanalyzer/simple/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!isliving(interacting_with))
@@ -773,7 +776,7 @@
scan_for_what = "diseases"
/obj/item/healthanalyzer/simple/disease/violence_damage(mob/living/user)
- user.adjustBruteLoss(1)
+ user.adjust_brute_loss(1)
user.reagents.add_reagent(/datum/reagent/toxin, rand(1, 3))
/obj/item/healthanalyzer/simple/disease/do_the_scan(mob/living/carbon/scanning, mob/living/user)
diff --git a/code/game/objects/items/devices/scanners/plant_analyzer.dm b/code/game/objects/items/devices/scanners/plant_analyzer.dm
index e653d09dcb8b1f..4adfec936299a9 100644
--- a/code/game/objects/items/devices/scanners/plant_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/plant_analyzer.dm
@@ -326,11 +326,11 @@
product_grinder_results[seed.product] = list()
var/obj/item/food/grown/product = new seed.product
var/datum/reagent/product_distill_reagent = product.distill_reagent
- var/datum/reagent/product_juice_typepath = product.juice_typepath
+ var/datum/reagent/product_juice_typepath = product.juice_typepath()
product_grinder_results[seed.product]["distill_reagent"] = initial(product_distill_reagent.name)
product_grinder_results[seed.product]["juice_name"] = initial(product_juice_typepath.name)
product_grinder_results[seed.product]["grind_results"] = list()
- for(var/datum/reagent/reagent as anything in product.grind_results)
+ for(var/datum/reagent/reagent as anything in product.grind_results())
product_grinder_results[seed.product]["grind_results"] += initial(reagent.name)
qdel(product)
seed_data["distill_reagent"] = product_grinder_results[seed.product]["distill_reagent"]
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index 97320669be87ce..9eb9ee94255cf4 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -17,3 +17,7 @@
/obj/item/sensor_device/attack_self(mob/user)
GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it
+
+/obj/item/sensor_device/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/drag_to_activate)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index f5b569b553244c..b4c9c628c05a4e 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -404,6 +404,7 @@ effective or pretty fucking useless.
desc = "A jury-rigged device that disrupts nearby radio communication. Its crude construction provides a significantly smaller area of effect compared to its Syndicate counterpart."
range = 5
disruptor_range = 3
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
/obj/item/jammer/makeshift/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm
index fe0fe2e2913b13..416abb3064e9ef 100644
--- a/code/game/objects/items/dice.dm
+++ b/code/game/objects/items/dice.dm
@@ -369,7 +369,7 @@
//Throw
selected_turf.visible_message(span_userdanger("Unseen forces throw [user]!"))
user.Stun(60)
- user.adjustBruteLoss(50)
+ user.adjust_brute_loss(50)
var/throw_dir = pick(GLOB.cardinals)
var/atom/throw_target = get_edge_target_turf(user, throw_dir)
user.throw_at(throw_target, 200, 4)
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index 09cc0a9b2ccb60..baf4bb85e62617 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -120,6 +120,7 @@
addtimer(CALLBACK(target.dna, TYPE_PROC_REF(/datum/dna, remove_mutation), mutation, MUTATION_SOURCE_TIMED_INJECTOR), duration)
if(fields)
if(fields["name"] && fields["UE"] && fields["blood_type"])
+ LAZYINITLIST(target.dna.previous)
if(!target.dna.previous["name"])
target.dna.previous["name"] = target.real_name
if(!target.dna.previous["UE"])
@@ -130,17 +131,19 @@
target.dna.unique_enzymes = fields["UE"]
target.name = target.real_name
target.set_blood_type(fields["blood_type"])
- target.dna.temporary_mutations[UE_CHANGED] = endtime
+ LAZYSET(target.dna.temporary_mutations, UE_CHANGED, endtime)
if(fields["UI"]) //UI+UE
+ LAZYINITLIST(target.dna.previous)
if(!target.dna.previous["UI"])
target.dna.previous["UI"] = target.dna.unique_identity
target.dna.unique_identity = merge_text(target.dna.unique_identity, fields["UI"])
- target.dna.temporary_mutations[UI_CHANGED] = endtime
+ LAZYSET(target.dna.temporary_mutations, UI_CHANGED, endtime)
if(fields["UF"]) //UI+UE
+ LAZYINITLIST(target.dna.previous)
if(!target.dna.previous["UF"])
target.dna.previous["UF"] = target.dna.unique_features
target.dna.unique_features = merge_text(target.dna.unique_features, fields["UF"])
- target.dna.temporary_mutations[UF_CHANGED] = endtime
+ LAZYSET(target.dna.temporary_mutations, UF_CHANGED, endtime)
if(fields["UI"] || fields["UF"])
target.updateappearance(mutcolor_update = TRUE, mutations_overlay_update = TRUE)
return TRUE
diff --git a/code/game/objects/items/dna_probe.dm b/code/game/objects/items/dna_probe.dm
index 9e3be2dce40c41..1f7307a8d75b67 100644
--- a/code/game/objects/items/dna_probe.dm
+++ b/code/game/objects/items/dna_probe.dm
@@ -54,6 +54,9 @@
/obj/item/dna_probe/proc/try_upload_dna(obj/machinery/dna_vault/target, mob/user)
var/uploaded = 0
+ stored_dna_plants -= target.plant_dna
+ stored_dna_human -= target.human_dna
+ stored_dna_animal -= target.animal_dna
var/plant_dna_length = length(stored_dna_plants)
var/human_dna_length = length(stored_dna_human)
var/animal_dna_length = length(stored_dna_animal)
diff --git a/code/game/objects/items/drug_items.dm b/code/game/objects/items/drug_items.dm
index bea5cec30fa2c6..1fd6a788894e69 100644
--- a/code/game/objects/items/drug_items.dm
+++ b/code/game/objects/items/drug_items.dm
@@ -74,7 +74,6 @@
transfer_fingerprints_to(ampoule_shard)
splash_reagents(hit_atom, throwingdatum?.get_thrower(), was_thrown = TRUE, allow_closed_splash = FALSE)
qdel(src)
- hit_atom.Bumped(ampoule_shard)
/obj/item/reagent_containers/cup/blastoff_ampoule/Initialize(mapload, vol)
. = ..()
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index f6edc5da9018bd..3f2aea409c75e7 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -151,7 +151,7 @@
if(HAS_TRAIT(src, TRAIT_WIELDED))
user.take_bodypart_damage(20,25,check_armor = TRUE)
else
- user.adjustStaminaLoss(25)
+ user.adjust_stamina_loss(25)
/obj/item/dualsaber/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(!HAS_TRAIT(src, TRAIT_WIELDED))
diff --git a/code/game/objects/items/dyespray.dm b/code/game/objects/items/dyespray.dm
index ceb292a20adcf9..a62a17f4352018 100644
--- a/code/game/objects/items/dyespray.dm
+++ b/code/game/objects/items/dyespray.dm
@@ -57,7 +57,7 @@
if(!user.can_perform_action(src, NEED_DEXTERITY))
return
- var/new_grad_color = input(user, "Choose a secondary hair color:", "Character Preference",human_target.grad_color) as color|null
+ var/new_grad_color = tgui_color_picker(user, "Choose a secondary hair color:", "Character Preference", human_target.get_hair_gradient_color())
if(!new_grad_color || !user.can_perform_action(src, NEED_DEXTERITY) || !target.IsReachableBy(user))
return
@@ -105,7 +105,7 @@
return
var/default_color = overlay.dye_color || overlay.draw_color
- var/new_color = input(user, "Choose a color for [selected]:", "Character Preference", default_color) as color|null
+ var/new_color = tgui_color_picker(user, "Choose a color for [selected]:", "Character Preference", default_color)
if(isnull(new_color) || new_color == default_color || !user.can_perform_action(src, NEED_DEXTERITY))
return
if(QDELETED(selected) || !(selected in target.organs))
diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm
index 219e1a3e144d82..9bce1d09fdd030 100644
--- a/code/game/objects/items/emags.dm
+++ b/code/game/objects/items/emags.dm
@@ -31,8 +31,7 @@
var/emag_count = 0
for(var/obj/item/card/emag/emag in get_all_contents() + emag_card.get_all_contents()) // This is including itself
emag_count++
- if(emag_count > 6) // 1 uplink's worth is the limit
- to_chat(user, span_warning("Nope, lesson learned. No more."))
+ if(emag_count >= 128) // prevent overlay sprite overload allowed on a single item, incase someone manages to (somehow) emag an emag 128 times
return FALSE
if(emag_card.loc != loc) // Both have to be in your hand (or TK shenanigans)
return FALSE
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index 4102728d4f0b9e..9f58808a752391 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -162,7 +162,7 @@
throwforce = 1
w_class = WEIGHT_CLASS_SMALL
force = 3
- custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4)
+ custom_materials = null
max_water = 30
sprite_name = "coolant"
dog_fashion = null
@@ -369,15 +369,19 @@
reagents.clear_reagents()
user.visible_message(span_notice("[user] empties out [src] onto the floor using the release valve."), span_info("You quietly empty out [src] using its release valve."))
-//firebot assembly
-/obj/item/extinguisher/attackby(obj/O, mob/user, list/modifiers, list/attack_modifiers)
- if(istype(O, /obj/item/bodypart/arm/left/robot) || istype(O, /obj/item/bodypart/arm/right/robot))
- to_chat(user, span_notice("You add [O] to [src]."))
- qdel(O)
- qdel(src)
- user.put_in_hands(new /obj/item/bot_assembly/firebot)
- else
- ..()
+// Firebot assembly
+/obj/item/extinguisher/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if (!istype(tool, /obj/item/bodypart/arm/left/robot) && !istype(tool, /obj/item/bodypart/arm/right/robot))
+ return NONE
+
+ to_chat(user, span_notice("You add [tool] to [src]."))
+ qdel(tool)
+ var/obj/item/bot_assembly/firebot/assembly = new(drop_location())
+ var/held_index = user.is_holding(src)
+ qdel(src)
+ if (held_index)
+ user.put_in_hand(assembly, held_index)
+ return ITEM_INTERACT_SUCCESS
/obj/item/extinguisher/anti
name = "fire extender"
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
index ed88848ea6d44c..23cd24c375c530 100644
--- a/code/game/objects/items/fireaxe.dm
+++ b/code/game/objects/items/fireaxe.dm
@@ -69,6 +69,8 @@ GLOBAL_DATUM(bridge_axe, /obj/item/fireaxe)
return
if(target.resistance_flags & INDESTRUCTIBLE)
return
+ if(QDELETED(target))
+ return
if(istype(target, /obj/structure/window) || istype(target, /obj/structure/grille))
target.atom_destruction("fireaxe")
@@ -83,6 +85,7 @@ GLOBAL_DATUM(bridge_axe, /obj/item/fireaxe)
icon_angle = 180
force_unwielded = 5
force_wielded = 23
+ custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 6)
/*
* Metal Hydrogen Axe
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index e406dbb6f5c59e..29a410dcb10313 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -12,7 +12,7 @@
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_NORMAL
- custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT * 0.5)
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.05, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.8)
resistance_flags = FIRE_PROOF
trigger_guard = TRIGGER_GUARD_NORMAL
light_system = OVERLAY_LIGHT
diff --git a/code/game/objects/items/flatpacks.dm b/code/game/objects/items/flatpacks.dm
index 8894b05f7b80ed..b2a49a51787594 100644
--- a/code/game/objects/items/flatpacks.dm
+++ b/code/game/objects/items/flatpacks.dm
@@ -103,6 +103,7 @@
icon_state = "flatcart"
density = TRUE
opacity = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8, /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT)
/obj/structure/flatpack_cart/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm
index 604b6c3c5abec8..7475a8c18ba6fc 100644
--- a/code/game/objects/items/food/_food.dm
+++ b/code/game/objects/items/food/_food.dm
@@ -10,7 +10,6 @@
righthand_file = 'icons/mob/inhands/items/food_righthand.dmi'
abstract_type = /obj/item/food
obj_flags = UNIQUE_RENAME
- grind_results = list()
material_flags = MATERIAL_NO_EDIBILITY
/**
* A list of material paths. the main material in the custom_materials list is also added on init.
diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm
index 5bcf079c24fcc5..05811a6dd9fa0a 100644
--- a/code/game/objects/items/food/burgers.dm
+++ b/code/game/objects/items/food/burgers.dm
@@ -684,7 +684,12 @@
tastes = list("bun" = 2, "beef patty" = 4, "cheese" = 2, "beef soaked in chili" = 3, "a smoking flare" = 2)
foodtypes = GRAIN | MEAT | DAIRY | VEGETABLES
crafting_complexity = FOOD_COMPLEXITY_4
- custom_materials = list(/datum/material/meat = MEATDISH_MATERIAL_AMOUNT * 2, /datum/material/plastic= SMALL_MATERIAL_AMOUNT * 0.5)
+ custom_materials = list(
+ /datum/material/meat = MEATDISH_MATERIAL_AMOUNT * 2,
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5,
+ /datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.5,
+ /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.5,
+ )
/obj/item/food/burger/crazy/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/food/cheese.dm b/code/game/objects/items/food/cheese.dm
index ee608c7e408a6a..78d590fa10a425 100644
--- a/code/game/objects/items/food/cheese.dm
+++ b/code/game/objects/items/food/cheese.dm
@@ -87,6 +87,7 @@
tastes = list("cheese" = 4, "royalty" = 1)
rat_heal = 70
crafting_complexity = FOOD_COMPLEXITY_3
+ custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT * 5)
//Curd cheese, a general term which I will now proceed to stretch as thin as the toppings on a supermarket sandwich:
//I'll use it as a substitute for ricotta, cottage cheese and quark, as well as any other non-aged, soft grainy cheese
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index 01c4c4b8f7a537..55fa78c3295550 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -211,6 +211,10 @@
foodtypes = RAW | MEAT | BUGS
blood_decal_type = /obj/effect/decal/cleanable/insectguts
+/obj/item/food/meat/slab/bugmeat/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/raptor_food, health_modifier = 2, color_chances = string_list(list(/datum/raptor_color/green = 2)))
+
/obj/item/food/meat/slab/mouse
name = "mouse meat"
desc = "A slab of mouse meat. Best not eat it raw."
@@ -337,6 +341,10 @@
tastes = list("meat" = 1)
foodtypes = RAW | MEAT | TOXIC
+/obj/item/food/meat/slab/goliath/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/raptor_food, attack_modifier = 0.5, speed_modifier = -0.05, color_chances = string_list(list(/datum/raptor_color/red = 5)))
+
/obj/item/food/meat/slab/goliath/burn()
visible_message(span_notice("[src] finishes cooking!"))
new /obj/item/food/meat/steak/goliath(loc)
@@ -569,6 +577,10 @@
trash_type = null
tastes = list("meat" = 1, "rock" = 1)
+/obj/item/food/meat/steak/goliath/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/raptor_food, attack_modifier = 1, speed_modifier = -0.075, color_chances = string_list(list(/datum/raptor_color/red = 7)))
+
/obj/item/food/meat/steak/gondola
name = "gondola steak"
tastes = list("meat" = 1, "tranquility" = 1)
diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm
index a0e619a1ec655b..afb2f506685c54 100644
--- a/code/game/objects/items/food/misc.dm
+++ b/code/game/objects/items/food/misc.dm
@@ -13,9 +13,11 @@
tastes = list("watermelon" = 1)
foodtypes = FRUIT
food_flags = FOOD_FINGER_FOOD
- juice_typepath = /datum/reagent/consumable/watermelonjuice
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/watermelonslice/juice_typepath()
+ return /datum/reagent/consumable/watermelonjuice
+
/obj/item/food/watermelonmush
name = "watermelon mush"
desc = "A plop of watery goodness."
@@ -29,9 +31,11 @@
tastes = list("watermelon" = 1)
foodtypes = FRUIT
food_flags = FOOD_FINGER_FOOD
- juice_typepath = /datum/reagent/consumable/watermelonjuice
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/watermelonmush/juice_typepath()
+ return /datum/reagent/consumable/watermelonjuice
+
/obj/item/food/holymelonslice
name = "holymelon slice"
desc = "A slice of holy goodness."
@@ -45,9 +49,11 @@
tastes = list("holymelon" = 1)
foodtypes = FRUIT
food_flags = FOOD_FINGER_FOOD
- juice_typepath = /datum/reagent/water/holywater
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/holymelonslice/juice_typepath()
+ return /datum/reagent/water/holywater
+
/obj/item/food/holymelonmush
name = "holymelon mush"
desc = "A plop of holy goodness."
@@ -61,9 +67,11 @@
tastes = list("holymelon" = 1)
foodtypes = FRUIT
food_flags = FOOD_FINGER_FOOD
- juice_typepath = /datum/reagent/water/holywater
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/holymelonmush/juice_typepath()
+ return /datum/reagent/water/holywater
+
/obj/item/food/barrelmelonslice
name = "barrelmelon slice"
desc = "A slice of beery goodness."
@@ -77,9 +85,11 @@
tastes = list("beer" = 1)
foodtypes = FRUIT
food_flags = FOOD_FINGER_FOOD
- juice_typepath = /datum/reagent/consumable/ethanol/beer
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/barrelmelonslice/juice_typepath()
+ return /datum/reagent/consumable/ethanol/beer
+
/obj/item/food/barrelmelonmush
name = "barrelmelon mush"
desc = "A plop of beery goodness."
@@ -93,9 +103,10 @@
tastes = list("beer" = 1)
foodtypes = FRUIT
food_flags = FOOD_FINGER_FOOD
- juice_typepath = /datum/reagent/consumable/ethanol/beer
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/barrelmelonmush/juice_typepath()
+ return /datum/reagent/consumable/ethanol/beer
/obj/item/food/appleslice
name = "apple slice"
@@ -110,9 +121,11 @@
tastes = list("apple" = 1)
foodtypes = FRUIT
food_flags = FOOD_FINGER_FOOD
- juice_typepath = /datum/reagent/consumable/applejuice
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/appleslice/juice_typepath()
+ return /datum/reagent/consumable/applejuice
+
/obj/item/food/hugemushroomslice
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
@@ -431,11 +444,13 @@
name = "pineapple slice"
desc = "A sliced piece of juicy pineapple."
icon_state = "pineapple_slice"
- juice_typepath = /datum/reagent/consumable/pineapplejuice
tastes = list("pineapple" = 1)
foodtypes = FRUIT | PINEAPPLE
w_class = WEIGHT_CLASS_TINY
+/obj/item/food/pineappleslice/juice_typepath()
+ return /datum/reagent/consumable/pineapplejuice
+
/obj/item/food/crab_rangoon
name = "crab rangoon"
desc = "Has many names, like crab puffs, cheese won'tons, crab dumplings? Whatever you call them, they're a fabulous blast of cream cheesy crab."
@@ -619,10 +634,12 @@
/datum/reagent/medicine/antihol = 2,
)
tastes = list("pickle" = 1, "spices" = 1, "salt water" = 2)
- juice_typepath = /datum/reagent/consumable/pickle
foodtypes = VEGETABLES
w_class = WEIGHT_CLASS_SMALL
+/obj/item/food/pickle/juice_typepath()
+ return /datum/reagent/consumable/pickle
+
/obj/item/food/pickle/make_edible()
. = ..()
AddComponentFrom(SOURCE_EDIBLE_INNATE, /datum/component/edible, check_liked = CALLBACK(src, PROC_REF(check_liked)))
@@ -849,8 +866,7 @@
/obj/item/food/ink_sac/proc/blind_em(mob/living/victim, can_splat_on)
if(can_splat_on)
- victim.adjust_temp_blindness_up_to(7 SECONDS, 10 SECONDS)
- victim.adjust_confusion_up_to(3.5 SECONDS, 6 SECONDS)
- victim.Paralyze(2 SECONDS) //splat!
+ victim.adjust_temp_blindness_up_to(2.5 SECONDS, 3 SECONDS)
+ victim.adjust_confusion_up_to(2.5 SECONDS, 3 SECONDS)
victim.visible_message(span_warning("[victim] is inked by [src]!"), span_userdanger("You've been inked by [src]!"))
playsound(victim, SFX_DESECRATION, 50, TRUE)
diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm
index 5b5f45a8d28a52..1458c3c101dd42 100644
--- a/code/game/objects/items/food/packaged.dm
+++ b/code/game/objects/items/food/packaged.dm
@@ -166,13 +166,11 @@
splat_color = COLOR_NEARLY_ALL_BLACK, \
hit_callback = CALLBACK(src, PROC_REF(blind_em)), \
)
- ADD_TRAIT(src, TRAIT_UNCATCHABLE, INNATE_TRAIT) //good luck catching the liquid
/obj/item/food/canned/squid_ink/proc/blind_em(mob/living/victim, can_splat_on)
if(can_splat_on)
- victim.adjust_temp_blindness_up_to(7 SECONDS, 10 SECONDS)
- victim.adjust_confusion_up_to(3.5 SECONDS, 6 SECONDS)
- victim.Paralyze(2 SECONDS) //splat!
+ victim.adjust_temp_blindness_up_to(2.5 SECONDS, 3 SECONDS)
+ victim.adjust_confusion_up_to(2.5 SECONDS, 3 SECONDS)
victim.visible_message(span_warning("[victim] is inked by [src]!"), span_userdanger("You've been inked by [src]!"))
playsound(victim, SFX_DESECRATION, 50, TRUE)
diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm
index 7fef3fb8657c54..ab8267e7ea4a15 100644
--- a/code/game/objects/items/food/pizza.dm
+++ b/code/game/objects/items/food/pizza.dm
@@ -73,7 +73,7 @@
. = ..()
if(!sliced)
return
- user.visible_message(span_notice("You take a slice of [src]."), span_notice("[user] takes a slice of [src]."))
+ user.visible_message(span_notice("[user] takes a slice of [src]."), span_notice("You take a slice of [src]."))
produce_slice(user)
/obj/item/food/pizza/proc/get_slices_filter() //to not repeat code
diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm
index 62d766839a9c7a..6e92d4013782af 100644
--- a/code/game/objects/items/food/sandwichtoast.dm
+++ b/code/game/objects/items/food/sandwichtoast.dm
@@ -30,9 +30,9 @@
custom_materials = null
/obj/item/food/sandwich/cheese/make_grillable()
- AddComponent(/datum/component/grillable, /obj/item/food/sandwich/cheese/grilled, rand(30 SECONDS, 60 SECONDS), TRUE)
+ AddComponent(/datum/component/grillable, /obj/item/food/sandwich/grilled_cheese, rand(30 SECONDS, 60 SECONDS), TRUE)
-/obj/item/food/sandwich/cheese/grilled
+/obj/item/food/sandwich/grilled_cheese
name = "grilled cheese sandwich"
desc = "A warm, melty sandwich that goes perfectly with tomato soup."
icon_state = "toastedsandwich"
@@ -43,8 +43,10 @@
/datum/reagent/carbon = 4,
)
tastes = list("toast" = 2, "cheese" = 3, "butter" = 1)
+ foodtypes = GRAIN | DAIRY
venue_value = FOOD_PRICE_NORMAL
crafting_complexity = FOOD_COMPLEXITY_3
+ custom_materials = null
/obj/item/food/sandwich/jelly
name = "jelly sandwich"
@@ -268,6 +270,7 @@
tastes = list("bread" = 1, "meat" = 1, "tomato sauce" = 1, "death" = 1)
foodtypes = MEAT|VEGETABLES|GRAIN
eat_time = 4 SECONDS // Makes it harder to force-feed this to people as a weapon, as funny as that is.
+ custom_materials = list(/datum/material/meat = MEATSLAB_MATERIAL_AMOUNT * 2)
var/static/list/correct_clothing = list(/obj/item/clothing/under/rank/civilian/cookjorts, /obj/item/clothing/under/shorts/jeanshorts)
/obj/item/food/sandwich/death/Initialize(mapload)
diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm
index 9da40b24807b27..7caf726e8123c6 100644
--- a/code/game/objects/items/food/snacks.dm
+++ b/code/game/objects/items/food/snacks.dm
@@ -230,9 +230,11 @@
custom_price = PAYCHECK_CREW * 0.8 //nuts are expensive in real life, and this is the best food in the vendor.
junkiness = 10 //less junky than other options, since peanuts are a decently healthy snack option
w_class = WEIGHT_CLASS_SMALL
- grind_results = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/fat/oil = 2)
var/safe_for_consumption = TRUE
+/obj/item/food/peanuts/grind_results()
+ return list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/fat/oil = 2)
+
/obj/item/food/peanuts/salted
name = "\improper Gallery's salt reserves peanuts"
desc = "Tastes salty."
@@ -397,7 +399,9 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types())
custom_price = PAYCHECK_CREW//pistachios are even more expensive.
junkiness = 10 //on par with peanuts
w_class = WEIGHT_CLASS_SMALL
- grind_results = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/fat/oil = 2)
+
+/obj/item/food/pistachios/grind_results()
+ return list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/fat/oil = 2)
/obj/item/food/semki
name = "\improper Semki Sunflower Seeds"
@@ -538,7 +542,9 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types())
foodtypes = JUNKFOOD | SUGAR | NUTS
junkiness = 25
w_class = WEIGHT_CLASS_SMALL
- grind_results = list(/datum/reagent/consumable/nutriment/fat/oil = 3, /datum/reagent/consumable/caramel = 2)
+
+/obj/item/food/hot_shots/grind_results()
+ return list(/datum/reagent/consumable/nutriment/fat/oil = 3, /datum/reagent/consumable/caramel = 2)
/obj/item/food/sticko
name = "\improper Sticko Classic"
diff --git a/code/game/objects/items/frog_statue.dm b/code/game/objects/items/frog_statue.dm
index d1f65dc4b2ad53..8c95ef4951bc19 100644
--- a/code/game/objects/items/frog_statue.dm
+++ b/code/game/objects/items/frog_statue.dm
@@ -96,7 +96,7 @@
return
if(contained_frog.stat == DEAD)
contained_frog.revive()
- contained_frog.adjustBruteLoss(-5)
+ contained_frog.adjust_brute_loss(-5)
/obj/item/frog_statue/proc/animate_filter(mob/living/frog)
add_filter(STATUE_FILTER, 2, list("type" = "outline", "color" = FILTER_COLOR, "size" = 1))
@@ -146,7 +146,7 @@
new_frog.name = frog_name
/obj/item/frog_contract/proc/select_frog_color(mob/user, mob/living/basic/leaper/new_frog)
- var/frog_color = input(user, "Select your frog's color!" , "Pet toad color", COLOR_GREEN) as color|null
+ var/frog_color = tgui_color_picker(user, "Select your frog's color!" , "Pet toad color", COLOR_GREEN)
if(isnull(frog_color))
to_chat(user, span_warning("Please choose a valid color."))
select_frog_color(user, new_frog)
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
index 1843431f3d2ae7..03fefc39ee181b 100644
--- a/code/game/objects/items/gift.dm
+++ b/code/game/objects/items/gift.dm
@@ -106,6 +106,8 @@
/obj/item/gift/anything
name = "christmas gift"
desc = "It could be anything!"
+ /// Weak reference to who this gift is for and who can open it, if that's nobody then anyone can
+ var/datum/weakref/recipient_ref = null
/obj/item/gift/anything/get_gift_type()
var/static/list/obj/item/possible_gifts = null
@@ -115,3 +117,25 @@
var/gift_type = pick(possible_gifts)
return gift_type
+
+/obj/item/gift/anything/attack_self(mob/user)
+ if (isnull(recipient_ref))
+ return ..()
+
+ var/datum/mind/recipient = recipient_ref.resolve()
+ if(recipient && recipient != user?.mind)
+ to_chat(user, span_notice("This gift isn't for you, and you don't want to get on Santa's bad side!"))
+ return FALSE
+ return ..()
+
+/// Assign the mind of someone as the person this gift is for
+/obj/item/gift/anything/proc/assign_recipient(datum/mind/recipient)
+ if (ismob(recipient)) // You're presumably at this point because you are an admin who fucked up but I will save you
+ var/mob/recipient_mob = recipient
+ recipient = recipient_mob.mind
+
+ if (isnull(recipient))
+ return
+
+ name = "[initial(name)] for [recipient.name] ([recipient.assigned_role.title])"
+ recipient_ref = WEAKREF(recipient)
diff --git a/code/game/objects/items/granters/magic/charge.dm b/code/game/objects/items/granters/magic/charge.dm
index 988d17aa13ba37..0210227d3b0b43 100644
--- a/code/game/objects/items/granters/magic/charge.dm
+++ b/code/game/objects/items/granters/magic/charge.dm
@@ -17,4 +17,5 @@
/obj/item/book/granter/action/spell/charge/recoil(mob/living/user)
. = ..()
to_chat(user,span_warning("[src] suddenly feels very warm!"))
- empulse(src, 1, 1)
+ empulse(src, 1, 1, emp_source = src)
+
diff --git a/code/game/objects/items/granters/martial_arts/cqc.dm b/code/game/objects/items/granters/martial_arts/cqc.dm
index 4fff32623c8643..4fb39673e9c853 100644
--- a/code/game/objects/items/granters/martial_arts/cqc.dm
+++ b/code/game/objects/items/granters/martial_arts/cqc.dm
@@ -24,6 +24,6 @@
to_chat(user, span_warning("[src] explodes!"))
playsound(src,'sound/effects/explosion/explosion1.ogg',40,TRUE)
user.flash_act(1, 1)
- user.adjustBruteLoss(6)
- user.adjustFireLoss(6)
+ user.adjust_brute_loss(6)
+ user.adjust_fire_loss(6)
qdel(src)
diff --git a/code/game/objects/items/granters/martial_arts/sleeping_carp.dm b/code/game/objects/items/granters/martial_arts/sleeping_carp.dm
index 88123439725f06..17db0d9ba147ca 100644
--- a/code/game/objects/items/granters/martial_arts/sleeping_carp.dm
+++ b/code/game/objects/items/granters/martial_arts/sleeping_carp.dm
@@ -4,8 +4,9 @@
martial_name = "sleeping carp"
desc = "A scroll filled with strange markings. It seems to be drawings of some sort of martial art."
greet = span_sciradio("You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \
- directed toward you while in Combat Mode. Your body has also hardened itself, granting extra protection against lasting wounds that would otherwise mount during extended combat. \
- However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.")
+ directed toward you while in Combat Mode. You are also able to sometimes dodge melee and unarmed attacks against you, but only as long as you dress in appropriate martial arts clothing. Or \
+ carp-themed clothing. Your body has also hardened itself, granting extra protection against lasting wounds that would otherwise mount during extended combat. However, you are also unable to \
+ use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.")
icon = 'icons/obj/scrolls.dmi'
icon_state = "sleepingcarp"
worn_icon_state = "scroll"
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 98b7edf19ae2f6..b5780ea8406a76 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -6,6 +6,7 @@
inhand_icon_state = "flashbang"
w_class = WEIGHT_CLASS_SMALL
force = 2
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
/// Which stage of construction this grenade is currently at.
var/stage = GRENADE_EMPTY
/// The set of reagent containers that have been added to this grenade casing.
diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm
index 4f3b9d2e4849c5..295faeb9809720 100644
--- a/code/game/objects/items/grenades/emgrenade.dm
+++ b/code/game/objects/items/grenades/emgrenade.dm
@@ -8,7 +8,6 @@
. = ..()
if(!.)
return
-
update_mob()
- empulse(src, 4, 10)
+ empulse(src, 4, 10, emp_source = src)
qdel(src)
diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm
index 41d370d7bdd8ed..cf7c11ade6a74d 100644
--- a/code/game/objects/items/grenades/flashbang.dm
+++ b/code/game/objects/items/grenades/flashbang.dm
@@ -32,24 +32,30 @@
return
update_mob()
- var/flashbang_turf = get_turf(src)
+ var/turf/flashbang_turf = get_turf(src)
if(!flashbang_turf)
return
+
+ //Check that there's enough pressure on the detonation turf for the 'bang' part of the flashbang to work.
+ var/datum/gas_mixture/environment = flashbang_turf.return_air()
+ var/pressure = environment?.return_pressure()
+ var/soundbang = pressure >= SOUND_MINIMUM_PRESSURE
+
do_sparks(rand(5, 9), FALSE, src)
playsound(flashbang_turf, 'sound/items/weapons/flashbang.ogg', 100, TRUE, 8, 0.9)
new /obj/effect/dummy/lighting_obj (flashbang_turf, flashbang_range + 2, 4, COLOR_WHITE, 2)
for(var/mob/living/living_mob in get_hearers_in_view(flashbang_range, flashbang_turf))
- bang(get_turf(living_mob), living_mob)
+ bang(get_turf(living_mob), living_mob, soundbang)
qdel(src)
-/obj/item/grenade/flashbang/proc/bang(turf/turf, mob/living/living_mob)
+/obj/item/grenade/flashbang/proc/bang(turf/turf, mob/living/living_mob, soundbang = TRUE)
if(living_mob.stat == DEAD) //They're dead!
return
living_mob.show_message(span_warning("BANG"), MSG_AUDIBLE)
- var/distance = max(0, get_dist(get_turf(src), turf))
+ var/distance = get_dist(get_turf(src), turf)
var/sweetspot_range = clamp(CEILING(flashbang_range/sweetspot_divider, 1), 0, flashbang_range)
-//Flash
+ //Flash
var/attempt_flash = living_mob.flash_act(affect_silicon = 1)
if(attempt_flash == FLASH_COMPLETED)
if(distance <= sweetspot_range || issilicon(living_mob))
@@ -60,20 +66,23 @@
living_mob.dropItemToGround(living_mob.get_active_held_item())
living_mob.dropItemToGround(living_mob.get_inactive_held_item())
-//Bang
- if(!distance || loc == living_mob || loc == living_mob.loc)
- living_mob.soundbang_act(2, 20 SECONDS, 10, 15)
+ //Bang
+ if(!soundbang && distance)
+ return
+
+ if(!distance)
+ living_mob.soundbang_act(SOUNDBANG_OVERWHELMING, 20 SECONDS, 10, 15)
return
if(distance <= 1) // Adds more stun as to not prime n' pull (#45381)
- living_mob.soundbang_act(2, 3 SECONDS, 5)
+ living_mob.soundbang_act(SOUNDBANG_STRONG, 3 SECONDS, 5)
return
if(distance <= sweetspot_range)
- living_mob.soundbang_act(1, max(200 / max(1, distance), 60), rand(0, 5))
+ living_mob.soundbang_act(SOUNDBANG_NORMAL, max(20 SECONDS / max(1, distance), 60), rand(0, 5))
return
- if(!living_mob.soundbang_act(1, 0, rand(0, 2)))
+ if(!living_mob.soundbang_act(SOUNDBANG_NORMAL, 0, rand(0, 2)))
return
living_mob.adjust_staggered_up_to(max(200/max(1, distance), 5), 10 SECONDS)
@@ -133,17 +142,17 @@
if(living_mob.stat == DEAD) //They're dead!
return
living_mob.show_message(span_warning("POP"), MSG_AUDIBLE)
- var/distance = max(0, get_dist(get_turf(src), turf))
+ var/distance = get_dist(get_turf(src), turf)
//Flash
if(living_mob.flash_act(affect_silicon = 1))
living_mob.Paralyze(max(10/max(1, distance), 5))
living_mob.Knockdown(max(100/max(1, distance), 60))
//Bang
- if(!distance || loc == living_mob || loc == living_mob.loc)
- living_mob.Paralyze(20)
- living_mob.Knockdown(200)
- living_mob.soundbang_act(1, 200, 10, 15)
+ if(!distance)
+ living_mob.Paralyze(2 SECONDS)
+ living_mob.Knockdown(20 SECONDS)
+ living_mob.soundbang_act(SOUNDBANG_NORMAL, 200, 10, 15)
if(living_mob.apply_damages(brute = 10, burn = 10))
to_chat(living_mob, span_userdanger("The blast from \the [src] bruises and burns you!"))
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 1a7dc6f4fffcbc..dec21fdc1f4c96 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -16,6 +16,7 @@
shrapnel_type = /obj/projectile/bullet/shrapnel/ied
det_time = 225 SECONDS //this is handled by assemblies now
display_timer = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.65, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
/// Explosive power
var/power = 5
/// Our assembly that when activated causes us to explode
diff --git a/code/game/objects/items/grenades/hypno.dm b/code/game/objects/items/grenades/hypno.dm
index d77049419abca3..13bdf7351ab45f 100644
--- a/code/game/objects/items/grenades/hypno.dm
+++ b/code/game/objects/items/grenades/hypno.dm
@@ -32,46 +32,38 @@
/obj/item/grenade/hypnotic/proc/bang(turf/turf, mob/living/living_mob)
if(living_mob.stat == DEAD) //They're dead!
return
- var/distance = max(0, get_dist(get_turf(src), turf))
+ var/distance = get_dist(get_turf(src), turf)
//Bang
var/hypno_sound = FALSE
//Hearing protection check
- if(iscarbon(living_mob))
- var/mob/living/carbon/target = living_mob
- var/list/reflist = list(1)
- SEND_SIGNAL(target, COMSIG_CARBON_SOUNDBANG, reflist)
- var/intensity = reflist[1]
- var/ear_safety = target.get_ear_protection()
- var/effect_amount = intensity - ear_safety
- if(effect_amount > 0)
- hypno_sound = TRUE
+ if(living_mob.get_ear_protection() < 0)
+ hypno_sound = TRUE
- if(!distance || loc == living_mob || loc == living_mob.loc)
- living_mob.Paralyze(10)
- living_mob.Knockdown(100)
+ if(!distance)
+ living_mob.Paralyze(1 SECONDS)
+ living_mob.Knockdown(10 SECONDS)
to_chat(living_mob, span_hypnophrase("The sound echoes in your brain..."))
living_mob.adjust_hallucinations(150 SECONDS)
else
if(distance <= 1)
- living_mob.Paralyze(5)
- living_mob.Knockdown(30)
+ living_mob.Paralyze(0.5 SECONDS)
+ living_mob.Knockdown(3 SECONDS)
if(hypno_sound)
to_chat(living_mob, span_hypnophrase("The sound echoes in your brain..."))
living_mob.adjust_hallucinations(150 SECONDS)
//Flash
- if(living_mob.flash_act(affect_silicon = 1))
- living_mob.Paralyze(max(10/max(1, distance), 5))
- living_mob.Knockdown(max(100/max(1, distance), 40))
- if(iscarbon(living_mob))
- var/mob/living/carbon/target = living_mob
- if(target.hypnosis_vulnerable()) //The sound causes the necessary conditions unless the target has mindshield or hearing protection
- target.apply_status_effect(/datum/status_effect/trance, 100, TRUE)
- else
- to_chat(target, span_hypnophrase("The light is so pretty..."))
- target.adjust_drowsiness_up_to(20 SECONDS, 40 SECONDS)
- target.adjust_confusion_up_to(10 SECONDS, 20 SECONDS)
- target.adjust_dizzy_up_to(20 SECONDS, 40 SECONDS)
+ if(!living_mob.flash_act(affect_silicon = TRUE))
+ return
+ living_mob.Paralyze(max(1 SECONDS / (distance || 1), 0.5 SECONDS))
+ living_mob.Knockdown(max(10 SECONDS / (distance || 1), 4 SECONDS))
+ if(living_mob.hypnosis_vulnerable()) //The sound causes the necessary conditions unless the target has mindshield or hearing protection
+ living_mob.apply_status_effect(/datum/status_effect/trance, 10 SECONDS, TRUE)
+ return
+ to_chat(living_mob, span_hypnophrase("The light is so pretty..."))
+ living_mob.adjust_drowsiness_up_to(20 SECONDS, 40 SECONDS)
+ living_mob.adjust_confusion_up_to(10 SECONDS, 20 SECONDS)
+ living_mob.adjust_dizzy_up_to(20 SECONDS, 40 SECONDS)
diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm
index 6e874f9d864bab..02fb27777bcd24 100644
--- a/code/game/objects/items/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/grenades/syndieminibomb.dm
@@ -73,6 +73,6 @@
for (var/turf/open/floor/floor in view(freeze_range, loc))
floor.MakeSlippery(TURF_WET_PERMAFROST, 6 MINUTES)
for(var/mob/living/carbon/victim in floor)
- victim.adjustStaminaLoss(stamina_damage)
+ victim.adjust_stamina_loss(stamina_damage)
victim.adjust_bodytemperature(temp_adjust)
qdel(src)
diff --git a/code/game/objects/items/gun_maintenance.dm b/code/game/objects/items/gun_maintenance.dm
index 77ba80352910b8..d580d37fe2535a 100644
--- a/code/game/objects/items/gun_maintenance.dm
+++ b/code/game/objects/items/gun_maintenance.dm
@@ -14,6 +14,7 @@
w_class = WEIGHT_CLASS_BULKY
drop_sound = 'sound/items/handling/ammobox_drop.ogg'
pickup_sound = 'sound/items/handling/ammobox_pickup.ogg'
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6)
/// How many times we can use this maintenance kit to maintain a gun
var/uses = 3
/// THe maximum uses, used for our examine text.
diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm
index 0d82370cdaabb7..cc4a9fd5b42e79 100644
--- a/code/game/objects/items/hand_items.dm
+++ b/code/game/objects/items/hand_items.dm
@@ -128,11 +128,11 @@
to_chat(user, span_warning("You can't bring yourself to noogie [target]! You don't want to risk harming anyone..."))
return
- if(!(target?.get_bodypart(BODY_ZONE_HEAD)) || user.pulling != target || user.grab_state < GRAB_AGGRESSIVE || user.getStaminaLoss() > 80)
+ if(!(target?.get_bodypart(BODY_ZONE_HEAD)) || user.pulling != target || user.grab_state < GRAB_AGGRESSIVE || user.get_stamina_loss() > 80)
return FALSE
var/obj/item/bodypart/head/the_head = target.get_bodypart(BODY_ZONE_HEAD)
- if(!(the_head.biological_state & BIO_FLESH))
+ if(!(the_head.biological_state & (BIO_FLESH|BIO_CHITIN)))
to_chat(user, span_warning("You can't noogie [target], [target.p_they()] [target.p_have()] no skin on [target.p_their()] head!"))
return
@@ -174,7 +174,7 @@
if(!(target?.get_bodypart(BODY_ZONE_HEAD)) || user.pulling != target)
return FALSE
- if(user.getStaminaLoss() > 80)
+ if(user.get_stamina_loss() > 80)
to_chat(user, span_warning("You're too tired to continue giving [target] a noogie!"))
to_chat(target, span_danger("[user] is too tired to continue giving you a noogie!"))
return
@@ -190,7 +190,7 @@
log_combat(user, target, "given a noogie to", addition = "([damage] brute before armor)")
target.apply_damage(damage, BRUTE, BODY_ZONE_HEAD)
- user.adjustStaminaLoss(iteration + 5)
+ user.adjust_stamina_loss(iteration + 5)
playsound(get_turf(user), SFX_RUSTLE, 50)
if(prob(33))
@@ -245,7 +245,7 @@
shake_camera(slapped, 2, 2)
slapped.Paralyze(2.5 SECONDS)
slapped.adjust_confusion(7 SECONDS)
- slapped.adjustStaminaLoss(40)
+ slapped.adjust_stamina_loss(40)
else if(user.zone_selected == BODY_ZONE_HEAD || user.zone_selected == BODY_ZONE_PRECISE_MOUTH)
if(user == slapped)
user.visible_message(
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index f4c36f02456e1f..6433aca9a069d5 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -208,7 +208,7 @@
var/cable_color = CABLE_COLOR_RED
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.75)
+ custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
breakouttime = 30 SECONDS
cuffsound = 'sound/items/weapons/cablecuff.ogg'
pickup_sound = null
@@ -572,6 +572,7 @@
righthand_file = 'icons/mob/inhands/weapons/thrown_righthand.dmi'
breakouttime = 3.5 SECONDS//easy to apply, easy to break out of
gender = NEUTER
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
///Amount of time to knock the target down for once it's hit in deciseconds.
var/knockdown = 0
///Reference of the mob we will attempt to snare
@@ -624,6 +625,7 @@
inhand_icon_state = "bola_r"
breakouttime = 7 SECONDS
knockdown = 3.5 SECONDS
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 6.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7)
/**
* A security variant of the bola.
@@ -639,6 +641,7 @@
w_class = WEIGHT_CLASS_SMALL
breakouttime = 6 SECONDS
custom_price = PAYCHECK_COMMAND * 0.35
+ custom_materials = null
/obj/item/restraints/legcuffs/bola/energy/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm
index 5bbec5cd17de4e..1aa4eb028100cf 100644
--- a/code/game/objects/items/his_grace.dm
+++ b/code/game/objects/items/his_grace.dm
@@ -157,7 +157,7 @@
master.remove_status_effect(/datum/status_effect/his_grace)
REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT)
master.Paralyze(60)
- master.adjustBruteLoss(master.maxHealth)
+ master.adjust_brute_loss(master.maxHealth)
playsound(master, 'sound/effects/splat.ogg', 100, FALSE)
else
master.apply_status_effect(/datum/status_effect/his_grace,gender)
@@ -181,7 +181,7 @@
do_attack_animation(L, null, src)
playsound(L, 'sound/items/weapons/smash.ogg', 50, TRUE)
playsound(L, 'sound/effects/desecration/desecration-01.ogg', 50, TRUE)
- L.adjustBruteLoss(force)
+ L.adjust_brute_loss(force)
adjust_bloodthirst(-5) //Don't stop attacking they're right there!
else
consume(L)
@@ -235,7 +235,7 @@
return
var/victims = 0
meal.visible_message(span_warning("[src] swings open and devours [meal]!"), "[src] consumes you!")
- meal.adjustBruteLoss(200)
+ meal.adjust_brute_loss(200)
playsound(meal, 'sound/effects/desecration/desecration-02.ogg', 75, TRUE)
playsound(src, 'sound/items/eatfood.ogg', 100, TRUE)
meal.forceMove(src)
diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm
index 1714010ae03607..832eca03a78614 100644
--- a/code/game/objects/items/implants/implant_explosive.dm
+++ b/code/game/objects/items/implants/implant_explosive.dm
@@ -143,16 +143,13 @@
if(imp_in && !imp_in.stat && !no_paralyze)
imp_in.visible_message(span_warning("[imp_in] doubles over in pain!"))
imp_in.Paralyze(14 SECONDS)
- //total of 4 bomb beeps, and we've already beeped once
- var/bomb_beeps_until_boom = 3
+
if(!panic_beep_sound)
- while(bomb_beeps_until_boom > 0)
+ for(var/index in 1 to 3) // Total of 4 bomb beeps, and we've already beeped once
//for extra spice
- var/beep_volume = 35
+ var/beep_volume = 30 + (5 * index)
playsound(loc, 'sound/items/timer.ogg', beep_volume, vary = FALSE)
sleep(delay * 0.25)
- bomb_beeps_until_boom--
- beep_volume += 5
explode()
else
addtimer(CALLBACK(src, PROC_REF(explode)), delay)
@@ -166,9 +163,9 @@
///When called, just explodes
/obj/item/implant/explosive/proc/explode(atom/override_explode_target = null)
- explosion_devastate = round(explosion_devastate)
- explosion_heavy = round(explosion_heavy)
- explosion_light = round(explosion_light)
+ explosion_devastate = floor(explosion_devastate)
+ explosion_heavy = floor(explosion_heavy)
+ explosion_light = floor(explosion_light)
explosion(override_explode_target || src, devastation_range = explosion_devastate, heavy_impact_range = explosion_heavy, light_impact_range = explosion_light, flame_range = explosion_light, flash_range = explosion_light, explosion_cause = src)
var/mob/living/kill_mob = isliving(override_explode_target) ? override_explode_target : imp_in
if(!isnull(kill_mob))
diff --git a/code/game/objects/items/implants/implant_kaza_ruk.dm b/code/game/objects/items/implants/implant_kaza_ruk.dm
new file mode 100644
index 00000000000000..ce26fb1b678bcd
--- /dev/null
+++ b/code/game/objects/items/implants/implant_kaza_ruk.dm
@@ -0,0 +1,41 @@
+/obj/item/implant/kaza_ruk
+ name = "kaza ruk implant"
+ desc = "Teaches you the Tiziran martial arts of Kaza Ruk in 5 short instructional videos beamed directly into your eyeballs."
+ icon = 'icons/obj/scrolls.dmi'
+ icon_state ="scroll2"
+ /// The martial art style this implant teaches.
+ var/datum/martial_art/kaza_ruk/style
+
+/obj/item/implant/kaza_ruk/get_data()
+ var/dat = {"Implant Specifications:
+ Name: Kaza Ruk Implant
+ Life: 4 hours after death of host
+ Implant Details:
+ Function: Teaches even the clumsiest host the arts of Kaza Ruk."}
+ return dat
+
+/obj/item/implant/kaza_ruk/Initialize(mapload)
+ . = ..()
+ style = new(src)
+
+/obj/item/implant/kaza_ruk/Destroy()
+ QDEL_NULL(style)
+ return ..()
+
+/obj/item/implant/kaza_ruk/activate()
+ . = ..()
+ if(isnull(imp_in.mind))
+ return
+ if(style.unlearn(imp_in))
+ return
+
+ style.teach(imp_in)
+
+/obj/item/implanter/kaza_ruk
+ name = "implanter (kaza ruk)"
+ imp_type = /obj/item/implant/kaza_ruk
+
+/obj/item/implantcase/kaza_ruk
+ name = "implant case - 'Kaza Ruk'"
+ desc = "A glass case containing an implant that can teach the user the Tiziran martial arts of Kaza Ruk."
+ imp_type = /obj/item/implant/kaza_ruk
diff --git a/code/game/objects/items/implants/implant_krav_maga.dm b/code/game/objects/items/implants/implant_krav_maga.dm
deleted file mode 100644
index 5dd821a683d696..00000000000000
--- a/code/game/objects/items/implants/implant_krav_maga.dm
+++ /dev/null
@@ -1,41 +0,0 @@
-/obj/item/implant/krav_maga
- name = "krav maga implant"
- desc = "Teaches you the arts of Krav Maga in 5 short instructional videos beamed directly into your eyeballs."
- icon = 'icons/obj/scrolls.dmi'
- icon_state ="scroll2"
- /// The martial art style this implant teaches.
- var/datum/martial_art/krav_maga/style
-
-/obj/item/implant/krav_maga/get_data()
- var/dat = {"Implant Specifications:
- Name: Krav Maga Implant
- Life: 4 hours after death of host
- Implant Details:
- Function: Teaches even the clumsiest host the arts of Krav Maga."}
- return dat
-
-/obj/item/implant/krav_maga/Initialize(mapload)
- . = ..()
- style = new(src)
-
-/obj/item/implant/krav_maga/Destroy()
- QDEL_NULL(style)
- return ..()
-
-/obj/item/implant/krav_maga/activate()
- . = ..()
- if(isnull(imp_in.mind))
- return
- if(style.unlearn(imp_in))
- return
-
- style.teach(imp_in)
-
-/obj/item/implanter/krav_maga
- name = "implanter (krav maga)"
- imp_type = /obj/item/implant/krav_maga
-
-/obj/item/implantcase/krav_maga
- name = "implant case - 'Krav Maga'"
- desc = "A glass case containing an implant that can teach the user the arts of Krav Maga."
- imp_type = /obj/item/implant/krav_maga
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index ceccbe1b729e48..6e053a1a44b4e8 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -20,7 +20,7 @@
/obj/item/implant/emp/activate()
. = ..()
uses--
- empulse(imp_in, 3, 5)
+ empulse(imp_in, 3, 5, emp_source = src)
if(!uses)
qdel(src)
diff --git a/code/game/objects/items/inspector.dm b/code/game/objects/items/inspector.dm
index 8a08562bd840db..56e63994c22321 100644
--- a/code/game/objects/items/inspector.dm
+++ b/code/game/objects/items/inspector.dm
@@ -336,6 +336,7 @@
icon_state = "bananium_inspector"
w_class = WEIGHT_CLASS_SMALL
max_mode = BANANIUM_CLOWN_INSPECTOR_PRINT_SOUND_MODE_LAST
+ custom_materials = list(/datum/material/bananium = SHEET_MATERIAL_AMOUNT * 5)
///How many more times can we print?
var/paper_charges = 32
///Max value of paper_charges
@@ -458,9 +459,11 @@
* If it is ground, it will turn into 5u water.
*/
/obj/item/paper/fake_report/water
- grind_results = list(/datum/reagent/water = 5)
interaction_flags_click = NEED_DEXTERITY|NEED_HANDS|ALLOW_RESTING
+/obj/item/paper/fake_report/water/grind_results()
+ return list(/datum/reagent/water = 5)
+
/obj/item/paper/fake_report/water/click_alt(mob/living/user)
var/datum/action/innate/origami/origami_action = locate() in user.actions
if(origami_action?.active) //Origami masters can fold water
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 5ca2ae02bb4a43..95412ef4088ee8 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -131,7 +131,7 @@
/obj/item/knife/kitchen/silicon/examine()
. = ..()
- . += " It's fitted with a [tool_behaviour] head."
+ . += "It's fitted with a [tool_behaviour] head."
/obj/item/knife/kitchen/silicon/attack_self(mob/user)
playsound(get_turf(user), 'sound/items/tools/change_drill.ogg', 50, TRUE)
@@ -167,7 +167,7 @@
throwforce = 5
throw_speed = 3
throw_range = 7
- custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1.5)
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
resistance_flags = FLAMMABLE
w_class = WEIGHT_CLASS_NORMAL
attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm
index 963728761c0706..b94a91e34562c5 100644
--- a/code/game/objects/items/knives.dm
+++ b/code/game/objects/items/knives.dm
@@ -47,7 +47,7 @@
///Adds the butchering component, used to override stats for special cases
/obj/item/knife/proc/set_butchering()
AddComponent(/datum/component/butchering, \
- speed = 8 SECONDS - force, \
+ speed = 9 SECONDS - force * 2, \
effectiveness = 100, \
bonus_modifier = force - 10, \
)
@@ -134,7 +134,7 @@
/obj/item/knife/hunting/set_butchering()
AddComponent(/datum/component/butchering, \
- speed = 8 SECONDS - force, \
+ speed = 9 SECONDS - force * 2, \
effectiveness = 100, \
bonus_modifier = force + 10, \
)
@@ -217,7 +217,7 @@
obj_flags = parent_type::obj_flags & ~CONDUCTS_ELECTRICITY
force = 15
throwforce = 15
- custom_materials = null
+ custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 2)
/datum/embedding/combat_knife/weak
embed_chance = 35
@@ -245,7 +245,7 @@
attack_verb_continuous = list("shanks", "shivs")
attack_verb_simple = list("shank", "shiv")
armor_type = /datum/armor/none
- custom_materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT * 4)
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT)
/obj/item/knife/shiv/make_stabby()
AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple, -3)
@@ -258,7 +258,7 @@
force = 9
throwforce = 13
armor_type = /datum/armor/shiv_plasma
- custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT *4, /datum/material/plasma=SMALL_MATERIAL_AMOUNT * 2)
+ custom_materials = list(/datum/material/alloy/plasmaglass = SHEET_MATERIAL_AMOUNT)
/datum/armor/shiv_plasma
melee = 25
@@ -278,7 +278,7 @@
throw_range = 7
wound_bonus = 10
armor_type = /datum/armor/shiv_titanium
- custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 4, /datum/material/titanium=SMALL_MATERIAL_AMOUNT * 2)
+ custom_materials = list(/datum/material/alloy/titaniumglass = SHEET_MATERIAL_AMOUNT)
/datum/armor/shiv_titanium
melee = 25
@@ -301,7 +301,7 @@
wound_bonus = 10
exposed_wound_bonus = 20
armor_type = /datum/armor/shiv_plastitanium
- custom_materials = list(/datum/material/glass= SMALL_MATERIAL_AMOUNT * 4, /datum/material/alloy/plastitanium= SMALL_MATERIAL_AMOUNT * 2)
+ custom_materials = list(/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT)
/datum/armor/shiv_plastitanium
melee = 50
diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm
index b2190cdc88604e..3439e6867f5d0a 100644
--- a/code/game/objects/items/latexballoon.dm
+++ b/code/game/objects/items/latexballoon.dm
@@ -15,6 +15,7 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 7
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.2)
var/state = DEFLATED
var/datum/gas_mixture/air_contents = null
diff --git a/code/game/objects/items/lighter.dm b/code/game/objects/items/lighter.dm
index 46f84b7a11aeba..bd87f67ea2295e 100644
--- a/code/game/objects/items/lighter.dm
+++ b/code/game/objects/items/lighter.dm
@@ -9,7 +9,6 @@
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BELT
resistance_flags = FIRE_PROOF
- grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/fuel/oil = 5)
custom_price = PAYCHECK_CREW * 1.1
light_system = OVERLAY_LIGHT
light_range = 2
@@ -55,6 +54,9 @@
)
update_appearance()
+/obj/item/lighter/grind_results()
+ return list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/fuel/oil = 5)
+
/obj/item/lighter/examine(mob/user)
. = ..()
if(get_fuel() <= 0)
@@ -315,7 +317,9 @@
heat_while_on = parent_type::heat_while_on + 1000 //Blue flame is hotter, this means this does act as a welding tool.
light_color = LIGHT_COLOR_CYAN
overlay_state = "slime"
- grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5)
+
+/obj/item/lighter/slime/grind_results()
+ return list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/medicine/pyroxadone = 5)
/obj/item/lighter/skull
name = "badass zippo"
@@ -329,11 +333,13 @@
light_color = LIGHT_COLOR_HALOGEN
heat_while_on = TCMB //I swear it's a real lighter dude you just can't see the flame dude I promise
overlay_state = "mime"
- grind_results = list(/datum/reagent/iron = 1, /datum/reagent/toxin/mutetoxin = 5, /datum/reagent/consumable/nothing = 10)
light_range = 0
light_power = 0
fancy = FALSE
+/obj/item/lighter/mime/grind_results()
+ return list(/datum/reagent/iron = 1, /datum/reagent/toxin/mutetoxin = 5, /datum/reagent/consumable/nothing = 10)
+
/obj/item/lighter/mime/ignition_effect(atom/A, mob/user)
. = span_infoplain("[user] lifts \the [src] to the [A], which miraculously lights!")
@@ -343,11 +349,13 @@
icon_state = "slighter"
light_color = LIGHT_COLOR_ELECTRIC_CYAN
overlay_state = "bright"
- grind_results = list(/datum/reagent/iron = 1, /datum/reagent/flash_powder = 10)
light_range = 8
light_power = 3 //Irritatingly bright and large enough to cover a small room.
fancy = FALSE
+/obj/item/lighter/bright/grind_results()
+ return list(/datum/reagent/iron = 1, /datum/reagent/flash_powder = 10)
+
/obj/item/lighter/bright/examine(mob/user)
. = ..()
diff --git a/code/game/objects/items/maintenance_loot.dm b/code/game/objects/items/maintenance_loot.dm
index 9ad0c206bbca9b..9a87976932ce81 100644
--- a/code/game/objects/items/maintenance_loot.dm
+++ b/code/game/objects/items/maintenance_loot.dm
@@ -21,12 +21,14 @@
w_class = WEIGHT_CLASS_BULKY
wound_bonus = 20
demolition_mod = 1.25
- grind_results = list(/datum/reagent/lead = 20)
pickup_sound = 'sound/items/handling/lead_pipe/lead_pipe_pickup.ogg'
drop_sound = 'sound/items/handling/materials/metal_drop.ogg'
throw_drop_sound = 'sound/items/handling/lead_pipe/lead_pipe_drop.ogg'
hitsound = 'sound/items/lead_pipe_hit.ogg'
+/obj/item/lead_pipe/grind_results()
+ return list(/datum/reagent/lead = 20)
+
//A good battery early in the shift. Source of lead & sulfuric acid reagents.
//Add lead material to this once implemented.
/obj/item/stock_parts/power_store/cell/lead
@@ -42,7 +44,9 @@
emp_damage_modifier = 4 // 15 shots.
charge_light_type = null
connector_type = "leadacid"
- grind_results = list(/datum/reagent/lead = 15, /datum/reagent/toxin/acid = 15, /datum/reagent/water = 20)
+
+/obj/item/stock_parts/power_store/cell/lead/grind_results()
+ return list(/datum/reagent/lead = 15, /datum/reagent/toxin/acid = 15, /datum/reagent/water = 20)
//starts partially discharged
/obj/item/stock_parts/power_store/cell/lead/Initialize(mapload)
@@ -56,8 +60,8 @@
)
// Give our owner shock touch when entering the digital realm
-/obj/item/stock_parts/power_store/cell/lead/proc/shockingly_improve_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, external_load_flags)
- if(external_load_flags & DOMAIN_FORBIDS_ABILITIES)
+/obj/item/stock_parts/power_store/cell/lead/proc/shockingly_improve_avatar(mob/living/carbon/human/neo, mob/living/carbon/human/avatar, domain_flags)
+ if(domain_flags & DOMAIN_FORBIDS_ABILITIES)
return BITRUNNER_GEAR_LOAD_BLOCKED
if(!avatar.can_mutate())
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index f798fa66ad848b..611a035acba914 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -98,6 +98,7 @@
\
Dough: 10u water + 15u flour for simple dough.
\
6u egg yolk + 12 egg white + 15u flour + 5u sugar for cake batter.
\
+ (15u soy milk can be substituted for the eggs.)
\
Doughs can be transformed by using a knife and rolling pin.
\
All doughs can be baked.
\
Bowl: Add recipe ingredients and liquid to make soups.
\
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index 0ae9edda5edbfc..fdca06d2ae4c96 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -103,67 +103,94 @@
/obj/item/melee/baton/proc/add_deep_lore()
return
-/// Checks if we can actually USE the baton. Impure
-/obj/item/melee/baton/proc/can_baton(mob/living/target, mob/living/user)
+#define STUN_ATTACK "stun attack"
+
+/**
+ * Checks if we can stun targets with the baton.
+ *
+ * Impure (has chat feedback and mutates state in some subtypes).
+ * In other words don't call this unless a stun is being attempted.
+ *
+ * * target - The mob being hit with the baton
+ * * user - The mob using the baton
+ * * harmbatonning - Whether or not this is being called from a harmbaton attack
+ *
+ * Returns TRUE if we can stun the target, FALSE if we cannot.
+ */
+/obj/item/melee/baton/proc/try_stun(mob/living/target, mob/living/user, harmbatonning)
PROTECTED_PROC(TRUE)
- if(clumsy_check(user, target))
+ if(!active)
return FALSE
-
if(!chunky_finger_usable && ishuman(user))
var/mob/living/carbon/human/human_user = user
if(human_user.check_chunky_fingers() && user.is_holding(src) && !HAS_MIND_TRAIT(user, TRAIT_CHUNKYFINGERS_IGNORE_BATON))
- balloon_alert(human_user, "fingers are too big!")
+ if(!harmbatonning)
+ balloon_alert(human_user, "fingers are too big!")
return FALSE
-
+ if(!COOLDOWN_FINISHED(src, cooldown_check))
+ if(wait_desc && !harmbatonning)
+ balloon_alert(user, wait_desc)
+ return FALSE
+ if(HAS_TRAIT_FROM(target, TRAIT_IWASBATONED, REF(user)) ) //no doublebaton abuse anon!
+ if(!harmbatonning)
+ target.balloon_alert(user, "can't stun yet!")
+ return FALSE
return TRUE
// Stun attack
/obj/item/melee/baton/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers)
. = ..()
- if(. || !isliving(target))
- return .
-
- if(!can_baton(target, user))
+ if(.)
return TRUE
- if(!COOLDOWN_FINISHED(src, cooldown_check))
- if(wait_desc)
- balloon_alert(user, wait_desc)
- return TRUE
+ if(!isliving(target))
+ return FALSE // bashing objects
+
+ var/harmbatonning = LAZYACCESS(modifiers, RIGHT_CLICK)
+ if(harmbatonning && !stun_on_harmbaton)
+ return FALSE // harmbatonning, no stun
+
+ // see if this attack will result in a stun, or if we need to cancel it
+ if(!try_stun(target, user, harmbatonning))
+ if(harmbatonning)
+ return FALSE // if harmbatonning, ALwAYS attack
+ if(active)
+ return TRUE // if active, but can't stun? no attack
+ if(!user.combat_mode)
+ return TRUE // if not in combat mode? no attack
+
+ return FALSE // otherwise, attack normally
+
+ // clumsy people redirect this attack - yes, this bypasses IWASBATONED and such
+ if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
+ user.visible_message(
+ span_danger("[user] accidentally hits [user.p_them()]self over the head with [src]! What a doofus!"),
+ span_userdanger("You accidentally hit yourself over the head with [src]!"),
+ visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE,
+ )
- if(HAS_TRAIT_FROM(target, TRAIT_IWASBATONED, REF(user))) //no doublebaton abuse anon!
- target.balloon_alert(user, "can't stun yet!")
- return TRUE
+ finalize_baton_attack(user, user, clumsy = TRUE)
+ user.apply_damage(2 * force, BRUTE, BODY_ZONE_HEAD, attacking_item = src)
+ log_combat(user, user, "accidentally stun attacked [user.p_them()]self due to their clumsiness", src)
+ user.do_attack_animation(user)
+ user.changeNext_move(attack_speed)
+ return TRUE // you hit yourself, nerd
- if(active)
- // when we continue to attack, deal 0 (brute) damage (just stun)
+ // if not harm batonning, we override the default attack properties do do nothing
+ if(!harmbatonning)
SET_ATTACK_FORCE(attack_modifiers, 0)
MUTE_ATTACK_HITSOUND(attack_modifiers)
HIDE_ATTACK_MESSAGES(attack_modifiers)
- return .
-
-// Harm attack
-/obj/item/melee/baton/pre_attack_secondary(atom/target, mob/living/user, list/modifiers, list/attack_modifiers)
- . = ..()
- if(. != SECONDARY_ATTACK_CALL_NORMAL || !isliving(target))
- return .
-
- if(!can_baton(target, user))
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-
- // call attack, NOT pre_attack
- // (so we go directly to harming)
- return SECONDARY_ATTACK_CONTINUE_CHAIN
+ // then denote the attack as "will stun" for afterattack
+ LAZYSET(attack_modifiers, STUN_ATTACK, TRUE)
+ return FALSE // attack and stun
// This is where stun gets applied
/obj/item/melee/baton/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
- if(!isliving(target) || !active || !COOLDOWN_FINISHED(src, cooldown_check) || HAS_TRAIT_FROM(target, TRAIT_IWASBATONED, REF(user)))
- return
- // worst check in the chain but - right click = harmbaton
- if(LAZYACCESS(modifiers, RIGHT_CLICK) && !stun_on_harmbaton)
+ if(QDELETED(target) || !LAZYACCESS(attack_modifiers, STUN_ATTACK))
return
- finalize_baton_attack(target, user, modifiers)
+ finalize_baton_attack(target, user)
var/list/desc
if(iscyborg(target))
@@ -209,17 +236,17 @@
return CONTEXTUAL_SCREENTIP_SET
/// Wrapper for calling "stun()" and doing relevant vfx/sfx
-/obj/item/melee/baton/proc/finalize_baton_attack(mob/living/target, mob/living/user, list/modifiers)
+/obj/item/melee/baton/proc/finalize_baton_attack(mob/living/target, mob/living/user, clumsy = FALSE)
PROTECTED_PROC(TRUE)
COOLDOWN_START(src, cooldown_check, cooldown)
if(on_stun_sound)
playsound(src, on_stun_sound, on_stun_volume, TRUE, -1)
- if(baton_effect(target, user, modifiers) && user)
+ if(baton_effect(target, user, null, clumsy) && user)
set_batoned(target, user, cooldown)
log_combat(user, target, "stunned", src.name)
/// The actual "stun()" of the stun baton
-/obj/item/melee/baton/proc/baton_effect(mob/living/target, mob/living/user, list/modifiers, stun_override)
+/obj/item/melee/baton/proc/baton_effect(mob/living/target, mob/living/user, stun_override, clumsy)
PROTECTED_PROC(TRUE)
var/trait_check = HAS_TRAIT(target, TRAIT_BATON_RESISTANCE)
if(iscyborg(target))
@@ -233,7 +260,7 @@
var/mob/living/carbon/human/human_target = target
if(prob(force_say_chance))
human_target.force_say()
- var/armour_block = target.run_armor_check(null, armour_type_against_stun, null, null, stun_armour_penetration)
+ var/armour_block = target.run_armor_check(BODY_ZONE_CHEST, armour_type_against_stun, null, null, stun_armour_penetration)
target.apply_damage(stamina_damage, STAMINA, blocked = armour_block)
if(!trait_check)
target.Knockdown((isnull(stun_override) ? knockdown_time : stun_override))
@@ -278,34 +305,7 @@
ADD_TRAIT(target, TRAIT_IWASBATONED, user_ref)
addtimer(TRAIT_CALLBACK_REMOVE(target, TRAIT_IWASBATONED, user_ref), cooldown)
-/obj/item/melee/baton/proc/clumsy_check(mob/living/user, mob/living/intented_target)
- if(!active || !HAS_TRAIT(user, TRAIT_CLUMSY) || prob(50))
- return FALSE
- user.visible_message(span_danger("[user] accidentally hits [user.p_them()]self over the head with [src]! What a doofus!"), span_userdanger("You accidentally hit yourself over the head with [src]!"), visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE)
-
- if(iscyborg(user))
- if(affect_cyborg)
- user.flash_act(affect_silicon = TRUE)
- user.Paralyze(clumsy_knockdown_time)
- additional_effects_cyborg(user, user) // user is the target here
- if(on_stun_sound)
- playsound(src, on_stun_sound, on_stun_volume, TRUE, -1)
- else
- playsound(src, 'sound/effects/bang.ogg', 10, TRUE)
- else
- //straight up always force say for clumsy humans
- if(ishuman(user))
- var/mob/living/carbon/human/human_user = user
- human_user.force_say()
- user.Knockdown(clumsy_knockdown_time)
- user.apply_damage(stamina_damage, STAMINA)
- additional_effects_non_cyborg(user, user) // user is the target here
- if(on_stun_sound)
- playsound(src, on_stun_sound, on_stun_volume, TRUE, -1)
-
- user.apply_damage(2 * force, BRUTE, BODY_ZONE_HEAD, attacking_item = src)
- log_combat(user, user, "accidentally stun attacked [user.p_them()]self due to their clumsiness", src)
- user.do_attack_animation(user)
+#undef STUN_ATTACK
/obj/item/conversion_kit
name = "conversion kit"
@@ -666,28 +666,18 @@
//we're below minimum, turn off
turn_off()
-/obj/item/melee/baton/security/clumsy_check(mob/living/carbon/human/user)
- . = ..()
- if(.)
- SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
- deductcharge(cell_hit_cost)
-
-/obj/item/melee/baton/security/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers)
- . = ..()
- if(. || !isliving(target))
- return .
-
- if(!active && !user.combat_mode)
+/obj/item/melee/baton/security/try_stun(mob/living/target, mob/living/user, harmbatonning)
+ if(!active && !harmbatonning && !user.combat_mode)
target.visible_message(
span_warning("[user] prods [target] with [src]. Luckily it was off."),
span_warning("[user] prods you with [src]. Luckily it was off."),
visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE,
)
- return TRUE
+ return FALSE
- return .
+ return ..()
-/obj/item/melee/baton/security/baton_effect(mob/living/target, mob/living/user, modifiers, stun_override)
+/obj/item/melee/baton/security/baton_effect(mob/living/target, mob/living/user, stun_override, clumsy)
if(iscyborg(loc))
var/mob/living/silicon/robot/robot = loc
if(!robot || !robot.cell || !robot.cell.use(cell_hit_cost))
@@ -732,7 +722,7 @@
/obj/item/melee/baton/security/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
- if(!. && active && prob(throw_stun_chance) && hit_atom)
+ if(!. && active && prob(throw_stun_chance) && isliving(hit_atom))
finalize_baton_attack(hit_atom, throwingdatum?.get_thrower())
/obj/item/melee/baton/security/emp_act(severity)
@@ -764,6 +754,20 @@
/obj/item/melee/baton/security/loaded/hos
preload_cell_type = /obj/item/stock_parts/power_store/cell/super
+// Stunsword Skins
+/datum/atom_skin/stunsword
+ abstract_type = /datum/atom_skin/stunsword
+ change_inhand_icon_state = TRUE
+ change_base_icon_state = TRUE
+
+/datum/atom_skin/stunsword/default
+ preview_name = "Default"
+ new_icon_state = "stunsword"
+
+/datum/atom_skin/stunsword/energy
+ preview_name = "Energy"
+ new_icon_state = "stunsword_energy"
+
///Stun Sword
/obj/item/melee/baton/security/stunsword
name = "\improper NT-20 'Excalibur' Stunsword"
@@ -789,14 +793,12 @@
convertible = FALSE
obj_flags = UNIQUE_RENAME
- unique_reskin = list(
- "Default" = "stunsword",
- "Energy Stunsword" = "stunsword_energy",
- )
- unique_reskin_changes_inhand = TRUE
- unique_reskin_changes_base_icon_state = TRUE
-/obj/item/melee/baton/security/stunsword/loaded/add_deep_lore()
+/obj/item/melee/baton/security/stunsword/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/stunsword)
+
+/obj/item/melee/baton/security/stunsword/add_deep_lore()
return
/obj/item/melee/baton/security/stunsword/loaded
@@ -824,6 +826,7 @@
slot_flags = ITEM_SLOT_BACK
convertible = FALSE
active_changes_inhand = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.15, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
var/obj/item/assembly/igniter/sparkler
///Determines whether or not we can improve the cattleprod into a new type. Prevents turning the cattleprod subtypes into different subtypes, or wasting materials on making it....another version of itself.
var/can_upgrade = TRUE
@@ -867,16 +870,16 @@
var/obj/item/melee/baton/security/cattleprod/brand_new_prod = new our_prod(user.loc)
user.put_in_hands(brand_new_prod)
-/obj/item/melee/baton/security/cattleprod/can_baton(mob/living/target, mob/living/user)
- if(!sparkler.activate())
- return FALSE
- return ..()
+/obj/item/melee/baton/security/cattleprod/try_stun(mob/living/target, mob/living/user, harmbatonning)
+ return ..() && sparkler.activate()
/obj/item/melee/baton/security/cattleprod/Destroy()
- if(sparkler)
- QDEL_NULL(sparkler)
+ QDEL_NULL(sparkler)
return ..()
+/obj/item/melee/baton/security/cattleprod/loaded
+ preload_cell_type = /obj/item/stock_parts/power_store/cell/high
+
/obj/item/melee/baton/security/boomerang
name = "\improper OZtek Boomerang"
desc = "A device invented in 2486 for the great Space Emu War by the confederacy of Australicus, these high-tech boomerangs also work exceptionally well at stunning crewmembers. Just be careful to catch it when thrown!"
@@ -913,18 +916,13 @@
inhand_icon_state = "teleprod"
slot_flags = null
can_upgrade = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.15, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
-/obj/item/melee/baton/security/cattleprod/teleprod/clumsy_check(mob/living/carbon/human/user)
- . = ..()
- if(!.)
- return
- do_teleport(user, get_turf(user), 50, channel = TELEPORT_CHANNEL_BLUESPACE)
-
-/obj/item/melee/baton/security/cattleprod/teleprod/baton_effect(mob/living/target, mob/living/user, modifiers, stun_override)
+/obj/item/melee/baton/security/cattleprod/teleprod/baton_effect(mob/living/target, mob/living/user, stun_override, clumsy)
. = ..()
if(!. || target.move_resist >= MOVE_FORCE_OVERPOWERING)
return
- do_teleport(target, get_turf(target), 15, channel = TELEPORT_CHANNEL_BLUESPACE)
+ do_teleport(target, get_turf(target), clumsy ? 50 : 15, channel = TELEPORT_CHANNEL_BLUESPACE)
/obj/item/melee/baton/security/cattleprod/telecrystalprod
name = "snatcherprod"
@@ -937,13 +935,7 @@
throw_stun_chance = 50 //I think it'd be funny
can_upgrade = FALSE
-/obj/item/melee/baton/security/cattleprod/telecrystalprod/clumsy_check(mob/living/carbon/human/user)
- . = ..()
- if(!.)
- return
- do_teleport(src, get_turf(user), 50, channel = TELEPORT_CHANNEL_BLUESPACE) //Wait, where did it go?
-
-/obj/item/melee/baton/security/cattleprod/telecrystalprod/baton_effect(mob/living/target, mob/living/user, modifiers, stun_override)
+/obj/item/melee/baton/security/cattleprod/telecrystalprod/baton_effect(mob/living/target, mob/living/user, stun_override, clumsy)
. = ..()
if(!.)
return
@@ -956,6 +948,8 @@
stuff_in_hand.forceMove(user.drop_location())
stuff_in_hand.loc.visible_message(span_warning("[stuff_in_hand] suddenly appears!"))
+ if(clumsy && user.dropItemToGround(src, force = TRUE, silent = TRUE))
+ do_teleport(src, get_turf(user), 50, channel = TELEPORT_CHANNEL_BLUESPACE) //Wait, where did it go?
/obj/item/melee/baton/nunchaku
name = "Syndie Fitness Nunchuks"
@@ -998,7 +992,7 @@
randomize_state()
// blocks any melee/throwable attacks
- owner.adjustStaminaLoss(5)
+ owner.adjust_stamina_loss(5)
final_block_chance = 100
// counterattack at melee
diff --git a/code/game/objects/items/melee/chainofcommand.dm b/code/game/objects/items/melee/chainofcommand.dm
index 8009b031df4c79..ed0482f4abc1bf 100644
--- a/code/game/objects/items/melee/chainofcommand.dm
+++ b/code/game/objects/items/melee/chainofcommand.dm
@@ -66,7 +66,8 @@
/atom/movable/screen/alert/status_effect/commanded
name = "Commanded"
desc = "You are inspired to do things faster!"
- icon_state = "commanded"
+ use_user_hud_icon = TRUE
+ overlay_state = "commanded"
/obj/item/melee/chainofcommand/tailwhip
name = "liz o' nine tails"
@@ -74,6 +75,7 @@
icon_state = "tailwhip"
inhand_icon_state = "tailwhip"
item_flags = NONE
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.1)
/obj/item/melee/chainofcommand/tailwhip/kitty
name = "cat o' nine tails"
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 956c75bb94334e..8c450549066494 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -23,6 +23,8 @@
var/active_force = 30
/// Throwforce while active.
var/active_throwforce = 20
+ /// The throw speed of the weapon when on
+ var/active_throw_speed = 4
/// Sharpness while active.
var/active_sharpness = SHARP_EDGED
/// Hitsound played attacking while active.
@@ -61,7 +63,7 @@
/datum/component/transforming, \
force_on = active_force, \
throwforce_on = active_throwforce, \
- throw_speed_on = 4, \
+ throw_speed_on = active_throw_speed, \
sharpness_on = active_sharpness, \
hitsound_on = active_hitsound, \
w_class_on = active_w_class, \
@@ -156,6 +158,7 @@
active_force = 150
active_throwforce = 30
+ active_throw_speed = 3
active_w_class = WEIGHT_CLASS_HUGE
/obj/item/melee/energy/axe/make_transformable()
@@ -163,7 +166,7 @@
/datum/component/transforming, \
force_on = active_force, \
throwforce_on = active_throwforce, \
- throw_speed_on = throw_speed, \
+ throw_speed_on = active_throw_speed, \
sharpness_on = sharpness, \
w_class_on = active_w_class, \
)
@@ -211,6 +214,9 @@
if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
return FALSE
+ if(attack_type == OVERWHELMING_ATTACK)
+ return FALSE
+
if(attack_type == LEAP_ATTACK)
final_block_chance -= 25 //OH GOD GET IT OFF ME
@@ -384,7 +390,7 @@
icon_angle = 0
/obj/item/melee/energy/sword/surplus
- name = "\improper Type I 'Iaito' energy sword"
+ name = "\improper Pattern I 'Iaito' energy sword"
desc = "Oversized, overengineered, and somehow still mass-produced. The twin energy blades, theoretically, help make up for the poor cutting plane the emitter generates. \
When there are no more heroes in a desperate struggle, it's kill or be killed."
icon_state = "surplus_e_sword"
@@ -396,6 +402,7 @@
inhand_y_dimension = 64
active_force = 15 // This force is augmented by the state of our target.
active_throwforce = 15
+ active_throw_speed = 3
alt_continuous = list("whacks", "smacks", "bashes")
alt_simple = list("whack", "smack", "bash")
alt_sharpness = NONE
@@ -414,7 +421,6 @@
. = ..()
RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, PROC_REF(check_power))
AddElement(/datum/element/examine_lore, \
- lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
lore = "This early iteration of the now infamous energy sword was, supposedly, a Waffle Corp prototype first trialed in a variety of armed conflicts \
around the interstellar frontier.
\
\
@@ -499,6 +505,26 @@
if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) || charge <= 0)
return
+ expend_charge(user)
+
+/obj/item/melee/energy/sword/surplus/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(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
+ return FALSE
+
+ if(attack_type == OVERWHELMING_ATTACK)
+ return FALSE
+
+ if(attack_type == LEAP_ATTACK)
+ final_block_chance -= 25
+
+ if(prob(final_block_chance) && charge)
+ expend_charge(owner)
+ return TRUE
+
+/obj/item/melee/energy/sword/surplus/proc/expend_charge(mob/user)
+ if(!charge) // not that this will ever get here without charge, but...
+ return
+
charge--
if(charge <= 0)
user.balloon_alert(user, "out of charge!")
@@ -531,20 +557,17 @@
armour_penetration = 0
wound_bonus = -10
demolition_mod = 1
- embed_type = /datum/embedding/holy_esword
sword_color_icon = "blue"
light_color = LIGHT_COLOR_LIGHT_CYAN
active_force = 18
active_throwforce = 10
+ active_throw_speed = 3
alt_force_mod = -3
/obj/item/melee/energy/sword/nullrod/Initialize(mapload)
. = ..()
AddElement(/datum/element/nullrod_core)
-/datum/embedding/holy_esword
- embed_chance = 0
-
/obj/item/melee/energy/sword/nullrod/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(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
return FALSE
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index e757897d69157d..2f4defafa2cdd2 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -43,7 +43,7 @@
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
obj_flags = CONDUCTS_ELECTRICITY | UNIQUE_RENAME
- force = 15
+ force = 20
throwforce = 10
demolition_mod = 0.75 //but not metal
w_class = WEIGHT_CLASS_BULKY
@@ -94,7 +94,7 @@
INVOKE_ASYNC(baned_target, TYPE_PROC_REF(/mob/living/carbon/human, emote), "scream")
/obj/item/melee/sabre/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(attack_type == (PROJECTILE_ATTACK || LEAP_ATTACK || OVERWHELMING_ATTACK))
+ if(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK || attack_type == OVERWHELMING_ATTACK)
final_block_chance = 0 //Don't bring a sword to a gunfight, and also you aren't going to really block someone full body tackling you with a sword. Or a road roller, if one happened to hit you.
return ..()
@@ -139,11 +139,11 @@
if(!QDELETED(affecting) && !(affecting.bodypart_flags & BODYPART_UNREMOVABLE) && affecting.owner == user && !QDELETED(user))
playsound(user, hitsound, 25, TRUE)
affecting.dismember(BRUTE)
- user.adjustBruteLoss(20)
+ user.adjust_brute_loss(force * 1.25)
/obj/item/melee/sabre/proc/manual_suicide(mob/living/user, originally_nodropped)
if(!QDELETED(user))
- user.adjustBruteLoss(200)
+ user.adjust_brute_loss(200)
user.death(FALSE)
REMOVE_TRAIT(src, TRAIT_NODROP, SABRE_SUICIDE_TRAIT)
@@ -178,7 +178,7 @@
AddComponent(/datum/component/jousting)
/obj/item/melee/parsnip_sabre/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(attack_type == (PROJECTILE_ATTACK || LEAP_ATTACK || OVERWHELMING_ATTACK))
+ if(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK || attack_type == OVERWHELMING_ATTACK)
final_block_chance = 0 //Don't bring a sword to a gunfight, and also you aren't going to really block someone full body tackling you with a sword. Or a road roller, if one happened to hit you.
return ..()
@@ -214,12 +214,12 @@
block_sound = 'sound/items/weapons/parry.ogg'
/obj/item/melee/beesword/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(attack_type == (PROJECTILE_ATTACK || LEAP_ATTACK || OVERWHELMING_ATTACK))
+ if(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK || attack_type == OVERWHELMING_ATTACK)
final_block_chance = 0 //Don't bring a sword to a gunfight, and also you aren't going to really block someone full body tackling you with a sword. Or a road roller, if one happened to hit you.
return ..()
/obj/item/melee/beesword/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
- if(iscarbon(target))
+ if(iscarbon(target) && !QDELETED(target))
var/mob/living/carbon/carbon_target = target
carbon_target.reagents.add_reagent(/datum/reagent/toxin, 4)
@@ -243,6 +243,7 @@
armour_penetration = 1000
force_string = "INFINITE"
item_flags = NEEDS_PERMIT|NO_BLOOD_ON_ITEM
+ custom_materials = list(/datum/material/adamantine = SHEET_MATERIAL_AMOUNT * 20, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
var/obj/machinery/power/supermatter_crystal/shard
var/balanced = 1
@@ -543,6 +544,7 @@
desc = "[initial(desc)] Its handle is made of [material.name]."
/obj/item/melee/cleric_mace/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(attack_type == (PROJECTILE_ATTACK || LEAP_ATTACK || OVERWHELMING_ATTACK))
+ if(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK || attack_type == OVERWHELMING_ATTACK)
final_block_chance = 0 //Don't bring a...mace to a gunfight, and also you aren't going to really block someone full body tackling you with a mace. Or a road roller, if one happened to hit you.
return ..()
+
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index dfff30effdc197..2e23ffdfbb7791 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -220,6 +220,7 @@ GLOBAL_LIST_EMPTY(sniffable_sheets)
desc = "A handheld tracking device that locates sheets of glass and iron."
icon_state = "pinpointer_sniffer"
worn_icon_state = "pinpointer_black"
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.8, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7)
/obj/item/pinpointer/material_sniffer/scan_for_target()
if(target || !GLOB.sniffable_sheets.len)
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumatic_cannon.dm
similarity index 99%
rename from code/game/objects/items/pneumaticCannon.dm
rename to code/game/objects/items/pneumatic_cannon.dm
index e8fe75c74b36ac..8ea0ee60b67a05 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumatic_cannon.dm
@@ -20,6 +20,7 @@
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
armor_type = /datum/armor/item_pneumatic_cannon
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6)
var/maxWeightClass = 20 //The max weight of items that can fit into the cannon
var/loadedWeightClass = 0 //The weight of items currently in the cannon
var/obj/item/tank/internals/tank = null //The gas tank that is drawn from to fire things
diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm
index 892cbe70489ff0..1e531a2ddcc67c 100644
--- a/code/game/objects/items/rcd/RCD.dm
+++ b/code/game/objects/items/rcd/RCD.dm
@@ -68,9 +68,9 @@
design_category = GLOB.rcd_designs[root_category][1]
var/list/design = GLOB.rcd_designs[root_category][design_category][1]
- rcd_design_path = design["[RCD_DESIGN_PATH]"]
+ rcd_design_path = design[RCD_DESIGN_PATH]
design_title = initial(rcd_design_path.name)
- mode = design["[RCD_DESIGN_MODE]"]
+ mode = design[RCD_DESIGN_MODE]
construction_mode = mode
GLOB.rcd_list += src
@@ -115,15 +115,13 @@
mode = RCD_TURF
user.visible_message(span_suicide("[user] sets the RCD to 'Wall' and points it down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide!"))
- if(checkResource(16, user)) // It takes 16 resources to construct a wall
+ if(useResource(16, user)) // It takes 16 resources to construct a wall
var/success = T.rcd_act(user, src, list("[RCD_DESIGN_MODE]" = RCD_TURF, "[RCD_DESIGN_PATH]" = /turf/open/floor/plating/rcd))
T = get_turf(user)
// If the RCD placed a floor instead of a wall, having a wall without plating under it is cursed
// There isn't an easy programmatical way to check if rcd_act will place a floor or a wall, so just repeat using it for free
if(success && isopenturf(T))
T.rcd_act(user, src, list("[RCD_DESIGN_MODE]" = RCD_TURF, "[RCD_DESIGN_PATH]" = /turf/open/floor/plating/rcd))
- useResource(16, user)
- activate()
playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
user.gib(DROP_ALL_REMAINS)
return MANUAL_SUICIDE
@@ -140,8 +138,8 @@
* * [mob][user]- the user
*/
/obj/item/construction/rcd/proc/can_place(atom/target, list/rcd_results, mob/user)
- var/rcd_mode = rcd_results["[RCD_DESIGN_MODE]"]
- var/atom/movable/rcd_structure = rcd_results["[RCD_DESIGN_PATH]"]
+ var/rcd_mode = rcd_results[RCD_DESIGN_MODE]
+ var/atom/movable/rcd_structure = rcd_results[RCD_DESIGN_PATH]
/**
*For anything that does not go an a wall we have to make sure that turf is clear for us to put the structure on it
*If we are just trying to destroy something then this check is not necessary
@@ -173,9 +171,18 @@
* if we are trying to create plating on turf which is not a proper floor then don't check for objects on top of the turf just allow that turf to be converted into plating. e.g. create plating beneath a player or underneath a machine frame/any dense object
* if we are trying to finish a wall girder then let it finish then make sure no one/nothing is stuck in the girder
*/
- else if(rcd_mode == RCD_TURF && rcd_structure == /turf/open/floor/plating/rcd && (!istype(target_turf, /turf/open/floor) || istype(target, /obj/structure/girder)))
+ else if(rcd_mode == RCD_TURF && rcd_structure == /turf/open/floor/plating/rcd)
//if a player builds a wallgirder on top of himself manually with iron sheets he can't finish the wall if he is still on the girder. Exclude the girder itself when checking for other dense objects on the turf
- if(istype(target, /obj/structure/girder) && target_turf.is_blocked_turf(exclude_mobs = FALSE, source_atom = null, ignore_atoms = list(target)))
+ var/list/ignore_types = list()
+ if(isturf(target))
+ if(isfloorturf(target))
+ ignore_types += /obj/structure/girder
+ else
+ ignore_types = null
+ else if(istype(target, /obj/structure/girder))
+ ignore_types += /obj/structure/girder
+
+ if(ignore_types && target_turf.is_blocked_turf(exclude_mobs = FALSE, source_atom = null, ignore_atoms = ignore_types, type_list = TRUE))
playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
balloon_alert(user, "something is on the girder!")
return FALSE
@@ -250,8 +257,8 @@
balloon_alert(user, "too durable!")
return ITEM_INTERACT_BLOCKING
- rcd_results["[RCD_DESIGN_MODE]"] = mode
- rcd_results["[RCD_DESIGN_PATH]"] = rcd_design_path
+ rcd_results[RCD_DESIGN_MODE] = mode
+ rcd_results[RCD_DESIGN_PATH] = rcd_design_path
var/delay = rcd_results["delay"] * delay_mod
if (
@@ -265,10 +272,10 @@
var/target_name = target.name //Store this information before it gets mutated by the rcd.
var/target_path = target.type
- var/atom/design_path = rcd_results["[RCD_DESIGN_PATH]"]
+ var/atom/design_path = rcd_results[RCD_DESIGN_PATH]
var/location = AREACOORD(target)
if(_rcd_create_effect(target, user, delay, rcd_results))
- log_tool("[key_name(user)] used [src] to [rcd_results["[RCD_DESIGN_MODE]"] != RCD_DECONSTRUCT ? "construct [initial(design_path.name)]([design_path])" : "deconstruct [target_name]([target_path])"] at [location]")
+ log_tool("[key_name(user)] used [src] to [rcd_results[RCD_DESIGN_MODE] != RCD_DECONSTRUCT ? "construct [initial(design_path.name)]([design_path])" : "deconstruct [target_name]([target_path])"] at [location]")
current_active_effects -= 1
return ITEM_INTERACT_SUCCESS
@@ -285,10 +292,10 @@
/obj/item/construction/rcd/proc/_rcd_create_effect(atom/target, mob/user, delay, list/rcd_results)
PRIVATE_PROC(TRUE)
- var/obj/effect/constructing_effect/rcd_effect = new(get_turf(target), delay, rcd_results["[RCD_DESIGN_MODE]"], construction_upgrades)
+ var/obj/effect/constructing_effect/rcd_effect = new(get_turf(target), delay, rcd_results[RCD_DESIGN_MODE], construction_upgrades)
//resource & structure placement sanity checks before & after delay along with beam effects
- if(!checkResource(rcd_results["cost"], user) || !can_place(target, rcd_results, user))
+ if(!useResource(rcd_results["cost"], user, TRUE) || !can_place(target, rcd_results, user))
qdel(rcd_effect)
return FALSE
var/beam
@@ -302,17 +309,14 @@
return FALSE
if (QDELETED(rcd_effect))
return FALSE
- if(!checkResource(rcd_results["cost"], user) || !can_place(target, rcd_results, user))
+ if(!useResource(rcd_results["cost"], user, TRUE) || !can_place(target, rcd_results, user))
qdel(rcd_effect)
return FALSE
- if(!useResource(rcd_results["cost"], user))
- qdel(rcd_effect)
- return FALSE
- activate()
if(!target.rcd_act(user, src, rcd_results))
qdel(rcd_effect)
return FALSE
+ useResource(rcd_results["cost"], user)
playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
rcd_effect.end_animation()
return TRUE
@@ -417,9 +421,9 @@
if(design == null) //not a valid design
return TRUE
design_category = category_name
- mode = design["[RCD_DESIGN_MODE]"]
+ mode = design[RCD_DESIGN_MODE]
construction_mode = mode
- rcd_design_path = design["[RCD_DESIGN_PATH]"]
+ rcd_design_path = design[RCD_DESIGN_PATH]
design_title = initial(rcd_design_path.name)
blueprint_changed = TRUE
@@ -486,31 +490,20 @@
max_matter = borgy.cell.maxcharge
return borgy.cell.charge
-/obj/item/construction/rcd/borg/useResource(amount, mob/user)
- if(!iscyborg(user))
- return 0
- var/mob/living/silicon/robot/borgy = user
- if(!borgy.cell)
- if(user)
- balloon_alert(user, "no cell found!")
- return 0
- . = borgy.cell.use(amount * energyfactor) //borgs get 1.3x the use of their RCDs
- if(!. && user)
- balloon_alert(user, "insufficient charge!")
- return .
-
-/obj/item/construction/rcd/borg/checkResource(amount, mob/user)
- if(!iscyborg(user))
- return 0
+/obj/item/construction/rcd/borg/useResource(amount, mob/user, dry_run)
var/mob/living/silicon/robot/borgy = user
+ if(!iscyborg(borgy))
+ return FALSE
if(!borgy.cell)
- if(user)
- balloon_alert(user, "no cell found!")
- return 0
- . = borgy.cell.charge >= (amount * energyfactor)
- if(!. && user)
+ balloon_alert(user, "no cell found!")
+ return FALSE
+ if(borgy.cell.charge < (amount * energyfactor))
balloon_alert(user, "insufficient charge!")
- return .
+ return FALSE
+ if(!dry_run)
+ playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+ return borgy.cell.use(amount * energyfactor)
+ return TRUE
/obj/item/construction/rcd/borg/syndicate
name = "syndicate RCD"
@@ -603,28 +596,37 @@
var/obj/vehicle/sealed/mecha/gundam = owner
return round(gundam.get_charge() / MASS_TO_ENERGY)
-/obj/item/construction/rcd/exosuit/useResource(amount, mob/user)
+/obj/item/construction/rcd/exosuit/useResource(amount, mob/user, dry_run)
if(silo_link)
return ..()
if(!ismecha(owner))
- return 0
- var/obj/vehicle/sealed/mecha/gundam = owner
- if(!gundam.use_energy(amount * MASS_TO_ENERGY))
- gundam.balloon_alert(user, "insufficient charge!")
return FALSE
- return TRUE
-
-/obj/item/construction/rcd/exosuit/checkResource(amount, mob/user)
- if(silo_link)
- return ..()
- if(!ismecha(owner))
- return 0
var/obj/vehicle/sealed/mecha/gundam = owner
if(!gundam.has_charge(amount * MASS_TO_ENERGY))
gundam.balloon_alert(user, "insufficient charge!")
return FALSE
+ if(!dry_run)
+ playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+ return gundam.use_energy(amount * MASS_TO_ENERGY)
return TRUE
+/obj/item/construction/rcd/exosuit/detonate_pulse()
+ var/obj/item/mecha_parts/mecha_equipment/rcd/ourshell = loc
+ if(!istype(ourshell))
+ return
+ ourshell.audible_message(span_danger("[ourshell] begins to vibrate and buzz loudly!"), \
+ span_danger("[ourshell] begins vibrating violently!"))
+ // 5 seconds to get rid of it
+ addtimer(CALLBACK(src, PROC_REF(detonate_pulse_explode)), 5 SECONDS)
+
+/obj/item/construction/rcd/exosuit/detonate_pulse_explode()
+ var/obj/item/mecha_parts/mecha_equipment/rcd/ourshell = loc
+ explosion(ourshell, light_impact_range = 3, flame_range = 1, flash_range = 1)
+ if(owner)
+ ourshell.detach()
+ qdel(ourshell)
+
+
#undef MASS_TO_ENERGY
#undef FREQUENT_USE_DEBUFF_MULTIPLIER
diff --git a/code/game/objects/items/rcd/RCL.dm b/code/game/objects/items/rcd/RCL.dm
index 1d966d37670f49..6c48d2f691d759 100644
--- a/code/game/objects/items/rcd/RCL.dm
+++ b/code/game/objects/items/rcd/RCL.dm
@@ -324,6 +324,7 @@
max_amount = 30
name = "makeshift rapid pipe cleaner layer"
ghetto = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 15)
/obj/item/rcl/ghetto/update_icon_state()
if(!loaded)
diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm
index 53e5ba0cb7ddd3..ccd2b9f50639c5 100644
--- a/code/game/objects/items/rcd/RHD.dm
+++ b/code/game/objects/items/rcd/RHD.dm
@@ -35,7 +35,7 @@
/// bitflags for banned upgrades
var/banned_upgrades = NONE
/// remote connection to the silo
- var/datum/component/remote_materials/silo_mats
+ var/datum/remote_materials/silo_mats
/// switch to use internal or remote storage
var/silo_link = FALSE
/// has the blueprint design changed
@@ -51,9 +51,13 @@
spark_system.set_up(5, 0, src)
spark_system.attach(src)
if(construction_upgrades & RCD_UPGRADE_SILO_LINK)
- silo_mats = AddComponent(/datum/component/remote_materials, mapload, FALSE)
+ silo_mats = new (src, mapload, FALSE)
update_appearance()
+/obj/item/construction/Destroy()
+ QDEL_NULL(silo_mats)
+ return ..()
+
///An do_after() specially designed for rhd devices
/obj/item/construction/proc/build_delay(mob/user, delay, atom/target)
if(delay <= 0)
@@ -122,7 +126,7 @@
return FALSE
construction_upgrades |= design_disk.upgrade
if((design_disk.upgrade & RCD_UPGRADE_SILO_LINK) && !silo_mats)
- silo_mats = AddComponent(/datum/component/remote_materials, FALSE, FALSE)
+ silo_mats = new (src, FALSE, FALSE)
playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
qdel(design_disk)
update_static_data_for_all_viewers()
@@ -166,9 +170,6 @@
balloon_alert(user, "storage full!")
return FALSE
-/obj/item/construction/proc/activate()
- playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
-
/obj/item/construction/attack_self(mob/user)
playsound(loc, 'sound/effects/pop.ogg', 50, FALSE)
if(prob(20))
@@ -181,27 +182,39 @@
if(ratio > 0)
. += "[icon_state]_charge[ratio]"
-/obj/item/construction/proc/useResource(amount, mob/user)
+/**
+ * Uses resource to do some action. Returns amount of resource used or TRUE/FALSE if only an dry run is required
+ *
+ * Arguments
+ * * amount - the amount of resource to use
+ * * mob/user - the player using the resource
+ * * dry_run - if TRUE will only check if the amount of resource is available but will not use any
+*/
+/obj/item/construction/proc/useResource(amount, mob/user, dry_run = FALSE)
if(!silo_mats || !silo_link)
if(matter < amount)
+ if(has_ammobar)
+ flick("[icon_state]_empty", src)
if(user)
balloon_alert(user, "not enough matter!")
return FALSE
- matter -= amount
- update_appearance()
- return TRUE
+ if(!dry_run)
+ matter -= amount
+ update_appearance()
+ playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
else
- if(!silo_mats.mat_container)
+ if(!silo_mats.can_use_resource(user_data = ID_DATA(user)))
if(user)
- balloon_alert(user, "no silo detected!")
+ balloon_alert(user, "permission denied!")
return FALSE
-
if(!silo_mats.mat_container.has_enough_of_material(/datum/material/iron, amount * SILO_USE_AMOUNT))
if(user)
balloon_alert(user, "not enough silo material!")
return FALSE
- silo_mats.use_materials(list(/datum/material/iron = SILO_USE_AMOUNT), multiplier = amount, action = "RESTOCKED", name = "x restocked an RCD", user_data = ID_DATA(user))
- return TRUE
+ if(!dry_run)
+ amount = silo_mats.use_materials(list(/datum/material/iron = SILO_USE_AMOUNT), multiplier = amount, action = "RESTOCKED", name = "x restocked an RCD", user_data = ID_DATA(user))
+ playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+ return dry_run ? TRUE : amount
/obj/item/construction/ui_static_data(mob/user)
. = list()
@@ -254,23 +267,6 @@
/obj/item/construction/proc/handle_ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
return null
-/obj/item/construction/proc/checkResource(amount, mob/user)
- if(!silo_mats || !silo_mats.mat_container || !silo_link)
- if(silo_link)
- balloon_alert(user, "silo link invalid!")
- return FALSE
- else
- . = matter >= amount
- else
- if(!silo_mats.can_use_resource(user_data = ID_DATA(user)))
- return FALSE
- . = silo_mats.mat_container.has_enough_of_material(/datum/material/iron, amount * SILO_USE_AMOUNT)
- if(!. && user)
- balloon_alert(user, "low ammo!")
- if(has_ammobar)
- flick("[icon_state]_empty", src) //somewhat hacky thing to make RCDs with ammo counters actually have a blinking yellow light
- return .
-
/obj/item/construction/proc/range_check(atom/target, mob/user)
if(target.z != user.z)
return
diff --git a/code/game/objects/items/rcd/RLD.dm b/code/game/objects/items/rcd/RLD.dm
index d88bb86e68bbf0..0a038ebc650c54 100644
--- a/code/game/objects/items/rcd/RLD.dm
+++ b/code/game/objects/items/rcd/RLD.dm
@@ -1,11 +1,11 @@
// RAPID LIGHTING DEVICE
-// modes of operation
+//modes of operation
#define GLOW_MODE 1
#define LIGHT_MODE 2
#define REMOVE_MODE 3
-// operation costs
+//operation costs
#define LIGHT_TUBE_COST 10
#define FLOOR_LIGHT_COST 15
#define GLOW_STICK_COST 5
@@ -32,7 +32,6 @@
/// mode of operation see above defines
var/mode = LIGHT_MODE
-
///reference to thr original icons
var/static/list/original_options = list(
"Color Pick" = icon(icon = 'icons/hud/radial.dmi', icon_state = "omni"),
@@ -42,6 +41,7 @@
)
///will contain the original icons modified with the color choice
var/list/display_options = list()
+ ///Current color choice
var/color_choice = "#ffffff"
/obj/item/construction/rld/Initialize(mapload)
@@ -69,7 +69,7 @@
mode = GLOW_MODE
to_chat(user, span_notice("You change RLD's mode to 'Light Launcher'."))
if("Color Pick")
- var/new_choice = input(user,"","Choose Color",color_choice) as color
+ var/new_choice = tgui_color_picker(user, "", "Choose Color", color_choice)
if(new_choice == null)
return
@@ -78,7 +78,7 @@
if(option == "Color Pick" || option == "Deconstruct" || option == "Silo Link")
continue
var/icon/icon = icon(original_options[option])
- icon.SetIntensity(new_rgb[1]/255, new_rgb[2]/255, new_rgb[3]/255) //apply new scale
+ icon.SetIntensity(new_rgb[1] / 255, new_rgb[2] / 255, new_rgb[3] / 255) //apply new scale
display_options[option] = icon
color_choice = new_choice
@@ -101,8 +101,8 @@
/**
* Try to place/remove a light or throw a glowstick
- * Arguments
*
+ * Arguments
* * atom/interacting_with - the target atom to light or throw glowsticks at
* * mob/user - the player doing this action
*/
@@ -119,26 +119,24 @@
return NONE
//resource sanity checks before & after delay
- if(!checkResource(DECONSTRUCT_COST, user))
+ if(!useResource(DECONSTRUCT_COST, user, TRUE))
return ITEM_INTERACT_BLOCKING
var/beam = user.Beam(interacting_with, icon_state="light_beam", time = 15)
playsound(src, 'sound/machines/click.ogg', 50, TRUE)
if(!do_after(user, REMOVE_DELAY, target = interacting_with))
qdel(beam)
return ITEM_INTERACT_BLOCKING
- if(!checkResource(DECONSTRUCT_COST, user))
+ if(!useResource(DECONSTRUCT_COST, user, TRUE))
return ITEM_INTERACT_BLOCKING
- if(!useResource(DECONSTRUCT_COST, user))
- return ITEM_INTERACT_BLOCKING
- activate()
qdel(interacting_with)
+ useResource(DECONSTRUCT_COST, user)
return ITEM_INTERACT_SUCCESS
if(LIGHT_MODE)
//resource sanity checks before & after delay
var/cost = iswallturf(interacting_with) ? LIGHT_TUBE_COST : FLOOR_LIGHT_COST
- if(!checkResource(cost, user))
+ if(!useResource(cost, user, TRUE))
return ITEM_INTERACT_BLOCKING
var/beam = user.Beam(interacting_with, icon_state="light_beam", time = BUILD_DELAY)
playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
@@ -146,7 +144,7 @@
if(!do_after(user, BUILD_DELAY, target = interacting_with))
qdel(beam)
return ITEM_INTERACT_BLOCKING
- if(!checkResource(cost, user))
+ if(!useResource(cost, user, TRUE))
return ITEM_INTERACT_BLOCKING
if(iswallturf(interacting_with))
@@ -173,31 +171,26 @@
if(!winner)
balloon_alert(user, "no valid target!")
return ITEM_INTERACT_BLOCKING
- if(!useResource(cost, user))
- return ITEM_INTERACT_BLOCKING
- activate()
var/obj/machinery/light/L = new /obj/machinery/light(get_turf(winner))
L.setDir(get_dir(winner, interacting_with))
L.color = color_choice
L.set_light_color(color_choice)
+ useResource(cost, user)
return ITEM_INTERACT_SUCCESS
if(isfloorturf(interacting_with))
var/turf/target = get_turf(interacting_with)
if(locate(/obj/machinery/light/floor) in target)
return ITEM_INTERACT_BLOCKING
- if(!useResource(cost, user))
- return ITEM_INTERACT_BLOCKING
- activate()
var/obj/machinery/light/floor/FL = new /obj/machinery/light/floor(target)
FL.color = color_choice
FL.set_light_color(color_choice)
+ useResource(cost, user)
return ITEM_INTERACT_SUCCESS
if(GLOW_MODE)
if(!useResource(GLOW_STICK_COST, user))
return ITEM_INTERACT_BLOCKING
- activate()
// Picks the closest fitting color for the fluid by hue
var/closest_diff = null
var/closest_fluid = null
diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm
index 043d99125c084d..5a4ae38f87304e 100644
--- a/code/game/objects/items/rcd/RPLD.dm
+++ b/code/game/objects/items/rcd/RPLD.dm
@@ -197,26 +197,23 @@
//resource & placement sanity check before & after delay
var/is_allowed = TRUE
- if(!checkResource(cost, user) || !(is_allowed = canPlace(destination)))
+ if(!useResource(cost, user, TRUE) || !(is_allowed = canPlace(destination)))
if(!is_allowed)
balloon_alert(user, "tile is blocked!")
return FALSE
if(!build_delay(user, cost, target = destination))
return FALSE
- if(!checkResource(cost, user) || !(is_allowed = canPlace(destination)))
+ if(!useResource(cost, user, TRUE) || !(is_allowed = canPlace(destination)))
if(!is_allowed)
balloon_alert(user, "tile is blocked!")
return FALSE
- if(!useResource(cost, user))
- return FALSE
- activate()
playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
if(ispath(blueprint, /obj/machinery/duct))
- var/is_omni = current_color == DUCT_COLOR_OMNI
- new blueprint(destination, FALSE, GLOB.pipe_paint_colors[current_color], GLOB.plumbing_layers[current_layer], null, is_omni)
+ new blueprint(destination, GLOB.pipe_paint_colors[current_color], GLOB.plumbing_layers[current_layer])
else
- new blueprint(destination, FALSE, GLOB.plumbing_layers[current_layer])
+ new blueprint(destination, GLOB.plumbing_layers[current_layer])
+ useResource(cost, user)
return TRUE
/obj/item/construction/plumbing/proc/canPlace(turf/destination)
@@ -312,6 +309,8 @@
name = "service plumbing constructor"
desc = "A type of plumbing constructor designed to rapidly deploy the machines needed to make a brewery."
icon_state = "plumberer_service"
+ ///Extra price because it appears in bartender's vendor
+ custom_premium_price = PAYCHECK_CREW * 6
///Design types for plumbing service constructor
var/static/list/service_design_types = list(
//Category 1 synthesizers
diff --git a/code/game/objects/items/rcd/RTD.dm b/code/game/objects/items/rcd/RTD.dm
index 50f973246c800b..b552fc33d4e1ad 100644
--- a/code/game/objects/items/rcd/RTD.dm
+++ b/code/game/objects/items/rcd/RTD.dm
@@ -285,7 +285,7 @@
return ITEM_INTERACT_BLOCKING
//resource sanity check before & after delay along with special effects
- if(!checkResource(selected_design.cost, user))
+ if(!useResource(selected_design.cost, user, TRUE))
return ITEM_INTERACT_BLOCKING
var/delay = CONSTRUCTION_TIME(selected_design.cost)
var/obj/effect/constructing_effect/rcd_effect = new(floor, delay, RCD_TURF)
@@ -299,15 +299,11 @@
qdel(beam)
qdel(rcd_effect)
return ITEM_INTERACT_BLOCKING
- if(!checkResource(selected_design.cost, user))
+ if(!useResource(selected_design.cost, user, TRUE))
qdel(rcd_effect)
return ITEM_INTERACT_BLOCKING
//do the tilling
- if(!useResource(selected_design.cost, user))
- qdel(rcd_effect)
- return ITEM_INTERACT_BLOCKING
- activate()
//step 1 create tile
var/obj/item/stack/tile/final_tile = selected_design.new_tile(user.drop_location(), selected_direction)
if(QDELETED(final_tile)) //if you were standing on a stack of tiles this newly spawned tile could get merged with it cause its spawned on your location
@@ -320,6 +316,7 @@
for(var/datum/overlay_info/info in design_overlays)
info.add_decal(new_turf)
rcd_effect.end_animation()
+ useResource(selected_design.cost, user)
return ITEM_INTERACT_SUCCESS
@@ -357,7 +354,7 @@
return ITEM_INTERACT_BLOCKING
//resource sanity check before & after delay along with beam effects
- if(!checkResource(cost * 0.7, user)) //no ballon alert for checkResource as it already spans an alert to chat
+ if(!useResource(cost * 0.7, user, TRUE)) //no ballon alert for checkResource as it already spans an alert to chat
return ITEM_INTERACT_BLOCKING
var/delay = DECONSTRUCTION_TIME(cost)
var/obj/effect/constructing_effect/rcd_effect = new(floor, delay, RCD_DECONSTRUCT)
@@ -371,15 +368,11 @@
qdel(beam)
qdel(rcd_effect)
return ITEM_INTERACT_BLOCKING
- if(!checkResource(cost * 0.7, user))
+ if(!useResource(cost * 0.7, user, TRUE))
qdel(rcd_effect)
return ITEM_INTERACT_BLOCKING
//begin deconstruction
- if(!useResource(cost * 0.7, user))
- qdel(rcd_effect)
- return ITEM_INTERACT_BLOCKING
- activate()
//find & collect all decals
var/list/all_decals = list()
for(var/obj/effect/decal in floor.contents)
@@ -393,6 +386,7 @@
else //for every other turf we scrape away exposing base turf underneath
floor.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
rcd_effect.end_animation()
+ useResource(cost * 0.7, user)
return ITEM_INTERACT_SUCCESS
@@ -415,27 +409,20 @@
max_matter = borgy.cell.maxcharge
return borgy.cell.charge
-/obj/item/construction/rtd/borg/useResource(amount, mob/user)
- if(!iscyborg(user))
- return 0
- var/mob/living/silicon/robot/borgy = user
- if(!borgy.cell)
- balloon_alert(user, "no cell found!")
- return 0
- . = borgy.cell.use(amount * RTD_BORG_ENERGY_FACTOR)
- if(!.)
- balloon_alert(user, "insufficient charge!")
-
-/obj/item/construction/rtd/borg/checkResource(amount, mob/user)
- if(!iscyborg(user))
- return 0
+/obj/item/construction/rtd/borg/useResource(amount, mob/user, dry_run)
var/mob/living/silicon/robot/borgy = user
+ if(!iscyborg(borgy))
+ return FALSE
if(!borgy.cell)
balloon_alert(user, "no cell found!")
- return 0
- . = borgy.cell.charge >= (amount * RTD_BORG_ENERGY_FACTOR)
- if(!.)
+ return FALSE
+ if(borgy.cell.charge < (amount * RTD_BORG_ENERGY_FACTOR))
balloon_alert(user, "insufficient charge!")
+ return FALSE
+ if(!dry_run)
+ playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+ return borgy.cell.use(amount * RTD_BORG_ENERGY_FACTOR)
+ return TRUE
#undef RTD_BORG_ENERGY_FACTOR
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index 728e7dbe584a71..e820a462ff5305 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -9,6 +9,7 @@
attack_verb_simple = list("forcefully inspire", "violently encourage", "relentlessly galvanize")
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
var/inspiration_available = TRUE //If this banner can be used to inspire crew
var/morale_time = 0
var/morale_cooldown = 600 //How many deciseconds between uses
@@ -66,8 +67,8 @@
/obj/item/banner/proc/inspiration(mob/living/carbon/human/inspired_human)
var/need_mob_update = FALSE
- need_mob_update += inspired_human.adjustBruteLoss(-15, updating_health = FALSE)
- need_mob_update += inspired_human.adjustFireLoss(-15, updating_health = FALSE)
+ need_mob_update += inspired_human.adjust_brute_loss(-15, updating_health = FALSE)
+ need_mob_update += inspired_human.adjust_fire_loss(-15, updating_health = FALSE)
if(need_mob_update)
inspired_human.updatehealth()
inspired_human.AdjustStun(-4 SECONDS)
@@ -129,8 +130,8 @@
/obj/item/banner/medical/special_inspiration(mob/living/carbon/human/inspired_human)
var/need_mob_update = FALSE
- need_mob_update += inspired_human.adjustToxLoss(-15, updating_health = FALSE)
- need_mob_update += inspired_human.setOxyLoss(0, updating_health = FALSE)
+ need_mob_update += inspired_human.adjust_tox_loss(-15, updating_health = FALSE)
+ need_mob_update += inspired_human.set_oxy_loss(0, updating_health = FALSE)
if(need_mob_update)
inspired_human.updatehealth()
inspired_human.reagents.add_reagent(/datum/reagent/medicine/inaprovaline, 5)
@@ -404,6 +405,9 @@
/obj/item/claymore/weak
desc = "This one is rusted."
+ icon = 'icons/obj/weapons/sword.dmi'
+ icon_state = "claymore_old"
+ worn_icon = 'icons/mob/clothing/back.dmi'
force = 30
armour_penetration = 15
diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm
index 96e043032ba68e..3a99888c4e752d 100644
--- a/code/game/objects/items/robot/items/generic.dm
+++ b/code/game/objects/items/robot/items/generic.dm
@@ -39,7 +39,7 @@
return
user.do_attack_animation(attacked_mob)
- attacked_mob.adjustStaminaLoss(stamina_damage)
+ attacked_mob.adjust_stamina_loss(stamina_damage)
attacked_mob.set_confusion_if_lower(5 SECONDS)
attacked_mob.adjust_stutter(20 SECONDS)
attacked_mob.set_jitter_if_lower(5 SECONDS)
@@ -175,7 +175,7 @@
)
else
if(!iscyborg(attacked_mob))
- attacked_mob.adjustFireLoss(10)
+ attacked_mob.adjust_fire_loss(10)
user.visible_message(
span_userdanger("[user] shocks [attacked_mob]!"),
span_danger("You shock [attacked_mob]!"),
@@ -202,7 +202,7 @@
span_danger("You crush [attacked_mob]!"),
)
playsound(loc, 'sound/items/weapons/smash.ogg', 50, TRUE, -1)
- attacked_mob.adjustBruteLoss(15)
+ attacked_mob.adjust_brute_loss(15)
user.cell.use(0.3 * STANDARD_CELL_CHARGE, force = TRUE)
COOLDOWN_START(src, crush_cooldown, HUG_CRUSH_COOLDOWN)
@@ -374,7 +374,7 @@
span_danger("The siren pierces your hearing!"),
)
for(var/mob/living/carbon/carbon in get_hearers_in_view(9, user))
- if(carbon.get_ear_protection())
+ if(carbon.get_ear_protection() > 0)
continue
carbon.adjust_confusion(6 SECONDS)
@@ -387,18 +387,20 @@
to_chat(robot_user.connected_ai, "
[span_notice("NOTICE - Peacekeeping 'HARM ALARM' used by: [user]")]
")
else
user.audible_message("BZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZT")
- for(var/mob/living/carbon/carbon in get_hearers_in_view(9, user))
- var/bang_effect = carbon.soundbang_act(2, 0, 0, 5)
+ for(var/mob/living/living in get_hearers_in_view(9, user))
+ var/bang_effect = living.soundbang_act(SOUNDBANG_STRONG, 0, 0, 5)
switch(bang_effect)
+ if(0)
+ continue
if(1)
- carbon.adjust_confusion(5 SECONDS)
- carbon.adjust_stutter(20 SECONDS)
- carbon.adjust_jitter(20 SECONDS)
- if(2)
- carbon.Paralyze(40)
- carbon.adjust_confusion(10 SECONDS)
- carbon.adjust_stutter(30 SECONDS)
- carbon.adjust_jitter(50 SECONDS)
+ living.adjust_confusion(5 SECONDS)
+ living.adjust_stutter(20 SECONDS)
+ living.adjust_jitter(20 SECONDS)
+ else
+ living.Paralyze(4 SECONDS)
+ living.adjust_confusion(10 SECONDS)
+ living.adjust_stutter(30 SECONDS)
+ living.adjust_jitter(50 SECONDS)
playsound(get_turf(src), 'sound/machines/warning-buzzer.ogg', 130, 3)
COOLDOWN_START(src, alarm_cooldown, HARM_ALARM_NO_SAFETY_COOLDOWN)
user.log_message("used an emagged Cyborg Harm Alarm", LOG_ATTACK)
diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm
index 0915e735dcb0ea..117de62e37092f 100644
--- a/code/game/objects/items/robot/items/hypo.dm
+++ b/code/game/objects/items/robot/items/hypo.dm
@@ -115,13 +115,13 @@
* In most places we add + 1 because we're secretly keeping [max_volume_per_reagent + 1]
* units, so that when this reagent runs out it's not wholesale removed from the reagents
*/
- var/max_volume_per_reagent = 30
+ var/max_volume_per_reagent = 25
/// Cell cost for charging a reagent
- var/charge_cost = 0.05 * STANDARD_CELL_CHARGE
+ var/charge_cost = 0.075 * STANDARD_CELL_CHARGE
/// Counts up to the next time we charge
var/charge_timer = 0
/// Time it takes for shots to recharge (in seconds)
- var/recharge_time = 10
+ var/recharge_time = 12
///Optional variable to override the temperature add_reagent() will use
var/dispensed_temperature = DEFAULT_REAGENT_TEMPERATURE
/// If the hypospray can go through armor or thick material
@@ -181,10 +181,12 @@
/obj/item/reagent_containers/borghypo/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!iscarbon(interacting_with))
return NONE
+
var/mob/living/carbon/injectee = interacting_with
if(!selected_reagent)
balloon_alert(user, "no reagent selected!")
return ITEM_INTERACT_BLOCKING
+
if(!stored_reagents.has_reagent(selected_reagent.type, amount_per_transfer_from_this))
balloon_alert(user, "not enough [selected_reagent.name]!")
return ITEM_INTERACT_BLOCKING
@@ -193,20 +195,16 @@
balloon_alert(user, "[injectee.parse_zone_with_bodypart(user.zone_selected)] is blocked!")
return ITEM_INTERACT_BLOCKING
- // This is the in-between where we're storing the reagent we're going to inject the injectee with
- // because we cannot specify a singular reagent to transfer in trans_to
- var/datum/reagents/hypospray_injector = new()
- stored_reagents.remove_reagent(selected_reagent.type, amount_per_transfer_from_this)
- hypospray_injector.add_reagent(selected_reagent.type, amount_per_transfer_from_this, reagtemp = dispensed_temperature, no_react = TRUE)
+ if (!injectee.reagents)
+ balloon_alert(user, "unable to inject!")
+ return ITEM_INTERACT_BLOCKING
to_chat(injectee, span_warning("You feel a tiny prick!"))
to_chat(user, span_notice("You inject [injectee] with the injector ([selected_reagent.name])."))
user.changeNext_move(CLICK_CD_MELEE)
-
- if(injectee.reagents)
- hypospray_injector.trans_to(injectee, amount_per_transfer_from_this, transferred_by = user, methods = INJECT)
- balloon_alert(user, "[amount_per_transfer_from_this] unit\s injected")
- log_combat(user, injectee, "injected", src, "(CHEMICALS: [selected_reagent])")
+ stored_reagents.trans_to(injectee, amount_per_transfer_from_this, target_id = selected_reagent.type, transferred_by = user, methods = INJECT)
+ balloon_alert(user, "[amount_per_transfer_from_this] unit\s injected")
+ log_combat(user, injectee, "injected", src, "(CHEMICALS: [selected_reagent])")
return ITEM_INTERACT_SUCCESS
/obj/item/reagent_containers/borghypo/ui_interact(mob/user, datum/tgui/ui)
diff --git a/code/game/objects/items/robot/items/storage.dm b/code/game/objects/items/robot/items/storage.dm
index a9e94b7c0d9e87..8236b58108c26f 100644
--- a/code/game/objects/items/robot/items/storage.dm
+++ b/code/game/objects/items/robot/items/storage.dm
@@ -209,6 +209,23 @@
item_flags = SURGICAL_TOOL
storable = list(/obj/item/organ,
/obj/item/bodypart)
+ /// Underlay of whatever we have stored
+ var/image/stored_underlay
+
+/obj/item/borg/apparatus/organ_storage/update_overlays()
+ . = ..()
+ if(stored_underlay)
+ underlays -= stored_underlay
+ if(!stored)
+ return
+ stored_underlay = image(stored)
+ stored_underlay.layer = FLOAT_LAYER
+ stored_underlay.plane = FLOAT_PLANE
+ stored_underlay.pixel_w = 0
+ stored_underlay.pixel_x = 0
+ stored_underlay.pixel_y = 0
+ stored_underlay.pixel_z = 0
+ underlays += stored_underlay
/obj/item/borg/apparatus/organ_storage/examine()
. = ..()
@@ -220,22 +237,6 @@
. += "Nothing."
. += span_notice(" Alt-click will drop the currently stored organ. ")
-/obj/item/borg/apparatus/organ_storage/update_overlays()
- . = ..()
- icon_state = null // hides the original icon (otherwise it's drawn underneath)
- var/mutable_appearance/bag
- if(stored)
- var/mutable_appearance/stored_organ = new /mutable_appearance(stored)
- stored_organ.layer = FLOAT_LAYER
- stored_organ.plane = FLOAT_PLANE
- stored_organ.pixel_w = 0
- stored_organ.pixel_z = 0
- . += stored_organ
- bag = mutable_appearance(icon, icon_state = "evidence") // full bag
- else
- bag = mutable_appearance(icon, icon_state = "evidenceobj") // empty bag
- . += bag
-
/obj/item/borg/apparatus/organ_storage/click_alt(mob/living/silicon/robot/user)
if(!stored)
to_chat(user, span_notice("[src] is empty."))
@@ -243,8 +244,7 @@
var/obj/item/organ = stored
user.visible_message(span_notice("[user] dumps [organ] from [src]."), span_notice("You dump [organ] from [src]."))
- cut_overlays()
- organ.forceMove(get_turf(src))
+ organ.forceMove(drop_location())
return CLICK_ACTION_SUCCESS
///Apparatus to allow Engineering/Sabo borgs to manipulate any material sheets.
@@ -254,7 +254,8 @@
icon_state = "borg_stack_apparatus"
storable = list(/obj/item/stack/sheet,
/obj/item/stack/tile,
- /obj/item/stack/rods)
+ /obj/item/stack/rods,
+ /obj/item/stack/conveyor)
/obj/item/borg/apparatus/sheet_manipulator/Initialize(mapload)
update_appearance()
@@ -292,6 +293,7 @@
/obj/item/electronics,
/obj/item/stock_parts/power_store,
/obj/item/light,
+ /obj/item/conveyor_switch_construct,
)
/obj/item/borg/apparatus/engineering/Initialize(mapload)
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 5dee6df43084b3..5264bca98bdf9a 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -170,17 +170,16 @@
if(istype(W, /obj/item/stack/sheet/iron))
var/obj/item/stack/sheet/iron/M = W
if(!l_arm && !r_arm && !l_leg && !r_leg && !chest && !head)
- if (M.use(1))
- var/obj/item/bot_assembly/ed209/B = new
- B.forceMove(drop_location())
- to_chat(user, span_notice("You arm the robot frame."))
- var/holding_this = user.get_inactive_held_item() == src
- qdel(src)
- if (holding_this)
- user.put_in_inactive_hand(B)
- else
+ if (!M.use(1))
to_chat(user, span_warning("You need one sheet of iron to start building ED-209!"))
return
+ var/obj/item/bot_assembly/ed209/assembly = new(drop_location())
+ to_chat(user, span_notice("You arm the robot frame."))
+ var/held_index = user.is_holding(src)
+ qdel(src)
+ if (held_index)
+ user.put_in_hand(assembly, held_index)
+
else if(istype(W, /obj/item/bodypart/leg/left/robot))
if(l_leg)
return
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index a44bcd4e48705c..e8a5a93ea66606 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -359,8 +359,8 @@
else
repair_amount = -1
energy_cost = 0.01 * STANDARD_CELL_CHARGE
- cyborg.adjustBruteLoss(repair_amount)
- cyborg.adjustFireLoss(repair_amount)
+ cyborg.adjust_brute_loss(repair_amount)
+ cyborg.adjust_fire_loss(repair_amount)
cyborg.updatehealth()
cyborg.cell.use(energy_cost)
else
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index a54c3bf46eb08c..5c3211b4f9af3c 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -1,4 +1,4 @@
-#define BATON_BASH_COOLDOWN (3 SECONDS)
+#define WEAPON_BASH_COOLDOWN (3 SECONDS)
/obj/item/shield
name = "shield"
@@ -26,7 +26,7 @@
/// sound the shield makes when it breaks
var/shield_break_sound = 'sound/effects/bang.ogg'
/// baton bash cooldown
- COOLDOWN_DECLARE(baton_bash)
+ COOLDOWN_DECLARE(weapon_bash)
/// is shield bashable?
var/is_bashable = TRUE
/// sound when a shield is bashed
@@ -54,7 +54,7 @@
if(attack_type == LEAP_ATTACK)
effective_block_chance = 100
if(attack_type == OVERWHELMING_ATTACK)
- effective_block_chance -= 25
+ effective_block_chance = 0
final_block_chance = clamp(effective_block_chance, 0, 100)
. = ..()
if(.)
@@ -75,13 +75,14 @@
. = ..()
if(. & ITEM_INTERACT_ANY_BLOCKER)
return .
- if(!istype(tool, /obj/item/melee/baton) || !is_bashable)
+ if(!istype(tool, /obj/item/melee) || !is_bashable)
return .
- if(!COOLDOWN_FINISHED(src, baton_bash))
+ if(!COOLDOWN_FINISHED(src, weapon_bash))
return ITEM_INTERACT_BLOCKING
- user.visible_message(span_warning("[user] bashes [src] with [tool]!"))
playsound(src, shield_bash_sound, 50, TRUE)
- COOLDOWN_START(src, baton_bash, BATON_BASH_COOLDOWN)
+ user.manual_emote("bashes [src] with [tool]!")
+ COOLDOWN_START(src, weapon_bash, WEAPON_BASH_COOLDOWN)
+ user.Shake(3, 3, 0.5 SECONDS)
return ITEM_INTERACT_SUCCESS
/obj/item/shield/proc/on_shield_block(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
@@ -116,7 +117,7 @@
desc = "A medieval wooden buckler."
icon_state = "buckler"
inhand_icon_state = "buckler"
- custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10)
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 20)
resistance_flags = FLAMMABLE
block_chance = 30
max_integrity = 55
@@ -130,6 +131,7 @@
block_chance = 40
max_integrity = 40
w_class = WEIGHT_CLASS_NORMAL
+ custom_materials = null
/obj/item/shield/kite
name = "kite shield"
@@ -166,7 +168,7 @@
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder, less so bullets and laser beams."
icon_state = "riot"
inhand_icon_state = "riot"
- custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT * 3.75, /datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/glass= SHEET_MATERIAL_AMOUNT * 4.05, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.8)
transparent = TRUE
max_integrity = 75
shield_break_sound = 'sound/effects/glass/glassbr3.ogg'
@@ -202,6 +204,7 @@
icon_state = "flashshield"
inhand_icon_state = "flashshield"
var/obj/item/assembly/flash/handheld/embedded_flash = /obj/item/assembly/flash/handheld
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.1, /datum/material/glass= SHEET_MATERIAL_AMOUNT * 4.35)
/obj/item/shield/riot/flash/Initialize(mapload)
. = ..()
@@ -344,7 +347,7 @@
var/effective_block_chance = final_block_chance
if(attack_type == OVERWHELMING_ATTACK)
- effective_block_chance -= 25
+ effective_block_chance = 0
if(attack_type == PROJECTILE_ATTACK)
var/obj/projectile/our_projectile = hitby
@@ -478,10 +481,10 @@
desc = "A crude shield made out of several sheets of iron taped together, not very durable."
icon_state = "improvised"
inhand_icon_state = "improvised"
- custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 2)
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10)
max_integrity = 35
shield_break_leftover = /obj/item/stack/rods/two
armor_type = /datum/armor/item_shield/improvised
block_sound = 'sound/items/trayhit/trayhit2.ogg'
-#undef BATON_BASH_COOLDOWN
+#undef WEAPON_BASH_COOLDOWN
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index 8ed78cccc8768f..32b8c08747d609 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -5,7 +5,7 @@
icon_state = "target_h"
density = FALSE
max_integrity = 1800
- item_flags = CAN_BE_HIT
+ obj_flags = CAN_BE_HIT
/// Lazylist to keep track of bullet-hole overlays.
var/list/bullethole_overlays
@@ -32,7 +32,7 @@
if(isnull(always_leave_marks))
always_leave_marks = typecacheof(list(
/obj/projectile/beam/practice,
- /obj/projectile/beam/laser/carbine/practice,
+ /obj/projectile/beam/laser/rapid/practice,
))
var/is_invalid_damage = hitting_projectile.damage_type != BRUTE && hitting_projectile.damage_type != BURN
diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm
index a1b60aad298358..6b70eb9cad8b87 100644
--- a/code/game/objects/items/signs.dm
+++ b/code/game/objects/items/signs.dm
@@ -10,7 +10,7 @@
attack_verb_continuous = list("bashes", "smacks")
attack_verb_simple = list("bash", "smack")
resistance_flags = FLAMMABLE
-
+ custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT * 2, /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
var/label = ""
COOLDOWN_DECLARE(picket_sign_cooldown)
diff --git a/code/game/objects/items/skateboards.dm b/code/game/objects/items/skateboards.dm
index f03189ec012785..0d860ef11f90d9 100644
--- a/code/game/objects/items/skateboards.dm
+++ b/code/game/objects/items/skateboards.dm
@@ -10,6 +10,7 @@
w_class = WEIGHT_CLASS_NORMAL
attack_verb_continuous = list("smacks", "whacks", "slams", "smashes")
attack_verb_simple = list("smack", "whack", "slam", "smash")
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10)
///The vehicle counterpart for the board
var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
diff --git a/code/game/objects/items/soulscythe.dm b/code/game/objects/items/soulscythe.dm
index b4699dd3fa55c3..4e00fea5143f9c 100644
--- a/code/game/objects/items/soulscythe.dm
+++ b/code/game/objects/items/soulscythe.dm
@@ -138,15 +138,15 @@
return TRUE
/obj/item/soulscythe/proc/use_blood(amount = 0, message = TRUE)
- if(amount > soul.blood_volume)
+ if(amount > soul.get_blood_volume())
if(message)
to_chat(soul, span_warning("Not enough blood!"))
return FALSE
- soul.blood_volume -= amount
+ soul.adjust_blood_volume(-amount)
return TRUE
/obj/item/soulscythe/proc/give_blood(amount)
- soul.blood_volume = min(MAX_BLOOD_LEVEL, soul.blood_volume + amount)
+ soul.adjust_blood_volume(amount, maximum = MAX_BLOOD_LEVEL)
/obj/item/soulscythe/proc/on_resist(mob/living/user)
SIGNAL_HANDLER
@@ -256,17 +256,18 @@
gender = NEUTER
mob_biotypes = MOB_SPIRIT
faction = list()
- blood_volume = MAX_BLOOD_LEVEL
+ default_blood_volume = MAX_BLOOD_LEVEL
hud_type = /datum/hud/soulscythe
+ spawn_blacklisted = TRUE
/mob/living/basic/soulscythe/Initialize(mapload)
. = ..()
add_traits(list(TRAIT_ASHSTORM_IMMUNE, TRAIT_SNOWSTORM_IMMUNE, TRAIT_LAVA_IMMUNE), INNATE_TRAIT)
RegisterSignal(src, COMSIG_LIVING_LIFE, PROC_REF(on_life))
-/mob/living/basic/soulscythe/proc/on_life(datum/source, seconds_per_tick, times_fired) // done like this because there's no need to go through all of life since the item does the work anyways
+/mob/living/basic/soulscythe/proc/on_life(datum/source, seconds_per_tick) // done like this because there's no need to go through all of life since the item does the work anyways
if(stat == CONSCIOUS)
- blood_volume = min(MAX_BLOOD_LEVEL, blood_volume + round(1 * seconds_per_tick))
+ adjust_blood_volume(round(1 * seconds_per_tick), maximum = MAX_BLOOD_LEVEL)
return COMPONENT_LIVING_CANCEL_LIFE_PROCESSING
/// Special projectile for the soulscythe.
diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm
index d1658244ea6afe..3c3a2d507785e1 100644
--- a/code/game/objects/items/spear.dm
+++ b/code/game/objects/items/spear.dm
@@ -8,14 +8,15 @@
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
icon_angle = -45
force = 10
+ reach = 2
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 20
throw_speed = 4
- demolition_mod = 0.75
+ demolition_mod = 0.75 // Note: This is significant, as this needs to be low enough that any possible force adjustments from better spears does not go over airlock deflection. See AIRLOCK_DAMAGE_DEFLECTION_N.
embed_type = /datum/embedding/spear
- armour_penetration = 10
- custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass= HALF_SHEET_MATERIAL_AMOUNT * 2)
+ armour_penetration = 5
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.65, /datum/material/glass= SHEET_MATERIAL_AMOUNT * 1.15)
hitsound = 'sound/items/weapons/bladeslice.ogg'
attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
@@ -32,6 +33,10 @@
var/force_unwielded = 10
/// How much damage to do wielded
var/force_wielded = 18
+ /// Whether or not hitting with this spear causes damage to the spear itself
+ var/improvised_construction = TRUE
+ /// What is left over when a spear breaks
+ var/spear_leftovers = /obj/item/stack/rods
/datum/embedding/spear
impact_pain_mult = 2
@@ -59,6 +64,8 @@
force_unwielded = force_unwielded, \
force_wielded = force_wielded, \
icon_wielded = "[icon_prefix]1", \
+ wield_callback = CALLBACK(src, PROC_REF(on_wield)), \
+ unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \
)
add_headpike_component()
update_appearance()
@@ -89,38 +96,89 @@
if(/obj/item/shard/plasma)
force = 11
throwforce = 21
- custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT, /datum/material/alloy/plasmaglass= HALF_SHEET_MATERIAL_AMOUNT * 2)
icon_prefix = "spearplasma"
+ modify_max_integrity(220)
+ wound_bonus = -10
force_unwielded = 11
force_wielded = 19
- AddComponent(/datum/component/two_handed, force_unwielded=force_unwielded, force_wielded=force_wielded, icon_wielded="[icon_prefix]1")
+ AddComponent(/datum/component/two_handed, \
+ force_unwielded = force_unwielded, \
+ force_wielded = force_wielded, \
+ icon_wielded = "[icon_prefix]1", \
+ wield_callback = CALLBACK(src, PROC_REF(on_wield)), \
+ unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \
+ )
+
if(/obj/item/shard/titanium)
- force = 13
- throwforce = 21
+ force = 12
+ throwforce = 22
throw_range = 8
throw_speed = 5
- custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT, /datum/material/alloy/titaniumglass= HALF_SHEET_MATERIAL_AMOUNT * 2)
- wound_bonus = -10
- force_unwielded = 13
- force_wielded = 18
+ modify_max_integrity(230)
+ wound_bonus = -5
+ force_unwielded = 12
+ force_wielded = 20
+ armour_penetration = 10
icon_prefix = "speartitanium"
- AddComponent(/datum/component/two_handed, force_unwielded=force_unwielded, force_wielded=force_wielded, icon_wielded="[icon_prefix]1")
+ AddComponent(/datum/component/two_handed, \
+ force_unwielded = force_unwielded, \
+ force_wielded = force_wielded, \
+ icon_wielded = "[icon_prefix]1", \
+ wield_callback = CALLBACK(src, PROC_REF(on_wield)), \
+ unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \
+ )
+
if(/obj/item/shard/plastitanium)
force = 13
- throwforce = 22
+ throwforce = 23
throw_range = 9
throw_speed = 5
- custom_materials = list(/datum/material/iron= HALF_SHEET_MATERIAL_AMOUNT, /datum/material/alloy/plastitaniumglass= HALF_SHEET_MATERIAL_AMOUNT * 2)
- wound_bonus = -10
+ modify_max_integrity(240)
+ wound_bonus = 0
exposed_wound_bonus = 20
force_unwielded = 13
- force_wielded = 20
+ force_wielded = 21
+ armour_penetration = 15
icon_prefix = "spearplastitanium"
- AddComponent(/datum/component/two_handed, force_unwielded=force_unwielded, force_wielded=force_wielded, icon_wielded="[icon_prefix]1")
+ AddComponent(/datum/component/two_handed, \
+ force_unwielded = force_unwielded, \
+ force_wielded = force_wielded, \
+ icon_wielded = "[icon_prefix]1", \
+ wield_callback = CALLBACK(src, PROC_REF(on_wield)), \
+ unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \
+ )
update_appearance()
return ..()
+/obj/item/spear/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
+ if(!improvised_construction)
+ return
+ take_damage(force/2, sound_effect = FALSE)
+
+/obj/item/spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ if (.) //spear was caught
+ return
+ if(!improvised_construction)
+ return
+ take_damage(throwforce/2, sound_effect = FALSE)
+
+/obj/item/spear/atom_destruction(damage_flag)
+ playsound(src, 'sound/effects/grillehit.ogg', 50)
+ new spear_leftovers(get_turf(src))
+ if(isliving(loc))
+ loc.balloon_alert(loc, "spear broken!")
+ return ..()
+
+/obj/item/spear/proc/on_wield(obj/item/source, mob/living/carbon/user)
+ reach = 1
+ armour_penetration *= 2
+
+/obj/item/spear/proc/on_unwield(obj/item/source, mob/living/carbon/user)
+ reach = 2
+ armour_penetration /= 2
+
/obj/item/spear/explosive
name = "explosive lance"
icon_state = "spearbomb0"
@@ -196,19 +254,18 @@
attack_verb_simple = list("gore")
force_unwielded = 15
force_wielded = 25
+ improvised_construction = FALSE
/obj/item/spear/grey_tide/afterattack(atom/movable/target, mob/living/user, list/modifiers, list/attack_modifiers)
user.faction |= "greytide([REF(user)])"
if(!isliving(target))
return
var/mob/living/stabbed = target
- if(istype(stabbed, /mob/living/simple_animal/hostile/illusion))
+ if(istype(stabbed, /mob/living/basic/illusion))
return
if(stabbed.stat == CONSCIOUS && prob(50))
- var/mob/living/simple_animal/hostile/illusion/fake_clone = new(user.loc)
- fake_clone.faction = user.faction.Copy()
- fake_clone.Copy_Parent(user, 100, user.health/2.5, 12, 30)
- fake_clone.GiveTarget(stabbed)
+ var/mob/living/basic/illusion/fake_clone = new(user.loc)
+ fake_clone.full_setup(user, target_mob = stabbed, faction = user.faction, life = 10 SECONDS, hp = user.health / 2.5, damage = 12, replicate = 30)
//MILITARY
/obj/item/spear/military
@@ -226,6 +283,7 @@
throw_range = 9
throw_speed = 5
sharpness = NONE // we break bones instead of cutting flesh
+ improvised_construction = FALSE
/obj/item/spear/military/add_headpike_component()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/headpikemilitary)
@@ -235,21 +293,81 @@
slapcraft_recipes = slapcraft_recipe_list,\
)
+/*
+ * Anti-big monster spear
+ * "WHERES MY DRAGONATOR?!"
+ */
+/obj/item/spear/dragonator
+ name = "giantslayer spear"
+ desc = "An oversized multi-bladed spear designed to kill large hostile xenoforms such as space dragons or the creatures of Indecipheres. Capable of being launched from a ballista."
+ icon = 'icons/obj/weapons/48x.dmi'
+ icon_state = "speardragon0"
+ icon_prefix = "speardragon"
+ base_icon_state = "speardragon"
+ lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
+ demolition_mod = 0.5
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ force = 13
+ throwforce = 23
+ throw_range = 9
+ throw_speed = 5
+ wound_bonus = 0
+ exposed_wound_bonus = 20
+ force_unwielded = 13
+ force_wielded = 21
+ armour_penetration = 15
+ improvised_construction = FALSE
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 42,
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 15,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 5)
+
+/obj/item/spear/dragonator/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/bane, mob_biotypes = MOB_MINING, damage_multiplier = 3.5) //For killing really big monsters,
+
+/*
+ * Untreated Giantslayer , needs to be thrown into lava
+ */
+/obj/item/spear/dragonator_untreated
+ name = "unfired giantslayer spear"
+ desc = "A half-finished giantslayer spear, needs to be thrown in lava to forge the metals to a killing edge."
+ icon = 'icons/obj/weapons/48x.dmi'
+ icon_state = "speardragonraw0"
+ icon_prefix = "speardragonraw"
+ base_icon_state = "speardragonraw"
+ demolition_mod = 0.5
+ wound_bonus = 0
+ exposed_wound_bonus = 0
+ force_unwielded = 5
+ force_wielded = 10
+ armour_penetration = 0
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 42,
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 15,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 5)
+
+/obj/item/spear/dragonator_untreated/fire_act(exposed_temperature, exposed_volume)
+ var/obj/item/spear/dragonator/dragonator = new(loc)
+ playsound(dragonator.loc, 'sound/effects/magic/staff_change.ogg',5)
+ qdel(src)
+
/*
* Bone Spear
*/
/obj/item/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
+ name = "bone spear"
+ desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
icon_state = "bone_spear0"
base_icon_state = "bone_spear0"
icon_prefix = "bone_spear"
- name = "bone spear"
- desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
-
throwforce = 22
- armour_penetration = 15 //Enhanced armor piercing
- custom_materials = list(/datum/material/bone = HALF_SHEET_MATERIAL_AMOUNT * 7)
+ armour_penetration = 20 //Enhanced armor piercing
+ custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 4)
force_unwielded = 12
force_wielded = 20
+ spear_leftovers = /obj/item/stack/sheet/bone
/obj/item/spear/bonespear/add_headpike_component()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/headpikebone)
@@ -262,18 +380,16 @@
/*
* Bamboo Spear
*/
-/obj/item/spear/bamboospear //Blatant imitation of spear, but all natural. Also not valid for explosive modification.
+/obj/item/spear/bamboospear //Blatant imitation of spear, but all natural.
icon_state = "bamboo_spear0"
base_icon_state = "bamboo_spear0"
icon_prefix = "bamboo_spear"
name = "bamboo spear"
desc = "A haphazardly-constructed bamboo stick with a sharpened tip, ready to poke holes into unsuspecting people."
- throwforce = 22 //Better to throw
- custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 20)
- force_unwielded = 10
- force_wielded = 18
-
+ throwforce = 23 //Better to throw
+ custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 25)
+ spear_leftovers = /obj/item/stack/sheet/mineral/bamboo
/obj/item/spear/bamboospear/add_headpike_component()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/headpikebamboo)
@@ -305,6 +421,7 @@
)
action_slots = ITEM_SLOT_HANDS
actions_types = list(/datum/action/item_action/skybulge)
+ improvised_construction = FALSE
///The action button the spear gives, usable once a minute.
/datum/action/item_action/skybulge
diff --git a/code/game/objects/items/stacks/ammonia_crystals.dm b/code/game/objects/items/stacks/ammonia_crystals.dm
index 2ed8331929056b..885ab685a80cb5 100644
--- a/code/game/objects/items/stacks/ammonia_crystals.dm
+++ b/code/game/objects/items/stacks/ammonia_crystals.dm
@@ -6,5 +6,7 @@
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
max_amount = 50
- grind_results = list(/datum/reagent/ammonia = 10)
merge_type = /obj/item/stack/ammonia_crystals
+
+/obj/item/stack/ammonia_crystals/grind_results()
+ return list(/datum/reagent/ammonia = 10)
diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm
index 1082d682c4ffa0..a278c02ce13062 100644
--- a/code/game/objects/items/stacks/bscrystal.dm
+++ b/code/game/objects/items/stacks/bscrystal.dm
@@ -10,12 +10,14 @@
mats_per_unit = list(/datum/material/bluespace=SHEET_MATERIAL_AMOUNT)
points = 50
refined_type = /obj/item/stack/sheet/bluespace_crystal
- grind_results = list(/datum/reagent/bluespace = 20)
scan_state = "rock_bscrystal"
merge_type = /obj/item/stack/ore/bluespace_crystal
/// The teleport range when crushed/thrown at someone.
var/blink_range = 8
+/obj/item/stack/ore/bluespace_crystal/grind_results()
+ return list(/datum/reagent/bluespace = 20)
+
/obj/item/stack/ore/bluespace_crystal/refined
name = "refined bluespace crystal"
points = 0
@@ -28,6 +30,7 @@
. = ..()
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
+ AddElement(/datum/element/raptor_food, ability_modifier = 0.05, attack_modifier = 0.5, color_chances = string_list(list(/datum/raptor_color/black = 1)))
/obj/item/stack/ore/bluespace_crystal/get_part_rating()
return 1
@@ -60,11 +63,13 @@
blink_range = 4 // Not as good as the organic stuff!
points = 0 //nice try
refined_type = null
- grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/silicon = 20)
merge_type = /obj/item/stack/ore/bluespace_crystal/artificial
drop_sound = null //till I make a better one
pickup_sound = null
+/obj/item/stack/ore/bluespace_crystal/artificial/grind_results()
+ return list(/datum/reagent/bluespace = 10, /datum/reagent/silicon = 20)
+
//Polycrystals, aka stacks
/obj/item/stack/sheet/bluespace_crystal
name = "bluespace polycrystal"
@@ -78,11 +83,12 @@
attack_verb_continuous = list("bluespace polybashes", "bluespace polybatters", "bluespace polybludgeons", "bluespace polythrashes", "bluespace polysmashes")
attack_verb_simple = list("bluespace polybash", "bluespace polybatter", "bluespace polybludgeon", "bluespace polythrash", "bluespace polysmash")
novariants = TRUE
- grind_results = list(/datum/reagent/bluespace = 20)
merge_type = /obj/item/stack/sheet/bluespace_crystal
material_type = /datum/material/bluespace
var/crystal_type = /obj/item/stack/ore/bluespace_crystal/refined
+/obj/item/stack/sheet/bluespace_crystal/grind_results()
+ return list(/datum/reagent/bluespace = 20)
/obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user)// to prevent the construction menu from ever happening
to_chat(user, span_warning("You cannot crush the polycrystal in-hand, try breaking one off."))
diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index 5541c90895e25b..35bb72d0a6725f 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -13,17 +13,19 @@
full_w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
var/value = 0
- grind_results = list(/datum/reagent/cellulose = 10)
/obj/item/stack/spacecash/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1)
. = ..()
add_traits(list(TRAIT_FISHING_BAIT, TRAIT_BAIT_ALLOW_FISHING_DUD), INNATE_TRAIT)
update_desc()
+/obj/item/stack/spacecash/grind_results()
+ return list(/datum/reagent/cellulose = 10)
+
/obj/item/stack/spacecash/update_desc()
. = ..()
var/total_worth = get_item_credit_value()
- desc = "It's worth [total_worth] credit[(total_worth > 1) ? "s" : null] in total."
+ desc = "It's worth [total_worth] [MONEY_NAME_AUTOPURAL(total_worth)] in total."
/obj/item/stack/spacecash/get_item_credit_value()
return (amount*value)
diff --git a/code/game/objects/items/stacks/golem_food/golem_food_buff.dm b/code/game/objects/items/stacks/golem_food/golem_food_buff.dm
index cbd84aee0cb3f1..4960a6dfb1316a 100644
--- a/code/game/objects/items/stacks/golem_food/golem_food_buff.dm
+++ b/code/game/objects/items/stacks/golem_food/golem_food_buff.dm
@@ -40,7 +40,7 @@
/// Amount by which you heal from eating some iron
var/healed_amount = 3
/// Order in which to heal damage types
- var/list/damage_heal_order = list(BRUTE, BURN, TOX, OXY)
+ var/list/damage_heal_order = list(BRUTE, BURN)
/datum/golem_food_buff/iron/apply_effects(mob/living/carbon/consumer, atom/movable/consumed, multiplier = 1)
if (consumer.health == consumer.maxHealth)
diff --git a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm
index df9c187b1a4133..eb01814eef1bfd 100644
--- a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm
+++ b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm
@@ -326,7 +326,7 @@
set_arm_fluff(arm)
return TRUE
-/datum/status_effect/golem/diamond/tick(delta_time, times_fired)
+/datum/status_effect/golem/diamond/tick(delta_time)
owner.alpha = max(owner.alpha - alpha_per_tick, 0)
/// Reset alpha to starting value
@@ -388,7 +388,7 @@
alert_desc = "You are more resistant to physical blows, and pack more of a punch yourself."
filter_color = LIGHT_COLOR_HALOGEN
/// Amount to reduce brute damage by
- var/brute_modifier = 0.7
+ var/brute_modifier = 0.8 // golems already have an innate 0.5 brute resistance - this is multiplicate on top of that
/// How much extra damage do we do with our fists?
var/damage_increase = 3
/// Deal this much extra damage to mining mobs, most of which take 0 unarmed damage usually
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index ace7b216ca030c..9da8cebbc21b3f 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -16,6 +16,7 @@
cost = 250
source = /datum/robot_energy_storage/medical
merge_type = /obj/item/stack/medical
+ apply_verb = "treating"
/// How long it takes to apply it to yourself
var/self_delay = 5 SECONDS
/// How long it takes to apply it to someone else
@@ -32,8 +33,6 @@
var/sanitization
/// How much we add to flesh_healing for burn wounds on application
var/flesh_regeneration
- /// Verb used when applying this object to someone
- var/apply_verb = "treating"
/// Whether this item can be used on dead bodies
var/works_on_dead = FALSE
/// The sound this makes when starting healing with this item
@@ -328,7 +327,7 @@
break // one at a time
affecting.adjustBleedStacks(-1 * stop_bleeding, 0)
if(flesh_regeneration || sanitization)
- for(var/datum/wound/burn/flesh/wound as anything in affecting.wounds)
+ for(var/datum/wound/burn/flesh/wound in affecting.wounds)
if(wound.can_be_ointmented_or_meshed())
wound.flesh_healing += flesh_regeneration
wound.sanitization += sanitization
@@ -336,9 +335,9 @@
post_heal_effects(max(previous_damage - affecting.get_damage(), 0), patient, user)
return TRUE
-/// Healing a simple mob, just an adjustbruteloss call
+/// Healing a simple mob, just an adjust_brute_loss() call
/obj/item/stack/medical/proc/heal_simplemob(mob/living/patient, mob/living/user)
- patient.adjustBruteLoss(-1 * (heal_brute * patient.maxHealth / 100))
+ patient.adjust_brute_loss(-1 * (heal_brute * patient.maxHealth / 100))
user.visible_message(
span_green("[user] applies [src] on [patient]."),
span_green("You apply [src] on [patient]."),
@@ -360,10 +359,12 @@
heal_brute = 40
self_delay = 4 SECONDS
other_delay = 2 SECONDS
- grind_results = list(/datum/reagent/medicine/c2/libital = 10)
merge_type = /obj/item/stack/medical/bruise_pack
apply_verb = "applying to"
+/obj/item/stack/medical/bruise_pack/grind_results()
+ return list(/datum/reagent/medicine/c2/libital = 10)
+
/obj/item/stack/medical/bruise_pack/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
return BRUTELOSS
@@ -378,10 +379,11 @@
other_delay = 2 SECONDS
max_amount = 12
amount = 6
- grind_results = list(/datum/reagent/cellulose = 2)
custom_price = PAYCHECK_CREW * 2
absorption_rate = 0.125
absorption_capacity = 5
+ sanitization = 3
+ flesh_regeneration = 5
splint_factor = 0.7
burn_cleanliness_bonus = 0.35
merge_type = /obj/item/stack/medical/gauze
@@ -397,6 +399,9 @@
. = ..()
register_context()
+/obj/item/stack/medical/gauze/grind_results()
+ return list(/datum/reagent/cellulose = 2)
+
/obj/item/stack/medical/gauze/Destroy(force)
. = ..()
@@ -490,6 +495,13 @@
if(limb.cached_bleed_rate)
add_mob_blood(patient)
+
+ // Dressing burns provides a "one-time" bonus to sanitization and healing
+ // However, any notable infection will reduce the effectiveness of this bonus
+ for(var/datum/wound/burn/flesh/wound in limb.wounds)
+ wound.sanitization += sanitization * (wound.infection > 0.1 ? 0.2 : 1)
+ wound.flesh_healing += flesh_regeneration * (wound.infection > 0.1 ? 0 : 1)
+
limb.apply_gauze(src)
/obj/item/stack/medical/gauze/twelve
@@ -527,6 +539,8 @@
burn_cleanliness_bonus = 0.7
absorption_rate = 0.075
absorption_capacity = 4
+ sanitization = 1
+ flesh_regeneration = 3
merge_type = /obj/item/stack/medical/gauze/improvised
/*
@@ -549,8 +563,7 @@
max_amount = 10
repeating = TRUE
heal_brute = 10
- stop_bleeding = 0.6
- grind_results = list(/datum/reagent/medicine/spaceacillin = 2)
+ stop_bleeding = 0.5
merge_type = /obj/item/stack/medical/suture
apply_verb = "suturing"
drop_sound = SFX_SUTURE_DROP
@@ -559,15 +572,20 @@
heal_continuous_sound = SFX_SUTURE_CONTINUOUS
heal_end_sound = SFX_SUTURE_END
+/obj/item/stack/medical/suture/grind_results()
+ return list(/datum/reagent/medicine/spaceacillin = 2)
+
/obj/item/stack/medical/suture/medicated
name = "medicated suture"
icon_state = "suture_purp"
desc = "A suture infused with drugs that speed up wound healing of the treated laceration."
heal_brute = 15
stop_bleeding = 0.75
- grind_results = list(/datum/reagent/medicine/polypyr = 1)
merge_type = /obj/item/stack/medical/suture/medicated
+/obj/item/stack/medical/suture/medicated/grind_results()
+ return list(/datum/reagent/medicine/polypyr = 1)
+
/obj/item/stack/medical/ointment
name = "ointment"
desc = "Basic burn ointment, rated effective for second degree burns with proper bandaging, though it's still an effective stabilizer for worse burns. Not terribly good at outright healing burns though."
@@ -580,14 +598,15 @@
max_amount = 8
self_delay = 4 SECONDS
other_delay = 2 SECONDS
-
heal_burn = 5
flesh_regeneration = 2.5
sanitization = 0.25
- grind_results = list(/datum/reagent/medicine/c2/lenturi = 10)
merge_type = /obj/item/stack/medical/ointment
apply_verb = "applying to"
+/obj/item/stack/medical/ointment/grind_results()
+ return list(/datum/reagent/medicine/c2/lenturi = 10)
+
/obj/item/stack/medical/ointment/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is squeezing [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?"))
return TOXLOSS
@@ -611,17 +630,20 @@
heal_begin_sound = SFX_REGEN_MESH_BEGIN
heal_continuous_sound = SFX_REGEN_MESH_CONTINUOUS
heal_end_sound = SFX_REGEN_MESH_END
-
- var/is_open = TRUE ///This var determines if the sterile packaging of the mesh has been opened.
- grind_results = list(/datum/reagent/medicine/spaceacillin = 2)
merge_type = /obj/item/stack/medical/mesh
+ ///This var determines if the sterile packaging of the mesh has been opened.
+ var/is_open = TRUE
+
/obj/item/stack/medical/mesh/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1)
. = ..()
if(amount == max_amount) //only seal full mesh packs
is_open = FALSE
update_appearance()
+/obj/item/stack/medical/mesh/grind_results()
+ return list(/datum/reagent/medicine/spaceacillin = 2)
+
/obj/item/stack/medical/mesh/update_icon_state()
if(is_open)
return ..()
@@ -658,15 +680,16 @@
/obj/item/stack/medical/mesh/advanced
name = "advanced regenerative mesh"
desc = "An advanced mesh made with aloe extracts and sterilizing chemicals, used to treat burns."
-
gender = PLURAL
icon_state = "aloe_mesh"
heal_burn = 15
sanitization = 1.25
flesh_regeneration = 3.5
- grind_results = list(/datum/reagent/consumable/aloejuice = 1)
merge_type = /obj/item/stack/medical/mesh/advanced
+/obj/item/stack/medical/mesh/advanced/grind_results()
+ return list(/datum/reagent/consumable/aloejuice = 1)
+
/obj/item/stack/medical/mesh/advanced/update_icon_state()
if(is_open)
return ..()
@@ -675,7 +698,6 @@
/obj/item/stack/medical/aloe
name = "aloe cream"
desc = "A healing paste for minor cuts and burns."
-
gender = PLURAL
singular_name = "aloe cream"
icon_state = "aloe_paste"
@@ -687,7 +709,6 @@
repeating = TRUE
heal_brute = 3
heal_burn = 3
- grind_results = list(/datum/reagent/consumable/aloejuice = 1)
merge_type = /obj/item/stack/medical/aloe
apply_verb = "applying to"
@@ -695,6 +716,9 @@
. = ..()
AddComponent(/datum/component/bakeable, /obj/item/food/badrecipe, rand(10 SECONDS, 15 SECONDS), FALSE)
+/obj/item/stack/medical/aloe/grind_results()
+ return list(/datum/reagent/consumable/aloejuice = 1)
+
/obj/item/stack/medical/aloe/fresh
amount = 2
@@ -702,20 +726,20 @@
name = "bone gel"
singular_name = "bone gel"
desc = "A potent medical gel that, when applied to a damaged bone in a proper surgical setting, triggers an intense melding reaction to repair the wound. Can be directly applied alongside surgical sticky tape to a broken bone in dire circumstances, though this is very harmful to the patient and not recommended."
-
icon = 'icons/obj/medical/surgery_tools.dmi'
icon_state = "bone-gel"
inhand_icon_state = "bone-gel"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
-
amount = 5
self_delay = 20
- grind_results = list(/datum/reagent/bone_dust = 10, /datum/reagent/carbon = 10)
novariants = TRUE
merge_type = /obj/item/stack/medical/bone_gel
apply_verb = "applying to"
+/obj/item/stack/medical/bone_gel/grind_results()
+ return list(/datum/reagent/bone_dust = 10, /datum/reagent/carbon = 10)
+
/obj/item/stack/medical/bone_gel/get_surgery_tool_overlay(tray_extended)
return "gel" + (tray_extended ? "" : "_out")
@@ -773,7 +797,7 @@
/obj/item/stack/medical/poultice/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/living/user)
. = ..()
playsound(src, 'sound/misc/soggy.ogg', 30, TRUE)
- healed_mob.adjustOxyLoss(amount_healed)
+ healed_mob.adjust_oxy_loss(amount_healed)
/obj/item/stack/medical/bandage
name = "first aid bandage"
@@ -789,10 +813,11 @@
stop_bleeding = 0.2
self_delay = 3 SECONDS
other_delay = 1 SECONDS
- grind_results = list(/datum/reagent/medicine/c2/libital = 2)
apply_verb = "applying to"
pickup_sound = SFX_CLOTH_PICKUP
- // add a better drop sound more fitting for a lil' itty bitty band-aid
+
+/obj/item/stack/medical/bandage/grind_results()
+ return list(/datum/reagent/medicine/c2/libital = 2)
/obj/item/stack/medical/bandage/makeshift
name = "makeshift bandage"
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index fc19ce70ccc9aa..17fd93bc5bfc8e 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
new/datum/stack_recipe("ladder", /obj/structure/ladder/crafted, 15, time = 15 SECONDS, crafting_flags = CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
new/datum/stack_recipe("catwalk floor tile", /obj/item/stack/tile/catwalk_tile, 1, 4, 20, category = CAT_TILES), \
new/datum/stack_recipe("stairs frame", /obj/structure/stairs_frame, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
- new/datum/stack_recipe("probing cane", /obj/item/cane/white, 3, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY, category = CAT_TOOLS), \
+ new/datum/stack_recipe("probing cane", /obj/item/cane/white, 3, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_TOOLS), \
new/datum/stack_recipe("sharpened iron rod", /obj/item/ammo_casing/rebar, 1, time = 0.2 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY, category = CAT_WEAPON_AMMO), \
))
@@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
throw_speed = 3
throw_range = 7
demolition_mod = 1.25
- mats_per_unit = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT)
+ mats_per_unit = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
max_amount = 50
attack_verb_continuous = list("hits", "bludgeons", "whacks")
attack_verb_simple = list("hit", "bludgeon", "whack")
@@ -81,9 +81,9 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
. = ..()
var/amount = get_amount()
if(amount <= 5)
- icon_state = "rods-[amount]"
+ icon_state = "[initial(icon_state)]-[amount]"
else
- icon_state = "rods"
+ icon_state = initial(icon_state)
/obj/item/stack/rods/welder_act(mob/living/user, obj/item/tool)
if(get_amount() < 2)
@@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
name = "heat resistant rod"
desc = "Treated, specialized iron rods. When exposed to the vacuum of space their coating breaks off, but they can hold up against the extreme heat of active lava."
singular_name = "heat resistant rod"
- icon_state = "rods"
+ icon_state = "lavarods"
inhand_icon_state = "rods"
color = "#5286b9ff"
obj_flags = CONDUCTS_ELECTRICITY
@@ -151,6 +151,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
name = "shuttle frame rods"
desc = "Treated, specialized iron rods suitable for the construction of shuttle frames or the expansion of existing shuttles."
singular_name = "shuttle frame rod"
+ icon_state = "shuttlerods"
mats_per_unit = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium=SMALL_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/rods/shuttle
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index c2547cbbea722e..038f8fde839abf 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -25,7 +25,6 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
armor_type = /datum/armor/sheet_glass
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/glass
- grind_results = list(/datum/reagent/silicon = 20)
material_type = /datum/material/glass
table_type = /obj/structure/table/glass
matter_amount = 4
@@ -39,6 +38,9 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
fire = 50
acid = 100
+/obj/item/stack/sheet/glass/grind_results()
+ return list(/datum/reagent/silicon = 20)
+
/obj/item/stack/sheet/glass/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] begins to slice [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
return BRUTELOSS
@@ -101,12 +103,14 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
armor_type = /datum/armor/sheet_plasmaglass
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/plasmaglass
- grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10)
material_flags = NONE
table_type = /obj/structure/table/glass/plasmaglass
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
+/obj/item/stack/sheet/plasmaglass/grind_results()
+ return list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10)
+
/obj/item/stack/sheet/plasmaglass/fifty
amount = 50
@@ -146,7 +150,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
null, \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/unanchored, time = 0.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_CHECK_DIRECTION, category = CAT_WINDOWS), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/fulltile/unanchored, 2, time = 2 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_IS_FULLTILE, category = CAT_WINDOWS), \
- new/datum/stack_recipe("glass shard", /obj/item/shard, time = 10, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND, category = CAT_MISC), \
+ new/datum/stack_recipe("glass shard", /obj/item/shard, time = 10, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_MISC), \
new/datum/stack_recipe("reinforced glass tile", /obj/item/stack/tile/rglass, 1, 4, 20, category = CAT_TILES) \
))
@@ -161,12 +165,14 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
armor_type = /datum/armor/sheet_rglass
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/rglass
- grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/iron = 10)
matter_amount = 6
table_type = /obj/structure/table/reinforced/rglass
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
+/obj/item/stack/sheet/rglass/grind_results()
+ return list(/datum/reagent/silicon = 20, /datum/reagent/iron = 10)
+
/obj/item/stack/sheet/rglass/fifty
amount = 50
@@ -185,7 +191,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
GLOBAL_LIST_INIT(prglass_recipes, list ( \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/plasma/unanchored, time = 0.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_CHECK_DIRECTION, category = CAT_WINDOWS), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/plasma/fulltile/unanchored, 2, time = 2 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_IS_FULLTILE, category = CAT_WINDOWS), \
- new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 40, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND, category = CAT_MISC), \
+ new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 40, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_MISC), \
new/datum/stack_recipe("reinforced plasma glass tile", /obj/item/stack/tile/rglass/plasma, 1, 4, 20, category = CAT_TILES) \
))
@@ -200,13 +206,15 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
resistance_flags = ACID_PROOF
material_flags = NONE
merge_type = /obj/item/stack/sheet/plasmarglass
- grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10, /datum/reagent/iron = 10)
gulag_valid = TRUE
matter_amount = 8
table_type = /obj/structure/table/reinforced/plasmarglass
pickup_sound = 'sound/items/handling/materials/glass_pick_up.ogg'
drop_sound = 'sound/items/handling/materials/glass_drop.ogg'
+/obj/item/stack/sheet/plasmarglass/grind_results()
+ return list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10, /datum/reagent/iron = 10)
+
/datum/armor/sheet_plasmarglass
melee = 20
fire = 80
@@ -377,6 +385,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
to_chat(user, span_notice("You begin to wrap the [cloth] around the [src]..."))
if(do_after(user, craft_time, target = src))
var/obj/item/knife/shiv/shiv = new shiv_type
+ shiv.set_custom_materials(custom_materials)
cloth.use(1)
to_chat(user, span_notice("You wrap the [cloth] around the [src], forming a makeshift weapon."))
remove_item_from_storage(src, user)
diff --git a/code/game/objects/items/stacks/sheets/hot_ice.dm b/code/game/objects/items/stacks/sheets/hot_ice.dm
index cb7b016c8e30bd..de42ef32e448d2 100644
--- a/code/game/objects/items/stacks/sheets/hot_ice.dm
+++ b/code/game/objects/items/stacks/sheets/hot_ice.dm
@@ -5,10 +5,12 @@
singular_name = "hot ice piece"
icon = 'icons/obj/stack_objects.dmi'
mats_per_unit = list(/datum/material/hot_ice=SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/toxin/hot_ice = 25)
material_type = /datum/material/hot_ice
merge_type = /obj/item/stack/sheet/hot_ice
+/obj/item/stack/sheet/hot_ice/grind_results()
+ return list(/datum/reagent/toxin/hot_ice = 25)
+
/obj/item/stack/sheet/hot_ice/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] begins licking \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
return FIRELOSS//dont you kids know that stuff is toxic?
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index 8597cfc859f2b9..4d06e8fb3d1665 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -11,9 +11,12 @@
throw_range = 7
obj_flags = CONDUCTS_ELECTRICITY
max_amount = 60
- grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/copper = 5)
+ mats_per_unit = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.05, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.05)
merge_type = /obj/item/stack/light_w
+/obj/item/stack/light_w/grind_results()
+ return list(/datum/reagent/silicon = 20, /datum/reagent/copper = 5)
+
/obj/item/stack/light_w/examine(mob/user)
. = ..()
. += span_warning("\The [src] looks unfinished, add iron to complete it.")
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 0decdd0706cba4..a8169276d899e7 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -24,9 +24,9 @@ Mineral Sheets
*/
GLOBAL_LIST_INIT(sandstone_recipes, list ( \
- new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
+ new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
new/datum/stack_recipe("sandstone platform", /obj/structure/platform/sandstone, 2, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
- new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND, category = CAT_MISC), \
+ new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND | CRAFT_NO_MATERIALS, category = CAT_MISC), \
))
/obj/item/stack/sheet/mineral/sandstone
@@ -72,6 +72,9 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
. = ..()
. += GLOB.sandbag_recipes
+/obj/item/stack/sheet/mineral/sandbags/fifty
+ amount = 50
+
/obj/item/emptysandbag
name = "empty sandbag"
desc = "A bag to be filled with sand."
@@ -101,17 +104,19 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
singular_name = "diamond"
construction_path_type = "diamond"
mats_per_unit = list(/datum/material/diamond=SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/carbon = 20)
gulag_valid = TRUE
merge_type = /obj/item/stack/sheet/mineral/diamond
material_type = /datum/material/diamond
walltype = /turf/closed/wall/mineral/diamond
GLOBAL_LIST_INIT(diamond_recipes, list ( \
- new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
+ new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
new/datum/stack_recipe("diamond tile", /obj/item/stack/tile/mineral/diamond, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
))
+/obj/item/stack/sheet/mineral/diamond/grind_results()
+ return list(/datum/reagent/carbon = 20)
+
/obj/item/stack/sheet/mineral/diamond/get_main_recipes()
. = ..()
. += GLOB.diamond_recipes
@@ -132,18 +137,20 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
singular_name = "uranium sheet"
construction_path_type = "uranium"
mats_per_unit = list(/datum/material/uranium=SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/uranium = 20)
gulag_valid = TRUE
merge_type = /obj/item/stack/sheet/mineral/uranium
material_type = /datum/material/uranium
walltype = /turf/closed/wall/mineral/uranium
GLOBAL_LIST_INIT(uranium_recipes, list ( \
- new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
+ new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
new/datum/stack_recipe("depleted uranium platform", /obj/structure/platform/uranium, 2, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
new/datum/stack_recipe("uranium tile", /obj/item/stack/tile/mineral/uranium, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
))
+/obj/item/stack/sheet/mineral/uranium/grind_results()
+ return list(/datum/reagent/uranium = 20)
+
/obj/item/stack/sheet/mineral/uranium/get_main_recipes()
. = ..()
. += GLOB.uranium_recipes
@@ -169,18 +176,20 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
resistance_flags = FLAMMABLE
max_integrity = 100
mats_per_unit = list(/datum/material/plasma=SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/toxin/plasma = 20)
gulag_valid = TRUE
merge_type = /obj/item/stack/sheet/mineral/plasma
material_type = /datum/material/plasma
walltype = /turf/closed/wall/mineral/plasma
+/obj/item/stack/sheet/mineral/plasma/grind_results()
+ return list(/datum/reagent/toxin/plasma = 20)
+
/obj/item/stack/sheet/mineral/plasma/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] begins licking \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
return TOXLOSS//dont you kids know that stuff is toxic?
GLOBAL_LIST_INIT(plasma_recipes, list ( \
- new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
+ new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
))
@@ -207,20 +216,22 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
singular_name = "gold bar"
construction_path_type = "gold"
mats_per_unit = list(/datum/material/gold=SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/gold = 20)
gulag_valid = TRUE
merge_type = /obj/item/stack/sheet/mineral/gold
material_type = /datum/material/gold
walltype = /turf/closed/wall/mineral/gold
GLOBAL_LIST_INIT(gold_recipes, list ( \
- new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
+ new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
new/datum/stack_recipe("golden platform", /obj/structure/platform/gold, 2, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
new/datum/stack_recipe("gold tile", /obj/item/stack/tile/mineral/gold, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
new/datum/stack_recipe("blank plaque", /obj/item/plaque, 1, crafting_flags = NONE, category = CAT_FURNITURE), \
new/datum/stack_recipe("Simple Crown", /obj/item/clothing/head/costume/crown, 5, crafting_flags = NONE, category = CAT_CLOTHING), \
))
+/obj/item/stack/sheet/mineral/gold/grind_results()
+ return list(/datum/reagent/gold = 20)
+
/obj/item/stack/sheet/mineral/gold/get_main_recipes()
. = ..()
. += GLOB.gold_recipes
@@ -238,7 +249,6 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
singular_name = "silver bar"
construction_path_type = "silver"
mats_per_unit = list(/datum/material/silver=SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/silver = 20)
gulag_valid = TRUE
merge_type = /obj/item/stack/sheet/mineral/silver
material_type = /datum/material/silver
@@ -246,11 +256,14 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
walltype = /turf/closed/wall/mineral/silver
GLOBAL_LIST_INIT(silver_recipes, list ( \
- new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
+ new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
new/datum/stack_recipe("silver platform", /obj/structure/platform/silver, 2, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
new/datum/stack_recipe("silver tile", /obj/item/stack/tile/mineral/silver, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
))
+/obj/item/stack/sheet/mineral/silver/grind_results()
+ return list(/datum/reagent/silver = 20)
+
/obj/item/stack/sheet/mineral/silver/get_main_recipes()
. = ..()
. += GLOB.silver_recipes
@@ -268,7 +281,6 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
singular_name = "bananium sheet"
construction_path_type = "bananium"
mats_per_unit = list(/datum/material/bananium=SHEET_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/consumable/banana = 20)
gulag_valid = TRUE
merge_type = /obj/item/stack/sheet/mineral/bananium
material_type = /datum/material/bananium
@@ -278,6 +290,9 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
))
+/obj/item/stack/sheet/mineral/bananium/grind_results()
+ return list(/datum/reagent/consumable/banana = 20)
+
/obj/item/stack/sheet/mineral/bananium/get_main_recipes()
. = ..()
. += GLOB.bananium_recipes
@@ -309,7 +324,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \
new /datum/stack_recipe("Titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
new/datum/stack_recipe("Titanium Platform", /obj/structure/platform/titanium, 2, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
new /datum/stack_recipe("Shuttle seat", /obj/structure/chair/comfy/shuttle, 2, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
- new /datum/stack_recipe("Material tram door assembly", /obj/structure/door_assembly/multi_tile/door_assembly_tram, 8, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
+ new /datum/stack_recipe("Tram door assembly", /obj/structure/door_assembly/multi_tile/door_assembly_tram, 8, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
))
/obj/item/stack/sheet/mineral/titanium/get_main_recipes()
@@ -382,7 +397,6 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \
singular_name = "snow block"
force = 1
throwforce = 2
- grind_results = list(/datum/reagent/consumable/ice = 20)
merge_type = /obj/item/stack/sheet/mineral/snow
walltype = /turf/closed/wall/mineral/snow
material_type = /datum/material/snow
@@ -400,6 +414,9 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \
. = ..()
AddComponent(/datum/component/storm_hating)
+/obj/item/stack/sheet/mineral/snow/grind_results()
+ return list(/datum/reagent/consumable/ice = 20)
+
/obj/item/stack/sheet/mineral/snow/get_main_recipes()
. = ..()
. += GLOB.snow_recipes
@@ -472,6 +489,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
GLOBAL_LIST_INIT(abductor_recipes, list ( \
new/datum/stack_recipe("alien bed", /obj/structure/bed/abductor, 2, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("alien locker", /obj/structure/closet/abductor, 2, time = 2 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new/datum/stack_recipe("strange closet", /obj/structure/closet/acloset, 2, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS), \
new/datum/stack_recipe("alien table frame", /obj/structure/table_frame/abductor, 1, time = 2 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("alien airlock assembly", /obj/structure/door_assembly/door_assembly_abductor, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
null, \
@@ -493,9 +511,11 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \
icon_state = "slag"
singular_name = "coal lump"
merge_type = /obj/item/stack/sheet/mineral/coal
- grind_results = list(/datum/reagent/carbon = 20)
novariants = TRUE
+/obj/item/stack/sheet/mineral/coal/grind_results()
+ return list(/datum/reagent/carbon = 20)
+
/obj/item/stack/sheet/mineral/coal/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/stacks/sheets/runed_metal.dm b/code/game/objects/items/stacks/sheets/runed_metal.dm
index b1810b624829f9..674dea391c1e0e 100644
--- a/code/game/objects/items/stacks/sheets/runed_metal.dm
+++ b/code/game/objects/items/stacks/sheets/runed_metal.dm
@@ -77,11 +77,13 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list( \
mats_per_unit = list(/datum/material/runedmetal = SHEET_MATERIAL_AMOUNT)
construction_path_type = "runed"
merge_type = /obj/item/stack/sheet/runed_metal
- grind_results = list(/datum/reagent/iron = 5, /datum/reagent/blood = 15)
material_type = /datum/material/runedmetal
has_unique_girder = TRUE
use_radial = TRUE
+/obj/item/stack/sheet/runed_metal/grind_results()
+ return list(/datum/reagent/iron = 5, /datum/reagent/blood = 15)
+
/obj/item/stack/sheet/runed_metal/interact(mob/user)
if(!IS_CULTIST(user))
to_chat(user, span_warning("Only one with forbidden knowledge could hope to work this metal..."))
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 38c2c4dc26d962..c67f4c21f86c3a 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -31,18 +31,20 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("lime comfy chair", /obj/structure/chair/comfy/lime, 2, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("teal comfy chair", /obj/structure/chair/comfy/teal, 2, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
)), \
- new/datum/stack_recipe_list("sofas", list(
- new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa/middle, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE),
- new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE),
- new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE),
- new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE)
- )), \
- new/datum/stack_recipe_list("corporate sofas", list( \
- new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa/corp, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
- new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/corp/left, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
- new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/corp/right, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
- new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corp/corner, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
- )), \
+ new/datum/stack_recipe_list("sofas", list( \
+ new /datum/stack_recipe("corporate sofa (middle)", /obj/structure/chair/sofa/corp, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("corporate sofa (left)", /obj/structure/chair/sofa/corp/left, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("corporate sofa (right)", /obj/structure/chair/sofa/corp/right, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("corporate sofa (corner)", /obj/structure/chair/sofa/corp/corner, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa/middle, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corner, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("retro sofa (middle)", /obj/structure/chair/sofa/middle/brown, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("retro sofa (left)", /obj/structure/chair/sofa/left/brown, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("retro sofa (right)", /obj/structure/chair/sofa/right/brown, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new /datum/stack_recipe("retro sofa (corner)", /obj/structure/chair/sofa/corner/brown, 1, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE) \
+ )), \
new /datum/stack_recipe_list("benches", list( \
new /datum/stack_recipe("bench (middle)", /obj/structure/chair/sofa/bench, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new /datum/stack_recipe("bench (left)", /obj/structure/chair/sofa/bench/left, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
@@ -142,10 +144,10 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("telescreen turbine frame", /obj/item/wallframe/telescreen/turbine, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
new/datum/stack_recipe("telescreen engine frame", /obj/item/wallframe/telescreen/engine, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
new/datum/stack_recipe("telescreen auxbase frame", /obj/item/wallframe/telescreen/auxbase, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
- new/datum/stack_recipe("tram controller frame", /obj/item/wallframe/tram/controller, 20, crafting_flags = NONE, category = CAT_STRUCTURE), \
+ new/datum/stack_recipe("tram controller frame", /obj/item/wallframe/tram, 20, crafting_flags = NONE, category = CAT_STRUCTURE), \
new/datum/stack_recipe("tram display frame", /obj/item/wallframe/indicator_display, 7, crafting_flags = NONE, category = CAT_STRUCTURE), \
null, \
- new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), \
+ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS), \
new/datum/stack_recipe("filing cabinet", /obj/structure/filingcabinet, 2, time = 10 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("desk bell", /obj/structure/desk_bell, 2, time = 3 SECONDS, crafting_flags = NONE, category = CAT_FURNITURE), \
new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
@@ -167,7 +169,6 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
obj_flags = CONDUCTS_ELECTRICITY
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/sheet/iron
- grind_results = list(/datum/reagent/iron = 20)
gulag_valid = TRUE
table_type = /obj/structure/table
material_type = /datum/material/iron
@@ -187,6 +188,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
)
AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
+/obj/item/stack/sheet/iron/grind_results()
+ return list(/datum/reagent/iron = 20)
+
/obj/item/stack/sheet/iron/examine(mob/user)
. = ..()
. += span_notice("Right click on floor to build:")
@@ -294,6 +298,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
new/datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 10, time = 5 SECONDS, crafting_flags = NONE, category = CAT_CHEMISTRY),
new/datum/stack_recipe("Large Gas Tank", /obj/structure/tank_frame, 4, time=1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF, category = CAT_ATMOSPHERIC),
new/datum/stack_recipe("shutter assembly", /obj/machinery/door/poddoor/shutters/preopen/deconstructed, 5, time = 5 SECONDS, crafting_flags = CRAFT_ONE_PER_TURF, category = CAT_DOORS),
+ new/datum/stack_recipe("large metal box", /obj/structure/closet/cardboard/metal, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS),
null,
new /datum/stack_recipe_list("airlock assemblies", list( \
new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_DOORS),
@@ -314,7 +319,6 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
armor_type = /datum/armor/sheet_plasteel
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/sheet/plasteel
- grind_results = list(/datum/reagent/iron = 20, /datum/reagent/toxin/plasma = 20)
gulag_valid = TRUE
table_type = /obj/structure/table/reinforced
material_flags = NONE
@@ -324,6 +328,9 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
fire = 100
acid = 80
+/obj/item/stack/sheet/plasteel/grind_results()
+ return list(/datum/reagent/iron = 20, /datum/reagent/toxin/plasma = 20)
+
/obj/item/stack/sheet/plasteel/get_main_recipes()
. = ..()
. += GLOB.plasteel_recipes
@@ -359,7 +366,10 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying/rack, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \
new/datum/stack_recipe("wooden barrel", /obj/structure/fermenting_barrel, 8, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS), \
new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new/datum/stack_recipe("gavel hammer", /obj/item/gavelhammer, 2, time = 3 SECONDS, crafting_flags = NONE, category = CAT_ENTERTAINMENT), \
+ new/datum/stack_recipe("gavel block", /obj/item/gavelblock, 1, time = 2 SECONDS, crafting_flags = NONE, category = CAT_ENTERTAINMENT), \
new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
+ new/datum/stack_recipe("cabinet", /obj/structure/closet/cabinet, 2, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS), \
new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 1 SECONDS, crafting_flags = NONE, category = CAT_ENTERTAINMENT),\
new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 1 SECONDS, crafting_flags = NONE, category = CAT_ENTERTAINMENT),\
new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
@@ -373,7 +383,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 1 SECONDS, crafting_flags = NONE, category = CAT_TOOLS),\
new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS),\
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE),\
- new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 1.5 SECONDS, crafting_flags = NONE, category = CAT_WEAPON_MELEE),\
+ new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 1.5 SECONDS, crafting_flags = NONE, category = CAT_WEAPON_MELEE, removed_mats = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1.5)),\
new/datum/stack_recipe("wooden crutch", /obj/item/cane/crutch/wood, 5, time = 1.5 SECONDS, crafting_flags = NONE, category = CAT_WEAPON_MELEE),\
new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/cup/mortar, 3, crafting_flags = NONE, category = CAT_CHEMISTRY), \
@@ -411,7 +421,6 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/mineral/wood
material_type = /datum/material/wood
- grind_results = list(/datum/reagent/cellulose = 20) //no lignocellulose or lignin reagents yet,
walltype = /turf/closed/wall/mineral/wood
stairs_type = /obj/structure/stairs/wood
pickup_sound = 'sound/items/handling/materials/wood_pick_up.ogg'
@@ -420,6 +429,9 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
/datum/armor/mineral_wood
fire = 50
+/obj/item/stack/sheet/mineral/wood/grind_results()
+ return list(/datum/reagent/cellulose = 20)
+
/obj/item/stack/sheet/mineral/wood/get_main_recipes()
. = ..()
. += GLOB.wood_recipes
@@ -451,7 +463,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
new/datum/stack_recipe("bamboo spear", /obj/item/spear/bamboospear, 25, time = 9 SECONDS, crafting_flags = NONE, category = CAT_WEAPON_MELEE), \
new/datum/stack_recipe("blow gun", /obj/item/gun/syringe/blowgun, 10, time = 7 SECONDS, crafting_flags = NONE, category = CAT_WEAPON_RANGED), \
new/datum/stack_recipe("crude syringe", /obj/item/reagent_containers/syringe/crude, 5, time = 1 SECONDS, crafting_flags = NONE, category = CAT_CHEMISTRY), \
- new/datum/stack_recipe("rice hat", /obj/item/clothing/head/costume/rice_hat, 10, time = 7 SECONDS, crafting_flags = NONE, category = CAT_CLOTHING), \
+ new/datum/stack_recipe("rice hat", /obj/item/clothing/head/costume/rice_hat, 10, time = 7 SECONDS, crafting_flags = CRAFT_SKIP_MATERIALS_PARITY, category = CAT_CLOTHING), \
null, \
new/datum/stack_recipe("bamboo stool", /obj/structure/chair/stool/bamboo, 2, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("bamboo mat piece", /obj/item/stack/tile/bamboo, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
@@ -477,7 +489,6 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
armor_type = /datum/armor/mineral_bamboo
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/mineral/bamboo
- grind_results = list(/datum/reagent/cellulose = 10)
material_type = /datum/material/bamboo
walltype = /turf/closed/wall/mineral/bamboo
drop_sound = null
@@ -486,6 +497,9 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
/datum/armor/mineral_bamboo
fire = 50
+/obj/item/stack/sheet/mineral/bamboo/grind_results()
+ return list(/datum/reagent/cellulose = 10)
+
/obj/item/stack/sheet/mineral/bamboo/get_main_recipes()
. = ..()
. += GLOB.bamboo_recipes
@@ -547,10 +561,12 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
merge_type = /obj/item/stack/sheet/cloth
drop_sound = 'sound/items/handling/cloth/cloth_drop1.ogg'
pickup_sound = 'sound/items/handling/cloth/cloth_pickup1.ogg'
- grind_results = list(/datum/reagent/cellulose = 20)
pickup_sound = SFX_CLOTH_PICKUP
drop_sound = SFX_CLOTH_DROP
+/obj/item/stack/sheet/cloth/grind_results()
+ return list(/datum/reagent/cellulose = 20)
+
/obj/item/stack/sheet/cloth/get_main_recipes()
. = ..()
. += GLOB.cloth_recipes
@@ -607,23 +623,25 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/cotton
- grind_results = list(/datum/reagent/cellulose = 20)
- var/loom_result = /obj/item/stack/sheet/cloth
- var/loom_time = 1 SECONDS
drop_sound = 'sound/items/handling/cloth/cloth_drop1.ogg'
pickup_sound = 'sound/items/handling/cloth/cloth_pickup1.ogg'
+ var/loom_result = /obj/item/stack/sheet/cloth
+ var/loom_time = 1 SECONDS
+
/obj/item/stack/sheet/cotton/Initialize(mapload)
. = ..()
AddElement(/datum/element/loomable, resulting_atom = loom_result, loom_time = loom_time)
+/obj/item/stack/sheet/cotton/grind_results()
+ return list(/datum/reagent/cellulose = 20)
+
/obj/item/stack/sheet/cotton/durathread
name = "raw durathread bundle"
desc = "A bundle of raw durathread ready to be spun on the loom."
singular_name = "raw durathread ball"
icon_state = "sheet-durathreadraw"
merge_type = /obj/item/stack/sheet/cotton/durathread
- grind_results = list()
loom_result = /obj/item/stack/sheet/durathread
/obj/item/stack/sheet/cotton/wool
@@ -632,7 +650,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
singular_name = "raw wool ball"
icon_state = "sheet-wool"
merge_type = /obj/item/stack/sheet/cotton/wool
- grind_results = list()
loom_result = /obj/item/stack/sheet/cloth
/*
@@ -643,6 +660,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/costume/cardborg, 3, crafting_flags = NONE, category = CAT_CLOTHING), \
new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/costume/cardborg, crafting_flags = NONE, category = CAT_CLOTHING), \
new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS), \
+ new/datum/stack_recipe("medium box", /obj/structure/closet/crate/cardboard, 4, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS), \
new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5, crafting_flags = NONE, category = CAT_ENTERTAINMENT), \
null, \
@@ -704,7 +722,7 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
null, \
))
-/obj/item/stack/sheet/cardboard //BubbleWrap //it's cardboard you fuck
+/obj/item/stack/sheet/cardboard
name = "cardboard"
desc = "Large sheets of card, like boxes folded flat."
singular_name = "cardboard sheet"
@@ -715,7 +733,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
force = 0
throwforce = 0
merge_type = /obj/item/stack/sheet/cardboard
- grind_results = list(/datum/reagent/cellulose = 10)
material_type = /datum/material/cardboard
pickup_sound = 'sound/items/handling/materials/cardboard_pick_up.ogg'
drop_sound = 'sound/items/handling/materials/cardboard_drop.ogg'
@@ -729,6 +746,9 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
slapcraft_recipes = slapcraft_recipe_list,\
)
+/obj/item/stack/sheet/cardboard/grind_results()
+ return list(/datum/reagent/cellulose = 10)
+
/obj/item/stack/sheet/cardboard/get_main_recipes()
. = ..()
. += GLOB.cardboard_recipes
@@ -791,22 +811,19 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
throw_speed = 1
throw_range = 3
novariants = FALSE
- grind_results = list(/datum/reagent/iron = 20, /datum/reagent/copper = 12) //we have no "tin" reagent so this is the closest thing
merge_type = /obj/item/stack/sheet/bronze
table_type = /obj/structure/table/bronze
material_type = /datum/material/bronze
walltype = /turf/closed/wall/mineral/bronze
has_unique_girder = TRUE
+/obj/item/stack/sheet/bronze/grind_results()
+ return list(/datum/reagent/iron = 20, /datum/reagent/copper = 12)
+
/obj/item/stack/sheet/bronze/get_main_recipes()
. = ..()
. += GLOB.bronze_recipes
-/obj/item/stack/sheet/paperframes/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1)
- . = ..()
- pixel_x = 0
- pixel_y = 0
-
/obj/item/stack/sheet/bronze/thirty
amount = 30
@@ -848,7 +865,6 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 1
throw_range = 3
- grind_results = list(/datum/reagent/carbon = 10)
merge_type = /obj/item/stack/sheet/bone
material_type = /datum/material/bone
drop_sound = null
@@ -873,6 +889,10 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
/datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
+
+/obj/item/stack/sheet/bone/grind_results()
+ return list(/datum/reagent/carbon = 10)
+
GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("plastic floor tile", /obj/item/stack/tile/plastic, 1, 4, 20, time = 2 SECONDS, crafting_flags = NONE, category = CAT_TILES), \
new /datum/stack_recipe("light tram tile", /obj/item/stack/thermoplastic/light, 1, 4, 20, time = 2 SECONDS, crafting_flags = NONE, category = CAT_TILES), \
@@ -881,7 +901,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, time = 4 SECONDS, category = CAT_FURNITURE), \
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/empty, crafting_flags = NONE, category = CAT_CONTAINERS), \
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/cup/glass/waterbottle/large/empty, 3, crafting_flags = NONE, category = CAT_CONTAINERS), \
- new /datum/stack_recipe("colo cups", /obj/item/reagent_containers/cup/glass/colocup, 1, crafting_flags = NONE, category = CAT_CONTAINERS), \
+ new /datum/stack_recipe("colo cups", /obj/item/reagent_containers/cup/glass/colocup, 1, crafting_flags = NONE, category = CAT_CONTAINERS, removed_mats = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)), \
new /datum/stack_recipe("mannequin", /obj/structure/mannequin/plastic, 25, time = 5 SECONDS, crafting_flags = CRAFT_ONE_PER_TURF, category = CAT_ENTERTAINMENT), \
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2, crafting_flags = NONE, category = CAT_EQUIPMENT), \
new /datum/stack_recipe("warning cone", /obj/item/clothing/head/cone, 2, crafting_flags = NONE, category = CAT_EQUIPMENT), \
@@ -928,11 +948,13 @@ GLOBAL_LIST_INIT(paperframe_recipes, list(
mats_per_unit = list(/datum/material/paper = SHEET_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/sheet/paperframes
resistance_flags = FLAMMABLE
- grind_results = list(/datum/reagent/cellulose = 20)
material_type = /datum/material/paper
drop_sound = null
pickup_sound = null
+/obj/item/stack/sheet/paperframes/grind_results()
+ return list(/datum/reagent/cellulose = 20)
+
/obj/item/stack/sheet/paperframes/get_main_recipes()
. = ..()
. += GLOB.paperframe_recipes
@@ -1000,7 +1022,9 @@ GLOBAL_LIST_INIT(pizza_sheet_recipes, list(
merge_type = /obj/item/stack/sheet/hauntium
material_type = /datum/material/hauntium
material_modifier = 1 //None of that wussy stuff
- grind_results = list(/datum/reagent/hauntium = 20)
+
+/obj/item/stack/sheet/hauntium/grind_results()
+ return list(/datum/reagent/hauntium = 20)
/obj/item/stack/sheet/hauntium/fifty
amount = 50
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 52a74476fbe57e..b1cb72cba89c97 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -58,6 +58,8 @@
// They're here instead of /stack/medical
// because sticky tape can be used as a makeshift bandage or splint
+ /// Verb used when applying this object to someone
+ var/apply_verb = "applying"
/// If set and this used as a splint for a broken bone wound,
/// This is used as a multiplier for applicable slowdowns (lower = better) (also for speeding up burn recoveries)
var/splint_factor
@@ -94,12 +96,11 @@
if(merge)
. = INITIALIZE_HINT_LATELOAD
- var/materials_mult = amount
if(LAZYLEN(mat_override))
- materials_mult *= mat_amt
mats_per_unit = mat_override
if(LAZYLEN(mats_per_unit))
- initialize_materials(mats_per_unit, materials_mult)
+ mats_per_unit = SSmaterials.FindOrCreateMaterialCombo(mats_per_unit, mat_amt)
+ initialize_materials(mats_per_unit, amount)
recipes = get_main_recipes().Copy()
if(material_type)
@@ -120,6 +121,10 @@
/obj/item/stack/LateInitialize()
merge_with_loc()
+/obj/item/stack/Destroy()
+ mats_per_unit = null
+ return ..()
+
/obj/item/stack/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
. = ..()
if((!throwing || throwing.target_turf == loc) && old_loc != loc && (flags_1 & INITIALIZED_1))
@@ -160,11 +165,6 @@
other_stack = find_other_stack(already_found, TRUE)
return TRUE
-/obj/item/stack/apply_material_effects(list/materials)
- . = ..()
- if(amount)
- mats_per_unit = SSmaterials.FindOrCreateMaterialCombo(materials, 1/amount)
-
/obj/item/stack/blend_requirements()
if(is_cyborg)
to_chat(usr, span_warning("[src] is too integrated into your chassis and can't be ground up!"))
@@ -176,14 +176,16 @@
if(current_amount <= 0 || QDELETED(src)) //just to get rid of this 0 amount/deleted stack we return success
return TRUE
+ var/list/grind_reagents = grind_results()
+
if(reagents)
reagents.trans_to(target_holder, reagents.total_volume, transferred_by = user)
var/available_volume = target_holder.maximum_volume - target_holder.total_volume
//compute total volume of reagents that will be occupied by grind_results
var/total_volume = 0
- for(var/reagent in grind_results)
- total_volume += grind_results[reagent]
+ for(var/reagent in grind_reagents)
+ total_volume += grind_reagents[reagent]
//compute number of pieces(or sheets) from available_volume
var/available_amount = min(current_amount, round(available_volume / total_volume))
@@ -191,7 +193,6 @@
return FALSE
//Now transfer the grind results scaled by available_amount
- var/list/grind_reagents = grind_results.Copy()
for(var/reagent in grind_reagents)
grind_reagents[reagent] *= available_amount
target_holder.add_reagent_list(grind_reagents)
@@ -417,7 +418,7 @@
#undef FULL_LIST
/// Makes the item with the given recipe.
-/obj/item/stack/proc/make_item(mob/builder, datum/stack_recipe/recipe, multiplier)
+/obj/item/stack/proc/make_item(mob/builder, datum/stack_recipe/recipe, multiplier = 1)
if(get_amount() < 1 && !is_cyborg) //sanity check as this shouldn't happen
qdel(src)
return
@@ -456,8 +457,6 @@
return
created = covered_turf.place_on_top(recipe.result_type, flags = CHANGETURF_INHERIT_AIR)
builder.balloon_alert(builder, "placed [ispath(recipe.result_type, /turf/open) ? "floor" : "wall"]")
- if((recipe.crafting_flags & CRAFT_APPLIES_MATS) && LAZYLEN(mats_per_unit))
- created.set_custom_materials(mats_per_unit, recipe.req_amount / recipe.res_amount)
else
created = new recipe.result_type(builder.drop_location())
@@ -468,17 +467,30 @@
if(ismovable(created))
created.setDir(builder.dir)
created.on_craft_completion(list(used_stack), null, builder)
- qdel(used_stack) //you've outlived your purpose
builder.investigate_log("crafted [recipe.title]", INVESTIGATE_CRAFTING)
// Apply mat datums
- if((recipe.crafting_flags & CRAFT_APPLIES_MATS) && LAZYLEN(mats_per_unit))
+ if(LAZYLEN(mats_per_unit) && !(recipe.crafting_flags & CRAFT_NO_MATERIALS))
+ var/list/result_mats = mats_per_unit.Copy()
+ for(var/mat in recipe.removed_mats)
+ var/to_remove = recipe.removed_mats[mat]
+ var/datum/material/ref_mat = locate(mat) in result_mats
+ if(!ref_mat)
+ continue
+ if(result_mats[ref_mat] < to_remove)
+ result_mats -= ref_mat
+ else
+ result_mats[ref_mat] -= to_remove
+
if(isstack(created))
var/obj/item/stack/crafted_stack = created
- crafted_stack.set_custom_materials(mats_per_unit, (recipe.req_amount / recipe.res_amount) * crafted_stack.amount)
+ crafted_stack.mats_per_unit = SSmaterials.FindOrCreateMaterialCombo(result_mats)
+ update_custom_materials()
else
- created.set_custom_materials(mats_per_unit, recipe.req_amount / recipe.res_amount)
+ created.set_custom_materials(result_mats, recipe.req_amount * multiplier)
+
+ qdel(used_stack) //you've outlived your purpose
// We could be qdeleted - like if it's a stack and has already been merged
if(QDELETED(created))
@@ -573,11 +585,10 @@
if (amount < used)
return FALSE
amount -= used
- if(check && is_zero_amount(delete_if_zero = TRUE))
- return TRUE
- update_custom_materials()
- update_appearance()
- update_weight()
+ if(!is_zero_amount(delete_if_zero = check))
+ update_custom_materials()
+ update_appearance()
+ update_weight()
return TRUE
/obj/item/stack/tool_use_check(mob/living/user, amount, heat_required)
diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm
index f507e2fc784a3e..3f30d259aa91bd 100644
--- a/code/game/objects/items/stacks/stack_recipe.dm
+++ b/code/game/objects/items/stacks/stack_recipe.dm
@@ -25,6 +25,8 @@
var/trait_modifier = 1
/// Category for general crafting menu
var/category
+ /// The amount of material to remove from the recipe's result
+ var/list/removed_mats
///crafting_flags var to hold bool values
var/crafting_flags = CRAFT_CHECK_DENSITY
@@ -41,6 +43,7 @@
trait_booster,
trait_modifier = 1,
category,
+ list/removed_mats,
)
src.title = title
@@ -55,6 +58,8 @@
src.trait_modifier = trait_modifier
src.category = src.category || category || CAT_MISC
+ src.removed_mats = removed_mats
+
// We create base64 image only if item have color. Otherwise use icon_ref for TGUI
var/obj/item/result = result_type
var/paint = result::color
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
index 62ac35ec72813f..a83f1627c74260 100644
--- a/code/game/objects/items/stacks/tape.dm
+++ b/code/game/objects/items/stacks/tape.dm
@@ -12,14 +12,14 @@
amount = 5
max_amount = 5
resistance_flags = FLAMMABLE
- grind_results = list(/datum/reagent/cellulose = 5)
splint_factor = 0.65
merge_type = /obj/item/stack/sticky_tape
+ greyscale_config = /datum/greyscale_config/tape
+ greyscale_colors = "#B2B2B2#BD6A62"
+
var/conferred_embed = /datum/embedding/sticky_tape
///The tape type you get when ripping off a piece of tape.
var/obj/tape_gag = /obj/item/clothing/mask/muzzle/tape
- greyscale_config = /datum/greyscale_config/tape
- greyscale_colors = "#B2B2B2#BD6A62"
/datum/embedding/sticky_tape
pain_mult = 0
@@ -27,6 +27,9 @@
ignore_throwspeed_threshold = TRUE
immune_traits = null
+/obj/item/stack/sticky_tape/grind_results()
+ return list(/datum/reagent/cellulose = 5)
+
/obj/item/stack/sticky_tape/attack_hand(mob/user, list/modifiers)
if(user.get_inactive_held_item() == src)
if(is_zero_amount(delete_if_zero = TRUE))
@@ -166,7 +169,7 @@
if(issilicon(interacting_with))
var/mob/living/silicon/robotic_pal = interacting_with
- var/robot_is_damaged = robotic_pal.getBruteLoss()
+ var/robot_is_damaged = robotic_pal.get_brute_loss()
if(!robot_is_damaged)
user.balloon_alert(user, "[robotic_pal] is not damaged!")
@@ -178,7 +181,7 @@
if(!do_after(user, 3 SECONDS, target = robotic_pal))
return ITEM_INTERACT_BLOCKING
- robotic_pal.adjustBruteLoss(-object_repair_value)
+ robotic_pal.adjust_brute_loss(-object_repair_value)
use(1)
to_chat(user, span_notice("You finish repairing [interacting_with] with [src]."))
return ITEM_INTERACT_SUCCESS
diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm
index 0c4bce3310a28d..651cf36ac1a31a 100644
--- a/code/game/objects/items/stacks/tiles/light.dm
+++ b/code/game/objects/items/stacks/tiles/light.dm
@@ -8,6 +8,7 @@
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
turf_type = /turf/open/floor/light
merge_type = /obj/item/stack/tile/light
+ mats_per_unit = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.05, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.05)
var/state = 0
/obj/item/stack/tile/light/attackby(obj/item/O, mob/user, list/modifiers, list/attack_modifiers)
diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm
index 4e7c23b51ff539..67a905b4334f46 100644
--- a/code/game/objects/items/stacks/tiles/tile_mineral.dm
+++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm
@@ -230,3 +230,4 @@
turf_type = /turf/open/floor/fake_snow
mineralType = "snow"
merge_type = /obj/item/stack/tile/mineral/snow
+ mats_per_unit = list(/datum/material/snow = HALF_SHEET_MATERIAL_AMOUNT / 2)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 31c20817c90603..024142e04c44b9 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -137,6 +137,7 @@
/obj/item/stack/tile/wood/tile,
/obj/item/stack/tile/wood/parquet,
)
+ mats_per_unit = list(/datum/material/wood = HALF_SHEET_MATERIAL_AMOUNT / 2)
/obj/item/stack/tile/wood/parquet
name = "parquet wood floor tile"
@@ -175,6 +176,7 @@
/obj/item/stack/tile/bamboo/tatami/purple,
/obj/item/stack/tile/bamboo/tatami/black,
)
+ mats_per_unit = list(/datum/material/bamboo = HALF_SHEET_MATERIAL_AMOUNT / 2)
/obj/item/stack/tile/bamboo/tatami
name = "Tatami with green rim"
@@ -207,6 +209,7 @@
inhand_icon_state = "tile-basalt"
turf_type = /turf/open/floor/fakebasalt
merge_type = /obj/item/stack/tile/basalt
+ mats_per_unit = list(/datum/material/sand = SHEET_MATERIAL_AMOUNT * 2)
//Carpets
/obj/item/stack/tile/carpet
@@ -1079,6 +1082,7 @@
/obj/item/stack/tile/circuit/green,
/obj/item/stack/tile/circuit/red,
)
+ mats_per_unit = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.05, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.05)
/obj/item/stack/tile/circuit/green
name = "green circuit tile"
@@ -1142,7 +1146,7 @@
singular_name = "plastic floor tile"
desc = "A tile of cheap, flimsy plastic flooring."
icon_state = "tile_plastic"
- mats_per_unit = list(/datum/material/plastic=SMALL_MATERIAL_AMOUNT*5)
+ mats_per_unit = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT / 2)
turf_type = /turf/open/floor/plastic
merge_type = /obj/item/stack/tile/plastic
@@ -1191,13 +1195,13 @@
desc = "A clangy tile made of high-quality bronze. Clockwork construction techniques allow the clanging to be minimized."
icon_state = "tile_brass"
turf_type = /turf/open/floor/bronze
- mats_per_unit = list(/datum/material/bronze=SMALL_MATERIAL_AMOUNT*5)
+ mats_per_unit = list(/datum/material/bronze = HALF_SHEET_MATERIAL_AMOUNT / 2)
merge_type = /obj/item/stack/tile/bronze
tile_reskin_types = list(
/obj/item/stack/tile/bronze,
/obj/item/stack/tile/bronze/flat,
/obj/item/stack/tile/bronze/filled,
- )
+ )
/obj/item/stack/tile/bronze/flat
name = "flat bronze tile"
@@ -1257,7 +1261,7 @@
desc = "Flooring that shows its contents underneath. Engineers love it!"
icon_state = "maint_catwalk"
inhand_icon_state = "tile-catwalk"
- mats_per_unit = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT)
+ mats_per_unit = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.2)
turf_type = /turf/open/floor/catwalk_floor
merge_type = /obj/item/stack/tile/catwalk_tile //Just to be cleaner, these all stack with each other
tile_reskin_types = list(
@@ -1324,7 +1328,7 @@
inhand_icon_state = "tile-rglass"
turf_type = /turf/open/floor/glass/reinforced
merge_type = /obj/item/stack/tile/rglass
- mats_per_unit = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 0.125, /datum/material/glass=SHEET_MATERIAL_AMOUNT * 0.25) // 4 tiles per sheet
+ mats_per_unit = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.125, /datum/material/glass=SHEET_MATERIAL_AMOUNT * 0.25) // 4 tiles per sheet
/obj/item/stack/tile/rglass/sixty
amount = 60
diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm
index 600c7b3e451be9..0c445cc2986b1a 100644
--- a/code/game/objects/items/stacks/wrap.dm
+++ b/code/game/objects/items/stacks/wrap.dm
@@ -53,8 +53,8 @@
set_greyscale(colors = list(generated_base_color, generated_ribbon_color))
/obj/item/stack/wrapping_paper/click_alt(mob/user)
- var/new_base = input(user, "", "Select a base color", color) as color
- var/new_ribbon = input(user, "", "Select a ribbon color", color) as color
+ var/new_base = tgui_color_picker(user, "", "Select a base color", color)
+ var/new_ribbon = tgui_color_picker(user, "", "Select a ribbon color", color)
if(!new_base || !new_ribbon)
return CLICK_ACTION_BLOCKING
@@ -93,9 +93,11 @@
amount = 25
max_amount = 25
resistance_flags = FLAMMABLE
- grind_results = list(/datum/reagent/cellulose = 5)
merge_type = /obj/item/stack/package_wrap
+/obj/item/stack/package_wrap/grind_results()
+ return list(/datum/reagent/cellulose = 5)
+
/obj/item/stack/package_wrap/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] begins wrapping [user.p_them()]self in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
if(use(3))
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 20e9700e07569b..d0292a81f042b4 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -161,6 +161,8 @@
INVOKE_ASYNC(src, PROC_REF(handle_move), user)
/obj/item/storage/bag/ore/proc/handle_move(mob/living/user)
+ if(user.stat != CONSCIOUS)
+ return
var/turf/tile = get_turf(user)
var/obj/structure/ore_box/box = null
if(istype(user.pulling, /obj/structure/ore_box))
@@ -305,7 +307,7 @@
// "Only 20 uranium 'cause of radiation"
/obj/item/storage/bag/sheetsnatcher/debug/PopulateContents()
// amount should be null if it should spawn with the type's default amount
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/stack/sheet/iron/fifty = null,
/obj/item/stack/sheet/glass/fifty = null,
/obj/item/stack/sheet/rglass/fifty = null,
@@ -327,6 +329,7 @@
/obj/item/stack/rods/fifty = null,
/obj/item/stack/sheet/mineral/plastitanium = 50,
/obj/item/stack/sheet/mineral/abductor = 50,
+ /obj/item/stack/sheet/mineral/sandbags/fifty = null,
/obj/item/stack/sheet/cardboard/fifty = null,
)
for(var/obj/item/stack/stack_type as anything in items_inside)
@@ -513,6 +516,7 @@
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE|ITEM_SLOT_NECK
resistance_flags = FLAMMABLE
storage_type = /datum/storage/bag/rebar_quiver
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
/obj/item/storage/bag/rebar_quiver/syndicate
icon_state = "syndie_quiver_0"
@@ -582,6 +586,7 @@
/obj/item/storage/bag/quiver/lesser
storage_type = /datum/storage/bag/quiver/less
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
/obj/item/storage/bag/quiver/full/PopulateContents()
. = ..()
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 91240c6534e6a2..00b49c8913c502 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -343,7 +343,7 @@
/obj/item/storage/belt/champion/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/adjust_fishing_difficulty, -2)
+ AddElement(/datum/element/adjust_fishing_difficulty, -2)
/obj/item/storage/belt/military
name = "chest rig"
@@ -454,7 +454,7 @@
/obj/item/grenade/syndieminibomb = 2,
/obj/item/multitool = 1,
/obj/item/screwdriver = 1,
- ),src)
+ ), src)
/obj/item/storage/belt/wands
@@ -588,10 +588,19 @@
w_class = WEIGHT_CLASS_BULKY
interaction_flags_click = parent_type::interaction_flags_click | NEED_DEXTERITY | NEED_HANDS
var/stored_blade
+ actions_types = list(/datum/action/innate/blade_counter)
+ action_slots = ITEM_SLOT_BELT
+ COOLDOWN_DECLARE(resheath_cooldown)
+ COOLDOWN_DECLARE(full_ability_cooldown)
/obj/item/storage/belt/sheath/Initialize(mapload)
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
+ RegisterSignal(src, COMSIG_ATOM_STORED_ITEM, PROC_REF(post_resheath))
+
+/obj/item/storage/belt/sheath/Destroy(force)
+ . = ..()
+ UnregisterSignal(src, COMSIG_ATOM_STORED_ITEM)
/obj/item/storage/belt/sheath/examine(mob/user)
. = ..()
@@ -623,6 +632,104 @@
new stored_blade(src)
update_appearance()
+/obj/item/storage/belt/sheath/proc/post_resheath()
+ SIGNAL_HANDLER
+ COOLDOWN_START(src, resheath_cooldown, 10 SECONDS)
+
+/datum/action/innate/blade_counter
+ name = "Counterattack"
+ desc = "Anticipate an enemy's attack and strike back with your sheathed blade."
+ button_icon = 'icons/mob/actions/actions_spells.dmi'
+ button_icon_state = "declaration"
+ ranged_mousepointer = 'icons/effects/mouse_pointers/honorbound.dmi'
+
+ enable_text = "You prepare to counterattack a target..."
+ disable_text = "You relax your stance."
+
+ click_action = TRUE
+
+ var/datum/weakref/eyed_fool
+
+/datum/action/innate/blade_counter/IsAvailable(feedback = TRUE)
+ if(!isliving(owner))
+ return FALSE
+ var/obj/item/storage/belt/sheath/owners_sheath = target
+ if(!COOLDOWN_FINISHED(owners_sheath, full_ability_cooldown))
+ if(feedback)
+ to_chat(owner, span_warning("You failed a counterattack too recently!"))
+ return FALSE
+ if(!length(owners_sheath.contents))
+ if(feedback)
+ to_chat(owner, span_warning("Your sheath is empty!"))
+ return FALSE
+ if(!COOLDOWN_FINISHED(owners_sheath, resheath_cooldown))
+ if(feedback)
+ to_chat(owner, span_warning("You only just resheathed your blade!"))
+ return FALSE
+ return TRUE
+
+/datum/action/innate/blade_counter/proc/final_checks(atom/cast_on)
+ if(!isliving(cast_on))
+ return FALSE
+ if(owner == cast_on)
+ to_chat(owner, span_warning("You can't counterattack yourself!"))
+ return FALSE
+ var/mob/living/target = cast_on
+ if(!target.mind)
+ to_chat(owner, span_warning("They are too unpredictable to counterattack!"))
+ return FALSE
+ var/obj/item/storage/belt/sheath/oursheath = target
+ if(!length(oursheath.contents))
+ return FALSE
+ return TRUE
+
+/datum/action/innate/blade_counter/do_ability(mob/living/swordsman, mob/living/cast_on)
+ if(!final_checks(cast_on))
+ return TRUE
+ var/obj/item/storage/belt/sheath/used_sheath = target
+ RegisterSignal(swordsman, COMSIG_LIVING_CHECK_BLOCK, PROC_REF(counter_attack))
+ swordsman.Immobilize(1 SECONDS)
+ eyed_fool = WEAKREF(cast_on)
+ swordsman.visible_message(span_danger("[swordsman] widens [p_their(swordsman)] stance, [p_their(swordsman)] hand hovering over \the [used_sheath]!"), span_notice("You prepare to counterattack [cast_on]!"))
+ addtimer(CALLBACK(src, PROC_REF(relax), swordsman), 1 SECONDS)
+ COOLDOWN_START(used_sheath, full_ability_cooldown, 60 SECONDS)
+ unset_ranged_ability(swordsman)
+ return TRUE
+
+#define COUNTERMULTIPLIER 3
+
+/datum/action/innate/blade_counter/proc/counter_attack(mob/living/forward_thinker, atom/attackingthing, damage, attack_text, attack_type)
+ SIGNAL_HANDLER
+ var/obj/item/storage/belt/sheath/used_sheath = target
+ if(!used_sheath || !length(used_sheath.contents) || (attack_type != MELEE_ATTACK && attack_type != UNARMED_ATTACK))
+ return FAILED_BLOCK
+
+ var/obj/item/justicetool = used_sheath.contents[1]
+ var/mob/living/fool = isliving(attackingthing) ? attackingthing : attackingthing.loc
+ if(used_sheath.loc != forward_thinker || fool != eyed_fool.resolve() || !forward_thinker.put_in_active_hand(justicetool))
+ return FAILED_BLOCK
+ var/obj/item/bodypart/offending_hand = fool.get_active_hand()
+ fool.apply_damage(
+ damage = justicetool.force * COUNTERMULTIPLIER,
+ damagetype = justicetool.damtype,
+ def_zone = offending_hand,
+ blocked = fool.run_armor_check(offending_hand, MELEE, armour_penetration = justicetool.armour_penetration, silent = TRUE),
+ wound_bonus = justicetool.wound_bonus * COUNTERMULTIPLIER,
+ exposed_wound_bonus = justicetool.exposed_wound_bonus * COUNTERMULTIPLIER,
+ sharpness = justicetool.sharpness,
+ attack_direction = get_dir(forward_thinker, fool),
+ attacking_item = justicetool,
+ )
+ playsound(forward_thinker, 'sound/items/unsheath.ogg', 50, TRUE)
+ forward_thinker.visible_message(span_danger("[forward_thinker] swiftly draws \the [justicetool] and strikes [fool] during [p_their(fool)] attack!"), span_notice("You swiftly draw \the [justicetool] and counter-attack [fool]!"))
+ COOLDOWN_RESET(used_sheath, full_ability_cooldown)
+ return SUCCESSFUL_BLOCK
+
+#undef COUNTERMULTIPLIER
+
+/datum/action/innate/blade_counter/proc/relax(mob/living/holder)
+ UnregisterSignal(holder, COMSIG_LIVING_CHECK_BLOCK)
+
/obj/item/storage/belt/sheath/sabre
name = "sabre sheath"
desc = "An ornate sheath designed to hold an officer's blade."
@@ -640,6 +747,15 @@
worn_icon_state = "grass_sheath"
storage_type = /datum/storage/green_sabre_belt
+/obj/item/storage/belt/sheath/gladius
+ name = "gladius scabbard"
+ desc = "A fun-sized sheath for a fun-sized sword."
+ icon_state = "gladius_sheath"
+ inhand_icon_state = "gladius_sheath"
+ worn_icon_state = "gladius_sheath"
+ storage_type = /datum/storage/gladius_belt
+ stored_blade = /obj/item/claymore/gladius
+
/obj/item/storage/belt/plant
name = "botanical belt"
desc = "A sturdy leather belt used to hold most hydroponics supplies."
diff --git a/code/game/objects/items/storage/boxes/_boxes.dm b/code/game/objects/items/storage/boxes/_boxes.dm
index ab29439da506f9..a491ace1eea766 100644
--- a/code/game/objects/items/storage/boxes/_boxes.dm
+++ b/code/game/objects/items/storage/boxes/_boxes.dm
@@ -19,6 +19,8 @@
/obj/item/storage/box/Initialize(mapload)
. = ..()
+ if(foldable_result == /obj/item/stack/sheet/cardboard)
+ set_custom_materials(list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT))
update_appearance()
/obj/item/storage/box/suicide_act(mob/living/carbon/user)
diff --git a/code/game/objects/items/storage/boxes/cargo_boxes.dm b/code/game/objects/items/storage/boxes/cargo_boxes.dm
index ea2fc77ffb13d0..749873b50a06a9 100644
--- a/code/game/objects/items/storage/boxes/cargo_boxes.dm
+++ b/code/game/objects/items/storage/boxes/cargo_boxes.dm
@@ -6,10 +6,10 @@
illustration = "shipping"
/obj/item/storage/box/shipping/PopulateContents()
- var/static/items_inside = list(
- /obj/item/dest_tagger=1,
- /obj/item/universal_scanner=1,
- /obj/item/stack/package_wrap/small=2,
- /obj/item/stack/wrapping_paper/small=1,
- )
+ var/list/items_inside = list(
+ /obj/item/dest_tagger = 1,
+ /obj/item/universal_scanner = 1,
+ /obj/item/stack/package_wrap/small = 2,
+ /obj/item/stack/wrapping_paper/small = 1,
+ )
generate_items_inside(items_inside,src)
diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm
index 2ac97ff0313dbc..f692354a689d61 100644
--- a/code/game/objects/items/storage/boxes/clothes_boxes.dm
+++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm
@@ -232,6 +232,14 @@
new /obj/item/clothing/gloves/divine_archer(src)
new /obj/item/clothing/shoes/divine_archer(src)
+/obj/item/storage/box/holy/heretic
+ name = "Occult Practitioner Kit"
+ typepath_for_preview = /obj/item/clothing/suit/chaplainsuit/armor/heretic
+
+/obj/item/storage/box/holy/heretic/PopulateContents()
+ new /obj/item/clothing/suit/chaplainsuit/armor/heretic(src)
+ new /obj/item/clothing/head/helmet/chaplain/heretic(src)
+
/obj/item/storage/box/floor_camo
name = "floor tile camo box"
desc = "Thank you for shopping from Camo-J's, our uniquely designed \
diff --git a/code/game/objects/items/storage/boxes/engineering_boxes.dm b/code/game/objects/items/storage/boxes/engineering_boxes.dm
index f2b0fcc97b27a9..f2f0d43d620886 100644
--- a/code/game/objects/items/storage/boxes/engineering_boxes.dm
+++ b/code/game/objects/items/storage/boxes/engineering_boxes.dm
@@ -24,7 +24,7 @@
storage_type = /datum/storage/box/debug
/obj/item/storage/box/debugtools/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/card/emag=1,
/obj/item/construction/rcd/combat/admin=1,
/obj/item/disk/tech_disk/debug=1,
diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm
index 0c24d5b18f45f7..bd4b3d8e66d461 100644
--- a/code/game/objects/items/storage/boxes/food_boxes.dm
+++ b/code/game/objects/items/storage/boxes/food_boxes.dm
@@ -48,6 +48,7 @@
desc = "Instructions: DO NOT heat in microwave. Product will remove all hostile threats with cutting edge Donk Co. technology."
icon_state = "donkpocketboxshell"
donktype = /obj/item/ammo_casing/shotgun/flechette/donk
+ storage_type = /datum/storage/box/donk_bullets
/obj/item/storage/box/papersack
name = "paper sack"
@@ -58,6 +59,7 @@
illustration = null
resistance_flags = FLAMMABLE
foldable_result = null
+ custom_materials = list(/datum/material/paper = SHEET_MATERIAL_AMOUNT * 1.25)
/// A list of all available papersack reskins
var/list/papersack_designs = list()
///What design from papersack_designs we are currently using.
@@ -377,7 +379,6 @@
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
item_flags = NOBLUDGEON|SKIP_FANTASY_ON_SPAWN
- grind_results = list(/datum/reagent/aluminium = 1)
///The typepath of the type of gum that will spawn in our PopulateContents,
///this is set in Initialize by the gum box if there is one.
@@ -392,6 +393,9 @@
atom_storage.display_contents = FALSE
update_appearance(UPDATE_OVERLAYS)
+/obj/item/storage/bubblegum_wrapper/grind_results()
+ return list(/datum/reagent/aluminium = 1)
+
/obj/item/storage/bubblegum_wrapper/PopulateContents()
new gum_to_spawn(src)
diff --git a/code/game/objects/items/storage/boxes/implant_boxes.dm b/code/game/objects/items/storage/boxes/implant_boxes.dm
index b0961f881e31c8..b3f1db2e457218 100644
--- a/code/game/objects/items/storage/boxes/implant_boxes.dm
+++ b/code/game/objects/items/storage/boxes/implant_boxes.dm
@@ -5,7 +5,7 @@
illustration = "implant"
/obj/item/storage/box/trackimp/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/implantcase/tracking = 4,
/obj/item/implanter = 1,
/obj/item/implantpad = 1,
@@ -19,7 +19,7 @@
illustration = "implant"
/obj/item/storage/box/minertracker/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/implantcase/tracking = 2,
/obj/item/implantcase/beacon = 2,
/obj/item/implanter = 1,
@@ -34,7 +34,7 @@
illustration = "implant"
/obj/item/storage/box/chemimp/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/implantcase/chem = 5,
/obj/item/implanter = 1,
/obj/item/implantpad = 1,
@@ -47,7 +47,7 @@
illustration = "implant"
/obj/item/storage/box/exileimp/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/implantcase/exile = 5,
/obj/item/implanter = 1,
/obj/item/implantpad = 1,
@@ -61,7 +61,7 @@
illustration = "implant"
/obj/item/storage/box/beaconimp/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/implantcase/beacon = 3,
/obj/item/implanter = 1,
/obj/item/implantpad = 1,
@@ -74,7 +74,7 @@
illustration = "implant"
/obj/item/storage/box/teleport_blocker/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/implantcase/teleport_blocker = 2,
/obj/item/implanter = 1,
/obj/item/implantpad = 1,
diff --git a/code/game/objects/items/storage/boxes/job_boxes.dm b/code/game/objects/items/storage/boxes/job_boxes.dm
index bfa20617d59524..23e0d2fc33ac21 100644
--- a/code/game/objects/items/storage/boxes/job_boxes.dm
+++ b/code/game/objects/items/storage/boxes/job_boxes.dm
@@ -195,9 +195,11 @@
return ITEM_INTERACT_BLOCKING
qdel(tool)
loc.balloon_alert(user, "wheels added, honk!")
- var/obj/item/bot_assembly/honkbot/A = new
+ var/obj/item/bot_assembly/honkbot/assembly = new(drop_location())
+ var/held_index = user.is_holding(src)
qdel(src)
- user.put_in_hands(A)
+ if (held_index)
+ user.put_in_hand(assembly, held_index)
return ITEM_INTERACT_SUCCESS
/obj/item/storage/box/clown/suicide_act(mob/living/user)
diff --git a/code/game/objects/items/storage/boxes/medical_boxes.dm b/code/game/objects/items/storage/boxes/medical_boxes.dm
index 7d468ff81b1a58..f8563a10024e97 100644
--- a/code/game/objects/items/storage/boxes/medical_boxes.dm
+++ b/code/game/objects/items/storage/boxes/medical_boxes.dm
@@ -87,7 +87,7 @@
illustration = "dna"
/obj/item/storage/box/injectors/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/dnainjector/h2m = 3,
/obj/item/dnainjector/m2h = 3,
)
@@ -127,7 +127,7 @@
illustration = "beaker"
/obj/item/storage/box/evilmeds/PopulateContents()
- var/static/list/items_inside = list(
+ var/list/items_inside = list(
/obj/item/reagent_containers/cup/beaker/meta/omnizine = 1,
/obj/item/reagent_containers/cup/beaker/meta/sal_acid = 1,
/obj/item/reagent_containers/cup/beaker/meta/oxandrolone = 1,
diff --git a/code/game/objects/items/storage/boxes/misc.dm b/code/game/objects/items/storage/boxes/misc.dm
index 41c958b1398e6c..c9d184feb61981 100644
--- a/code/game/objects/items/storage/boxes/misc.dm
+++ b/code/game/objects/items/storage/boxes/misc.dm
@@ -63,7 +63,7 @@
icon_state = "blank_package"
/obj/item/storage/box/methdealer/PopulateContents()
- var/static/list/items_inside = list(
+ var/list/items_inside = list(
/obj/item/food/drug/meth_crystal = 4,
/obj/item/cigarette/pipe/crackpipe = 2,
)
@@ -75,7 +75,7 @@
icon_state = "blank_package"
/obj/item/storage/box/opiumdealer/PopulateContents()
- var/static/list/items_inside = list(
+ var/list/items_inside = list(
/obj/item/food/drug/opium = 4,
/obj/item/cigarette/pipe/cobpipe = 2,
)
@@ -87,7 +87,7 @@
icon_state = "blank_package"
/obj/item/storage/box/kronkdealer/PopulateContents()
- var/static/list/items_inside = list(
+ var/list/items_inside = list(
/obj/item/food/drug/moon_rock = 4,
/obj/item/cigarette/pipe/crackpipe = 2,
)
diff --git a/code/game/objects/items/storage/boxes/science_boxes.dm b/code/game/objects/items/storage/boxes/science_boxes.dm
index 46d0890ea40974..11eebd8699cf77 100644
--- a/code/game/objects/items/storage/boxes/science_boxes.dm
+++ b/code/game/objects/items/storage/boxes/science_boxes.dm
@@ -71,7 +71,7 @@
desc = "Contains a variety of basic stock parts."
/obj/item/storage/box/stockparts/basic/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/stock_parts/capacitor = 3,
/obj/item/stock_parts/servo = 3,
/obj/item/stock_parts/matter_bin = 3,
@@ -86,7 +86,7 @@
icon_state = "syndiebox"
/obj/item/storage/box/stockparts/deluxe/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/stock_parts/capacitor/quadratic = 3,
/obj/item/stock_parts/scanning_module/triphasic = 3,
/obj/item/stock_parts/servo/femto = 3,
@@ -104,7 +104,7 @@
new /obj/item/circuitboard/machine/protolathe/offstation(src)
new /obj/item/circuitboard/machine/destructive_analyzer(src)
new /obj/item/circuitboard/machine/circuit_imprinter/offstation(src)
- new /obj/item/circuitboard/computer/rdconsole(src)
+ new /obj/item/circuitboard/computer/rdconsole/unlocked(src)
/obj/item/storage/box/stabilized //every single stabilized extract from xenobiology
name = "box of stabilized extracts"
@@ -112,7 +112,7 @@
storage_type = /datum/storage/box/stabilized
/obj/item/storage/box/stabilized/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/slimecross/stabilized/adamantine=1,
/obj/item/slimecross/stabilized/black=1,
/obj/item/slimecross/stabilized/blue=1,
diff --git a/code/game/objects/items/storage/boxes/service_boxes.dm b/code/game/objects/items/storage/boxes/service_boxes.dm
index b751cfc1e5d7fc..e2b8a1082ec61b 100644
--- a/code/game/objects/items/storage/boxes/service_boxes.dm
+++ b/code/game/objects/items/storage/boxes/service_boxes.dm
@@ -150,7 +150,7 @@
custom_premium_price = PAYCHECK_CREW * 3
/obj/item/storage/box/dishdrive/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/circuitboard/machine/dish_drive = 1,
/obj/item/screwdriver = 1,
/obj/item/stack/cable_coil/five = 1,
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index f8b650ec0eed61..8f697d4a6bd5fe 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -609,7 +609,7 @@
spawn_count = 10
contents_tag = "pickle"
foldable_result = /obj/item/reagent_containers/cup/beaker/large
- custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.25)
open_status = FANCY_CONTAINER_ALWAYS_OPEN
has_open_closed_states = FALSE
storage_type = /datum/storage/pickles_jar
diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm
index 4fe7ad9c664cf5..507523e1f8dbc3 100644
--- a/code/game/objects/items/storage/garment.dm
+++ b/code/game/objects/items/storage/garment.dm
@@ -100,7 +100,7 @@
new /obj/item/clothing/suit/armor/vest/warden/alt(src)
new /obj/item/clothing/under/rank/security/warden/formal(src)
new /obj/item/clothing/under/rank/security/warden/skirt(src)
- new /obj/item/clothing/gloves/krav_maga/sec(src)
+ new /obj/item/clothing/gloves/kaza_ruk/sec(src)
new /obj/item/clothing/glasses/hud/security/sunglasses(src)
new /obj/item/clothing/mask/gas/sechailer(src)
@@ -146,7 +146,7 @@
new /obj/item/clothing/head/utility/hardhat/white(src)
new /obj/item/clothing/head/utility/hardhat/welding/white(src)
new /obj/item/clothing/neck/cloak/ce(src)
- new /obj/item/clothing/shoes/sneakers/brown(src)
+ new /obj/item/clothing/shoes/workboots(src)
/obj/item/storage/bag/garment/quartermaster/PopulateContents()
new /obj/item/clothing/under/rank/cargo/qm(src)
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
index 5f191ae60f0b7c..a4f9a271c17584 100644
--- a/code/game/objects/items/storage/holsters.dm
+++ b/code/game/objects/items/storage/holsters.dm
@@ -37,9 +37,13 @@
desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Designed to hold energy weaponry. A production stamp indicates that it was shipped with a disabler."
/obj/item/storage/belt/holster/energy/disabler/PopulateContents()
- generate_items_inside(list(
- /obj/item/gun/energy/disabler = 1,
- ),src)
+ new /obj/item/gun/energy/disabler(src)
+
+/obj/item/storage/belt/holster/energy/laser_pistol
+ desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Designed to hold energy weaponry. A production stamp indicates that it was shipped with a Type 5C laser pistol."
+
+/obj/item/storage/belt/holster/energy/laser_pistol/PopulateContents()
+ new /obj/item/gun/energy/laser/pistol(src)
/obj/item/storage/belt/holster/energy/smoothbore
desc = "A rather plain pair of shoulder holsters with a bit of insulated padding inside. Designed to hold energy weaponry. Seems it was meant to fit two smoothbores."
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index 8efce4eefc732b..ab56a92533207e 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -42,7 +42,7 @@
/obj/item/storage/medkit/regular/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/suture = 2,
/obj/item/stack/medical/mesh = 2,
@@ -60,7 +60,7 @@
/obj/item/storage/medkit/emergency/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/healthanalyzer/simple = 1,
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/bandage = 1,
@@ -80,7 +80,7 @@
/obj/item/storage/medkit/surgery/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/healthanalyzer = 1,
/obj/item/stack/medical/gauze/twelve = 1,
/obj/item/stack/medical/suture = 2,
@@ -104,7 +104,7 @@
/obj/item/storage/medkit/surgery_syndie/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/scalpel/advanced = 1,
/obj/item/retractor/advanced = 1,
/obj/item/cautery/advanced = 1,
@@ -130,7 +130,7 @@
/obj/item/storage/medkit/ancient/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/stack/medical/gauze = 1,
/obj/item/stack/medical/bruise_pack = 3,
/obj/item/stack/medical/ointment= 3)
@@ -157,7 +157,7 @@
/obj/item/storage/medkit/fire/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/reagent_containers/applicator/patch/aiuri = 3,
/obj/item/reagent_containers/spray/hercuri = 1,
/obj/item/reagent_containers/hypospray/medipen/oxandrolone = 1,
@@ -182,7 +182,7 @@
/obj/item/storage/medkit/toxin/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/storage/pill_bottle/multiver/less = 1,
/obj/item/reagent_containers/syringe/syriniver = 3,
/obj/item/storage/pill_bottle/potassiodide = 1,
@@ -208,7 +208,7 @@
/obj/item/storage/medkit/o2/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/reagent_containers/syringe/convermol = 3,
/obj/item/reagent_containers/hypospray/medipen/salbutamol = 1,
/obj/item/reagent_containers/hypospray/medipen = 1,
@@ -232,7 +232,7 @@
/obj/item/storage/medkit/brute/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/reagent_containers/applicator/patch/libital = 3,
/obj/item/stack/medical/gauze = 1,
/obj/item/storage/pill_bottle/probital = 1,
@@ -255,7 +255,7 @@
/obj/item/storage/medkit/advanced/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/reagent_containers/applicator/patch/synthflesh = 3,
/obj/item/reagent_containers/hypospray/medipen/atropine = 2,
/obj/item/stack/medical/gauze = 1,
@@ -274,7 +274,7 @@
/obj/item/storage/medkit/tactical_lite/PopulateContents()
if(empty)
return
- var/static/list/items_inside = list(
+ var/list/items_inside = list(
/obj/item/healthanalyzer/advanced = 1,
/obj/item/reagent_containers/hypospray/medipen/atropine = 1,
/obj/item/stack/medical/gauze = 1,
@@ -297,7 +297,7 @@
/obj/item/storage/medkit/tactical/PopulateContents()
if(empty)
return
- var/static/list/items_inside = list(
+ var/list/items_inside = list(
/obj/item/cautery = 1,
/obj/item/scalpel = 1,
/obj/item/healthanalyzer/advanced = 1,
@@ -319,13 +319,15 @@
desc = "May or may not contain traces of lead."
icon_state = "medkit_tactical_premium"
inhand_icon_state = "medkit-tactical-premium"
- grind_results = list(/datum/reagent/lead = 10)
storage_type = /datum/storage/medkit/tactical/premium
+/obj/item/storage/medkit/tactical/premium/grind_results()
+ return list(/datum/reagent/lead = 10)
+
/obj/item/storage/medkit/tactical/premium/PopulateContents()
if(empty)
return
- var/static/list/items_inside = list(
+ var/list/items_inside = list(
/obj/item/stack/medical/suture/medicated = 2,
/obj/item/stack/medical/mesh/advanced = 2,
/obj/item/reagent_containers/applicator/patch/libital = 3,
@@ -356,7 +358,7 @@
/obj/item/storage/medkit/coroner/PopulateContents()
if(empty)
return
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/reagent_containers/cup/bottle/formaldehyde = 1,
/obj/item/reagent_containers/medigel/sterilizine = 1,
/obj/item/reagent_containers/blood = 1,
@@ -374,14 +376,16 @@
balloon_alert(user, "items inside!")
return ITEM_INTERACT_BLOCKING
- var/obj/item/bot_assembly/medbot/medbot_assembly = new()
+ var/obj/item/bot_assembly/medbot/medbot_assembly = new(drop_location())
medbot_assembly.set_skin(get_medbot_skin())
- user.put_in_hands(medbot_assembly)
medbot_assembly.balloon_alert(user, "arm added")
medbot_assembly.robot_arm = tool.type
medbot_assembly.medkit_type = type
qdel(tool)
+ var/held_index = user.is_holding(src)
qdel(src)
+ if (held_index)
+ user.put_in_hand(medbot_assembly, held_index)
return ITEM_INTERACT_SUCCESS
/// Gets what skin (icon_state) this medkit uses for a medbot
@@ -496,6 +500,7 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
storage_type = /datum/storage/test_tube_rack
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
/obj/item/storage/test_tube_rack/update_icon_state()
icon_state = "[base_icon_state][contents.len > 0 ? contents.len : null]"
diff --git a/code/game/objects/items/storage/toolboxes/_toolbox.dm b/code/game/objects/items/storage/toolboxes/_toolbox.dm
index 538dc79f373510..7601e326425044 100644
--- a/code/game/objects/items/storage/toolboxes/_toolbox.dm
+++ b/code/game/objects/items/storage/toolboxes/_toolbox.dm
@@ -149,13 +149,15 @@
/obj/item/storage/toolbox/crafter = "#9D3282",
/obj/item/storage/toolbox/syndicate = "#3d3d3d",
)
- var/obj/item/bot_assembly/repairbot/repair = new
+ var/obj/item/bot_assembly/repairbot/repair = new(drop_location())
repair.toolbox = type
var/new_color = toolbox_colors[type] || "#445eb3"
repair.set_color(new_color)
- user.put_in_hands(repair)
repair.update_appearance()
repair.balloon_alert(user, "sensor added!")
qdel(tool)
+ var/held_index = user.is_holding(src)
qdel(src)
+ if (held_index)
+ user.put_in_hand(repair, held_index)
return ITEM_INTERACT_SUCCESS
diff --git a/code/game/objects/items/storage/toolboxes/fishing.dm b/code/game/objects/items/storage/toolboxes/fishing.dm
index 884649be939a40..445630647a4615 100644
--- a/code/game/objects/items/storage/toolboxes/fishing.dm
+++ b/code/game/objects/items/storage/toolboxes/fishing.dm
@@ -13,7 +13,7 @@
/obj/item/storage/toolbox/fishing/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/adjust_fishing_difficulty, fishing_modifier, ITEM_SLOT_HANDS)
+ AddElement(/datum/element/adjust_fishing_difficulty, fishing_modifier, ITEM_SLOT_HANDS)
/obj/item/storage/toolbox/fishing/PopulateContents()
new /obj/item/bait_can/worm(src)
diff --git a/code/game/objects/items/storage/toolboxes/weapons.dm b/code/game/objects/items/storage/toolboxes/weapons.dm
index b1e13ba58b575f..f7d6384865932a 100644
--- a/code/game/objects/items/storage/toolboxes/weapons.dm
+++ b/code/game/objects/items/storage/toolboxes/weapons.dm
@@ -122,7 +122,7 @@
var/i_dont_even_think_once_about_blowing_stuff_up = tgui_alert(user, "Would you like to activate the evidence disposal bomb now?", "BYE BYE", list("Yes","No"))
- if(i_dont_even_think_once_about_blowing_stuff_up != "Yes" || currently_exploding || QDELETED(user) || QDELETED(src) || user.can_perform_action(src, NEED_DEXTERITY|NEED_HANDS|ALLOW_RESTING))
+ if(i_dont_even_think_once_about_blowing_stuff_up != "Yes" || currently_exploding || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, NEED_DEXTERITY|NEED_HANDS|ALLOW_RESTING))
return
explosion_timer = addtimer(CALLBACK(src, PROC_REF(think_fast_chucklenuts)), 5 SECONDS, (TIMER_UNIQUE|TIMER_OVERRIDE))
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 53548989384a6b..1e8a9acbba861e 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -301,7 +301,7 @@
new /obj/item/clothing/head/helmet/marine/pmc(src)
new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/clothing/glasses/night(src) // 3~ TC
- new /obj/item/clothing/gloves/krav_maga/combatglovesplus(src) //5TC
+ new /obj/item/clothing/gloves/kaza_ruk/combatglovesplus(src) //5TC
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/storage/belt/military/assault/fisher(src) //items in this belt easily costs 18 TC
@@ -751,7 +751,7 @@
new spess_suit(src) // Above allows me to get the helmet from a variable on the object
var/obj/item/clothing/head/helmet/space/syndicate/spess_helmet = GLOB.syndicate_space_suits_to_helmets[spess_suit]
new spess_helmet(src) // 4 TC for the space gear
- new /obj/item/tank/jetpack/oxygen/harness(src) // They kinda need this to fly to the cruiser.
+ new /obj/item/tank/jetpack/harness(src) // They kinda need this to fly to the cruiser.
// Tacticool gear
new /obj/item/clothing/shoes/combat(src)
new /obj/item/clothing/under/syndicate(src)
@@ -889,9 +889,15 @@
/obj/item/storage/box/syndicate/horse_box/PopulateContents()
new /obj/item/food/monkeycube/dangerous_horse(src)
- new /obj/item/slimepotion/slime/sentience/nuclear/dangerous_horse(src)
+ new /obj/item/slimepotion/sentience/nuclear/dangerous_horse(src)
new /obj/item/food/grown/apple(src)
+/obj/item/storage/box/syndicate/sleeping_carp/PopulateContents()
+ new /obj/item/book/granter/martial/carp(src)
+ new /obj/item/clothing/head/costume/snakeeater(src)
+ new /obj/item/clothing/under/costume/gi(src)
+ new /obj/item/clothing/shoes/sandal(src)
+
#undef KIT_RECON
#undef KIT_BLOODY_SPAI
#undef KIT_STEALTHY
diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm
index e55b7d711865eb..8c0ccdad40fec5 100644
--- a/code/game/objects/items/surgery_tray.dm
+++ b/code/game/objects/items/surgery_tray.dm
@@ -13,6 +13,7 @@
slowdown = 1
item_flags = SLOWS_WHILE_IN_HAND
pass_flags = NONE
+ custom_materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
/// If true we're currently portable
var/is_portable = TRUE
@@ -218,6 +219,7 @@
/obj/item/reagent_containers/medigel/sterilizine,
/obj/item/bonesetter,
/obj/item/blood_filter,
+ /obj/item/shears,
/obj/item/stack/medical/bone_gel,
/obj/item/stack/sticky_tape/surgical,
/obj/item/clothing/mask/surgical,
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index 815631e4cf8d59..ad6c52709bafbc 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -1,5 +1,5 @@
/obj/item/tank/jetpack
- name = "jetpack (empty)"
+ name = "jetpack (oxygen)"
desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
inhand_icon_state = "jetpack"
@@ -189,6 +189,7 @@
full_speed = FALSE
drift_force = 1 NEWTONS
stabilizer_force = 0.5 NEWTONS
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4.4, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3)
/obj/item/tank/jetpack/improvised/allow_thrust(num)
if(!ismob(loc))
@@ -207,13 +208,7 @@
icon_state = "jetpack-void"
inhand_icon_state = "jetpack-void"
-/obj/item/tank/jetpack/oxygen
- name = "jetpack (oxygen)"
- desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
- icon_state = "jetpack"
- inhand_icon_state = "jetpack"
-
-/obj/item/tank/jetpack/oxygen/harness
+/obj/item/tank/jetpack/harness
name = "jet harness (oxygen)"
desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."
icon_state = "jetpack-mini"
@@ -222,7 +217,7 @@
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
-/obj/item/tank/jetpack/oxygen/captain
+/obj/item/tank/jetpack/captain
name = "captain's jetpack"
desc = "A compact, lightweight jetpack containing a high amount of compressed oxygen."
icon_state = "jetpack-captain"
@@ -234,14 +229,12 @@
drift_force = 2 NEWTONS
stabilizer_force = 2 NEWTONS
-/obj/item/tank/jetpack/oxygen/security
+/obj/item/tank/jetpack/security
name = "security jetpack (oxygen)"
desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas by security forces."
icon_state = "jetpack-sec"
inhand_icon_state = "jetpack-sec"
-
-
/obj/item/tank/jetpack/carbondioxide
name = "jetpack (carbon dioxide)"
desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals."
diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm
index 75544b7ae1b31e..0f22083f67b088 100644
--- a/code/game/objects/items/tcg/tcg.dm
+++ b/code/game/objects/items/tcg/tcg.dm
@@ -188,6 +188,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
icon_state = "deck_up"
base_icon_state = "deck"
obj_flags = UNIQUE_RENAME
+ spawn_blacklisted = TRUE
var/flipped = FALSE
var/static/radial_draw = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_draw")
var/static/radial_shuffle = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_shuffle")
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index 62bcbbc6d63b96..4858a3413b5b3c 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -374,7 +374,7 @@
attempt_teleport(user = user, triggered_by_emp = FALSE)
return TRUE
-/obj/item/syndicate_teleporter/process(seconds_per_tick, times_fired)
+/obj/item/syndicate_teleporter/process(seconds_per_tick)
if(SPT_PROB(10, seconds_per_tick) && charges < max_charges)
charges++
if(ishuman(loc))
diff --git a/code/game/objects/items/tongs.dm b/code/game/objects/items/tongs.dm
index 3c85cc8c004cfa..a6be04b604fda4 100644
--- a/code/game/objects/items/tongs.dm
+++ b/code/game/objects/items/tongs.dm
@@ -81,7 +81,7 @@
if (COOLDOWN_FINISHED(src, clack_cooldown))
click_clack()
return ..()
- if (!IsEdible(attacked) || attacked.w_class > WEIGHT_CLASS_NORMAL || !isnull(tonged))
+ if (!IS_EDIBLE(attacked) || attacked.w_class > WEIGHT_CLASS_NORMAL || !isnull(tonged))
return ..()
tonged = attacked
attacked.do_pickup_animation(src)
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 73b4c648a2bab7..bd7ccaca3aa053 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -175,7 +175,7 @@
/obj/item/crowbar/power/examine()
. = ..()
- . += " It's fitted with a [tool_behaviour == first_tool_behavior ? inactive_text : active_text] head."
+ . += "It's fitted with a [tool_behaviour == first_tool_behavior ? inactive_text : active_text] head."
/*
* Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
@@ -300,6 +300,12 @@
ACCESS_RD,
ACCESS_SYNDICATE,
)
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4.75,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2.50,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 1.75,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.25,
+ )
radio_alert = TRUE
/obj/item/crowbar/power/paramedic/sound_the_alarms(mob/user, obj/machinery/door/airlock/target)
@@ -327,8 +333,9 @@
)
/obj/item/crowbar/power/paramedic/silent
- name = "modified jaws of recovery"
- desc = "Modified version for jaws of life, made to act like jaws of recovery. This one doesn't announce doors you're prying open and lets you pry any door, acting like regular jaws of life"
+ desc = "A specialized version of the jaws of life, primarily to be used by paramedics to recover the injured and the recently deceased. Rather than a cutting arm, this tool has a bonesetting apparatus. \
+ This one looks upgraded."
+ w_class = WEIGHT_CLASS_NORMAL // it's a modified, normal jaws
limit_jaws_access = FALSE
radio_alert = FALSE
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index e1b644a08cc9c5..c05a5048646872 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -143,7 +143,7 @@
/obj/item/screwdriver/power/examine()
. = ..()
- . += " It's fitted with a [tool_behaviour == TOOL_SCREWDRIVER ? "screw" : "bolt"] bit."
+ . += "It's fitted with a [tool_behaviour == TOOL_SCREWDRIVER ? "screw" : "bolt"] bit."
/obj/item/screwdriver/power/suicide_act(mob/living/user)
if(tool_behaviour == TOOL_SCREWDRIVER)
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index 2e02dcfb4e6643..142bf0be111f74 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -333,6 +333,7 @@
name = "industrial welding tool"
desc = "A slightly larger welder with a larger tank."
icon_state = "indwelder"
+ inhand_icon_state = "indwelder"
max_fuel = 40
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT*0.6)
@@ -353,6 +354,7 @@
name = "emergency welding tool"
desc = "A miniature welder used during emergencies."
icon_state = "miniwelder"
+ inhand_icon_state = "miniwelder"
max_fuel = 10
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.1)
@@ -369,6 +371,7 @@
desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
icon = 'icons/obj/antags/abductor.dmi'
icon_state = "welder"
+ inhand_icon_state = "abductorwelder"
toolspeed = 0.1
custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT, /datum/material/diamond =SHEET_MATERIAL_AMOUNT)
light_system = NO_LIGHT_SUPPORT
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index 234f268ace29d7..9879865ac6b87c 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -7,12 +7,12 @@
inhand_icon_state = "cutters"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-
+ flags_1 = IS_PLAYER_COLORABLE_1|NO_NEW_GAGS_PREVIEW_1
greyscale_config = /datum/greyscale_config/wirecutters
greyscale_config_belt = /datum/greyscale_config/wirecutters_belt_overlay
greyscale_config_inhand_left = /datum/greyscale_config/wirecutter_inhand_left
greyscale_config_inhand_right = /datum/greyscale_config/wirecutter_inhand_right
-
+ greyscale_colors = COLOR_RED
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BELT
force = 6
@@ -72,6 +72,10 @@
icon_state = "cutters"
toolspeed = 0.1
random_color = FALSE
+ greyscale_config = null
+ greyscale_config_inhand_left = null
+ greyscale_config_inhand_right = null
+ greyscale_colors = null
snap_time_strong_handcuffs = 1 SECONDS
/obj/item/wirecutters/cyborg
@@ -82,3 +86,5 @@
worn_icon_state = "cutters"
toolspeed = 0.5
random_color = FALSE
+ greyscale_config = null
+ greyscale_colors = null
diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm
index 74dccf416ee628..cf8b1f341289b5 100644
--- a/code/game/objects/items/toy_mechs.dm
+++ b/code/game/objects/items/toy_mechs.dm
@@ -226,15 +226,15 @@
if(1, 3)
SpinAnimation(5, 0)
playsound(src, 'sound/vehicles/mecha/mechstep.ogg', 30, TRUE)
- user.adjustBruteLoss(25)
- user.adjustStaminaLoss(50)
+ user.adjust_brute_loss(25)
+ user.adjust_stamina_loss(50)
if(2)
user.SpinAnimation(5, 0)
playsound(user, 'sound/items/weapons/smash.ogg', 20, TRUE)
combat_health-- //we scratched it!
if(4)
say(special_attack_cry + "!!")
- user.adjustStaminaLoss(25)
+ user.adjust_stamina_loss(25)
if(!combat_sleep(1 SECONDS, null, user))
say("PATHETIC.")
@@ -243,7 +243,7 @@
return SHAME
sleep(0.5 SECONDS)
- user.adjustBruteLoss(450)
+ user.adjust_brute_loss(450)
in_combat = FALSE
say("AN EASY WIN. MY POWER INCREASES.") // steal a soul, become swole
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 55a6ba57957f18..c9f0434868281b 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -459,7 +459,7 @@
return
if(!user.is_holding(src)) // Half digestion? Start choking to death
user.visible_message(span_suicide("[user] panics and starts choking [user.p_them()]self to death!"))
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE) // unfortunately you have to handle the suiciding yourself with a manual suicide
user.ghostize(FALSE) // get the fuck out of our body
return
@@ -467,13 +467,13 @@
if(CH.cavity_item) // if he's (un)bright enough to have a round and full belly...
user.visible_message(span_danger("[user] regurgitates [src]!")) // I swear i dont have a fetish
user.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 100, distance = 0)
- user.adjustOxyLoss(120)
+ user.adjust_oxy_loss(120)
user.dropItemToGround(src) // incase the crit state doesn't drop the singulo to the floor
user.set_suicide(FALSE)
return
user.transferItemToLoc(src, user, TRUE)
CH.cavity_item = src // The mother came inside and found Andy, dead with a HUGE belly full of toys
- user.adjustOxyLoss(200) // You know how most small toys in the EU have that 3+ onion head icon and a warning that says "Unsuitable for children under 3 years of age due to small parts - choking hazard"? This is why.
+ user.adjust_oxy_loss(200) // You know how most small toys in the EU have that 3+ onion head icon and a warning that says "Unsuitable for children under 3 years of age due to small parts - choking hazard"? This is why.
user.death(FALSE)
user.ghostize(FALSE)
@@ -586,6 +586,7 @@
w_class = WEIGHT_CLASS_SMALL
attack_verb_continuous = list("attacks", "strikes", "hits")
attack_verb_simple = list("attack", "strike", "hit")
+ custom_materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.1, /datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.1)
/// Whether our sword has been multitooled to rainbow
var/hacked = FALSE
/// The color of our fake energy sword
@@ -788,7 +789,7 @@
/obj/item/dualsaber/toy/impale(mob/living/user)//Stops Toy Dualsabers from injuring clowns
to_chat(user, span_warning("You twirl around a bit before losing your balance and impaling yourself on [src]."))
- user.adjustStaminaLoss(25)
+ user.adjust_stamina_loss(25)
/obj/item/toy/katana
name = "replica katana"
@@ -1081,6 +1082,7 @@
icon_state = "snowball"
throwforce = 20 //the same damage as a disabler shot
damtype = STAMINA //maybe someday we can add stuffing rocks (or perhaps ore?) into snowballs to make them deal brute damage
+ custom_materials = list(/datum/material/snow = SHEET_MATERIAL_AMOUNT)
/obj/item/toy/snowball/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
user.throw_item(interacting_with)
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 9e513a939cffc5..8dc3181464c26e 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -46,7 +46,9 @@
/obj/item/trash/boritos
name = "boritos bag"
icon_state = "boritos"
- grind_results = list(/datum/reagent/aluminium = 1) //from the mylar bag
+
+/obj/item/trash/boritos/grind_results()
+ return list(/datum/reagent/aluminium = 1)
/obj/item/trash/boritos/green
icon_state = "boritosgreen"
@@ -130,9 +132,11 @@
name = "crushed can"
icon_state = "cola"
resistance_flags = NONE
- grind_results = list(/datum/reagent/aluminium = 10)
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2)
+/obj/item/trash/can/grind_results()
+ return list(/datum/reagent/aluminium = 10)
+
/obj/item/trash/can/food
icon = 'icons/obj/food/canned.dmi'
icon_state = "peachcan_empty"
diff --git a/code/game/objects/items/v8_engine.dm b/code/game/objects/items/v8_engine.dm
index 2d2d5e405933c1..5b5e934bb25e31 100644
--- a/code/game/objects/items/v8_engine.dm
+++ b/code/game/objects/items/v8_engine.dm
@@ -1,8 +1,14 @@
-#define ENGINE_COOLDOWN (5 SECONDS)
-#define DASH_COOLDOWN (2.5 SECONDS)
+#define ENGINE_COOLDOWN 5 SECONDS
+#define SLASH_COOLDOWN 1.2 SECONDS
+#define SLASH_WINDUP 1 SECONDS
+#define CHARGE_DAMAGE_MOD 10
#define HOUSE_EDGE_ICONS_MAX 3
#define HOUSE_EDGE_ICONS_MIN 0
+/**
+ * File for the House Edge sword and the V8 Engine, obtained from the black market.
+ */
+
/obj/item/v8_engine
name = "ancient engine"
desc = "An extremely well-preserved, massive V8 engine from the early 2000s. It seems to be missing the rest of the vehicle. There's a tiny label on the side."
@@ -46,8 +52,9 @@
name = "House Edge"
desc = "Dangerous. Loud. Sleek. It has a built in roulette wheel. This thing could easily rip your arm off if you're not careful."
icon = 'icons/obj/weapons/sword.dmi'
- icon_state = "house_edge0"
- inhand_icon_state = "house_edge0"
+ icon_state = "house_edge"
+ base_icon_state = "house_edge"
+ inhand_icon_state = "house_edge"
icon_angle = -45
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
@@ -57,7 +64,9 @@
throwforce = 10
throw_range = 5
throw_speed = 1
+ armour_penetration = 15
hitsound = 'sound/items/car_engine_start.ogg'
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 14, /datum/material/cardboard = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.8)
/// The number of charges the house edge has accrued through 2-handed hits, to charge a more powerful charge attack.
var/fire_charges = 0
///Sound played when wielded.
@@ -74,14 +83,11 @@
/obj/item/house_edge/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
if(!ismob(target))
return
- if(HAS_TRAIT(src, TRAIT_WIELDED))
+ var/mob/mob_target = target
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && mob_target.stat != DEAD)
//Add a fire charge to a max of 3, updates icon_state.
fire_charges = clamp((fire_charges + 1), HOUSE_EDGE_ICONS_MIN, HOUSE_EDGE_ICONS_MAX)
COOLDOWN_RESET(src, fire_charge_cooldown)
- else
- //Lose a fire charge to a min of 0, updates icon_state.
- fire_charges = clamp((fire_charges - 1), HOUSE_EDGE_ICONS_MIN, HOUSE_EDGE_ICONS_MAX)
- do_sparks(number = 0, cardinal_only = TRUE, source = src)
update_appearance(UPDATE_ICON_STATE)
/obj/item/house_edge/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
@@ -90,26 +96,102 @@
if(fire_charges <= 0)
balloon_alert(user, "no fire charges!")
return ITEM_INTERACT_BLOCKING
- user.throw_at(target = get_turf(interacting_with), range = 2 * fire_charges, speed = 5, thrower = user, spin = FALSE, gentle = FALSE, quickstart = TRUE)
- COOLDOWN_START(src, fire_charge_cooldown, DASH_COOLDOWN)
- reset_charges(on_dash = TRUE)
+ to_chat(user, span_boldnotice("You take aim at [interacting_with]..."))
+ user.add_shared_particles(/particles/bonfire)
+
+ if(!do_after(user, SLASH_WINDUP, target = src))
+ // Special attack fizzles, no slash and charges lost.
+ reset_charges()
+ drop_particles(user)
+ return ITEM_INTERACT_BLOCKING
+
+ user.add_shared_particles(/particles/bonfire)
+ new /obj/effect/temp_visual/focus_ring(get_turf(src))
+ playsound(src, 'sound/items/car_engine_start.ogg', vol = 35, vary = FALSE, extrarange = 3)
+
+ if(!do_after(user, SLASH_WINDUP * 2, target = src) || fire_charges < 3)
+ flaming_slash(interacting_with, user, upgraded = FALSE)
+ return ITEM_INTERACT_SUCCESS
+
+ flaming_slash(interacting_with, user, upgraded = TRUE) //Upgraded slash.
return ITEM_INTERACT_SUCCESS
/obj/item/house_edge/update_icon_state()
- inhand_icon_state = HAS_TRAIT(src, TRAIT_WIELDED) ? "house_edge1" : "house_edge0"
- icon_state = "house_edge[fire_charges]"
+ inhand_icon_state = HAS_TRAIT(src, TRAIT_WIELDED) ? "house_edge1" : "house_edge"
+ icon_state = "[base_icon_state][fire_charges ? fire_charges : ""]"
return ..()
-/obj/item/house_edge/proc/reset_charges(on_dash = FALSE)
- if(!COOLDOWN_FINISHED(src, fire_charge_cooldown) && !on_dash)
+/**
+ * Proc that handles the house edge's fire_charge mechanic when resetting charges back to zero.
+ * Updates icon, sets count, and updates icon.
+ */
+/obj/item/house_edge/proc/reset_charges(on_slash = FALSE)
+ if(!COOLDOWN_FINISHED(src, fire_charge_cooldown) && !on_slash)
return
if(fire_charges)
balloon_alert_to_viewers("charges lost!")
fire_charges = 0
- icon_state = "house_edge[fire_charges]"
- update_icon()
+ update_icon(UPDATE_OVERLAYS|UPDATE_ICON_STATE)
+
+/// Kills any of the relevant particles off the wielder, as added during special attacks.
+/obj/item/house_edge/proc/drop_particles(mob/living/user)
+ user.remove_shared_particles(/particles/bonfire)
+
+/**
+ * Proc that creates and fires the flaming_slash projectile from the house edge special attack.
+ * Extends off the ranged_interact_with_atom_secondary() behavior.
+ * * upgraded: when juiced up from the second do_after, applies a light explosion radius to the slash.
+ */
+/obj/item/house_edge/proc/flaming_slash(atom/interacting_with, mob/living/user, upgraded = FALSE)
+ // Do the cool slash
+ var/obj/projectile/flaming_slash/projectile = new /obj/projectile/flaming_slash(get_turf(src))
+
+ projectile.aim_projectile(interacting_with, src)
+ projectile.firer = user
+ projectile.damage += (10 * fire_charges)
+ if(upgraded)
+ projectile.explosion_power = 1
+ projectile.damage /= 2 // The damage is pretty solid normally, but with the explosion and all the RNG that comes with, it's nearly a 1-shot. This evens a playing field a bit.
+ projectile.fire(null, interacting_with)
+
+ user.visible_message(span_danger("[user] makes a[upgraded ? " devastating" : "" ] blazing slash at [interacting_with]!"),\
+ span_notice("You take a blazing swipe at [interacting_with]!"))
+ playsound(src, 'sound/items/modsuit/flamethrower.ogg', vol = 75, vary = FALSE, extrarange = 3)
+ playsound(src, 'sound/items/weapons/slash.ogg', vol = 50, vary = FALSE, extrarange = 3)
+
+ drop_particles(user)
+ COOLDOWN_START(src, fire_charge_cooldown, SLASH_COOLDOWN)
+ reset_charges(on_slash = TRUE)
+
+/// Flaming slash for the special attack at max charges.
+/obj/projectile/flaming_slash
+ name = "flaming slash"
+ desc = "Someone is about to cash out."
+ icon_state = "flaming_slash"
+ damage_type = BURN
+ armor_flag = MELEE //We're operating off of anime remote slash logic here. As such, we can treat this as a hybrid burn/brute this way.
+ damage = 10 // Damage amps based on the number of flame_charges it was created off of.
+ speed = 2
+ light_range = 1
+ light_power = 1
+ light_color = LIGHT_COLOR_FIRE
+ sharpness = SHARP_EDGED
+
+ ///Applied in on_hit as the light_devastation_range. Defaults to zero unless giving the slash an extra juiced charge.
+ var/explosion_power = 0
+
+/obj/projectile/flaming_slash/on_hit(atom/target, blocked, pierce_hit)
+ . = ..()
+ explosion(loc,
+ light_impact_range = explosion_power,
+ flame_range = 3,
+ explosion_cause = "[firer] using \the [fired_from]",
+ explosion_arc = 120
+ )
#undef ENGINE_COOLDOWN
-#undef DASH_COOLDOWN
+#undef SLASH_COOLDOWN
+#undef SLASH_WINDUP
+#undef CHARGE_DAMAGE_MOD
#undef HOUSE_EDGE_ICONS_MAX
#undef HOUSE_EDGE_ICONS_MIN
diff --git a/code/game/objects/items/virgin_mary.dm b/code/game/objects/items/virgin_mary.dm
index 5ae4d33df2bcf4..cbd63adf7c0088 100644
--- a/code/game/objects/items/virgin_mary.dm
+++ b/code/game/objects/items/virgin_mary.dm
@@ -56,5 +56,5 @@
return MANUAL_SUICIDE
/obj/item/virgin_mary/proc/manual_suicide(mob/living/user)
- user.adjustOxyLoss(200)
+ user.adjust_oxy_loss(200)
user.death(FALSE)
diff --git a/code/game/objects/items/wall_mounted.dm b/code/game/objects/items/wall_mounted.dm
index 1abf80b5a19493..2cd4c4011dad54 100644
--- a/code/game/objects/items/wall_mounted.dm
+++ b/code/game/objects/items/wall_mounted.dm
@@ -6,66 +6,92 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
+ ///The final object to construct after mount
var/result_path
- var/wall_external = FALSE // For frames that are external to the wall they are placed on, like light fixtures and cameras.
- var/pixel_shift //The amount of pixels
+ /// For frames that are external to the wall they are placed on, like light fixtures and cameras.
+ var/wall_external = FALSE
+ //The amount of pixels to shift when mounted
+ var/pixel_shift
-/obj/item/wallframe/proc/try_build(turf/on_wall, mob/user)
- if(get_dist(on_wall,user) > 1)
+/**
+ * Returns an structure to mount on from the atom passed
+ * for e.g if its not an closed turf then return an structure on the turf to mount on
+ * Arguments
+ * * atom/structure - the atom or something in this atom we are trying to mount on
+*/
+/obj/item/wallframe/proc/find_support_structure(atom/structure)
+ SHOULD_BE_PURE(TRUE)
+
+ return isclosedturf(structure) ? structure : null
+
+/obj/item/wallframe/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ var/atom/support_structure = find_support_structure(interacting_with)
+ if(isnull(support_structure))
+ return NONE
+ if(!try_build(support_structure, user))
+ return ITEM_INTERACT_FAILURE
+
+ playsound(loc, 'sound/machines/click.ogg', 75, TRUE)
+ user.visible_message(span_notice("[user.name] attaches [src] to the wall."),
+ span_notice("You attach [src] to the wall."),
+ span_hear("You hear clicking."))
+
+ var/floor_to_support = get_dir(user, support_structure)
+ var/obj/hanging_object = new result_path(get_turf(user))
+ hanging_object.setDir(floor_to_support)
+ if(pixel_shift)
+ switch(floor_to_support)
+ if(NORTH)
+ hanging_object.pixel_y = pixel_shift
+ if(SOUTH)
+ hanging_object.pixel_y = -pixel_shift
+ if(EAST)
+ hanging_object.pixel_x = pixel_shift
+ if(WEST)
+ hanging_object.pixel_x = -pixel_shift
+ if(!istype(get_area(user), /area/shuttle)) //due to turf changing issue we don't mount here for now
+ hanging_object.AddComponent(/datum/component/atom_mounted, support_structure)
+ after_attach(hanging_object)
+ qdel(src)
+
+ return ITEM_INTERACT_SUCCESS
+
+/**
+ * Check if we can build on this support structure
+ *
+ * Arguments
+ * * atom/support - the atom we are trying to mount on
+ * * mob/user - the player attempting to do the mount
+*/
+/obj/item/wallframe/proc/try_build(atom/support, mob/user)
+ if(get_dist(support, user) > 1)
balloon_alert(user, "you are too far!")
- return
- var/floor_to_wall = get_dir(user, on_wall)
- if(!(floor_to_wall in GLOB.cardinals))
+ return FALSE
+ var/floor_to_support = get_dir(user, support)
+ if(!(floor_to_support in GLOB.cardinals))
balloon_alert(user, "stand in line with wall!")
- return
+ return FALSE
var/turf/T = get_turf(user)
- var/area/A = get_area(T)
if(!isfloorturf(T))
balloon_alert(user, "cannot place here!")
- return
- if(A.always_unpowered)
- balloon_alert(user, "cannot place in this area!")
- return
- if(check_wall_item(T, floor_to_wall, wall_external))
+ return FALSE
+ if(check_wall_item(T, floor_to_support, wall_external))
balloon_alert(user, "already something here!")
- return
+ return FALSE
return TRUE
-/obj/item/wallframe/proc/attach(turf/on_wall, mob/user)
- if(result_path)
- playsound(src.loc, 'sound/machines/click.ogg', 75, TRUE)
- user.visible_message(span_notice("[user.name] attaches [src] to the wall."),
- span_notice("You attach [src] to the wall."),
- span_hear("You hear clicking."))
- var/floor_to_wall = get_dir(user, on_wall)
-
- var/obj/hanging_object = new result_path(get_turf(user))
- hanging_object.setDir(floor_to_wall)
- if(pixel_shift)
- switch(floor_to_wall)
- if(NORTH)
- hanging_object.pixel_y = pixel_shift
- if(SOUTH)
- hanging_object.pixel_y = -pixel_shift
- if(EAST)
- hanging_object.pixel_x = pixel_shift
- if(WEST)
- hanging_object.pixel_x = -pixel_shift
- hanging_object.find_and_hang_on_wall()
- after_attach(hanging_object)
-
- qdel(src)
-
+/**
+ * Stuff to do after wallframe attached to support atom
+ *
+ * Arguments
+ * * obj/attached_to - the object that has been created on the atom
+*/
/obj/item/wallframe/proc/after_attach(obj/attached_to)
transfer_fingerprints_to(attached_to)
/obj/item/wallframe/screwdriver_act(mob/living/user, obj/item/tool)
- // For camera-building borgs
- var/turf/wall_turf = get_step(get_turf(user), user.dir)
- if(iswallturf(wall_turf))
- wall_turf.item_interaction(user, src)
- return ITEM_INTERACT_SUCCESS
+ return interact_with_atom(get_step(get_turf(user), user.dir), user)
/obj/item/wallframe/wrench_act(mob/living/user, obj/item/tool)
var/metal_amt = round(custom_materials[GET_MATERIAL_REF(/datum/material/iron)]/SHEET_MATERIAL_AMOUNT) //Replace this shit later
@@ -92,8 +118,10 @@
obj_flags = CONDUCTS_ELECTRICITY
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.5)
- grind_results = list(/datum/reagent/iron = 10, /datum/reagent/silicon = 10)
custom_price = PAYCHECK_CREW * 0.5
sound_vary = TRUE
pickup_sound = SFX_GENERIC_DEVICE_PICKUP
drop_sound = SFX_GENERIC_DEVICE_DROP
+
+/obj/item/electronics/grind_results()
+ return list(/datum/reagent/iron = 10, /datum/reagent/silicon = 10)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 63ee92212ec34f..5b128b21ab0563 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -155,7 +155,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
return BRUTELOSS
/obj/item/claymore/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(attack_type == (PROJECTILE_ATTACK || LEAP_ATTACK || OVERWHELMING_ATTACK))
+ if(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK || attack_type == OVERWHELMING_ATTACK)
final_block_chance = 0 //Don't bring a sword to a gunfight, and also you aren't going to really block someone full body tackling you with a sword. Or a road roller, if one happened to hit you.
return ..()
@@ -363,6 +363,25 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/claymore/highlander/robot/process()
loc.layer = ABOVE_ALL_MOB_LAYER
+/obj/item/claymore/gladius
+ name = "gladius"
+ desc = "A short but formidable sword, favored by recently-reanimated ancient warriors."
+ icon = 'icons/obj/weapons/sword.dmi'
+ icon_state = "gladius"
+ inhand_icon_state = "gladius"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ sharpness = SHARP_POINTY
+ attack_verb_continuous = list("stabs", "cuts")
+ attack_verb_simple = list("stab", "cut")
+ slot_flags = null
+ sound_vary = TRUE
+ block_sound = 'sound/items/weapons/parry.ogg'
+ hitsound = 'sound/items/weapons/bladeslice.ogg'
+ pickup_sound = SFX_KNIFE_PICKUP
+ drop_sound = SFX_KNIFE_DROP
+
+
/obj/item/katana
name = "katana"
desc = "Woefully underpowered in D20."
@@ -396,6 +415,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
alt_simple = string_list(alt_simple)
AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple, -15)
+/obj/item/katana/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(attack_type == OVERWHELMING_ATTACK)
+ final_block_chance = 0 //Not a high freuqnecy blade, sorry pal
+ return ..()
+
/datum/armor/item_katana
fire = 100
acid = 50
@@ -604,6 +628,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_angle = -135
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
+ custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 4)
/obj/item/bambostaff/Initialize(mapload)
. = ..()
@@ -618,6 +643,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = inhand_icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]"
return ..()
+/obj/item/bambostaff/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(attack_type == PROJECTILE_ATTACK || attack_type == LEAP_ATTACK || attack_type == OVERWHELMING_ATTACK)
+ final_block_chance = 0 //Don't bring a staff to a gunfight, and also you aren't going to really block someone full body tackling you with a staff. Or a road roller, if one happened to hit you.
+ return ..()
+
/obj/item/cane
name = "cane"
desc = "A cane used by a true gentleman. Or a clown."
@@ -716,7 +746,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
desc = "A handmade crutch. Also makes a decent bludgeon if you need it."
icon_state = "crutch_wood"
inhand_icon_state = "crutch_wood"
- custom_materials = list(/datum/material/wood = SMALL_MATERIAL_AMOUNT * 0.5)
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 5)
/obj/item/cane/white
name = "white cane"
@@ -819,7 +849,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
gender = PLURAL
icon = 'icons/effects/magic.dmi'
icon_state = "ectoplasm"
- grind_results = list(/datum/reagent/hauntium = 25) //can be ground into hauntium
+
+/obj/item/ectoplasm/grind_results()
+ return list(/datum/reagent/hauntium = 25)
/obj/item/ectoplasm/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane!"))
@@ -844,6 +876,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 1
attack_verb_continuous = list("clubs", "bludgeons")
attack_verb_simple = list("club", "bludgeon")
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
/obj/item/melee/baseball_bat
name = "baseball bat"
@@ -1023,10 +1056,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_SMALL
/// Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
var/static/list/splattable
- /// Things in this list which take a lot more damage from the fly swatter, but not be necessarily killed by it.
- var/static/list/strong_against
- /// How much extra damage the fly swatter does against mobs it is strong against
- var/extra_strength_damage = 24
/obj/item/melee/flyswatter/Initialize(mapload)
. = ..()
@@ -1041,15 +1070,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/effect/decal/cleanable/ants,
/obj/item/queen_bee,
))
- if (isnull(strong_against))
- strong_against = typecacheof(list(
- /mob/living/basic/spider,
- ))
-
+ AddElement(/datum/element/bane, mob_biotypes = MOB_BUG, target_type = /mob/living/basic, damage_multiplier = 0, added_damage = 24, requires_combat_mode = FALSE)
/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
if(is_type_in_typecache(target, splattable))
to_chat(user, span_warning("You easily splat [target]."))
+ if(QDELETED(target))
+ return
if(isliving(target))
new /obj/effect/decal/cleanable/insectguts(target.drop_location())
var/mob/living/bug = target
@@ -1057,10 +1084,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
bug.gib(DROP_ALL_REMAINS)
else
qdel(target)
- return
- if(is_type_in_typecache(target, strong_against) && isliving(target))
- var/mob/living/living_target = target
- living_target.adjustBruteLoss(extra_strength_damage)
/obj/item/proc/can_trigger_gun(mob/living/user, akimbo_usage)
if(!user.can_use_guns(src))
@@ -1191,7 +1214,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
playsound(src, SFX_BULLET_MISS, 75, TRUE)
return TRUE
return FALSE
- if(prob(final_block_chance * (HAS_TRAIT(src, TRAIT_WIELDED) ? 2 : 1)))
+ var/stop_that_blade = (final_block_chance + (attack_type == OVERWHELMING_ATTACK ? 25 : 0)) * (HAS_TRAIT(src, TRAIT_WIELDED) ? 2 : 1)
+ if(prob(stop_that_blade))
owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!"))
return TRUE
return FALSE
diff --git a/code/game/objects/items/wiki_manuals.dm b/code/game/objects/items/wiki_manuals.dm
index 671f408557c616..e3647434e61fff 100644
--- a/code/game/objects/items/wiki_manuals.dm
+++ b/code/game/objects/items/wiki_manuals.dm
@@ -200,7 +200,7 @@
part.adjustBleedStacks(5)
H.gib_animation()
sleep(0.3 SECONDS)
- H.adjustBruteLoss(1000) //to make the body super-bloody
+ H.adjust_brute_loss(1000) //to make the body super-bloody
// if we use gib() then the body gets deleted
H.spawn_gibs()
H.spill_organs(DROP_ALL_REMAINS)
diff --git a/code/game/objects/items/wind_turbine.dm b/code/game/objects/items/wind_turbine.dm
index 74cd1213b698bf..b713c3acd5eef7 100644
--- a/code/game/objects/items/wind_turbine.dm
+++ b/code/game/objects/items/wind_turbine.dm
@@ -22,12 +22,11 @@
force = 10
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 22, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
///What item is being charged currently?
var/obj/item/charging = null
///Did we put power into "charging" last process()?
var/using_power = FALSE
- ///Did we finish recharging the currently inserted item?
- var/finished_recharging = FALSE
///Current rotor animation frame. (floating point value).
var/rotor_tick = 0
@@ -231,7 +230,6 @@
if(is_type_in_typecache(arrived, allowed_devices))
charging = arrived
START_PROCESSING(SSmachines, src)
- finished_recharging = FALSE
using_power = TRUE
update_appearance()
return ..()
@@ -313,18 +311,17 @@
if(charging_cell)
var/wanted_power = min(charging_cell.maxcharge - charging_cell.charge, charging_cell.chargerate)
if(wanted_power > 0)
- using_power = TRUE
var/power_to_give = min(available_power, wanted_power) * seconds_per_tick / 2
if (power_to_give > 0)
charging_cell.give(power_to_give)
available_power -= power_to_give
+ if(charging_cell.charge == charging_cell.maxcharge)
+ playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
+ say("[charging] has finished recharging!")
+ else
+ using_power = TRUE
update_appearance()
- if(!using_power && !finished_recharging) //Inserted thing is at max charge/ammo, notify those around us
- finished_recharging = TRUE
- playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
- say("[charging] has finished recharging!")
-
/obj/item/portable_wind_turbine/emp_act(severity)
. = ..()
if (. & EMP_PROTECT_CONTENTS)
diff --git a/code/game/objects/items/wizard_weapons.dm b/code/game/objects/items/wizard_weapons.dm
index 7179eedb9d58e0..5c8eaf4a818479 100644
--- a/code/game/objects/items/wizard_weapons.dm
+++ b/code/game/objects/items/wizard_weapons.dm
@@ -64,7 +64,7 @@
return
charged = FALSE
- if(isliving(target))
+ if(isliving(target) && !QDELETED(target))
var/mob/living/smacked = target
smacked.take_bodypart_damage(20, 0)
playsound(user, 'sound/items/weapons/marauder.ogg', 50, TRUE)
diff --git a/code/game/objects/items_reskin.dm b/code/game/objects/items_reskin.dm
deleted file mode 100644
index 98a3165b5e2ab2..00000000000000
--- a/code/game/objects/items_reskin.dm
+++ /dev/null
@@ -1,95 +0,0 @@
-/// Called when alt clicked and the item has unique reskin options
-/obj/item/proc/on_click_alt_reskin(datum/source, mob/user)
- SIGNAL_HANDLER
-
- if(!user.can_perform_action(src, NEED_DEXTERITY))
- return NONE
-
- if(!(obj_flags & INFINITE_RESKIN) && current_skin)
- return NONE
-
- INVOKE_ASYNC(src, PROC_REF(reskin_obj), user)
- return CLICK_ACTION_SUCCESS
-
-/**
- * Checks if we should set up reskinning,
- * by default if unique_reskin is set.
- *
- * Called on setup_reskinning().
- * Inheritors should override this to add their own checks.
- */
-/obj/item/proc/check_setup_reskinning()
- SHOULD_CALL_PARENT(TRUE)
- if(unique_reskin)
- return TRUE
-
- return FALSE
-
-/**
- * Registers signals and context for reskinning,
- * if check_setup_reskinning() passes.
- *
- * Called on Initialize(...).
- * Inheritors should override this to add their own setup steps,
- * or to avoid double calling register_context().
- */
-/obj/item/proc/setup_reskinning()
- SHOULD_CALL_PARENT(FALSE)
- if(!check_setup_reskinning())
- return
-
- RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(on_click_alt_reskin))
- register_context()
-
-/**
- * Reskins object based on a user's choice
- *
- * Arguments:
- * * user The mob choosing a reskin option
- */
-/obj/item/proc/reskin_obj(mob/user)
- if(!LAZYLEN(unique_reskin))
- return
-
- var/list/items = list()
- for(var/reskin_option in unique_reskin)
- var/image/item_image = image(icon = src.icon, icon_state = unique_reskin[reskin_option])
- items += list("[reskin_option]" = item_image)
- sort_list(items)
-
- var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_reskin_menu), user), radius = 38, require_near = TRUE)
- if(!pick)
- return
- if(!unique_reskin[pick])
- return
- current_skin = pick
- icon_state = unique_reskin[pick]
-
- if (unique_reskin_changes_base_icon_state)
- base_icon_state = icon_state
-
- if (unique_reskin_changes_inhand)
- inhand_icon_state = icon_state
-
- update_appearance()
-
- to_chat(user, "[src] is now skinned as '[pick].'")
- SEND_SIGNAL(src, COMSIG_OBJ_RESKIN, user, pick)
-
-
-/**
- * Checks if we are allowed to interact with a radial menu for reskins
- *
- * Arguments:
- * * user The mob interacting with the menu
- */
-/obj/item/proc/check_reskin_menu(mob/user)
- if(QDELETED(src))
- return FALSE
- if(!(obj_flags & INFINITE_RESKIN) && current_skin)
- return FALSE
- if(!istype(user))
- return FALSE
- if(user.incapacitated)
- return FALSE
- return TRUE
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 10b500824e5ebe..cc7cf0f2ccd821 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -64,10 +64,14 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
if (id_tag)
GLOB.objects_by_id_tag[id_tag] = src
+ if(opacity)
+ SScameras.update_visibility(src)
/obj/Destroy(force)
if(!ismachinery(src))
STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
+ if(opacity)
+ SScameras.update_visibility(src)
SStgui.close_uis(src)
GLOB.objects_by_id_tag -= id_tag
. = ..()
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 3e7e13c1df2f7a..9d4442238ac929 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -23,10 +23,8 @@
if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
- GLOB.cameranet.updateVisibility(src)
/obj/structure/Destroy(force)
- GLOB.cameranet.updateVisibility(src)
if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
deleted file mode 100644
index 6eee27ce24ee03..00000000000000
--- a/code/game/objects/structures/ai_core.dm
+++ /dev/null
@@ -1,484 +0,0 @@
-#define AI_CORE_BRAIN(X) X.braintype == "Android" ? "brain" : "MMI"
-
-/obj/structure/ai_core
- density = TRUE
- anchored = FALSE
- name = "\improper AI core"
- icon = 'icons/mob/silicon/ai.dmi'
- icon_state = "0"
- desc = "The framework for an artificial intelligence core."
- max_integrity = 500
- var/state = EMPTY_CORE
- var/datum/ai_laws/laws
- var/obj/item/circuitboard/aicore/circuit
- var/obj/item/mmi/core_mmi
- /// only used in cases of AIs piloting mechs or shunted malf AIs, possible later use cases
- var/mob/living/silicon/ai/remote_ai = null
-
-/obj/structure/ai_core/Initialize(mapload)
- . = ..()
- laws = new
- laws.set_laws_config()
-
-/obj/structure/ai_core/examine(mob/user)
- . = ..()
- if(!anchored)
- if(state != EMPTY_CORE)
- . += span_notice("It has some bolts that could be tightened.")
- else
- . += span_notice("It has some bolts that could be tightened. The frame can be melted down.")
- else
- switch(state)
- if(EMPTY_CORE)
- . += span_notice("There is a slot for a circuit board, its bolts can be loosened.")
- if(CIRCUIT_CORE)
- . += span_notice("The circuit board can be screwed into place or pried out.")
- if(SCREWED_CORE)
- . += span_notice("The frame can be wired, the circuit board can be unfastened.")
- if(CABLED_CORE)
- if(!core_mmi)
- . += span_notice("There are wires which could be hooked up to an MMI or positronic brain, or cut.")
- else
- var/accept_laws = TRUE
- if(core_mmi.laws.id != DEFAULT_AI_LAWID || !core_mmi.brainmob || !core_mmi.brainmob?.mind)
- accept_laws = FALSE
- . += span_notice("There is a slot for a reinforced glass panel, the [AI_CORE_BRAIN(core_mmi)] could be pried out.[accept_laws ? " A law module can be swiped across." : ""]")
- if(GLASS_CORE)
- . += span_notice("The monitor [core_mmi?.brainmob?.mind && !suicide_check() ? "and neural interface " : ""]can be screwed in, the panel can be pried out.")
- if(AI_READY_CORE)
- . += span_notice("The monitor's connection can be cut[core_mmi?.brainmob?.mind && !suicide_check() ? " the neural interface can be screwed in." : "."]")
-
-/obj/structure/ai_core/Exited(atom/movable/gone, direction)
- . = ..()
- if(gone == circuit)
- circuit = null
- if((state != GLASS_CORE) && (state != AI_READY_CORE))
- state = EMPTY_CORE
- update_appearance()
- if(gone == core_mmi)
- core_mmi = null
- update_appearance()
-
-/obj/structure/ai_core/Destroy()
- if(istype(remote_ai))
- remote_ai = null
- QDEL_NULL(circuit)
- QDEL_NULL(core_mmi)
- QDEL_NULL(laws)
- return ..()
-
-/obj/structure/ai_core/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir, armour_penetration)
- . = ..()
- if(. > 0 && istype(remote_ai))
- to_chat(remote_ai, span_danger("Your core is under attack!"))
-
-
-/obj/structure/ai_core/deactivated
- icon_state = "ai-empty"
- anchored = TRUE
- state = AI_READY_CORE
- var/mob/living/silicon/ai/attached_ai
-
-/obj/structure/ai_core/deactivated/Initialize(mapload, skip_mmi_creation = FALSE, posibrain = FALSE, linked_ai)
- . = ..()
- circuit = new(src)
- if(linked_ai)
- attached_ai = linked_ai
- if(skip_mmi_creation)
- return
- if(posibrain)
- core_mmi = new/obj/item/mmi/posibrain(src, /* autoping = */ FALSE)
- else
- core_mmi = new(src)
- core_mmi.brain = new(core_mmi)
- core_mmi.update_appearance()
-
-/obj/structure/ai_core/deactivated/Destroy()
- if(attached_ai)
- attached_ai.linked_core = null
- attached_ai = null
- . = ..()
-
-/obj/structure/ai_core/deactivated/proc/disable_doomsday(datum/source)
- SIGNAL_HANDLER
- attached_ai.ShutOffDoomsdayDevice()
-
-/obj/structure/ai_core/latejoin_inactive
- name = "networked AI core"
- desc = "This AI core is connected by bluespace transmitters to NTNet, allowing for an AI personality to be downloaded to it on the fly mid-shift."
- icon_state = "ai-empty"
- anchored = TRUE
- state = AI_READY_CORE
- var/available = TRUE
- var/safety_checks = TRUE
- var/active = TRUE
-
-/obj/structure/ai_core/latejoin_inactive/Initialize(mapload)
- . = ..()
- circuit = new(src)
- core_mmi = new(src)
- core_mmi.brain = new(core_mmi)
- core_mmi.update_appearance()
- GLOB.latejoin_ai_cores += src
-
-/obj/structure/ai_core/latejoin_inactive/Destroy()
- GLOB.latejoin_ai_cores -= src
- return ..()
-
-/obj/structure/ai_core/latejoin_inactive/examine(mob/user)
- . = ..()
- . += "Its transmitter seems to be [active? "on" : "off"]."
- . += span_notice("You could [active? "deactivate" : "activate"] it with a multitool.")
-
-/obj/structure/ai_core/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them.
- if(!available)
- return FALSE
- if(!safety_checks)
- return TRUE
- if(!active)
- return FALSE
- var/turf/T = get_turf(src)
- var/area/A = get_area(src)
- if(!(A.area_flags & BLOBS_ALLOWED))
- return FALSE
- if(!A.power_equip)
- return FALSE
- if(!SSmapping.level_trait(T.z,ZTRAIT_STATION))
- return FALSE
- if(!isfloorturf(T))
- return FALSE
- return TRUE
-
-/obj/structure/ai_core/latejoin_inactive/attackby(obj/item/tool, mob/user, list/modifiers, list/attack_modifiers)
- if(tool.tool_behaviour == TOOL_MULTITOOL)
- active = !active
- to_chat(user, span_notice("You [active? "activate" : "deactivate"] \the [src]'s transmitters."))
- return
- return ..()
-
-/obj/structure/ai_core/wrench_act(mob/living/user, obj/item/tool)
- . = ..()
- default_unfasten_wrench(user, tool)
- return ITEM_INTERACT_SUCCESS
-
-/obj/structure/ai_core/screwdriver_act(mob/living/user, obj/item/tool)
- . = ..()
- if(state == AI_READY_CORE)
- if(!core_mmi)
- balloon_alert(user, "no brain installed!")
- return ITEM_INTERACT_SUCCESS
- else if(!core_mmi.brainmob?.mind || suicide_check())
- balloon_alert(user, "brain is inactive!")
- return ITEM_INTERACT_SUCCESS
- else
- balloon_alert(user, "connecting neural network...")
- if(!tool.use_tool(src, user, 10 SECONDS))
- return ITEM_INTERACT_SUCCESS
- if(!ai_structure_to_mob())
- return ITEM_INTERACT_SUCCESS
- balloon_alert(user, "connected neural network")
- return ITEM_INTERACT_SUCCESS
-
-/obj/structure/ai_core/attackby(obj/item/tool, mob/living/user, list/modifiers, list/attack_modifiers)
- if(remote_ai)
- to_chat(remote_ai, span_danger("CORE TAMPERING DETECTED!"))
- if(!anchored)
- if(tool.tool_behaviour == TOOL_WELDER)
- if(state != EMPTY_CORE)
- balloon_alert(user, "core must be empty to deconstruct it!")
- return
-
- if(!tool.tool_start_check(user, amount=1))
- return
-
- balloon_alert(user, "deconstructing frame...")
- if(tool.use_tool(src, user, 20, volume=50) && state == EMPTY_CORE)
- balloon_alert(user, "deconstructed frame")
- deconstruct(TRUE)
- return
- else
- if(!user.combat_mode)
- balloon_alert(user, "bolt it down first!")
- return
- else
- return ..()
- else
- switch(state)
- if(EMPTY_CORE)
- if(istype(tool, /obj/item/circuitboard/aicore))
- if(!user.transferItemToLoc(tool, src))
- return
- playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
- balloon_alert(user, "circuit board inserted")
- update_appearance()
- state = CIRCUIT_CORE
- circuit = tool
- return
- if(CIRCUIT_CORE)
- if(tool.tool_behaviour == TOOL_SCREWDRIVER)
- tool.play_tool_sound(src)
- balloon_alert(user, "board screwed into place")
- state = SCREWED_CORE
- update_appearance()
- return
- if(tool.tool_behaviour == TOOL_CROWBAR)
- tool.play_tool_sound(src)
- balloon_alert(user, "circuit board removed")
- state = EMPTY_CORE
- circuit.forceMove(loc)
- return
- if(SCREWED_CORE)
- if(tool.tool_behaviour == TOOL_SCREWDRIVER && circuit)
- tool.play_tool_sound(src)
- balloon_alert(user, "circuit board unfastened")
- state = CIRCUIT_CORE
- update_appearance()
- return
- if(istype(tool, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/C = tool
- if(C.get_amount() >= 5)
- playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
- balloon_alert(user, "adding cables to frame...")
- if(do_after(user, 2 SECONDS, target = src) && state == SCREWED_CORE && C.use(5))
- balloon_alert(user, "added cables to frame.")
- state = CABLED_CORE
- update_appearance()
- else
- balloon_alert(user, "need five lengths of cable!")
- return
- if(CABLED_CORE)
- if(tool.tool_behaviour == TOOL_WIRECUTTER)
- if(core_mmi)
- balloon_alert(user, "remove the [AI_CORE_BRAIN(core_mmi)] first!")
- else
- tool.play_tool_sound(src)
- balloon_alert(user, "cables removed")
- state = SCREWED_CORE
- update_appearance()
- new /obj/item/stack/cable_coil(drop_location(), 5)
- return
-
- if(istype(tool, /obj/item/stack/sheet/rglass))
- if(!core_mmi)
- balloon_alert(user, "add a brain first!")
- return
- var/obj/item/stack/sheet/rglass/G = tool
- if(G.get_amount() >= 2)
- playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
- balloon_alert(user, "adding glass panel...")
- if(do_after(user, 2 SECONDS, target = src) && state == CABLED_CORE && G.use(2))
- balloon_alert(user, "added glass panel")
- state = GLASS_CORE
- update_appearance()
- else
- balloon_alert(user, "need two sheets of reinforced glass!")
- return
-
- if(istype(tool, /obj/item/ai_module))
- if(!core_mmi)
- balloon_alert(user, "no brain installed!")
- return
- if(!core_mmi.brainmob || !core_mmi.brainmob?.mind || suicide_check())
- balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] is inactive!")
- return
- if(core_mmi.laws.id != DEFAULT_AI_LAWID)
- balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] already has set laws!")
- return
- var/obj/item/ai_module/module = tool
- module.install(laws, user)
- return
-
- if(istype(tool, /obj/item/mmi) && !core_mmi)
- var/obj/item/mmi/M = tool
- if(!M.brain_check(user))
- var/install = tgui_alert(user, "This [AI_CORE_BRAIN(M)] is inactive, would you like to make an inactive AI?", "Installing AI [AI_CORE_BRAIN(M)]", list("Yes", "No"))
- if(install != "Yes")
- return
- if(M.brainmob && HAS_TRAIT(M.brainmob, TRAIT_SUICIDED))
- to_chat(user, span_warning("[M.name] is completely useless!"))
- return
- if(!user.transferItemToLoc(M, src))
- return
- core_mmi = M
- balloon_alert(user, "added [AI_CORE_BRAIN(core_mmi)] to frame")
- update_appearance()
- return
-
- var/mob/living/brain/B = M.brainmob
- if(!CONFIG_GET(flag/allow_ai) || (is_banned_from(B.ckey, JOB_AI) && !QDELETED(src) && !QDELETED(user) && !QDELETED(M) && !QDELETED(user) && Adjacent(user)))
- if(!QDELETED(M))
- to_chat(user, span_warning("This [M.name] does not seem to fit!"))
- return
- if(!user.transferItemToLoc(M,src))
- return
-
- core_mmi = M
- balloon_alert(user, "added [AI_CORE_BRAIN(core_mmi)] to frame")
- update_appearance()
- return
-
- if(tool.tool_behaviour == TOOL_CROWBAR && core_mmi)
- tool.play_tool_sound(src)
- balloon_alert(user, "removed [AI_CORE_BRAIN(core_mmi)]")
- if(remote_ai)
- var/mob/living/silicon/ai/remoted_ai = remote_ai
- remoted_ai.break_core_link()
- if(!IS_MALF_AI(remoted_ai))
- //don't pull back shunted malf AIs
- remoted_ai.death(gibbed = TRUE, drop_mmi = FALSE)
- ///the drop_mmi param determines whether the MMI is dropped at their current location
- ///which in this case would be somewhere else, so we drop their MMI at the core instead
- remoted_ai.make_mmi_drop_and_transfer(core_mmi, src)
- core_mmi.forceMove(loc) //if they're malf, just drops a blank MMI, or if it's an incomplete shell
- return //it drops the mmi that was put in before it was finished
-
- if(GLASS_CORE)
- if(tool.tool_behaviour == TOOL_CROWBAR)
- tool.play_tool_sound(src)
- balloon_alert(user, "removed glass panel")
- state = CABLED_CORE
- update_appearance()
- new /obj/item/stack/sheet/rglass(loc, 2)
- return
-
- if(tool.tool_behaviour == TOOL_SCREWDRIVER)
- if(suicide_check())
- to_chat(user, span_warning("The brain installed is completely useless."))
- return
- tool.play_tool_sound(src)
-
- var/atom/alert_source = src
- if(core_mmi.brainmob?.mind)
- alert_source = ai_structure_to_mob() || alert_source
- else
- state = AI_READY_CORE
- update_appearance()
- alert_source.balloon_alert(user, "connected monitor[core_mmi?.brainmob?.mind ? " and neural network" : ""]")
- return
-
- if(AI_READY_CORE)
- if(istype(tool, /obj/item/aicard))
- return //handled by /obj/structure/ai_core/transfer_ai()
-
- if(tool.tool_behaviour == TOOL_WIRECUTTER)
- tool.play_tool_sound(src)
- balloon_alert(user, "disconnected monitor")
- state = GLASS_CORE
- update_appearance()
- return
- return ..()
-
-/obj/structure/ai_core/proc/ai_structure_to_mob()
- var/mob/living/brain/the_brainmob = core_mmi.brainmob
- if(!the_brainmob.mind || suicide_check())
- return FALSE
- the_brainmob.mind.remove_antags_for_borging()
- if(!the_brainmob.mind.has_ever_been_ai)
- SSblackbox.record_feedback("amount", "ais_created", 1)
- var/mob/living/silicon/ai/ai_mob = null
-
- if(core_mmi.overrides_aicore_laws)
- ai_mob = new /mob/living/silicon/ai(loc, core_mmi.laws, the_brainmob)
- core_mmi.laws = null //MMI's law datum is being donated, so we need the MMI to let it go or the GC will eat it
- else
- ai_mob = new /mob/living/silicon/ai(loc, laws, the_brainmob)
- laws = null //we're giving the new AI this datum, so let's not delete it when we qdel(src) 5 lines from now
-
- var/datum/antagonist/malf_ai/malf_datum = IS_MALF_AI(ai_mob)
- if(malf_datum)
- malf_datum.add_law_zero()
-
- if(!isnull(the_brainmob.client))
- ai_mob.set_gender(the_brainmob.client)
- if(core_mmi.force_replace_ai_name)
- ai_mob.fully_replace_character_name(ai_mob.name, core_mmi.replacement_ai_name())
- ai_mob.posibrain_inside = core_mmi.braintype == "Android"
- deadchat_broadcast(" has been brought online at [get_area_name(ai_mob, format_text = TRUE)].", span_name("[ai_mob]"), follow_target = ai_mob, message_type = DEADCHAT_ANNOUNCEMENT)
- qdel(src)
- return ai_mob
-
-/obj/structure/ai_core/update_icon_state()
- switch(state)
- if(EMPTY_CORE)
- icon_state = "0"
- if(CIRCUIT_CORE)
- icon_state = "1"
- if(SCREWED_CORE)
- icon_state = "2"
- if(CABLED_CORE)
- if(core_mmi)
- icon_state = "3b"
- else
- icon_state = "3"
- if(GLASS_CORE)
- icon_state = "4"
- if(AI_READY_CORE)
- icon_state = "ai-empty"
- return ..()
-
-/obj/structure/ai_core/atom_deconstruct(disassembled = TRUE)
- if(state >= GLASS_CORE)
- new /obj/item/stack/sheet/rglass(loc, 2)
- if(state >= CABLED_CORE)
- new /obj/item/stack/cable_coil(loc, 5)
- if(circuit)
- circuit.forceMove(loc)
- circuit = null
- new /obj/item/stack/sheet/plasteel(loc, 4)
-
-/// Quick proc to call to see if the brainmob inside of us has suicided. Returns TRUE if we have, FALSE in any other scenario.
-/obj/structure/ai_core/proc/suicide_check()
- if(isnull(core_mmi) || isnull(core_mmi.brainmob))
- return FALSE
- return HAS_TRAIT(core_mmi.brainmob, TRAIT_SUICIDED)
-
-/*
-This is a good place for AI-related object verbs so I'm sticking it here.
-If adding stuff to this, don't forget that an AI need to cancel_camera() whenever it physically moves to a different location.
-That prevents a few funky behaviors.
-*/
-//The type of interaction, the player performing the operation, the AI itself, and the card object, if any.
-
-
-/atom/proc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
- SHOULD_CALL_PARENT(TRUE)
- if(istype(card))
- if(card.flush)
- to_chat(user, span_alert("ERROR: AI flush is in progress, cannot execute transfer protocol."))
- return FALSE
- return TRUE
-
-/obj/structure/ai_core/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
- if(state != AI_READY_CORE || !..())
- return
- if(core_mmi && core_mmi.brainmob)
- if(core_mmi.brainmob.mind)
- to_chat(user, span_warning("[src] already contains an active mind!"))
- return
- else if(suicide_check())
- to_chat(user, span_warning("[AI_CORE_BRAIN(core_mmi)] installed in [src] is completely useless!"))
- return
- //Transferring a carded AI to a core.
- if(interaction == AI_TRANS_FROM_CARD)
- AI.set_control_disabled(FALSE)
- AI.radio_enabled = TRUE
- AI.forceMove(loc) // to replace the terminal.
- to_chat(AI, span_notice("You have been uploaded to a stationary terminal. Remote device connection restored."))
- to_chat(user, "[span_boldnotice("Transfer successful")]: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.")
- card.AI = null
- AI.battery = circuit.battery
- AI.posibrain_inside = isnull(core_mmi) || core_mmi.braintype == "Android"
- qdel(src)
- else //If for some reason you use an empty card on an empty AI terminal.
- to_chat(user, span_alert("There is no AI loaded on this terminal."))
-
-/obj/item/circuitboard/aicore
- name = "AI core (AI Core Board)" //Well, duh, but best to be consistent
- var/battery = 200 //backup battery for when the AI loses power. Copied to/from AI mobs when carding, and placed here to avoid recharge via deconning the core
-
-/obj/item/circuitboard/aicore/Initialize(mapload)
- . = ..()
- if(mapload && HAS_TRAIT(SSstation, STATION_TRAIT_HUMAN_AI))
- return INITIALIZE_HINT_QDEL
-
-#undef AI_CORE_BRAIN
diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm
index 1f77227a8bec83..2c0b620dce929c 100644
--- a/code/game/objects/structures/beds_chairs/alien_nest.dm
+++ b/code/game/objects/structures/beds_chairs/alien_nest.dm
@@ -15,6 +15,10 @@
can_deconstruct = FALSE
var/static/mutable_appearance/nest_overlay = mutable_appearance('icons/mob/nonhuman-player/alien.dmi', "nestoverlay", LYING_MOB_LAYER)
+/obj/structure/bed/nest/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_DANGEROUS_BUCKLE, INNATE_TRAIT)
+
/obj/structure/bed/nest/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
if(held_item?.tool_behaviour == TOOL_WRENCH)
return NONE
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 6b687c8a4b01f5..c6435e1973d779 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -19,6 +19,7 @@
resistance_flags = FLAMMABLE
max_integrity = 100
integrity_failure = 0.35
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/// What material this bed is made of
var/build_stack_type = /obj/item/stack/sheet/iron
/// How many mats to drop when deconstructed
@@ -314,6 +315,7 @@
build_stack_type = /obj/item/stack/sheet/mineral/wood
build_stack_amount = 10
elevation = 0
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10)
var/owned = FALSE
/obj/structure/bed/dogbed/ian
@@ -381,6 +383,7 @@
icon_state = "bed_double"
build_stack_amount = 4
max_buckled_mobs = 2
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4)
/// The mob who buckled to this bed second, to avoid other mobs getting pixel-shifted before he unbuckles.
var/mob/living/goldilocks
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index b2432b7f760479..58e3fa5899ee0f 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -27,7 +27,7 @@
fishing_modifier -= 8
MakeRotate()
if(can_buckle && fishing_modifier)
- AddComponent(/datum/component/adjust_fishing_difficulty, fishing_modifier)
+ AddElement(/datum/element/adjust_fishing_difficulty, fishing_modifier)
/obj/structure/chair/buckle_feedback(mob/living/being_buckled, mob/buckler)
if(HAS_TRAIT(being_buckled, TRAIT_RESTRAINED))
@@ -71,7 +71,7 @@
///This proc adds the rotate component, overwrite this if you for some reason want to change some specific args.
/obj/structure/chair/proc/MakeRotate()
- AddComponent(/datum/component/simple_rotation, ROTATION_IGNORE_ANCHORED|ROTATION_GHOSTS_ALLOWED)
+ AddElement(/datum/element/simple_rotation, ROTATION_IGNORE_ANCHORED|ROTATION_GHOSTS_ALLOWED)
/obj/structure/chair/Destroy()
SSjob.latejoin_trackers -= src //These may be here due to the arrivals shuttle
@@ -188,6 +188,7 @@
buildstackamount = 3
item_chair = /obj/item/chair/wood
fishing_modifier = -6
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 3)
/obj/structure/chair/wood/narsie_act()
return
@@ -207,6 +208,7 @@
item_chair = null
fishing_modifier = -7
has_armrest = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/chair/comfy/brown
color = rgb(70, 47, 28)
@@ -232,7 +234,7 @@
unbuckle_sound = SFX_SEATBELT_UNBUCKLE
resistance_flags = FIRE_PROOF
max_integrity = 120
- custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/chair/comfy/shuttle/electrify_self(obj/item/assembly/shock_kit/input_shock_kit, mob/user, list/overlays_from_child_procs)
if(!overlays_from_child_procs)
@@ -286,6 +288,7 @@
icon_state = "carp_chair"
buildstacktype = /obj/item/stack/sheet/animalhide/carp
fishing_modifier = -12
+ custom_materials = null
/obj/structure/chair/office
name = "office chair"
@@ -294,6 +297,7 @@
item_chair = null
fishing_modifier = -6
icon_state = "officechair_dark"
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
/obj/structure/chair/office/Initialize(mapload)
. = ..()
@@ -320,11 +324,17 @@
name = "stool"
desc = "Apply butt."
icon_state = "stool"
- can_buckle = FALSE
buildstackamount = 1
item_chair = /obj/item/chair/stool
max_integrity = 300
+/obj/structure/chair/stool/post_buckle_mob(mob/living/Mob)
+ Mob.add_offsets(type, z_add = 4)
+ . = ..()
+
+/obj/structure/chair/stool/post_unbuckle_mob(mob/living/Mob)
+ Mob.remove_offsets(type)
+
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
/obj/structure/chair/stool/narsie_act()
@@ -359,13 +369,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
desc = "It has some unsavory stains on it..."
icon_state = "bar"
item_chair = /obj/item/chair/stool/bar
- can_buckle = TRUE
-/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/M)
- M.pixel_y += 4
-
-/obj/structure/chair/stool/bar/post_unbuckle_mob(mob/living/M)
- M.pixel_y -= 4
+/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/Mob)
+ . = ..()
+ Mob.add_offsets(type, z_add = 7)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
@@ -378,6 +385,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
buildstacktype = /obj/item/stack/sheet/mineral/bamboo
buildstackamount = 2
item_chair = /obj/item/chair/stool/bamboo
+ custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 2)
/obj/item/chair
name = "chair"
@@ -396,7 +404,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
max_integrity = 100
hitsound = 'sound/items/trayhit/trayhit1.ogg'
hit_reaction_chance = 50
- custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
item_flags = SKIP_FANTASY_ON_SPAWN
// Duration of daze inflicted when the chair is smashed against someone from behind.
@@ -530,6 +538,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
origin_type = /obj/structure/chair/stool/bamboo
max_integrity = 40 //Submissive and breakable unlike the chad iron stool
daze_amount = 0 //Not hard enough to cause them to become dazed
+ custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 2)
/obj/item/chair/stool/narsie_act()
return //sturdy enough to ignore a god
@@ -544,6 +553,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
origin_type = /obj/structure/chair/wood
custom_materials = null
daze_amount = 0
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 3)
/obj/item/chair/wood/narsie_act()
return
@@ -569,6 +579,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
item_chair = null
fishing_modifier = -13 //the pinnacle of Ratvarian technology.
has_armrest = TRUE
+ custom_materials = list(/datum/material/bronze = SHEET_MATERIAL_AMOUNT)
/// Total rotations made
var/turns = 0
@@ -612,6 +623,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
obj_flags = parent_type::obj_flags | NO_DEBRIS_AFTER_DECONSTRUCTION
alpha = 0
fishing_modifier = -21 //it only lives for 25 seconds, so we make them worth it.
+ custom_materials = null
/obj/structure/chair/mime/wrench_act_secondary(mob/living/user, obj/item/weapon)
return NONE
@@ -628,7 +640,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
desc = "No matter how much you squirm, it'll still be uncomfortable."
resistance_flags = FLAMMABLE
max_integrity = 70
- custom_materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2)
buildstacktype = /obj/item/stack/sheet/plastic
buildstackamount = 2
item_chair = /obj/item/chair/plastic
@@ -662,7 +674,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
w_class = WEIGHT_CLASS_NORMAL
force = 7
throw_range = 5 //Lighter Weight --> Flies Farther.
- custom_materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2)
max_integrity = 70
daze_amount = 0
origin_type = /obj/structure/chair/plastic
diff --git a/code/game/objects/structures/beds_chairs/pew.dm b/code/game/objects/structures/beds_chairs/pew.dm
index e6c64d9f36f03c..22faec36e70b02 100644
--- a/code/game/objects/structures/beds_chairs/pew.dm
+++ b/code/game/objects/structures/beds_chairs/pew.dm
@@ -8,10 +8,11 @@
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 3
item_chair = null
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 3)
///This proc adds the rotate component, overwrite this if you for some reason want to change some specific args.
/obj/structure/chair/pew/MakeRotate()
- AddComponent(/datum/component/simple_rotation, ROTATION_REQUIRE_WRENCH|ROTATION_IGNORE_ANCHORED)
+ AddElement(/datum/element/simple_rotation, ROTATION_REQUIRE_WRENCH|ROTATION_IGNORE_ANCHORED)
/obj/structure/chair/pew/left
name = "left wooden pew end"
diff --git a/code/game/objects/structures/beds_chairs/sofa.dm b/code/game/objects/structures/beds_chairs/sofa.dm
index 986bbcd99a0766..75c2deb8d6d080 100644
--- a/code/game/objects/structures/beds_chairs/sofa.dm
+++ b/code/game/objects/structures/beds_chairs/sofa.dm
@@ -51,6 +51,27 @@ path/corner/color_name {\
COLORED_SOFA(/obj/structure/chair/sofa, brown, SOFA_BROWN)
COLORED_SOFA(/obj/structure/chair/sofa, maroon, SOFA_MAROON)
+// Make crafted brown sofas use the "retro sofa" display name without changing map-spawned ones.
+/obj/structure/chair/sofa/middle/brown/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ name = "retro sofa"
+
+/obj/structure/chair/sofa/left/brown/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ name = "retro sofa"
+
+/obj/structure/chair/sofa/right/brown/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ name = "retro sofa"
+
+/obj/structure/chair/sofa/corner/brown/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ name = "retro sofa"
+
// Original icon ported from Eris(?) and updated to work here.
/obj/structure/chair/sofa/corp
name = "sofa"
@@ -111,6 +132,7 @@ COLORED_SOFA(/obj/structure/chair/sofa, maroon, SOFA_MAROON)
buildstacktype = /obj/item/stack/sheet/mineral/bamboo
buildstackamount = 3
has_armrest = FALSE
+ custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 3)
/obj/structure/chair/sofa/bamboo/left
icon_state = "bamboo_sofaend_left"
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 256ffbd8296782..f869a1203ebd5d 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -37,7 +37,7 @@ LINEN BINS
/obj/item/bedsheet/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/surgery_initiator)
+ AddElement(/datum/element/surgery_aid, "bedsheet")
AddElement(/datum/element/bed_tuckable, mapload, 0, 0, 0)
if(bedsheet_type == BEDSHEET_DOUBLE)
stack_amount *= 2
@@ -581,6 +581,7 @@ LINEN BINS
resistance_flags = FLAMMABLE
max_integrity = 70
anchored_tabletop_offset = 6
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
/// The number of bedsheets in the bin
var/amount = 10
/// A list of actual sheets within the bin
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 2336208cf5b5b8..1b57b479140f05 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -17,6 +17,7 @@
anchored = TRUE
buckle_lying = 0
pass_flags_self = PASSTABLE | LETPASSTHROW
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10)
/// is the bonfire lit?
var/burning = FALSE
/// icon for the bonfire while on. for a softer more burning embers icon, use "bonfire_warm"
diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm
index 4c44ae646a8626..383e3517209349 100644
--- a/code/game/objects/structures/cannons/cannon.dm
+++ b/code/game/objects/structures/cannons/cannon.dm
@@ -15,14 +15,14 @@
var/anchorable_cannon = TRUE
var/obj/item/stack/cannonball/loaded_cannonball = null
var/charge_ignited = FALSE
- var/fire_delay = 15
+ var/fire_delay = 1.5 SECONDS
var/charge_size = 15
var/fire_sound = 'sound/items/weapons/gun/general/cannon.ogg'
/obj/structure/cannon/Initialize(mapload)
. = ..()
create_reagents(charge_size)
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
/obj/structure/cannon/examine(mob/user)
. = ..()
@@ -117,6 +117,7 @@
icon_state = "garbagegun"
anchored = FALSE
anchorable_cannon = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 11.15, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5)
var/fires_before_deconstruction = 5
/obj/structure/cannon/trash/fire()
diff --git a/code/game/objects/structures/cannons/cannonballs.dm b/code/game/objects/structures/cannons/cannonballs.dm
index 855292e8521a77..fca8eb7e901d57 100644
--- a/code/game/objects/structures/cannons/cannonballs.dm
+++ b/code/game/objects/structures/cannons/cannonballs.dm
@@ -71,6 +71,7 @@
base_icon_state = "trashballs"
merge_type = /obj/item/stack/cannonball/trashball
projectile_type = /obj/projectile/bullet/cannonball/trashball
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT)
/obj/item/stack/cannonball/trashball/four
amount = 4
diff --git a/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm b/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
index 3a7a027acb5812..5bf2e20a64e52a 100644
--- a/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
+++ b/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
@@ -9,34 +9,51 @@
icon = 'icons/obj/weapons/cannons.dmi'
icon_state = "falconet_patina"
var/icon_state_base = "falconet_patina"
+ var/icon_state_loaded = "falconet_patina"
var/icon_state_fire = "falconet_patina_fire"
max_integrity = 300
///whether the cannon can be unwrenched from the ground. Anchorable_cannon equivalent.
var/anchorable_gun = TRUE
+ /// does this thing need ammo at all or does it just make ammo?
+ var/uses_ammo = TRUE
///Max shots per firing of the gun.
var/max_shots_per_fire = 1
+ ///Delay it takes to load the gun. Set to 0 if none.
+ var/load_delay = 0
+ ///Message displayed when loading gun
+ var/loading_message = "gun loaded"
///Shots currently loaded. Should never be more than max_shots_per_fire.
var/shots_in_gun = 1
///shots added to gun, per piece of ammo loaded.
var/shots_per_load = 1
+ ///Does it have an alternative ammo type it can uses
+ var/has_alt_ammo = FALSE
+ //Is it loaded with said alternative ammo?
+ var/use_alt_ammo = FALSE
///Accepted "ammo" type
var/obj/item/ammo_type = /obj/item/ammo_casing/strilka310
+ ///Alternative ammo types, for extra effects!
+ var/obj/item/alt_ammo_type = /obj/item/ammo_casing/strilka310
///Projectile from said gun. Doesnt automatically inherit said ammo's projectile in case you wanted to make a gun that shoots floor tiles or something.
var/obj/projectile/projectile_type = /obj/projectile/bullet/strilka310
+ ///Projectile from said gun. Doesnt automatically inherit said ammo's projectile in case you wanted to make a gun that shoots floor tiles or something.
+ var/obj/projectile/alt_projectile_type = /obj/projectile/bullet/strilka310
///If the gun has anything in it.
var/loaded_gun = TRUE
///If the gun is currently loaded with its maximum capacity.
var/fully_loaded_gun = TRUE
///delay in firing the gun after lighting
- var/fire_delay = 5
+ var/fire_delay = 5 DECISECONDS
///Delay between shots
- var/shot_delay = 3
+ var/shot_delay = 3 DECISECONDS
///If the gun shakes the camera when firing
var/firing_shakes_camera = TRUE
///sound of firing for all but last shot
var/fire_sound = 'sound/items/weapons/gun/general/mountedgun.ogg'
///sound of firing for last shot
var/last_fire_sound = 'sound/items/weapons/gun/general/mountedgunend.ogg'
+ ///So you can't reload it mid-firing
+ var/is_firing = FALSE
/obj/structure/mounted_gun/wrench_act(mob/living/user, obj/item/tool)
. = ..()
@@ -46,37 +63,45 @@
return ITEM_INTERACT_SUCCESS
///Covers Reloading and lighting of the gun
-/obj/structure/mounted_gun/attackby(obj/item/ammo_casing/used_item, mob/user, list/modifiers, list/attack_modifiers)
- var/ignition_message = used_item.ignition_effect(src, user) // Checks if item used can ignite stuff.
- if(istype(used_item, ammo_type))
+/obj/structure/mounted_gun/attackby(obj/item/ammo_casing/used_item, mob/user, params)
+ if(is_firing)
+ balloon_alert(user, "gun is firing!")
+ return
+ if(istype(used_item, ammo_type) && (uses_ammo == TRUE)) //see if the gun needs to be loaded in some way.
if(fully_loaded_gun)
balloon_alert(user, "already fully loaded!")
return
- else
- shots_in_gun = shots_in_gun + shots_per_load //Add one to the shots in the gun
-
- loaded_gun = TRUE // Make sure it registers theres ammo in there, so it can fire.
- QDEL_NULL(used_item)
- if(shots_in_gun >= max_shots_per_fire)
- shots_in_gun = max_shots_per_fire // in case of somehow firing only some of a guns shots, and reloading, you still cant get above the maximum ammo size.
- fully_loaded_gun = TRUE //So you cant load extra.
+
+ if(load_delay > 0 && !do_after(user, load_delay, target = src))
return
- else if(ignition_message) // if item the player used ignites, light the gun!
- visible_message(ignition_message)
- user.log_message("fired a cannon", LOG_ATTACK)
- log_game("[key_name(user)] fired a cannon in [AREACOORD(src)]")
- addtimer(CALLBACK(src, PROC_REF(fire)), fire_delay) //uses fire proc as shown below to shoot the gun
+ shots_in_gun = shots_in_gun + shots_per_load //Add one to the shots in the gun
+ balloon_alert(user, loading_message)
+ loaded_gun = TRUE // Make sure it registers theres ammo in there, so it can fire.
+ QDEL_NULL(used_item)
+ if(shots_in_gun >= max_shots_per_fire)
+ shots_in_gun = max_shots_per_fire // in case of somehow firing only some of a guns shots, and reloading, you still cant get above the maximum ammo size.
+ fully_loaded_gun = TRUE //So you cant load extra.
+ icon_state = icon_state_loaded
+ return
+
+/obj/structure/mounted_gun/attack_hand(mob/living/user, list/modifiers)
+ if(is_firing)
+ balloon_alert(user, "gun is firing!")
return
- ..()
+ user.log_message("fired a mounted gun", LOG_ATTACK)
+ log_game("[key_name(user)] fired a mounted gun in [AREACOORD(src)]")
+ addtimer(CALLBACK(src, PROC_REF(fire)), fire_delay) //uses fire proc as shown below to shoot the gun
+ return
/obj/structure/mounted_gun/proc/fire()
if (!loaded_gun)
balloon_alert_to_viewers("gun is not loaded!","",2)
return
+ is_firing = TRUE
for(var/times_fired = 1, times_fired <= shots_in_gun, times_fired++) //The normal DM for loop structure since the times it has fired is changing in the loop itself.
for(var/mob/shaken_mob in urange(10, src))
- if(shaken_mob.stat == CONSCIOUS && firing_shakes_camera == TRUE)
+ if(shaken_mob.stat == CONSCIOUS && firing_shakes_camera == TRUE) //is the mob awake to feel the shaking?
shake_camera(shaken_mob, 3, 1)
icon_state = icon_state_fire
if(loaded_gun)
@@ -84,23 +109,29 @@
if (times_fired < shots_in_gun)
playsound(src, fire_sound, 50, FALSE, 5)
else
- playsound(src, last_fire_sound, 50, TRUE, 5)
- var/obj/projectile/fired_projectile = new projectile_type(get_turf(src))
+ playsound(src, last_fire_sound, 50, TRUE, 5) //for the empty fire sound
+
+ var/obj/projectile/fired_projectile = (use_alt_ammo) ? new alt_projectile_type(get_turf(src)) : new projectile_type(get_turf(src))
fired_projectile.firer = src
fired_projectile.fired_from = src
fired_projectile.fire(dir2angle(dir))
sleep(shot_delay)
- loaded_gun = FALSE
- shots_in_gun = 0
- fully_loaded_gun = FALSE
+
+ if(uses_ammo == TRUE)
+ loaded_gun = FALSE
+ use_alt_ammo = FALSE
+ shots_in_gun = 0
+ fully_loaded_gun = FALSE
+ is_firing = FALSE
icon_state = icon_state_base
-/obj/structure/mounted_gun/pipe
+/obj/structure/mounted_gun/organ_gun
name = "Pipe Organ Gun"
desc = "To become master over one who has killed, one must become a better killer. This engine of destruction is one of many things made to that end."
icon_state = "pipeorgangun"
icon_state_base = "pipeorgangun"
+ icon_state_loaded = "pipeorgangun"
icon_state_fire = "pipeorgangun_fire"
anchored = FALSE
anchorable_gun = TRUE
@@ -111,11 +142,12 @@
projectile_type = /obj/projectile/bullet/junk
loaded_gun = TRUE
fully_loaded_gun = TRUE
- fire_delay = 3
- shot_delay = 2
+ fire_delay = 3 DECISECONDS
+ shot_delay = 2 DECISECONDS
firing_shakes_camera = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 24.5, /datum/material/wood = SHEET_MATERIAL_AMOUNT * 15, /datum/material/glass = SMALL_MATERIAL_AMOUNT)
-/obj/structure/mounted_gun/pipe/examine_more(mob/user)
+/obj/structure/mounted_gun/organ_gun/examine_more(mob/user)
. = ..()
. += span_notice("Looking down at \the [src], you recall a tale told to you in some distant memory...")
@@ -125,7 +157,7 @@
. += span_info("As such, the man who ended another's life with a stone, was in turn smote himself by another wielding a spear. After spears, bows. Swords. Guns. Tanks. Missiles. And on and on Vengeance fed. Growing stronger. Growing Worse.")
. += span_info("Vengeance persists to this day. It sometimes may slumber, seemingly content with having gorged itself, but in the end, its ceaseless hunger can be neither numbed nor sated.")
-/obj/structure/mounted_gun/pipe/fire()
+/obj/structure/mounted_gun/organ_gun/fire()
if (!loaded_gun)
balloon_alert_to_viewers("Gun is not loaded!","",2)
return
@@ -164,6 +196,7 @@
desc = "''Quantity has a quality of its own.''"
icon_state = "canister_gatling"
icon_state_base = "canister_gatling"
+ icon_state_loaded = "canister_gatling"
icon_state_fire = "canister_gatling_fire"
anchored = FALSE
anchorable_gun = TRUE
@@ -174,8 +207,8 @@
projectile_type = /obj/projectile/bullet/shrapnel
loaded_gun = TRUE
fully_loaded_gun = TRUE
- fire_delay = 3
- shot_delay = 1
+ fire_delay = 3 DECISECONDS
+ shot_delay = 1 DECISECONDS
firing_shakes_camera = FALSE
/obj/item/ammo_casing/canister_shot
@@ -186,3 +219,136 @@
throwforce = 0
w_class = WEIGHT_CLASS_BULKY
projectile_type = /obj/projectile/bullet/shrapnel
+
+/obj/structure/mounted_gun/ratvarian_repeater
+ name = "Ratvarian Repeater"
+ desc = "''Brains? Bronze? Why not both?''"
+ icon_state = "ratvarian_repeater"
+ icon_state_base = "ratvarian_repeater"
+ icon_state_fire = "ratvarian_repeater_fire"
+ loading_message = "gun charged"
+ anchored = FALSE
+ anchorable_gun = TRUE
+ uses_ammo = FALSE
+ load_delay = 30
+ max_shots_per_fire = 12
+ shots_per_load = 12
+ shots_in_gun = 12
+ fire_sound = 'sound/items/weapons/thermalpistol.ogg'
+ last_fire_sound = 'sound/items/weapons/thermalpistol.ogg'
+ projectile_type = /obj/projectile/beam/laser/repeater
+ loaded_gun = TRUE
+ fully_loaded_gun = TRUE
+ fire_delay = 1
+ shot_delay = 2
+ firing_shakes_camera = FALSE
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.25,
+ /datum/material/bronze = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.29
+ )
+
+/obj/structure/mounted_gun/ratvarian_repeater/dump_contents()
+ return // Stub because we don't want to do anything here
+
+/obj/structure/mounted_gun/ratvarian_repeater/attack_hand(mob/user, params) //the repeater is weird so has to have its own code since it takes no ammo.
+
+ if(is_firing)
+ balloon_alert(user, "gun is firing!")
+ return
+
+ if(!fully_loaded_gun)
+ if(!do_after(user, load_delay, target = src))
+ return
+ shots_in_gun = shots_per_load //Add one to the shots in the gun
+ balloon_alert(user, "mechanism wound.")
+ playsound(src, 'sound/effects/magic/clockwork/fellowship_armory.ogg', 50, FALSE, 5)
+ loaded_gun = TRUE // Make sure it registers theres ammo in there, so it can fire.
+ if(shots_in_gun >= max_shots_per_fire)
+ shots_in_gun = max_shots_per_fire // in case of somehow firing only some of a guns shots, and reloading, you still cant get above the maximum ammo size.
+ fully_loaded_gun = TRUE //So you cant load extra.
+ return
+
+ user.log_message("fired a ratvatian repeater", LOG_ATTACK)
+ log_game("[key_name(user)] fired a ratvatian repeater in [AREACOORD(src)]")
+ addtimer(CALLBACK(src, PROC_REF(fire)), fire_delay) //uses fire proc as shown below to shoot the gun
+
+/obj/structure/mounted_gun/ratvarian_repeater/fire()
+ if (!loaded_gun)
+ balloon_alert_to_viewers("needs winding!", vision_distance = 2)
+ return
+ is_firing = TRUE
+ for(var/times_fired = 1, times_fired <= shots_in_gun, times_fired++) //The normal DM for loop structure since the times it has fired is changing in the loop itself.
+ if(loaded_gun)
+ icon_state = icon_state_fire
+ if (times_fired < shots_in_gun)
+ playsound(src, fire_sound, 50, FALSE, 5)
+ else
+ playsound(src, last_fire_sound, 50, TRUE, 5) //for the empty fire sound
+ var/obj/projectile/fired_projectile = new projectile_type(get_turf(src))
+ fired_projectile.firer = src
+ fired_projectile.fired_from = src
+ fired_projectile.fire(dir2angle(dir))
+ if(times_fired % 2 != 1)//Burst Fire.
+ sleep(shot_delay)
+ sleep(shot_delay)
+ loaded_gun = FALSE
+ shots_in_gun = 0
+ fully_loaded_gun = FALSE
+ is_firing = FALSE
+ icon_state = icon_state_base
+
+/obj/structure/mounted_gun/ballista
+ name = "Improvised Ballista"
+ desc = "''Engineers like to solve problems. If there are no problems handily available, they will create their own problems.''"
+ icon_state = "Improvised_Ballista"
+ icon_state_base = "Improvised_Ballista"
+ icon_state_loaded = "Improvised_Ballista_Loaded"
+ icon_state_fire = "Improvised_Ballista"
+ anchored = FALSE
+ anchorable_gun = TRUE
+ uses_ammo = TRUE
+ load_delay = 60
+ max_shots_per_fire = 1
+ shots_per_load = 1
+ shots_in_gun = 1
+ fire_sound = 'sound/items/xbow_lock.ogg'
+ last_fire_sound = 'sound/items/xbow_lock.ogg'
+ has_alt_ammo = TRUE
+ ammo_type = /obj/item/spear
+ projectile_type = /obj/projectile/bullet/ballista_spear
+ alt_ammo_type = /obj/item/spear/dragonator
+ alt_projectile_type = /obj/projectile/bullet/ballista_spear_dragon
+ loaded_gun = FALSE
+ fully_loaded_gun = FALSE
+ fire_delay = 1
+ shot_delay = 1
+ firing_shakes_camera = FALSE
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 15.15,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.5
+ )
+
+/obj/structure/mounted_gun/ballista/attackby(obj/item/ammo_casing/used_item, mob/user, params) //again its single shot so its kinda weird.
+ if(is_firing)
+ balloon_alert(user, "gun is firing")
+ return
+
+ if(!istype(used_item, ammo_type))
+ return
+
+ if(fully_loaded_gun)
+ balloon_alert(user, "already fully loaded!")
+ return
+
+ if(istype(used_item, alt_ammo_type))
+ use_alt_ammo = TRUE
+
+ playsound(src, 'sound/items/weapons/draw_bow.ogg', 50, FALSE, 5)
+ do_after(user, load_delay, target = src)
+ shots_in_gun = 1 //MAX OF ONE SHOT.
+ balloon_alert(user, loading_message)
+ loaded_gun = TRUE
+ QDEL_NULL(used_item)
+ fully_loaded_gun = TRUE
+ icon_state = icon_state_loaded
diff --git a/code/game/objects/structures/cat_house.dm b/code/game/objects/structures/cat_house.dm
index ea016e00d67785..746c67f0b1ec03 100644
--- a/code/game/objects/structures/cat_house.dm
+++ b/code/game/objects/structures/cat_house.dm
@@ -5,6 +5,7 @@
icon_state = "cat_house"
density = TRUE
anchored = TRUE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 5)
///cat residing in this house
var/mob/living/resident_cat
diff --git a/code/game/objects/structures/chess.dm b/code/game/objects/structures/chess.dm
index 04410e29980943..a8d45ccbf8fc7b 100644
--- a/code/game/objects/structures/chess.dm
+++ b/code/game/objects/structures/chess.dm
@@ -6,6 +6,7 @@
name = "\improper Probably a White Pawn"
desc = "This is weird. Please inform administration on how you managed to get the parent chess piece. Thanks!"
max_integrity = 100
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/chess/wrench_act(mob/user, obj/item/tool)
if(flags_1 & HOLOGRAM_1)
diff --git a/code/game/objects/structures/construction_console/construction_actions.dm b/code/game/objects/structures/construction_console/construction_actions.dm
index cce7d2ee516281..398e97954e7188 100644
--- a/code/game/objects/structures/construction_console/construction_actions.dm
+++ b/code/game/objects/structures/construction_console/construction_actions.dm
@@ -32,10 +32,10 @@
if (!area_constraint)
return TRUE
if(!istype(build_area, area_constraint))
- to_chat(owner, span_warning("You can only build within [area_constraint]!"))
+ to_chat(owner, span_warning("You can only build within [area_constraint::name]!"))
return FALSE
if(only_station_z && !is_station_level(build_target.z))
- to_chat(owner, span_warning("[area_constraint] has launched and can no longer be modified."))
+ to_chat(owner, span_warning("[area_constraint::name] has launched and can no longer be modified."))
return FALSE
return TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 7a776378165fe1..ff5e41f2c36ab9 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -20,6 +20,7 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
/// How insulated the thing is, for the purposes of calculating body temperature. Must be between 0 and 1!
contents_thermal_insulation = 0
pass_flags_self = PASSSTRUCTURE | LETPASSCLICKS
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/// The overlay for the closet's door
var/obj/effect/overlay/closet_door/door_obj
/// Whether or not this door is being animated
@@ -392,10 +393,20 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
var/screentip_change = FALSE
if(isnull(held_item))
- if(secure && !broken)
- context[SCREENTIP_CONTEXT_RMB] = opened ? "Lock" : "Unlock"
if(!welded)
context[SCREENTIP_CONTEXT_LMB] = opened ? "Close" : "Open"
+ context[SCREENTIP_CONTEXT_RMB] = opened ? "Close" : "Open"
+ if(secure && !broken)
+ if (opened)
+ context[SCREENTIP_CONTEXT_RMB] = "Close"
+ else
+ context[SCREENTIP_CONTEXT_RMB] = !locked ? "Lock" : "Unlock"
+ if (locked)
+ context[SCREENTIP_CONTEXT_LMB] = "Unlock"
+ screentip_change = TRUE
+ if(secure && !opened && istype(held_item, /obj/item/card/id))
+ context[SCREENTIP_CONTEXT_LMB] = !locked ? "Lock" : "Unlock"
+ context[SCREENTIP_CONTEXT_RMB] = !locked ? "Lock" : "Unlock"
screentip_change = TRUE
if(istype(held_item, cutting_tool))
@@ -678,6 +689,11 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
else
return ..()
+/obj/structure/closet/item_interaction_secondary(mob/living/user, obj/item/tool, list/modifiers)
+ if (attack_hand(user, modifiers))
+ return ITEM_INTERACT_SUCCESS
+ return NONE
+
/// check if we can install airlock electronics in this closet
/obj/structure/closet/proc/can_install_airlock_electronics(mob/user)
if(secure || !can_install_electronics || opened)
@@ -969,14 +985,15 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
. = ..()
if(.)
return
+
if(user.body_position == LYING_DOWN && get_dist(src, user) > 0)
return
if(toggle(user))
- return
+ return TRUE
if(!opened)
- togglelock(user)
+ return togglelock(user)
/obj/structure/closet/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
index 6c1990258deef3..12d9b7a3794361 100644
--- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm
+++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
@@ -19,6 +19,7 @@
can_install_electronics = FALSE
paint_jobs = null
can_weld_shut = FALSE
+ door_anim_time = 0
var/foldedbag_path = /obj/item/bodybag
var/obj/item/bodybag/foldedbag_instance = null
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 7773d54e3e4c2e..66f7e2780e5651 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -9,6 +9,8 @@
can_weld_shut = 0
cutting_tool = /obj/item/wirecutters
material_drop = /obj/item/stack/sheet/cardboard
+ material_drop_amount = 4
+ custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT * 4)
delivery_icon = "deliverybox"
anchorable = FALSE
open_sound = 'sound/machines/cardboard_box.ogg'
@@ -118,4 +120,5 @@
close_sound = 'sound/machines/crate/crate_close.ogg'
open_sound_volume = 35
close_sound_volume = 50
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 4)
material_drop = /obj/item/stack/sheet/plasteel
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index 4e43ea2ce10bf1..407fea71c316ab 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -13,7 +13,6 @@
new /obj/item/clothing/under/shorts/green(src)
new /obj/item/clothing/under/costume/jabroni(src)
-
/obj/structure/closet/boxinggloves
name = "boxing gloves closet"
desc = "It's a storage unit for gloves for use in the boxing ring."
@@ -26,7 +25,6 @@
new /obj/item/clothing/gloves/boxing/yellow(src)
new /obj/item/clothing/gloves/boxing(src)
-
/obj/structure/closet/masks
name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
@@ -37,7 +35,6 @@
new /obj/item/clothing/mask/luchador/rudos(src)
new /obj/item/clothing/mask/luchador/tecnicos(src)
-
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 24e9c93bdb97c9..d0d8689bc971d7 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -9,12 +9,15 @@
close_sound_volume = 50
max_integrity = 70
door_anim_time = 0 // no animation
+ material_drop = /obj/item/stack/sheet/mineral/wood
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/closet/acloset
name = "strange closet"
desc = "It looks alien!"
icon_state = "alien"
material_drop = /obj/item/stack/sheet/mineral/abductor
+ custom_materials = list(/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/closet/gimmick
name = "administrative supply closet"
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 39ec2eebcc094e..cdbc7f8856a241 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -7,7 +7,7 @@
/obj/structure/closet/gmcloset/PopulateContents()
..()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/head/hats/tophat = 2,
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/under/costume/buttondown/slacks/service = 2,
@@ -30,7 +30,7 @@
/obj/structure/closet/chefcloset/PopulateContents()
..()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/under/suit/waiter = 2,
/obj/item/radio/headset/headset_srv = 2,
/obj/item/clothing/accessory/waistcoat = 2,
@@ -119,7 +119,7 @@
icon_door = "sec_wardrobe"
/obj/structure/closet/wardrobe/red/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/suit/hooded/wintercoat/security = 1,
/obj/item/storage/backpack/security = 1,
/obj/item/storage/backpack/satchel/sec = 1,
@@ -139,7 +139,7 @@
icon_door = "cargo_wardrobe"
/obj/structure/closet/wardrobe/cargotech/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/suit/hooded/wintercoat/cargo = 1,
/obj/item/clothing/under/rank/cargo/tech = 3,
/obj/item/clothing/shoes/sneakers/black = 3,
@@ -153,7 +153,7 @@
icon_door = "atmos_wardrobe"
/obj/structure/closet/wardrobe/atmospherics_yellow/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/accessory/pocketprotector = 1,
/obj/item/storage/backpack/duffelbag/engineering = 1,
/obj/item/storage/backpack/satchel/eng = 1,
@@ -171,7 +171,7 @@
icon_door = "engi_wardrobe"
/obj/structure/closet/wardrobe/engineering_yellow/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/accessory/pocketprotector = 1,
/obj/item/storage/backpack/duffelbag/engineering = 1,
/obj/item/storage/backpack/industrial = 1,
@@ -190,7 +190,7 @@
icon_door = "med_wardrobe"
/obj/structure/closet/wardrobe/white/medical/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/accessory/pocketprotector = 1,
/obj/item/storage/backpack/duffelbag/med = 1,
/obj/item/storage/backpack/medic = 1,
@@ -213,7 +213,7 @@
icon_door = "robo_wardrobe"
/obj/structure/closet/wardrobe/robotics_black/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/glasses/hud/diagnostic = 2,
/obj/item/clothing/under/rank/rnd/roboticist = 2,
/obj/item/clothing/suit/toggle/labcoat = 2,
@@ -233,7 +233,7 @@
icon_door = "chem_wardrobe"
/obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/under/rank/medical/chemist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/chemist = 2,
@@ -251,7 +251,7 @@
icon_door = "gen_wardrobe"
/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/under/rank/rnd/geneticist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/genetics = 2,
@@ -268,7 +268,7 @@
icon_door = "viro_wardrobe"
/obj/structure/closet/wardrobe/virology_white/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/under/rank/medical/virologist = 2,
/obj/item/clothing/shoes/sneakers/white = 2,
/obj/item/clothing/suit/toggle/labcoat/virologist = 2,
@@ -285,7 +285,7 @@
icon_door = "sci_wardrobe"
/obj/structure/closet/wardrobe/science_white/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/clothing/accessory/pocketprotector = 1,
/obj/item/storage/backpack/science = 2,
/obj/item/storage/backpack/satchel/science = 2,
@@ -304,7 +304,7 @@
icon_door = "botany_wardrobe"
/obj/structure/closet/wardrobe/botanist/PopulateContents()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/storage/backpack/botany = 2,
/obj/item/storage/backpack/satchel/hyd = 2,
/obj/item/storage/backpack/messenger/hyd = 2,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 22dd2bec4b2bb5..e448c3d553de39 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -35,7 +35,7 @@
/obj/structure/closet/secure_closet/engineering_electrical/PopulateContents()
..()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/inducer = 2,
/obj/item/storage/toolbox/electrical = 3,
/obj/item/electronics/apc = 3,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 1e19671a455460..9f6acb67817fc4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -5,6 +5,7 @@
door_anim_squish = 0.22
door_anim_angle = 123
door_anim_time = 4
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3.5)
/// If FALSE, we will protect the first person in the freezer from an explosion / nuclear blast.
var/jones = FALSE
paint_jobs = null
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index e4ba63df947971..82a02d08c898df 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/medical1/PopulateContents()
..()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/reagent_containers/cup/beaker = 2,
/obj/item/reagent_containers/dropper = 2,
/obj/item/storage/belt/medical = 1,
@@ -83,8 +83,6 @@
new /obj/item/computer_disk/command/cmo(src)
new /obj/item/radio/headset/heads/cmo(src)
new /obj/item/megaphone/command(src)
- new /obj/item/defibrillator/compact/loaded(src)
- new /obj/item/healthanalyzer/advanced(src)
new /obj/item/assembly/flash/handheld(src)
new /obj/item/autosurgeon/medical_hud(src)
new /obj/item/door_remote/chief_medical_officer(src)
@@ -99,6 +97,7 @@
// Traitor steal objective
//new /obj/item/reagent_containers/hypospray/cmo(src) /// DOPPLER SHIFT REMOVAL
+ new /obj/item/defibrillator/compact/loaded/cmo(src)
/obj/structure/closet/secure_closet/animal
name = "animal control locker"
@@ -147,7 +146,7 @@
/obj/structure/closet/secure_closet/paramedic/PopulateContents()
..()
- var/static/items_inside = list(
+ var/list/items_inside = list(
/obj/item/storage/medkit/emergency = 1,
/obj/item/storage/box/bandages = 1,
/obj/item/pinpointer/crew = 1,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index f639df5f128660..01eb0550d57f57 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -45,6 +45,8 @@
open_sound_volume = 25
close_sound_volume = 50
door_anim_time = 0 // no animation
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
+ material_drop = /obj/item/stack/sheet/mineral/wood
/obj/structure/closet/secure_closet/personal/cabinet/PopulateContents()
new /obj/item/storage/backpack/satchel/leather/withwallet( src )
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 1fad4a1c9025b2..1d798b567a3cd2 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -8,6 +8,7 @@
secure = TRUE
damage_deflection = 20
material_drop_amount = 5
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
/datum/armor/closet_secure_closet
melee = 30
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 703c2647cba3dd..6d2420c5904772 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -13,6 +13,7 @@
new /obj/item/radio/headset/heads/captain(src)
new /obj/item/door_remote/captain(src)
new /obj/item/storage/photo_album/captain(src)
+ new /obj/item/megaphone/command(src)
/obj/structure/closet/secure_closet/captains/populate_contents_immediate()
new /obj/item/gun/energy/e_gun(src)
@@ -90,6 +91,7 @@
new /obj/item/storage/belt/secsword/full(src) // DOPPLER EDIT - new /obj/item/storage/belt/security/full(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/door_remote/head_of_security(src)
+ new /obj/item/storage/belt/bandolier(src)
/obj/structure/closet/secure_closet/warden/populate_contents_immediate()
@@ -175,7 +177,7 @@
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
- req_access = list(ACCESS_HOS)
+ req_access = list(ACCESS_ARMORY)
/obj/structure/closet/secure_closet/injection/PopulateContents()
..()
@@ -309,7 +311,7 @@
new /obj/item/storage/box/firingpins(src)
new /obj/item/gun/energy/ionrifle(src)
for(var/i in 1 to 3)
- new /obj/item/gun/energy/laser/thermal(src)
+ new /obj/item/gun/energy/laser/pistol(src)
/obj/structure/closet/secure_closet/armory3/populate_contents_immediate()
for(var/i in 1 to 3)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index fc2c2fe56d109d..f07fd7dca1df7f 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -30,6 +30,8 @@
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/mod/module/plasma_stabilizer(src)
new /obj/item/climbing_hook/syndicate(src)
+ new /obj/item/mod/module/thermal_regulator(src)
+ new /obj/item/mod/module/plasma_stabilizer(src)
/obj/structure/closet/syndicate/nuclear
desc = "It's a storage unit for a Syndicate boarding party."
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 6ee649ebb65883..c8f2ed625012df 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -51,7 +51,6 @@
new /obj/item/clothing/mask/bandana/skull/black(src)
return
-
/obj/structure/closet/wardrobe/green
name = "green wardrobe"
icon_door = "green"
@@ -67,7 +66,6 @@
new /obj/item/clothing/mask/bandana/green(src)
return
-
/obj/structure/closet/wardrobe/orange
name = "prison wardrobe"
desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
@@ -82,7 +80,6 @@
new /obj/item/clothing/shoes/sneakers/orange(src)
return
-
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
icon_door = "yellow"
@@ -98,7 +95,6 @@
new /obj/item/clothing/mask/bandana/gold(src)
return
-
/obj/structure/closet/wardrobe/white
name = "white wardrobe"
icon_door = "white"
@@ -133,7 +129,6 @@
new /obj/item/clothing/shoes/sneakers/white(src)
return
-
/obj/structure/closet/wardrobe/grey
name = "grey wardrobe"
icon_door = "grey"
@@ -163,7 +158,6 @@
new /obj/item/clothing/accessory/pocketprotector(src)
return
-
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
icon_door = "mixed"
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 018ad3d7c37c22..85ccb7d77ca2c8 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -41,7 +41,7 @@
/obj/structure/closet/crate/Initialize(mapload)
AddElement(/datum/element/climbable, climb_time = crate_climb_time, climb_stun = 0) //add element in closed state before parent init opens it(if it does)
if(elevation)
- AddComponent(/datum/component/climb_walkable)
+ AddElement(/datum/element/climb_walkable)
AddElement(/datum/element/elevation, pixel_shift = elevation)
. = ..()
@@ -184,6 +184,7 @@
paint_jobs = null
elevation_open = 0
can_weld_shut = FALSE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 5)
/obj/structure/closet/crate/trashcart //please make this a generic cart path later after things calm down a little
desc = "A heavy, metal trashcart with wheels."
diff --git a/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm
index 9301a93a3f50e7..009a8c6a843acc 100644
--- a/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm
@@ -7,12 +7,14 @@
base_icon_state = "securecrate"
integrity_failure = 0 //no breaking open the crate
var/code = null
- var/last_attempt = null
+ /// Associated list of previous attempts w/ bulls & cows
+ var/list/previous_attempts = list()
var/attempts = 10
var/code_length = 4
var/qdel_on_open = FALSE
var/spawned_loot = FALSE
tamperproof = 90
+ interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND
divable = FALSE // Stop people from "diving into" the crate accidentally, and then detonating it.
@@ -127,6 +129,7 @@
spawn_loot()
tamperproof = 0 // set explosion chance to zero, so we dont accidently hit it with a multitool and instantly die
togglelock(user)
+ SStgui.close_user_uis(user, src)
return
if(!validate_input(input))
@@ -134,7 +137,7 @@
return
to_chat(user, span_warning("A red light flashes."))
- last_attempt = input
+ previous_attempts += list(bulls_and_cows(input))
attempts--
if(attempts <= 0)
@@ -160,16 +163,28 @@
attack_hand(user) //this helps you not blow up so easily by overriding unlocking which results in an immediate boom.
return CLICK_ACTION_SUCCESS
+/obj/structure/closet/crate/secure/loot/ui_interact(mob/user, datum/tgui/ui)
+ . = ..()
+
+ // Attempt to update tgui ui, open and update if needed.
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AbandonedCrate", name)
+ ui.open()
+
+/obj/structure/closet/crate/secure/loot/ui_data(mob/user)
+ var/list/data = list()
+
+ data["previous_attempts"] = previous_attempts
+ data["attempts_left"] = attempts
+
+ return data
+
/obj/structure/closet/crate/secure/loot/multitool_act(mob/living/user, obj/item/tool)
if(!locked)
return
-
- to_chat(user, span_boldnotice("DECA-CODE LOCK REPORT:"))
- to_chat(user, span_warning("* Anti-Tamper Bomb will activate [attempts == 1 ? span_boldwarning("on next failed access attempt") : "after [span_boldwarning("[attempts]")] failed access attempts"]."))
-
- if(last_attempt)
- var/list/bulls_cows = bulls_and_cows(last_attempt)
- to_chat(user, span_notice("Last code attempt, [last_attempt], had [bulls_cows[1]] correct digits at correct positions and [bulls_cows[2]] correct digits at incorrect positions."))
+ if(Adjacent(user))
+ ui_interact(user)
return ITEM_INTERACT_SUCCESS
@@ -187,7 +202,7 @@
else if(findtext(code, guess_char))
cows++
- return list(bulls, cows)
+ return list("attempt" = guess, "bulls" = bulls, "cows" = cows)
/obj/structure/closet/crate/secure/loot/emag_act(mob/user, obj/item/card/emag/emag_card)
. = ..()
@@ -204,7 +219,7 @@
//reset the anti-tampering, number of attempts and last attempt when the lock is re-enabled.
tamperproof = initial(tamperproof)
attempts = initial(attempts)
- last_attempt = null
+ previous_attempts = list()
return
if(tamperproof)
return
diff --git a/code/game/objects/structures/crates_lockers/crates/cardboard.dm b/code/game/objects/structures/crates_lockers/crates/cardboard.dm
index 1544bb2e0a40f1..55a843f9edf8f9 100644
--- a/code/game/objects/structures/crates_lockers/crates/cardboard.dm
+++ b/code/game/objects/structures/crates_lockers/crates/cardboard.dm
@@ -1,9 +1,9 @@
/obj/structure/closet/crate/cardboard
name = "cardboard box"
desc = "A box, in which you can place things. Revolutionary, I know."
- pass_flags_self = PASSSTRUCTURE
material_drop = /obj/item/stack/sheet/cardboard
material_drop_amount = 4
+ custom_materials = list(/datum/material/cardboard = SHEET_MATERIAL_AMOUNT * 4)
icon_state = "cardboard"
base_icon_state = "cardboard"
open_sound = 'sound/items/poster/poster_ripped.ogg'
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index 5703cb6ddcb392..284bea5243d3d4 100644
--- a/code/game/objects/structures/crates_lockers/crates/wooden.dm
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -1,6 +1,7 @@
/obj/structure/closet/crate/wooden
name = "wooden crate"
desc = "Works just as well as a metal one."
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 6)
material_drop = /obj/item/stack/sheet/mineral/wood
material_drop_amount = 6
icon_state = "wooden"
@@ -11,6 +12,7 @@
close_sound_volume = 50
paint_jobs = null
cutting_tool = /obj/item/crowbar
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 6)
/obj/structure/closet/crate/wooden/toy
name = "toy box"
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index cde4f4da174e8c..ec864ca5a86f42 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -12,6 +12,7 @@
anchored = TRUE
opacity = FALSE
density = FALSE
+ custom_materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2, /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
/// used in making the icon state
var/icon_type = "bathroom"
var/open = TRUE
@@ -43,7 +44,7 @@
/obj/structure/curtain/attackby(obj/item/W, mob/user)
if (istype(W, /obj/item/toy/crayon))
- color = input(user,"","Choose Color",color) as color
+ color = tgui_color_picker(user, "", "Choose Color", color)
else
return ..()
@@ -107,6 +108,7 @@
color = null
alpha = 255
opaque_closed = TRUE
+ custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
/obj/structure/curtain/cloth/atom_deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/cloth (loc, 4)
diff --git a/code/game/objects/structures/detectiveboard.dm b/code/game/objects/structures/detectiveboard.dm
index ee03c07f8ab4a8..91df15cc4436bd 100644
--- a/code/game/objects/structures/detectiveboard.dm
+++ b/code/game/objects/structures/detectiveboard.dm
@@ -34,7 +34,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/detectiveboard, 32)
if(istype(item, /obj/item/paper) || istype(item, /obj/item/photo))
item.forceMove(src)
cases[current_case].notices++
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
register_context()
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index fb6347791dc304..3f3d06534a0192 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -227,6 +227,7 @@
resistance_flags = FLAMMABLE
anchored = TRUE
density = FALSE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 5)
///The airlock electronics inserted into the chassis, to be moved to the finished product.
var/obj/item/electronics/airlock/electronics
@@ -562,7 +563,7 @@
if(payments_acc)
payments_acc.adjust_money(sale_price, "Display Case: [capitalize(showpiece.name)]")
usr.put_in_hands(showpiece)
- to_chat(usr, span_notice("You purchase [showpiece] for [sale_price] credits."))
+ to_chat(usr, span_notice("You purchase [showpiece] for [sale_price] [MONEY_NAME]."))
playsound(src, 'sound/effects/cashregister.ogg', 40, TRUE)
flick("[initial(icon_state)]_vend", src)
showpiece = null
@@ -665,7 +666,7 @@
/obj/structure/displaycase/forsale/examine(mob/user)
. = ..()
if(showpiece && !open)
- . += span_notice("[showpiece] is for sale for [sale_price] credits.")
+ . += span_notice("[showpiece] is for sale for [sale_price] [MONEY_NAME].")
if(broken)
. += span_notice("[src] is sparking and the hover field generator seems to be overloaded. Use a multitool to fix it.")
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index a58dfd8abf400b..90a97bd7d10e42 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -6,6 +6,7 @@
anchored = FALSE
density = TRUE
max_integrity = 200
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4)
/// Airlock's current construction state
var/state = AIRLOCK_ASSEMBLY_NEEDS_WIRES
var/base_name = "Airlock"
@@ -308,7 +309,7 @@
door.closeOtherId = electronics.passed_cycle_id
door.update_other_id()
if(door.unres_sides)
- door.unres_sensor = TRUE
+ door.unres_latch = TRUE
door.previous_airlock = previous_assembly
electronics.forceMove(door)
door.autoclose = TRUE
@@ -377,7 +378,7 @@
return FALSE
/obj/structure/door_assembly/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT)
qdel(src)
return TRUE
return FALSE
diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm
index d62fb1bec76763..203039779d6ec6 100644
--- a/code/game/objects/structures/door_assembly_types.dm
+++ b/code/game/objects/structures/door_assembly_types.dm
@@ -122,6 +122,7 @@
noglass = TRUE
material_type = /obj/item/stack/sheet/plasteel
material_amt = 4
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 4)
/obj/structure/door_assembly/door_assembly_vault
name = "vault door assembly"
@@ -132,6 +133,7 @@
noglass = TRUE
material_type = /obj/item/stack/sheet/plasteel
material_amt = 6
+ custom_materials = list(/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 6)
/obj/structure/door_assembly/door_assembly_shuttle
name = "shuttle airlock assembly"
@@ -255,6 +257,7 @@
airlock_type = /obj/machinery/door/airlock/bronze
noglass = TRUE
material_type = /obj/item/stack/sheet/bronze
+ custom_materials = list(/datum/material/bronze = SHEET_MATERIAL_AMOUNT * 4)
/obj/structure/door_assembly/door_assembly_bronze/seethru
airlock_type = /obj/machinery/door/airlock/bronze/seethru
@@ -282,6 +285,7 @@
noglass = TRUE
mineral = "titanium"
material_type = /obj/item/stack/sheet/mineral/titanium
+ custom_materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 8)
/obj/structure/door_assembly/door_assembly_material/atom_deconstruct(disassembled = TRUE)
var/turf/target_turf = get_turf(src)
diff --git a/code/game/objects/structures/dresser.dm b/code/game/objects/structures/dresser.dm
index aaa1e52b3ccc0b..63faa9537508c7 100644
--- a/code/game/objects/structures/dresser.dm
+++ b/code/game/objects/structures/dresser.dm
@@ -6,6 +6,7 @@
resistance_flags = FLAMMABLE
density = TRUE
anchored = TRUE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10)
/obj/structure/dresser/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
if(I.tool_behaviour == TOOL_WRENCH)
@@ -44,7 +45,7 @@
if(new_undies)
dressing_human.underwear = new_undies
if("Underwear Color")
- var/new_underwear_color = input(dressing_human, "Choose your underwear color", "Underwear Color", dressing_human.underwear_color) as color|null
+ var/new_underwear_color = tgui_color_picker(dressing_human, "Choose your underwear color", "Underwear Color", dressing_human.underwear_color)
if(new_underwear_color)
dressing_human.underwear_color = sanitize_hexcolor(new_underwear_color)
if("Undershirt")
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 496bc850aa97f8..c807bc53df8118 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -18,7 +18,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29)
opened = TRUE
else
stored_extinguisher = new /obj/item/extinguisher(src)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
update_appearance(UPDATE_ICON)
register_context()
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index 39f0b506671bbf..44aa56d6088fdf 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -8,6 +8,7 @@
armor_type = /datum/armor/structure_fireaxecabinet
max_integrity = 150
integrity_failure = 0.33
+ custom_materials = /obj/item/wallframe/fireaxecabinet::custom_materials
/// Do we need to be unlocked to be opened.
var/locked = TRUE
/// Are we opened, can someone take the held item out.
@@ -39,7 +40,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32)
held_item = new item_path(src)
update_appearance()
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/structure/fireaxecabinet/Destroy()
if(held_item)
@@ -221,6 +222,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/empty, 32)
icon_state = "fireaxe"
result_path = /obj/structure/fireaxecabinet/empty
pixel_shift = 32
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5.1, /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 5, /datum/material/iron = SMALL_MATERIAL_AMOUNT)
/obj/structure/fireaxecabinet/mechremoval
name = "mech removal tool cabinet"
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 4565cd1b09a406..a836886da62767 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -11,9 +11,6 @@
/// If set, the flora will have this as its description after being harvested. When the flora becomes harvestable again, it regerts to its initial(desc)
var/harvested_desc
- /// A lazylist of products that could be created when harvesting this flora, syntax is (type = weight)
- /// Because of how this works, it can spawn in anomalies if you want it to. Or wall girders
- var/product_types
/// If the user is able to harvest this with their hands
var/harvest_with_hands = FALSE
/// The "verb" to use when the user harvests the flora
@@ -27,9 +24,9 @@
/// If false, the flora won't be able to be harvested at all. If it's true, go through checks normally to determine if the flora is able to be harvested
var/harvestable = TRUE
- /// The low end of how many product_type items you get
+ /// The low end of how many harvested items you get
var/harvest_amount_low = 1
- /// The high end of how many product_type items you get
+ /// The high end of how many harvested items you get
var/harvest_amount_high = 3
//Messages to show to the user depending on how many items they get when harvesting the flora
@@ -133,24 +130,34 @@
if(use_default_sound)
return ..()
-/*
+/**
+ * A helper proc for getting the products that could be created when harvesting this flora, list syntax is (type = weight)
+ * Because of how this works, it can spawn in anomalies if you want it to. Or wall girders
+ * Returns: An assoc list of obj typepaths and their weights e.g. list(/obj/item/food/grass = 1), or null
+ */
+/obj/structure/flora/proc/get_potential_products()
+ return null
+
+/**
* A helper proc for getting a random amount of products, associated with the flora's product list.
- * Returns: A list where each value is (product_type = amount_of_products)
+ * Returns: A list where each value is (harvested_item_typepath = amount_of_products)
*/
/obj/structure/flora/proc/get_products_list()
- if(!LAZYLEN(product_types))
- return list()
+ var/list/potential_product_list = get_potential_products()
+ if(isnull(potential_product_list))
+ return
+
var/list/product_list = list()
var/harvest_amount = rand(harvest_amount_low, harvest_amount_high)
for(var/iteration in 1 to harvest_amount)
- var/chosen_product = pick_weight(product_types)
+ var/chosen_product = pick_weight(potential_product_list)
if(!product_list[chosen_product])
product_list[chosen_product] = 0
product_list[chosen_product]++
return product_list
-/*
+/**
* A helper proc that determines if a user can currently harvest this flora with whatever tool they're trying to use.
* Returns: TRUE if they can harvest, FALSE if not. Null if it's not harvestable at all.
*/
@@ -177,7 +184,7 @@
return FALSE
-/*
+/**
* This gets called after a mob tries to harvest this flora with the correct tool.
* It displays a flavor message to whoever's harvesting this flora, then creates new products depending on the flora's product list.
* Also renames the flora if harvested_name or harvested_desc is set in the variables
@@ -185,11 +192,11 @@
*/
/obj/structure/flora/proc/harvest(user, product_amount_multiplier = 1)
. = FALSE
- if(harvested && !LAZYLEN(product_types))
+ if(harvested)
return FALSE
var/list/products_to_create = get_products_list()
- if(!products_to_create.len)
+ if(!LAZYLEN(products_to_create))
return FALSE
var/products_created = 0
@@ -250,7 +257,7 @@
desc = initial(desc)
harvested = FALSE
-/*
+/**
* Called after the user uproots the flora with a shovel.
*/
/obj/structure/flora/proc/uproot(mob/living/user)
@@ -260,7 +267,7 @@
previous_rotation = pick(-90, 90)
transform = M.Turn(previous_rotation)
-/*
+/**
* Called after the user plants the flora back into the ground after uprooted
*/
/obj/structure/flora/proc/replant(mob/living/user)
@@ -289,7 +296,6 @@
layer = FLY_LAYER
plane = ABOVE_GAME_PLANE
drag_slowdown = 1.5
- product_types = list(/obj/item/grown/log/tree = 1)
harvest_amount_low = 6
harvest_amount_high = 10
harvest_message_low = "You manage to gather a few logs from the tree."
@@ -304,6 +310,9 @@
. = ..()
AddComponent(/datum/component/seethrough, get_seethrough_map())
+/obj/structure/flora/tree/get_potential_products()
+ return list(/obj/item/grown/log/tree = 1)
+
///Return a see_through_map, examples in seethrough.dm
/obj/structure/flora/tree/proc/get_seethrough_map()
return SEE_THROUGH_MAP_DEFAULT
@@ -536,7 +545,6 @@
desc = "A patch of overgrown grass."
icon = 'icons/obj/fluff/flora/snowflora.dmi'
gender = PLURAL //"this is grass" not "this is a grass"
- product_types = list(/obj/item/food/grown/grass = 10, /obj/item/seeds/grass = 1)
harvest_with_hands = TRUE
harvest_amount_low = 0
harvest_amount_high = 2
@@ -546,6 +554,9 @@
can_uproot = TRUE
flora_flags = FLORA_HERBAL
+/obj/structure/flora/grass/get_potential_products()
+ return list(/obj/item/food/grown/grass = 10, /obj/item/seeds/grass = 1)
+
/obj/structure/flora/grass/brown
icon_state = "snowgrass1bb"
@@ -1006,7 +1017,6 @@
icon = 'icons/obj/fluff/flora/rocks.dmi'
density = TRUE
resistance_flags = FIRE_PROOF
- product_types = list(/obj/item/stack/ore/glass/basalt = 1)
harvest_amount_low = 10
harvest_amount_high = 20
harvest_message_med = "You finish mining the rock."
@@ -1015,6 +1025,9 @@
can_uproot = FALSE
delete_on_harvest = TRUE
+/obj/structure/flora/rock/get_potential_products()
+ return list(/obj/item/stack/ore/glass/basalt = 1)
+
/obj/structure/flora/rock/style_2
icon_state = "basalt2"
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 046b81838ef45f..d7545b9a63b245 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -11,6 +11,7 @@
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_GIRDER
canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_WALLS
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
var/state = GIRDER_NORMAL
var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
var/can_displace = TRUE //If the girder can be moved around by wrenching it
@@ -138,7 +139,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/iron))
+ else if(istype(stack, /obj/item/stack/sheet/iron))
var/amount = construction_cost[/obj/item/stack/sheet/iron]
if(state == GIRDER_DISPLACED)
if(stack.get_amount() < amount)
@@ -184,7 +185,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/titaniumglass) && state == GIRDER_TRAM)
+ else if(istype(stack, /obj/item/stack/sheet/titaniumglass) && state == GIRDER_TRAM)
var/amount = construction_cost[/obj/item/stack/sheet/titaniumglass]
if(stack.get_amount() < amount)
balloon_alert(user, "need [amount] sheets!")
@@ -199,7 +200,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/plasteel))
+ else if(istype(stack, /obj/item/stack/sheet/plasteel))
var/amount = construction_cost[/obj/item/stack/sheet/plasteel]
if(state == GIRDER_DISPLACED)
if(stack.get_amount() < amount)
@@ -242,7 +243,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/mineral/plastitanium))
+ else if(istype(stack, /obj/item/stack/sheet/mineral/plastitanium))
if(state == GIRDER_REINF)
if(stack.get_amount() < 1)
return
@@ -258,7 +259,7 @@
return
// No return here because generic material construction handles making normal plastitanium walls
- if(!stack.has_unique_girder && stack.material_type)
+ else if(!stack.has_unique_girder && stack.material_type)
if(istype(src, /obj/structure/girder/reinforced))
balloon_alert(user, "need plasteel or plastitanium!")
return
@@ -476,6 +477,7 @@
smoothing_flags = NONE
smoothing_groups = null
canSmoothWith = null
+ custom_materials = list(/datum/material/runedmetal = SHEET_MATERIAL_AMOUNT)
/obj/structure/girder/cult/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
add_fingerprint(user)
@@ -528,7 +530,7 @@
return FALSE
/obj/structure/girder/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- switch(rcd_data["[RCD_DESIGN_MODE]"])
+ switch(rcd_data[RCD_DESIGN_MODE])
if(RCD_TURF)
if(the_rcd.rcd_design_path != /turf/open/floor/plating/rcd)
return FALSE
@@ -551,6 +553,7 @@
smoothing_flags = NONE
smoothing_groups = null
canSmoothWith = null
+ custom_materials = list(/datum/material/bronze = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/girder/bronze/attackby(obj/item/W, mob/living/user, list/modifiers, list/attack_modifiers)
add_fingerprint(user)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index d21f7d457ab1db..ed3aa733d66284 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -15,6 +15,7 @@
armor_type = /datum/armor/structure_grille
max_integrity = 50
integrity_failure = 0.4
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
var/rods_type = /obj/item/stack/rods
var/rods_amount = 2
/// Whether or not we're disappearing but dramatically
@@ -92,7 +93,7 @@
return FALSE
/obj/structure/grille/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- switch(rcd_data["[RCD_DESIGN_MODE]"])
+ switch(rcd_data[RCD_DESIGN_MODE])
if(RCD_DECONSTRUCT)
qdel(src)
return TRUE
@@ -106,7 +107,7 @@
if(!clear_tile(user))
return FALSE
- var/obj/structure/window/window_path = rcd_data["[RCD_DESIGN_PATH]"]
+ var/obj/structure/window/window_path = rcd_data[RCD_DESIGN_PATH]
if(!ispath(window_path))
CRASH("Invalid window path type in RCD: [window_path]")
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 73af3fff09671c..917ae511928d6e 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -42,6 +42,12 @@
buckle_lying = 0
buckle_prevents_pull = TRUE
layer = ABOVE_MOB_LAYER
+ custom_materials = list(
+ /datum/material/wood = SHEET_MATERIAL_AMOUNT * 20,
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT,
+ )
/// The sound the guillotine makes when it successfully cuts off a head
var/drop_sound = 'sound/items/weapons/guillotine.ogg'
/// The current state of the blade
diff --git a/code/game/objects/structures/gym/punching_bag.dm b/code/game/objects/structures/gym/punching_bag.dm
index bea51bc1d8c6cd..f767f77c912b24 100644
--- a/code/game/objects/structures/gym/punching_bag.dm
+++ b/code/game/objects/structures/gym/punching_bag.dm
@@ -5,6 +5,7 @@
icon_state = "punchingbag"
anchored = TRUE
layer = ABOVE_MOB_LAYER
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5)
///List of sounds that can be played when punched.
var/static/list/hit_sounds = list(
'sound/items/weapons/genhit1.ogg',
@@ -65,7 +66,7 @@
if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising
stamina_exhaustion *= 0.5
- user.adjustStaminaLoss(stamina_exhaustion)
+ user.adjust_stamina_loss(stamina_exhaustion)
user.mind?.adjust_experience(/datum/skill/athletics, is_heavy_gravity ? 0.6 : 0.3)
user.apply_status_effect(/datum/status_effect/exercised)
diff --git a/code/game/objects/structures/gym/weight_machine.dm b/code/game/objects/structures/gym/weight_machine.dm
index c9b59efd89f08f..c3ba59cead6b19 100644
--- a/code/game/objects/structures/gym/weight_machine.dm
+++ b/code/game/objects/structures/gym/weight_machine.dm
@@ -12,6 +12,7 @@
density = TRUE
anchored = TRUE
blocks_emissive = EMISSIVE_BLOCK_UNIQUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
///How much we shift the user's pixel y when using the weight machine.
var/pixel_shift_z = -3
@@ -214,7 +215,7 @@
if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising
stamina_exhaustion *= 0.5
- user.adjustStaminaLoss(stamina_exhaustion * seconds_per_tick)
+ user.adjust_stamina_loss(stamina_exhaustion * seconds_per_tick)
return TRUE
diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm
index c9b9562ce731f1..5dcfac5f77ea12 100644
--- a/code/game/objects/structures/headpike.dm
+++ b/code/game/objects/structures/headpike.dm
@@ -5,6 +5,7 @@
icon_state = "headpike"
density = FALSE
anchored = TRUE
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.15, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.65)
var/obj/item/spear/spear
var/obj/item/spear/speartype = /obj/item/spear
var/obj/item/bodypart/head/victim
@@ -12,10 +13,12 @@
/obj/structure/headpike/bone //for bone spears
icon_state = "headpike-bone"
speartype = /obj/item/spear/bonespear
+ custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 4)
/obj/structure/headpike/bamboo //for bamboo spears
icon_state = "headpike-bamboo"
speartype = /obj/item/spear/bamboospear
+ custom_materials = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT * 25)
/obj/structure/headpike/military //for military spears
icon_state = "headpike-military"
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index fa17389ceb8b09..5948bf463235fd 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -8,6 +8,7 @@
density = TRUE
anchored = FALSE
max_integrity = 200
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
/obj/structure/kitchenspike_frame/Initialize(mapload)
. = ..()
@@ -71,13 +72,17 @@
desc = "A spike for collecting meat from animals."
density = TRUE
anchored = TRUE
- buckle_lying = FALSE
+ buckle_lying = 180
+ buckle_dir = SOUTH
can_buckle = TRUE
max_integrity = 250
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
+ buckle_delay = 10 SECONDS
/obj/structure/kitchenspike/Initialize(mapload)
. = ..()
register_context()
+ ADD_TRAIT(src, TRAIT_DANGEROUS_BUCKLE, INNATE_TRAIT)
/obj/structure/kitchenspike/examine(mob/user)
. = ..()
@@ -111,21 +116,24 @@
/obj/structure/kitchenspike/user_buckle_mob(mob/living/target, mob/user, check_loc = TRUE)
if(!iscarbon(target) && !isanimal_or_basicmob(target))
return
+ if(target != user || target.loc == loc)
+ return ..()
if(!do_after(user, 10 SECONDS, target))
return
+ if(!is_user_buckle_possible(target, user, check_loc))
+ return FALSE
return ..()
/obj/structure/kitchenspike/post_buckle_mob(mob/living/target)
playsound(src.loc, 'sound/effects/splat.ogg', 25, TRUE)
target.painful_scream() // DOPPLER EDIT: check for painkilling before screaming
target.add_splatter_floor()
- target.adjustBruteLoss(30)
- target.setDir(2)
- var/matrix/m180 = matrix(target.transform)
- m180.Turn(180)
- animate(target, transform = m180, time = 3)
- target.add_offsets(type, y_add = -6, animate = FALSE)
+ target.adjust_brute_loss(30)
+ target.add_offsets(type, x_add = -1)
+ target.set_lying_angle(buckle_lying)
ADD_TRAIT(target, TRAIT_MOVE_UPSIDE_DOWN, REF(src))
+ // So you can butcher people too
+ target.AddComponentFrom(REF(src), /datum/component/free_operation)
/obj/structure/kitchenspike/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
if(buckled_mob != user)
@@ -142,7 +150,7 @@
buckled_mob.visible_message(span_warning("[buckled_mob] struggles to break free from [src]!"),\
span_notice("You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)"),\
span_hear("You hear a wet squishing noise.."))
- buckled_mob.adjustBruteLoss(30)
+ buckled_mob.adjust_brute_loss(30)
if(!do_after(buckled_mob, 2 MINUTES, target = src, hidden = TRUE))
if(buckled_mob?.buckled)
to_chat(buckled_mob, span_warning("You fail to free yourself!"))
@@ -150,14 +158,12 @@
return ..()
/obj/structure/kitchenspike/post_unbuckle_mob(mob/living/buckled_mob)
- buckled_mob.adjustBruteLoss(30)
+ buckled_mob.adjust_brute_loss(30)
INVOKE_ASYNC(buckled_mob, TYPE_PROC_REF(/mob, emote), "scream")
buckled_mob.AdjustParalyzed(20)
- var/matrix/m180 = matrix(buckled_mob.transform)
- m180.Turn(180)
- animate(buckled_mob, transform = m180, time = 3)
- buckled_mob.remove_offsets(type, animate = FALSE)
+ buckled_mob.remove_offsets(type)
REMOVE_TRAIT(buckled_mob, TRAIT_MOVE_UPSIDE_DOWN, REF(src))
+ buckled_mob.RemoveComponentSource(REF(src), /datum/component/free_operation)
/obj/structure/kitchenspike/atom_deconstruct(disassembled = TRUE)
if(disassembled)
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index 6a60c80f92df2b..5d15c1af89f0fe 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -7,6 +7,7 @@
base_icon_state = "ladder"
anchored = TRUE
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5)
///the ladder below this one
VAR_FINAL/obj/structure/ladder/down
///the ladder above this one
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 4791a50f6fe07e..e9322232650d0d 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -16,7 +16,7 @@
canSmoothWith = SMOOTH_GROUP_LATTICE + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_OPEN_FLOOR
var/number_of_mats = 1
var/build_material = /obj/item/stack/rods
- var/list/give_turf_traits = list(TRAIT_CHASM_STOPPED, TRAIT_HYPERSPACE_STOPPED)
+ var/list/give_turf_traits = list(TRAIT_CHASM_STOPPED, TRAIT_HYPERSPACE_STOPPED, TRAIT_TURF_IGNORE_SLOWDOWN, TRAIT_IMMERSE_STOPPED)
/obj/structure/lattice/Initialize(mapload)
. = ..()
@@ -48,6 +48,10 @@
for(var/thing_that_falls in turfloc)
turfloc.zFall(thing_that_falls)
+ var/area/turf_area = get_area(turfloc)
+ if(isspaceturf(turfloc) && istype(turf_area, /area/space/nearstation))
+ set_turf_to_area(turfloc, GLOB.areas_by_type[/area/space])
+
/obj/structure/lattice/proc/deconstruction_hints(mob/user)
return span_notice("The rods look like they could be cut. There's space for more rods or a tile.")
@@ -82,8 +86,8 @@
return FALSE
/obj/structure/lattice/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF)
- var/design_structure = rcd_data["[RCD_DESIGN_PATH]"]
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF)
+ var/design_structure = rcd_data[RCD_DESIGN_PATH]
if(design_structure == /turf/open/floor/plating/rcd)
var/turf/T = src.loc
if(isgroundlessturf(T))
diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm
index 2d10df50a747d6..c60bae1af3f661 100644
--- a/code/game/objects/structures/loom.dm
+++ b/code/game/objects/structures/loom.dm
@@ -6,6 +6,7 @@
icon_state = "loom"
density = TRUE
anchored = TRUE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10)
/obj/structure/loom/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm
index 273a446eb854a4..0ee8e1b2bcb811 100644
--- a/code/game/objects/structures/maintenance.dm
+++ b/code/game/objects/structures/maintenance.dm
@@ -148,7 +148,7 @@ at the cost of risking a vicious bite.**/
var/altar_result = show_radial_menu(user, src, altar_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
switch(altar_result)
if("Change Color")
- var/chosen_color = input(user, "", "Choose Color", pants_color) as color|null
+ var/chosen_color = tgui_color_picker(user, "", "Choose Color", pants_color)
if(!isnull(chosen_color) && user.can_perform_action(src))
pants_color = chosen_color
if("Create Artefact")
@@ -250,6 +250,7 @@ at the cost of risking a vicious bite.**/
icon_state = "steam_vent"
anchored = TRUE
density = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.3, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 2)
/// How often does the vent reset the blow_steam cooldown.
var/steam_speed = 20 SECONDS
/// Is the steam vent active?
diff --git a/code/game/objects/structures/mannequin.dm b/code/game/objects/structures/mannequin.dm
index f390e9616fec50..f59ad4763724fe 100644
--- a/code/game/objects/structures/mannequin.dm
+++ b/code/game/objects/structures/mannequin.dm
@@ -63,7 +63,7 @@
material = pick(MANNEQUIN_WOOD, MANNEQUIN_PLASTIC)
icon_state = "mannequin_[material]_[body_type == FEMALE ? "female" : "male"]"
AddElement(/datum/element/strippable, GLOB.strippable_mannequin_items)
- AddComponent(/datum/component/simple_rotation, ROTATION_IGNORE_ANCHORED)
+ AddElement(/datum/element/simple_rotation, ROTATION_IGNORE_ANCHORED)
AddComponent(/datum/component/marionette)
update_appearance()
@@ -158,9 +158,11 @@
/obj/structure/mannequin/wood
material = MANNEQUIN_WOOD
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 25)
/obj/structure/mannequin/plastic
material = MANNEQUIN_PLASTIC
+ custom_materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 25)
/obj/structure/mannequin/skeleton
name = "skeleton model"
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 9d92831567cb6e..0bddf5575d2821 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -25,6 +25,7 @@
anchored = TRUE
integrity_failure = 0.5
max_integrity = 200
+ custom_materials = /obj/item/wallframe/mirror::custom_materials
///Can this mirror be removed from walls with tools?
var/deconstructable = TRUE
var/list/mirror_options = INERT_MIRROR_OPTIONS
@@ -55,7 +56,7 @@
check_reflect_signals = list(SIGNAL_ADDTRAIT(TRAIT_NO_MIRROR_REFLECTION), SIGNAL_REMOVETRAIT(TRAIT_NO_MIRROR_REFLECTION)), \
)
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
update_choices()
register_context()
@@ -80,14 +81,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
/obj/structure/mirror/attack_hand(mob/living/carbon/human/user)
. = ..()
-
if(. || !ishuman(user) || broken)
return TRUE
- if(!istype(src, /obj/structure/mirror/magic) && !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
- return TRUE //no tele-grooming (if nonmagical)
-
- return display_radial_menu(user)
+ display_radial_menu(user)
+ return TRUE
/obj/structure/mirror/wrench_act_secondary(mob/living/user, obj/item/tool)
if(!deconstructable)
@@ -106,9 +104,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
new /obj/item/wallframe/mirror(loc, 1)
/obj/structure/mirror/proc/display_radial_menu(mob/living/carbon/human/user)
+ if(!can_use_mirror(user))
+ return
+
var/pick = show_radial_menu(user, src, mirror_options, user, radius = 36, require_near = TRUE, tooltips = TRUE)
- if(!pick)
- return TRUE //get out
+ if(!pick || !can_use_mirror(user) || !pre_change(user, pick))
+ return
switch(pick)
if(CHANGE_HAIR)
@@ -124,45 +125,53 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
if(CHANGE_EYES)
change_eyes(user)
- return display_radial_menu(user)
+ display_radial_menu(user)
+
+/// Ran before we dive into any changes, can be used to block changes by returning FALSE
+/obj/structure/mirror/proc/pre_change(mob/living/carbon/human/user, picked)
+ return TRUE
+
+/// Checks if the mob can continue to use the mirror
+/obj/structure/mirror/proc/can_use_mirror(mob/living/carbon/human/user)
+ return !QDELETED(src) && !QDELETED(user) && user.can_perform_action(src, FORBID_TELEKINESIS_REACH)
/obj/structure/mirror/proc/change_beard(mob/living/carbon/human/beard_dresser)
if(beard_dresser.physique == FEMALE)
if(beard_dresser.facial_hairstyle == "Shaved")
balloon_alert(beard_dresser, "nothing to shave!")
- return TRUE
+ return
var/shave_beard = tgui_alert(beard_dresser, "Shave your beard?", "Grooming", list("Yes", "No"))
- if(shave_beard == "Yes")
+ if(shave_beard == "Yes" && can_use_mirror(beard_dresser))
beard_dresser.set_facial_hairstyle("Shaved", update = TRUE)
- return TRUE
+ return
var/new_style = tgui_input_list(beard_dresser, "Select a facial hairstyle", "Grooming", SSaccessories.facial_hairstyles_list)
- if(isnull(new_style))
- return TRUE
+ if(isnull(new_style) || !can_use_mirror(beard_dresser))
+ return
if(HAS_TRAIT(beard_dresser, TRAIT_SHAVED))
to_chat(beard_dresser, span_notice("If only growing back facial hair were that easy for you... The reminder makes you feel terrible."))
beard_dresser.add_mood_event("bald_hair_day", /datum/mood_event/bald_reminder)
- return TRUE
+ return
beard_dresser.set_facial_hairstyle(new_style, update = TRUE)
/obj/structure/mirror/proc/change_hair(mob/living/carbon/human/hairdresser)
var/new_style = tgui_input_list(hairdresser, "Select a hairstyle", "Grooming", SSaccessories.hairstyles_list)
- if(isnull(new_style))
- return TRUE
+ if(isnull(new_style) || !can_use_mirror(hairdresser))
+ return
if(HAS_TRAIT(hairdresser, TRAIT_BALD))
to_chat(hairdresser, span_notice("If only growing back hair were that easy for you... The reminder makes you feel terrible."))
hairdresser.add_mood_event("bald_hair_day", /datum/mood_event/bald_reminder)
- return TRUE
+ return
hairdresser.set_hairstyle(new_style, update = TRUE)
/obj/structure/mirror/proc/change_name(mob/living/carbon/human/user)
var/newname = sanitize_name(tgui_input_text(user, "Who are we again?", "Name change", user.name, MAX_NAME_LEN), allow_numbers = TRUE) //It's magic so whatever.
- if(!newname)
- return TRUE
+ if(!newname || !can_use_mirror(user))
+ return
user.real_name = newname
user.name = newname
if(user.dna)
@@ -173,49 +182,55 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
// Erm ackshually the proper term is species. Get it right??
/obj/structure/mirror/proc/change_race(mob/living/carbon/human/race_changer)
var/racechoice = tgui_input_list(race_changer, "What are we again?", "Race change", selectable_races)
- if(isnull(racechoice))
- return TRUE
+ if(isnull(racechoice) || !can_use_mirror(race_changer))
+ return
var/new_race_path = selectable_races[racechoice]
if(!ispath(new_race_path, /datum/species))
- return TRUE
+ return
- var/datum/species/newrace = new new_race_path()
+ var/datum/species/newrace = GLOB.species_prototypes[new_race_path]
var/attributes_desc = newrace.get_physical_attributes()
var/answer = tgui_alert(race_changer, attributes_desc, "Become a [newrace]?", list("Yes", "No"))
+ if(!answer || !can_use_mirror(race_changer))
+ return
if(answer != "Yes")
- qdel(newrace)
change_race(race_changer) // try again
return
- race_changer.set_species(newrace, icon_update = FALSE)
+ on_species_change(race_changer, newrace)
+ race_changer.set_species(new_race_path, icon_update = FALSE)
if(HAS_TRAIT(race_changer, TRAIT_USES_SKINTONES))
var/new_s_tone = tgui_input_list(race_changer, "Choose your skin tone", "Race change", GLOB.skin_tones)
- if(new_s_tone)
+ if(new_s_tone && can_use_mirror(race_changer))
race_changer.skin_tone = new_s_tone
race_changer.dna.update_ui_block(/datum/dna_block/identity/skin_tone)
else if(HAS_TRAIT(race_changer, TRAIT_MUTANT_COLORS) && !HAS_TRAIT(race_changer, TRAIT_FIXED_MUTANT_COLORS))
- var/new_mutantcolor = input(race_changer, "Choose your skin color:", "Race change", race_changer.dna.features[FEATURE_MUTANT_COLOR]) as color|null
- if(new_mutantcolor)
+ var/new_mutantcolor = tgui_color_picker(race_changer, "Choose your skin color:", "Race change", race_changer.dna.features[FEATURE_MUTANT_COLOR])
+ if(new_mutantcolor && can_use_mirror(race_changer))
var/list/mutant_hsv = rgb2hsv(new_mutantcolor)
-
if(mutant_hsv[3] >= 50) // mutantcolors must be bright
race_changer.dna.features[FEATURE_MUTANT_COLOR] = sanitize_hexcolor(new_mutantcolor)
race_changer.dna.update_uf_block(/datum/dna_block/feature/mutant_color)
else
to_chat(race_changer, span_notice("Invalid color. Your color is not bright enough."))
- return TRUE
race_changer.update_body(is_creating = TRUE)
race_changer.update_mutations_overlay() // no hulk lizard
+/// Hook for mirrors to do stuff on species change
+/obj/structure/mirror/proc/on_species_change(mob/living/carbon/human/race_changer, datum/species/newrace)
+ return
+
// possible Genders: MALE, FEMALE, PLURAL, NEUTER
// possible Physique: MALE, FEMALE
// saved you a click (many)
/obj/structure/mirror/proc/change_sex(mob/living/carbon/human/sexy)
var/chosen_sex = tgui_input_list(sexy, "Become a..", "Confirmation", list("Warlock", "Witch", "Wizard", "Itzard")) // YOU try coming up with the 'it' version of wizard
+ if(!chosen_sex || !can_use_mirror(sexy))
+ return
switch(chosen_sex)
if("Warlock")
@@ -233,7 +248,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
var/chosen_physique = tgui_input_list(sexy, "Alter your physique as well?", "Confirmation", list("Warlock Physique", "Witch Physique", "Wizards Don't Need Gender"))
- if(chosen_physique && chosen_physique != "Wizards Don't Need Gender")
+ if(chosen_physique && chosen_physique != "Wizards Don't Need Gender" && can_use_mirror(sexy))
sexy.physique = (chosen_physique == "Warlock Physique") ? MALE : FEMALE
sexy.dna.update_ui_block(/datum/dna_block/identity/gender)
@@ -242,9 +257,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
sexy.update_clothing(ITEM_SLOT_ICLOTHING) // update gender shaped clothing
/obj/structure/mirror/proc/change_eyes(mob/living/carbon/human/user)
- var/new_eye_color = input(user, "Choose your eye color", "Eye Color", user.eye_color_left) as color|null
- if(isnull(new_eye_color))
- return TRUE
+ var/new_eye_color = tgui_color_picker(user, "Choose your eye color", "Eye Color", user.eye_color_left)
+ if(isnull(new_eye_color) || !can_use_mirror(user))
+ return
user.set_eye_color(sanitize_hexcolor(new_eye_color))
user.dna.update_ui_block(/datum/dna_block/identity/eye_colors)
user.update_body()
@@ -336,10 +351,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
desc = "An unmounted mirror. Attach it to a wall to use."
icon = 'icons/obj/watercloset.dmi'
icon_state = "mirror"
- custom_materials = list(
- /datum/material/glass = SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = SHEET_MATERIAL_AMOUNT,
- )
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2)
result_path = /obj/structure/mirror
pixel_shift = 28
@@ -362,41 +374,42 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
/obj/structure/mirror/magic/change_beard(mob/living/carbon/human/beard_dresser) // magical mirrors do nothing but give you the damn beard
var/new_style = tgui_input_list(beard_dresser, "Select a facial hairstyle", "Grooming", SSaccessories.facial_hairstyles_list)
- if(isnull(new_style))
- return TRUE
+ if(isnull(new_style) || !can_use_mirror(beard_dresser))
+ return
+
beard_dresser.set_facial_hairstyle(new_style, update = TRUE)
- return TRUE
//Magic mirrors can change hair color as well
/obj/structure/mirror/magic/change_hair(mob/living/carbon/human/user)
var/hairchoice = tgui_alert(user, "Hairstyle or hair color?", "Change Hair", list("Style", "Color"))
+ if(!can_use_mirror(user))
+ return
if(hairchoice == "Style") //So you just want to use a mirror then?
return ..()
- var/new_hair_color = input(user, "Choose your hair color", "Hair Color", user.hair_color) as color|null
-
+ var/new_hair_color = tgui_color_picker(user, "Choose your hair color", "Hair Color", user.hair_color)
+ if(!new_hair_color || !can_use_mirror(user))
+ return
if(new_hair_color)
user.set_haircolor(sanitize_hexcolor(new_hair_color))
user.dna.update_ui_block(/datum/dna_block/identity/hair_color)
if(user.physique == MALE)
- var/new_face_color = input(user, "Choose your facial hair color", "Hair Color", user.facial_hair_color) as color|null
- if(new_face_color)
+ var/new_face_color = tgui_color_picker(user, "Choose your facial hair color", "Hair Color", user.facial_hair_color)
+ if(new_face_color && can_use_mirror(user))
user.set_facial_haircolor(sanitize_hexcolor(new_face_color))
user.dna.update_ui_block(/datum/dna_block/identity/facial_color)
-/obj/structure/mirror/magic/attack_hand(mob/living/carbon/human/user)
- . = ..()
- if(.)
- return TRUE
-
- if(HAS_TRAIT(user, TRAIT_ADVANCEDTOOLUSER) && HAS_TRAIT(user, TRAIT_LITERATE))
- return TRUE
+/// Hook for mirrors to do stuff on species change
+/obj/structure/mirror/magic/on_species_change(mob/living/carbon/human/race_changer, datum/species/newrace)
+ if(HAS_TRAIT(race_changer, TRAIT_ADVANCEDTOOLUSER) && HAS_TRAIT(race_changer, TRAIT_LITERATE))
+ return
- to_chat(user, span_alert("You feel quite intelligent."))
+ to_chat(race_changer, span_alert("You feel quite intelligent."))
// Prevents wizards from being soft locked out of everything
// If this stays after the species was changed once more, well, the magic mirror did it. It's magic i aint gotta explain shit
- user.add_traits(list(TRAIT_LITERATE, TRAIT_ADVANCEDTOOLUSER), SPECIES_TRAIT)
- return TRUE
+ race_changer.add_traits(list(TRAIT_LITERATE, TRAIT_ADVANCEDTOOLUSER), SPECIES_TRAIT)
+
+/obj/structure/mirror/magic/lesser
/obj/structure/mirror/magic/lesser/Initialize(mapload)
// Roundstart species don't have a flag, so it has to be set on Initialize.
@@ -414,32 +427,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
/// If the last user has altered anything about themselves
var/changed = FALSE
-/obj/structure/mirror/magic/pride/display_radial_menu(mob/living/carbon/human/user)
- var/pick = show_radial_menu(user, src, mirror_options, user, radius = 36, require_near = TRUE, tooltips = TRUE)
- if(!pick)
- return TRUE //get out
-
+/obj/structure/mirror/magic/pride/pre_change(mob/living/carbon/human/user, picked)
+ . = ..()
changed = TRUE
- switch(pick)
- if(CHANGE_HAIR)
- change_hair(user)
- if(CHANGE_BEARD)
- change_beard(user)
- if(CHANGE_RACE)
- change_race(user)
- if(CHANGE_SEX) // sex: yes
- change_sex(user)
- if(CHANGE_NAME)
- change_name(user)
- if(CHANGE_EYES)
- change_eyes(user)
-
- return display_radial_menu(user)
/obj/structure/mirror/magic/pride/attack_hand(mob/living/carbon/human/user)
changed = FALSE
. = ..()
- if (!changed)
+ if (!changed || QDELETED(user) || !IN_GIVEN_RANGE(user, src, 3)) // 3 range gives a tiny bit of leeway if you try to run away after using it
return
user.visible_message(
span_bolddanger("The ground splits beneath [user] as [user.p_their()] hand leaves the mirror!"),
diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm
index 3b3a4d9a9d9a67..7b71200fb47efa 100644
--- a/code/game/objects/structures/mystery_box.dm
+++ b/code/game/objects/structures/mystery_box.dm
@@ -23,6 +23,9 @@ GLOBAL_LIST_INIT(mystery_box_guns, list(
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun/nuclear,
/obj/item/gun/energy/laser,
+ /obj/item/gun/energy/laser/soul,
+ /obj/item/gun/energy/laser/pistol,
+ /obj/item/gun/energy/laser/assault,
/obj/item/gun/energy/laser/hellgun,
/obj/item/gun/energy/laser/captain,
/obj/item/gun/energy/laser/scatter,
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 20da9190d0b6c6..ed7ef50f383ce0 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -36,7 +36,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32)
notices++
update_appearance(UPDATE_ICON)
if(mapload)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
//attaching papers!!
/obj/structure/noticeboard/attackby(obj/item/O, mob/user, list/modifiers, list/attack_modifiers)
diff --git a/code/game/objects/structures/plaques/_plaques.dm b/code/game/objects/structures/plaques/_plaques.dm
index 5baf25200fdd15..de143b17f9f30b 100644
--- a/code/game/objects/structures/plaques/_plaques.dm
+++ b/code/game/objects/structures/plaques/_plaques.dm
@@ -20,6 +20,8 @@
/obj/structure/plaque/Initialize(mapload)
. = ..()
+ if(mapload)
+ find_and_mount_on_atom()
register_context()
/obj/structure/plaque/add_context(atom/source, list/context, obj/item/held_item, mob/user)
diff --git a/code/game/objects/structures/plaques/static_plaques.dm b/code/game/objects/structures/plaques/static_plaques.dm
index 6dcd9fe57bcb5c..6aed496b6f4196 100644
--- a/code/game/objects/structures/plaques/static_plaques.dm
+++ b/code/game/objects/structures/plaques/static_plaques.dm
@@ -9,6 +9,13 @@
SET_PLANE_IMPLICIT(src, FLOOR_PLANE)
layer = HIGH_TURF_LAYER
+/obj/structure/plaque/static_plaque/get_moutable_objects()
+ return list()
+
+/obj/structure/plaque/static_plaque/find_and_mount_on_atom(mark_for_late_init, late_init)
+ if(isProbablyWallMounted(src))
+ return ..()
+
/obj/structure/plaque/static_plaque/atmos
name = "\improper FEA Atmospherics Division plaque"
desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index 4837627daccdac..0c153c59128e0b 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -12,6 +12,7 @@
integrity_failure = 0.75
// This layer only matters for determining when you click it vs other objects
layer = BELOW_OPEN_DOOR_LAYER
+ custom_materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5)
/// If TRUE, we can't pass through unless the mob is resting (or fulfills more specific requirements)
var/require_resting = TRUE
/// Layer the flaps render on
diff --git a/code/game/objects/structures/platform.dm b/code/game/objects/structures/platform.dm
index 6adfcf310aa53a..af788a50b69be4 100644
--- a/code/game/objects/structures/platform.dm
+++ b/code/game/objects/structures/platform.dm
@@ -18,6 +18,7 @@
anchored = TRUE
armor_type = /datum/armor/half_wall
material_flags = MATERIAL_EFFECTS | MATERIAL_AFFECT_STATISTICS
+ custom_materials = list(/datum/material/iron = PLATFORM_BASE_MATERIAL_AMOUNT)
/// Icon used for the frame
var/frame_icon = 'icons/obj/smooth_structures/platform/frame_faces/window_frame_normal.dmi'
/// Material used in our construction
@@ -44,12 +45,12 @@
register_context()
update_appearance(UPDATE_OVERLAYS)
- AddComponent(/datum/component/climb_walkable)
+ AddElement(/datum/element/climb_walkable)
AddElement(/datum/element/climbable)
AddElement(/datum/element/elevation, pixel_shift = 12)
AddElement(/datum/element/give_turf_traits, string_list(turf_traits))
AddElement(/datum/element/footstep_override, footstep = footstep, priority = STEP_SOUND_TABLE_PRIORITY)
- AddComponent(/datum/component/table_smash)
+ AddElement(/datum/element/table_smash)
/obj/structure/platform/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
. = ..()
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index 5beb43a31bcd9f..7fa9a6ccb18d40 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -13,7 +13,7 @@
/// armor is a little bit less than a grille. max_integrity about half that of a grille.
armor_type = /datum/armor/structure_railing
max_integrity = 25
-
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
var/climbable = TRUE
///item released when deconstructed
var/item_deconstruct = /obj/item/stack/rods
@@ -32,6 +32,7 @@
icon_state = "railing_corner"
density = FALSE
climbable = FALSE
+ custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
/obj/structure/railing/corner/unbreakable
resistance_flags = INDESTRUCTIBLE
@@ -72,7 +73,7 @@
)
AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
- AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
+ AddElement(/datum/element/simple_rotation, ROTATION_NEEDS_ROOM)
/obj/structure/railing/examine(mob/user)
. = ..()
@@ -172,6 +173,7 @@
item_deconstruct = /obj/item/stack/sheet/mineral/wood
layer = ABOVE_MOB_LAYER
plane = GAME_PLANE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/railing/wooden_fence/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm
index ada47e65bc0ae1..082a140d699381 100644
--- a/code/game/objects/structures/reflector.dm
+++ b/code/game/objects/structures/reflector.dm
@@ -5,6 +5,7 @@
desc = "A base for reflector assemblies."
anchored = FALSE
density = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
var/deflector_icon_state
var/mutable_appearance/deflector_overlay
var/finished = FALSE
@@ -36,9 +37,7 @@
if(admin)
can_rotate = FALSE
- AddComponent(/datum/component/usb_port, list(
- /obj/item/circuit_component/reflector,
- ))
+ AddComponent(/datum/component/usb_port, typecacheof(list(/obj/item/circuit_component/reflector), only_root_path = TRUE))
/obj/structure/reflector/examine(mob/user)
. = ..()
@@ -209,6 +208,7 @@
finished = TRUE
buildstacktype = /obj/item/stack/sheet/rglass
buildstackamount = 10
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 10)
/obj/structure/reflector/double/anchored
anchored = TRUE
@@ -234,6 +234,7 @@
finished = TRUE
buildstacktype = /obj/item/stack/sheet/mineral/diamond
buildstackamount = 1
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, /datum/material/diamond = SHEET_MATERIAL_AMOUNT)
/obj/structure/reflector/box/anchored
anchored = TRUE
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 825c609f4a7797..0822d1db77c78a 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -21,11 +21,13 @@ FLOOR SAFES
obj_flags = CONDUCTS_ELECTRICITY
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT
custom_materials = list(
- /datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT*10,
- /datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT * 15,
+ /datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 8,
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 6,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
)
material_flags = MATERIAL_EFFECTS
-
/// The maximum combined w_class of stuff in the safe
var/maxspace = 24
/// The amount of tumblers that will be generated
@@ -302,6 +304,11 @@ FLOOR SAFES
icon_state = "floorsafe"
density = FALSE
layer = LOW_OBJ_LAYER
+ custom_materials = list(
+ /datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT * 15,
+ /datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 8,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.55,
+ )
/obj/structure/safe/floor/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/structures/secure_safe.dm b/code/game/objects/structures/secure_safe.dm
index 43af43268e86f3..71c3d0bb481a36 100644
--- a/code/game/objects/structures/secure_safe.dm
+++ b/code/game/objects/structures/secure_safe.dm
@@ -10,8 +10,9 @@
obj_flags = CONDUCTS_ELECTRICITY
resistance_flags = FIRE_PROOF
custom_materials = list(
- /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT*5,
- /datum/material/titanium = SHEET_MATERIAL_AMOUNT*3,
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 8,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
)
material_flags = MATERIAL_EFFECTS
/// The lock code transferred from the structure
@@ -104,13 +105,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/secure_safe, 32)
/obj/structure/secure_safe/Initialize(mapload)
. = ..()
//this will create the storage for us.
- AddComponent(/datum/component/lockable_storage, , stored_lock_code)
+ AddComponent(/datum/component/lockable_storage, stored_lock_code)
if(mapload)
PopulateContents()
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
RegisterSignal(src, COMSIG_LOCKABLE_STORAGE_SET_CODE, PROC_REF(update_lock_code))
-/obj/structure/secure_safe/find_and_hang_on_wall()
+/obj/structure/secure_safe/find_and_mount_on_atom(mark_for_late_init, late_init)
if(!density)
return ..()
@@ -163,7 +164,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/secure_safe, 32)
It is made out of the same material as the station's Black Box and is designed to resist all conventional weaponry. \
There appears to be a small amount of surface corrosion. It doesn't look like it could withstand much of an explosion.\
Due to the expensive material, it was made incredibly small to cut corners, leaving only enough room to fit something as slim as an ID card."
- icon = 'icons/obj/structures.dmi'
icon_state = "spare_safe"
base_icon_state = "spare_safe"
armor_type = /datum/armor/safe_caps_spare
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 88ee92fa4d81e6..09a48edbbbbe3a 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -87,7 +87,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
if(src.has_water_reclaimer)
reagents.add_reagent(reagent_id, reagent_capacity)
soundloop = new(src, FALSE)
- AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE)
+ AddComponent(/datum/component/plumbing/simple_demand/extended)
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
COMSIG_ATOM_EXITED = PROC_REF(on_exited),
@@ -374,7 +374,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
to_chat(living, span_warning("[src] is freezing!"))
else if(current_temperature == SHOWER_BOILING)
living.adjust_bodytemperature(35, 0, 500)
- living.adjustFireLoss(5)
+ living.adjust_fire_loss(5)
to_chat(living, span_danger("[src] is searing!"))
@@ -384,10 +384,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
icon_state = "shower_frame"
desc = "A shower frame, that needs a water recycler to finish construction."
anchored = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/showerframe/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
/obj/structure/showerframe/attackby(obj/item/tool, mob/living/user, list/modifiers, list/attack_modifiers)
if(istype(tool, /obj/item/stock_parts/water_recycler))
diff --git a/code/game/objects/structures/signs/_signs.dm b/code/game/objects/structures/signs/_signs.dm
index 905d709b273454..e1debb4aab1ff9 100644
--- a/code/game/objects/structures/signs/_signs.dm
+++ b/code/game/objects/structures/signs/_signs.dm
@@ -23,8 +23,11 @@
/obj/structure/sign/Initialize(mapload)
. = ..()
register_context()
- if(mapload)
- find_and_hang_on_wall()
+ if(mapload && !find_and_mount_on_atom(mark_for_late_init = TRUE))
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/structure/sign/LateInitialize()
+ find_and_mount_on_atom(late_init = TRUE)
/obj/structure/sign/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
@@ -48,17 +51,17 @@
/obj/structure/sign/wrench_act(mob/living/user, obj/item/wrench/I)
. = ..()
if(!buildable_sign)
- return TRUE
+ return ITEM_INTERACT_FAILURE
user.visible_message(span_notice("[user] starts removing [src]..."), \
span_notice("You start unfastening [src]."))
I.play_tool_sound(src)
if(!I.use_tool(src, user, 4 SECONDS))
- return TRUE
+ return ITEM_INTERACT_FAILURE
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
user.visible_message(span_notice("[user] unfastens [src]."), \
span_notice("You unfasten [src]."))
deconstruct(TRUE)
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/structure/sign/welder_act(mob/living/user, obj/item/I)
. = ..()
@@ -126,19 +129,6 @@
is_editable = TRUE
sign_change_name = "Blank Sign"
-/obj/structure/sign/nanotrasen
- name = "\improper Nanotrasen logo sign"
- sign_change_name = "Corporate Logo - Nanotrasen"
- desc = "A sign with the Nanotrasen logo on it. Glory to Nanotrasen!"
- icon_state = "nanotrasen"
- is_editable = TRUE
-
-/obj/structure/sign/logo
- name = "\improper Nanotrasen logo sign"
- desc = "The Nanotrasen corporate logo."
- icon_state = "nanotrasen_sign1"
- buildable_sign = FALSE
-
/obj/item/sign
name = "sign backing"
desc = "A plastic sign backing, use a pen to change the decal. It can be placed on a wall."
@@ -175,35 +165,35 @@
context[SCREENTIP_CONTEXT_LMB] = "Change design"
return CONTEXTUAL_SCREENTIP_SET
-/obj/item/sign/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
- if(is_editable && IS_WRITING_UTENSIL(I))
- if(!length(GLOB.editable_sign_types))
- CRASH("GLOB.editable_sign_types failed to populate")
- var/choice = tgui_input_list(user, "Select a sign type", "Sign Customization", GLOB.editable_sign_types)
- if(isnull(choice))
- return
- if(!Adjacent(user)) //Make sure user is adjacent still.
- to_chat(user, span_warning("You need to stand next to the sign to change it!"))
- return
- user.visible_message(span_notice("You begin changing [src]."))
- if(!do_after(user, 4 SECONDS, target = src))
- return
- set_sign_type(GLOB.editable_sign_types[choice])
- user.visible_message(span_notice("You finish changing the sign."))
- return
- return ..()
+/obj/item/sign/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!is_editable || !IS_WRITING_UTENSIL(tool))
+ return ..()
+ if(!length(GLOB.editable_sign_types))
+ CRASH("GLOB.editable_sign_types failed to populate")
+ var/choice = tgui_input_list(user, "Select a sign type", "Sign Customization", GLOB.editable_sign_types)
+ if(isnull(choice))
+ return ITEM_INTERACT_BLOCKING
+ if(!Adjacent(user)) //Make sure user is adjacent still.
+ to_chat(user, span_warning("You need to stand next to the sign to change it!"))
+ return ITEM_INTERACT_BLOCKING
+ user.visible_message(span_notice("You begin changing [src]."))
+ if(!do_after(user, 4 SECONDS, target = src))
+ return ITEM_INTERACT_BLOCKING
+ set_sign_type(GLOB.editable_sign_types[choice])
+ user.visible_message(span_notice("You finish changing the sign."))
+ return ITEM_INTERACT_SUCCESS
/obj/item/sign/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!iswallturf(interacting_with) && !istype(interacting_with, /obj/structure/tram))
return NONE
var/turf/target_turf = interacting_with
var/turf/user_turf = get_turf(user)
- var/obj/structure/sign/placed_sign = new sign_path(user_turf) //We place the sign on the turf the user is standing, and pixel shift it to the target wall, as below.
- //This is to mimic how signs and other wall objects are usually placed by mappers, and so they're only visible from one side of a wall.
var/dir = get_dir(user_turf, target_turf)
if(!(dir in GLOB.cardinals))
balloon_alert(user, "stand in line with wall!")
- return
+ return ITEM_INTERACT_BLOCKING
+ var/obj/structure/sign/placed_sign = new sign_path(user_turf) //We place the sign on the turf the user is standing, and pixel shift it to the target wall, as below.
+ //This is to mimic how signs and other wall objects are usually placed by mappers, and so they're only visible from one side of a wall.
if(dir & NORTH)
placed_sign.pixel_y = 32
else if(dir & SOUTH)
@@ -217,7 +207,7 @@
playsound(target_turf, 'sound/items/deconstruct.ogg', 50, TRUE)
placed_sign.update_integrity(get_integrity())
placed_sign.setDir(dir)
- placed_sign.find_and_hang_on_wall()
+ placed_sign.AddComponent(/datum/component/atom_mounted, target_turf)
qdel(src)
return ITEM_INTERACT_SUCCESS
@@ -239,6 +229,9 @@
atom_integrity = max_integrity
return TRUE
+/obj/item/sign/screwdriver_act(mob/living/user, obj/item/tool)
+ return interact_with_atom(get_step(get_turf(user), user.dir), user)
+
/obj/item/sign/proc/set_sign_type(obj/structure/sign/fake_type)
name = initial(fake_type.name)
if(fake_type != /obj/structure/sign/blank)
diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm
index a6701ed7e909cb..8bfd2aebbd0746 100644
--- a/code/game/objects/structures/signs/signs_maps.dm
+++ b/code/game/objects/structures/signs/signs_maps.dm
@@ -23,6 +23,9 @@
/obj/structure/sign/map/meta/right
icon_state = "map-right-MS"
+/obj/structure/sign/map/pubby
+ icon_state = "map-pubby"
+
/obj/structure/sign/directions/science
name = "science department sign"
desc = "A direction sign, pointing out which way the Science department is."
diff --git a/code/game/objects/structures/signs/signs_misc.dm b/code/game/objects/structures/signs/signs_misc.dm
index 8cf802fc939ba4..b167f62ec9d1f2 100644
--- a/code/game/objects/structures/signs/signs_misc.dm
+++ b/code/game/objects/structures/signs/signs_misc.dm
@@ -109,3 +109,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/xenobio_guide, 32)
return data
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/tram_plate, 32)
+
+/obj/structure/sign/nanotrasen
+ name = "\improper Nanotrasen logo sign"
+ sign_change_name = "Corporate Logo - Nanotrasen"
+ desc = "A sign with the Nanotrasen logo on it. Glory to Nanotrasen!"
+ icon_state = "nanotrasen"
+ is_editable = TRUE
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/nanotrasen, 32)
+
+/obj/structure/sign/logo
+ name = "\improper Nanotrasen logo sign"
+ desc = "The Nanotrasen corporate logo."
+ icon_state = "nanotrasen_sign1"
+ buildable_sign = FALSE
diff --git a/code/game/objects/structures/signs/signs_warning.dm b/code/game/objects/structures/signs/signs_warning.dm
index db44c75669d8a4..7f92f111f237fd 100644
--- a/code/game/objects/structures/signs/signs_warning.dm
+++ b/code/game/objects/structures/signs/signs_warning.dm
@@ -11,6 +11,7 @@
is_editable = TRUE
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/warning, 32)
+MAPPING_DIAGONAL_HELPERS(/obj/structure/sign/warning, 32)
/obj/structure/sign/warning/secure_area
name = "\improper SECURE AREA sign"
@@ -18,6 +19,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/warning, 32)
desc = "A warning sign which reads 'SECURE AREA'."
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/warning/secure_area, 32)
+MAPPING_DIAGONAL_HELPERS(/obj/structure/sign/warning/secure_area, 32)
/obj/structure/sign/warning/docking
name = "\improper KEEP CLEAR: DOCKING AREA sign"
diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm
index a98871a95b523b..e91c77e5a4cf61 100644
--- a/code/game/objects/structures/spawner.dm
+++ b/code/game/objects/structures/spawner.dm
@@ -221,7 +221,7 @@
/obj/structure/spawner/nether/process(seconds_per_tick)
for(var/mob/living/living_mob in contents)
playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE)
- living_mob.adjustBruteLoss(60 * seconds_per_tick)
+ living_mob.adjust_brute_loss(60 * seconds_per_tick)
new /obj/effect/gibspawner/generic(get_turf(living_mob), living_mob)
if(living_mob.stat == DEAD)
var/mob/living/basic/blankbody/newmob = new(loc)
@@ -280,7 +280,7 @@
. = ..()
if(!IS_CULTIST(user) && isliving(user))
var/mob/living/living_user = user
- living_user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15)
+ living_user.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15)
. += span_danger("The voices of the damned echo relentlessly in your mind, continously rebounding on the walls of your self the more you focus on [src]. Your head pounds, better keep away...")
else
. += span_cult("The gateway will create one weak proteon construct every [spawn_time * 0.1] seconds, up to a total of [max_mobs], that may be controlled by the spirits of the dead.")
diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm
index cc13ce6a25a2a7..8d7e1fc84e121f 100644
--- a/code/game/objects/structures/stairs.dm
+++ b/code/game/objects/structures/stairs.dm
@@ -2,6 +2,9 @@
#define STAIR_TERMINATOR_NO 1
#define STAIR_TERMINATOR_YES 2
+/// Range within which stair indicators will appear for approaching mobs
+#define STAIR_INDICATOR_RANGE 3
+
// dir determines the direction of travel to go upwards
// stairs require /turf/open/openspace as the tile above them to work, unless your stairs have 'force_open_above' set to TRUE
// multiple stair objects can be chained together; the Z level transition will happen on the final stair object in the chain
@@ -10,12 +13,22 @@
name = "stairs"
icon = 'icons/obj/stairs.dmi'
icon_state = "stairs"
+ base_icon_state = "stairs"
anchored = TRUE
move_resist = INFINITY
-
- var/force_open_above = FALSE // replaces the turf above this stair obj with /turf/open/openspace
- var/terminator_mode = STAIR_TERMINATOR_AUTOMATIC
- var/turf/listeningTo
+ plane = FLOOR_PLANE
+ layer = ABOVE_OPEN_TURF_LAYER
+
+ /// If TRUE replaces the turf above this stair obj with /turf/open/openspace
+ var/force_open_above = FALSE
+ /// Determines if this stair is the last in a "chain" of stairs, ie next step is upstairs
+ VAR_FINAL/terminator_mode = STAIR_TERMINATOR_AUTOMATIC
+ /// Upstairs turf. Is observed for changes if force_open_above is TRUE (to re-open if necessary)
+ VAR_FINAL/turf/directly_above
+ /// If TRUE, we have left/middle/right sprites.
+ var/has_merged_sprites = TRUE
+ /// Lazyassoc list of weakef to mob viewing stair indicators to their images
+ VAR_PRIVATE/list/mob_to_image
/obj/structure/stairs/north
dir = NORTH
@@ -31,49 +44,94 @@
/obj/structure/stairs/wood
icon_state = "stairs_wood"
+ has_merged_sprites = FALSE
/obj/structure/stairs/stone
icon_state = "stairs_stone"
+ has_merged_sprites = FALSE
/obj/structure/stairs/material
icon_state = "stairs_material"
material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
+ has_merged_sprites = FALSE
/obj/structure/stairs/Initialize(mapload)
+ . = ..()
+
GLOB.stairs += src
if(force_open_above)
force_open_above()
build_signal_listener()
update_surrounding()
- var/static/list/loc_connections = list(
- COMSIG_ATOM_EXIT = PROC_REF(on_exit),
+ var/static/list/exit_connections = list(
+ COMSIG_ATOM_EXIT = PROC_REF(on_exit_stairs),
)
- AddElement(/datum/element/connect_loc, loc_connections)
+ AddElement(/datum/element/connect_loc, exit_connections)
+
+ var/static/list/range_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_enter_range),
+ COMSIG_ATOM_EXITED = PROC_REF(on_exit_range),
+ )
+ AddComponent(/datum/component/connect_range, tracked = src, connections = range_connections, range = STAIR_INDICATOR_RANGE)
- return ..()
/obj/structure/stairs/Destroy()
- listeningTo = null
+ if(directly_above)
+ UnregisterSignal(directly_above, COMSIG_TURF_MULTIZ_NEW)
+ directly_above = null
+ for(var/climber_ref in mob_to_image)
+ clear_climber_image(climber_ref, instant = TRUE)
GLOB.stairs -= src
return ..()
-/obj/structure/stairs/Move() //Look this should never happen but...
+/obj/structure/stairs/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) //Look this should never happen but...
. = ..()
if(force_open_above)
build_signal_listener()
update_surrounding()
+/// Updates the sprite and the sprites of neighboring stairs to reflect merged sprites
/obj/structure/stairs/proc/update_surrounding()
+ if(!has_merged_sprites)
+ return
+
update_appearance()
- for(var/i in GLOB.cardinals)
- var/turf/T = get_step(get_turf(src), i)
- var/obj/structure/stairs/S = locate() in T
- if(S)
- S.update_appearance()
-/obj/structure/stairs/proc/on_exit(datum/source, atom/movable/leaving, direction)
+ for(var/obj/structure/stairs/stair in get_step(src, turn(dir, 90)))
+ stair.update_appearance()
+
+ for(var/obj/structure/stairs/stair in get_step(src, turn(dir, -90)))
+ stair.update_appearance()
+
+/obj/structure/stairs/update_icon_state()
+ . = ..()
+ if(!has_merged_sprites)
+ return
+
+ var/has_left_stairs = FALSE
+ var/has_right_stairs = FALSE
+ for(var/obj/structure/stairs/stair in get_step(src, turn(dir, 90)))
+ if(stair.dir == dir)
+ has_left_stairs = TRUE
+ break
+
+ for(var/obj/structure/stairs/stair in get_step(src, turn(dir, -90)))
+ if(stair.dir == dir)
+ has_right_stairs = TRUE
+ break
+
+ if(has_left_stairs && has_right_stairs)
+ icon_state = "[base_icon_state]-m"
+ else if(has_left_stairs)
+ icon_state = "[base_icon_state]-r"
+ else if(has_right_stairs)
+ icon_state = "[base_icon_state]-l"
+ else
+ icon_state = base_icon_state
+
+/obj/structure/stairs/proc/on_exit_stairs(datum/source, atom/movable/leaving, direction)
SIGNAL_HANDLER
if(leaving == src)
@@ -85,19 +143,95 @@
leaving.Bump(src)
return COMPONENT_ATOM_BLOCK_EXIT
+#define POINT_X_COMPONENT(pdir) ((pdir & EAST) ? 2 : ((pdir & WEST) ? -2 : 0))
+#define POINT_Y_COMPONENT(pdir) ((pdir & SOUTH) ? 2 : ((pdir & NORTH) ? -2 : 0))
+
+/obj/structure/stairs/proc/on_enter_range(datum/source, atom/movable/entered)
+ SIGNAL_HANDLER
+
+ if(!isliving(entered))
+ return
+
+ var/mob/living/climber = entered
+ var/datum/weakref/climber_ref = WEAKREF(climber)
+ if(!climber.client || !climber.client.prefs.read_preference(/datum/preference/toggle/stair_indicator))
+ return
+ if(climber.dir == REVERSE_DIR(dir))
+ return // walking away
+ if(LAZYACCESS(mob_to_image, climber_ref))
+ return // already see it
+ if(!(climber in viewers(STAIR_INDICATOR_RANGE + 1, src)))
+ return // can't see the staircase (+1 tile for some leeway)
+ if(!isopenturf(get_step_multiz(src, UP)))
+ return // no place to go up to
+
+ var/image/pointing_image = get_pointing_image()
+ climber.client.images += pointing_image
+ pointing_image.alpha = 0
+ animate(pointing_image, pixel_x = POINT_X_COMPONENT(dir), pixel_y = POINT_Y_COMPONENT(dir), time = 0.5 SECONDS, easing = SINE_EASING|EASE_OUT, loop = -1, tag = "point_xy")
+ animate(pixel_x = 0, pixel_y = 0, time = 0.5 SECONDS, easing = SINE_EASING|EASE_IN)
+ animate(pointing_image, alpha = 180, time = 0.75 SECONDS, tag = "point_fadein")
+ LAZYSET(mob_to_image, climber_ref, pointing_image)
+
+/obj/structure/stairs/proc/on_exit_range(datum/source, atom/movable/exited)
+ SIGNAL_HANDLER
+
+ if(!isliving(exited))
+ return
+
+ var/datum/weakref/climber_ref = WEAKREF(exited)
+ if(!LAZYACCESS(mob_to_image, climber_ref))
+ return // not seeing anything
+ if(exited in viewers(STAIR_INDICATOR_RANGE, src))
+ return // still in range and can see the staircase
+
+ clear_climber_image(climber_ref)
+
+/obj/structure/stairs/proc/clear_climber_image(datum/weakref/climber_ref, instant = FALSE)
+ var/image/pointing_image = LAZYACCESS(mob_to_image, climber_ref)
+ if(!pointing_image)
+ LAZYREMOVE(mob_to_image, climber_ref) // just in case
+ return
+ if(instant)
+ clear_climber_image_callback(climber_ref, pointing_image)
+ return
+
+ animate(pointing_image, alpha = 0, time = 0.75 SECONDS, tag = "point_fadeout")
+ // note: the player won't see a new indicator until the image is fully a removed, so this timer also serves as a cooldown
+ addtimer(CALLBACK(src, PROC_REF(clear_climber_image_callback), climber_ref, pointing_image), 1.5 SECONDS, TIMER_UNIQUE)
+
+/obj/structure/stairs/proc/clear_climber_image_callback(datum/weakref/climber_ref, image/pointing_image)
+ PRIVATE_PROC(TRUE)
+ var/mob/living/climber = climber_ref?.resolve()
+ climber?.client?.images -= pointing_image
+ LAZYREMOVE(mob_to_image, climber_ref)
+
+/obj/structure/stairs/proc/get_pointing_image()
+ PROTECTED_PROC(TRUE)
+ var/image/point_image = image('icons/hud/screen_gen.dmi', src, "arrow_large_white_still")
+ point_image.color = COLOR_DARK_MODERATE_LIME_GREEN
+ point_image.appearance_flags |= KEEP_APART
+ point_image.transform = matrix().Turn(dir2angle(REVERSE_DIR(dir)))
+ point_image.layer = BELOW_MOB_LAYER
+ SET_PLANE(point_image, GAME_PLANE, src)
+ return point_image
+
+#undef POINT_X_COMPONENT
+#undef POINT_Y_COMPONENT
+
/obj/structure/stairs/Cross(atom/movable/AM)
if(isTerminator() && (get_dir(src, AM) == dir))
return FALSE
return ..()
/obj/structure/stairs/proc/stair_ascend(atom/movable/climber)
- var/turf/checking = get_step_multiz(get_turf(src), UP)
+ var/turf/checking = get_step_multiz(src, UP)
if(!istype(checking))
return
// I'm only interested in if the pass is unobstructed, not if the mob will actually make it
if(!climber.can_z_move(UP, get_turf(src), checking, z_move_flags = ZMOVE_ALLOW_BUCKLED))
return
- var/turf/target = get_step_multiz(get_turf(src), (dir|UP))
+ var/turf/target = get_step_multiz(src, dir|UP)
if(istype(target) && !climber.can_z_move(DOWN, target, z_move_flags = ZMOVE_FALL_FLAGS)) //Don't throw them into a tile that will just dump them back down.
climber.zMove(target = target, z_move_flags = ZMOVE_STAIRS_FLAGS)
/// Moves anything that's being dragged by src or anything buckled to it to the stairs turf.
@@ -113,22 +247,22 @@
if(var_name != NAMEOF(src, force_open_above))
return
if(!var_value)
- if(listeningTo)
- UnregisterSignal(listeningTo, COMSIG_TURF_MULTIZ_NEW)
- listeningTo = null
+ if(directly_above)
+ UnregisterSignal(directly_above, COMSIG_TURF_MULTIZ_NEW)
+ directly_above = null
else
build_signal_listener()
force_open_above()
/obj/structure/stairs/proc/build_signal_listener()
- if(listeningTo)
- UnregisterSignal(listeningTo, COMSIG_TURF_MULTIZ_NEW)
- var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
+ if(directly_above)
+ UnregisterSignal(directly_above, COMSIG_TURF_MULTIZ_NEW)
+ var/turf/open/openspace/T = get_step_multiz(src, UP)
RegisterSignal(T, COMSIG_TURF_MULTIZ_NEW, PROC_REF(on_multiz_new))
- listeningTo = T
+ directly_above = T
/obj/structure/stairs/proc/force_open_above()
- var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
+ var/turf/open/openspace/T = get_step_multiz(src, UP)
if(T && !istype(T))
T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
@@ -136,7 +270,7 @@
SIGNAL_HANDLER
if(dir == UP)
- var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP)
+ var/turf/open/openspace/T = get_step_multiz(src, UP)
if(T && !istype(T))
T.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR)
@@ -192,6 +326,7 @@
icon_state = "stairs_frame"
density = FALSE
anchored = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
/// What type of stack will this drop on deconstruction?
var/frame_stack = /obj/item/stack/rods
/// How much of frame_stack should this drop on deconstruction?
@@ -199,12 +334,13 @@
/obj/structure/stairs_frame/wood
name = "wooden stairs frame"
- desc = "Everything you need to build a staircase, minus the actual stairs, this one is made of wood."
+ desc = "Everything you need to build a staircase, minus the actual stairs. This one is made of wood."
frame_stack = /obj/item/stack/sheet/mineral/wood
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10)
/obj/structure/stairs_frame/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
/obj/structure/stairs_frame/examine(mob/living/carbon/human/user)
. = ..()
@@ -282,3 +418,5 @@
#undef STAIR_TERMINATOR_AUTOMATIC
#undef STAIR_TERMINATOR_NO
#undef STAIR_TERMINATOR_YES
+
+#undef STAIR_INDICATOR_RANGE
diff --git a/code/game/objects/structures/steps.dm b/code/game/objects/structures/steps.dm
index a8e27e0b21a626..2940392a15d75a 100644
--- a/code/game/objects/structures/steps.dm
+++ b/code/game/objects/structures/steps.dm
@@ -6,6 +6,7 @@
icon_state = "iron"
anchored = TRUE
move_resist = INFINITY
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/steps/Initialize(mapload)
. = ..()
@@ -15,8 +16,8 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
- AddComponent(/datum/component/climb_walkable)
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/climb_walkable)
+ AddElement(/datum/element/simple_rotation)
register_context()
/obj/structure/steps/add_context(atom/source, list/context, obj/item/held_item, mob/user)
diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm
index 36ae8e5fb70433..f5df2da0fa5718 100644
--- a/code/game/objects/structures/table_frames.dm
+++ b/code/game/objects/structures/table_frames.dm
@@ -17,6 +17,7 @@
density = FALSE
anchored = FALSE
layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
max_integrity = 100
var/framestack = /obj/item/stack/rods
var/framestackamount = 2
@@ -97,6 +98,7 @@
framestack = /obj/item/stack/sheet/mineral/wood
framestackamount = 2
resistance_flags = FLAMMABLE
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/table_frame/wood/get_table_type(obj/item/stack/our_stack)
if(istype(our_stack, /obj/item/stack/sheet/mineral/wood))
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index bdd5919c1d425b..90277c0c1004f2 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -91,11 +91,7 @@
make_climbable()
AddElement(/datum/element/give_turf_traits, string_list(turf_traits))
AddElement(/datum/element/footstep_override, priority = STEP_SOUND_TABLE_PRIORITY)
- AddComponent(/datum/component/table_smash, gentle_push = slam_gently, after_smash = CALLBACK(src, PROC_REF(after_smash)))
-
-/// Called after someone is harmfully smashed into us
-/obj/structure/table/proc/after_smash(mob/living/smashed)
- return // This is mostly for our children
+ AddElement(/datum/element/table_smash, gentle_push = slam_gently, after_smash_proccall = PROC_REF(after_smash))
/// Applies additional properties based on the frame used to construct this table.
/obj/structure/table/proc/apply_frame_properties(obj/structure/table_frame/frame_used)
@@ -109,7 +105,7 @@
///Adds the element used to make the object climbable, and also the one that shift the mob buckled to it up.
/obj/structure/table/proc/make_climbable()
- AddComponent(/datum/component/climb_walkable)
+ AddElement(/datum/element/climb_walkable)
AddElement(/datum/element/climbable)
AddElement(/datum/element/elevation, pixel_shift = 12)
@@ -136,7 +132,7 @@
//proc that removes elements present in now-flipped tables
/obj/structure/table/proc/flip_table(new_dir = SOUTH)
playsound(src, flipped_table_sound, 100)
- qdel(GetComponent(/datum/component/climb_walkable))
+ RemoveElement(/datum/element/climb_walkable)
RemoveElement(/datum/element/climbable)
RemoveElement(/datum/element/footstep_override, priority = STEP_SOUND_TABLE_PRIORITY)
RemoveElement(/datum/element/give_turf_traits, turf_traits)
@@ -427,7 +423,7 @@
return FALSE
/obj/structure/table/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT)
qdel(src)
return TRUE
return FALSE
@@ -552,6 +548,7 @@
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
+ AddElement(/datum/element/give_turf_traits, string_list(list(TRAIT_AI_AVOID_TURF)))
/obj/structure/table/glass/proc/on_entered(datum/source, atom/movable/AM)
SIGNAL_HANDLER
@@ -636,7 +633,7 @@
canSmoothWith = SMOOTH_GROUP_WOOD_TABLES
custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
-/obj/structure/table/wood/after_smash(mob/living/smashed)
+/obj/structure/table/wood/after_smash(mob/living/smashed_onto)
if(QDELETED(src) || prob(66))
return
visible_message(
@@ -645,9 +642,9 @@
)
playsound(src, 'sound/effects/wounds/crack2.ogg', 50, TRUE)
- smashed.Knockdown(10 SECONDS)
- smashed.Paralyze(2 SECONDS)
- smashed.apply_damage(20, BRUTE)
+ smashed_onto.Knockdown(10 SECONDS)
+ smashed_onto.Paralyze(2 SECONDS)
+ smashed_onto.apply_damage(20, BRUTE)
deconstruct(FALSE)
/obj/structure/table/wood/narsie_act(total_override = TRUE)
@@ -858,7 +855,7 @@
canSmoothWith = SMOOTH_GROUP_BRONZE_TABLES
can_flip = FALSE
-/obj/structure/table/bronze/after_smash(mob/living/pushed_mob)
+/obj/structure/table/bronze/after_smash(mob/living/smashed_onto)
playsound(src, 'sound/effects/magic/clockwork/fellowship_armory.ogg', 50, TRUE)
/obj/structure/table/reinforced/rglass
@@ -937,6 +934,7 @@
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(mark_patient),
+ COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON = PROC_REF(mark_patient),
COMSIG_ATOM_EXITED = PROC_REF(unmark_patient),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -1045,15 +1043,15 @@
buckled.remove_offsets(type)
/// Any mob that enters our tile will be marked as a potential patient. They will be turned into a patient if they lie down.
-/obj/structure/table/optable/proc/mark_patient(datum/source, mob/living/carbon/potential_patient)
+/obj/structure/table/optable/proc/mark_patient(datum/source, mob/living/potential_patient)
SIGNAL_HANDLER
if(!istype(potential_patient))
return
- RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(recheck_patient))
+ RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(recheck_patient), TRUE)
recheck_patient(potential_patient) // In case the mob is already lying down before they entered.
/// Unmark the potential patient.
-/obj/structure/table/optable/proc/unmark_patient(datum/source, mob/living/carbon/potential_patient)
+/obj/structure/table/optable/proc/unmark_patient(datum/source, mob/living/potential_patient)
SIGNAL_HANDLER
if(!istype(potential_patient))
return
@@ -1070,34 +1068,60 @@
if(patient && patient != potential_patient)
return
- if(potential_patient.body_position == LYING_DOWN && potential_patient.loc == loc)
+ if(IS_LYING_OR_CANNOT_LIE(potential_patient) && potential_patient.loc == loc)
set_patient(potential_patient)
return
// Find another lying mob as a replacement.
- for (var/mob/living/carbon/replacement_patient in loc.contents)
- if(replacement_patient.body_position == LYING_DOWN)
- set_patient(replacement_patient)
- return
+ var/found_replacement
+ for (var/mob/living/replacement_patient in loc)
+ if(!IS_LYING_OR_CANNOT_LIE(replacement_patient))
+ continue
+ if(iscarbon(found_replacement))
+ break
+ else if(isliving(found_replacement) && !iscarbon(replacement_patient))
+ continue // Prefer carbons over non-carbons.
+ found_replacement = replacement_patient
- set_patient(null)
+ set_patient(found_replacement)
/obj/structure/table/optable/proc/set_patient(mob/living/carbon/new_patient)
if (patient)
- UnregisterSignal(patient, list(COMSIG_MOB_SURGERY_STARTED, COMSIG_MOB_SURGERY_FINISHED))
+ UnregisterSignal(patient, list(
+ SIGNAL_ADDTRAIT(TRAIT_READY_TO_OPERATE),
+ SIGNAL_REMOVETRAIT(TRAIT_READY_TO_OPERATE),
+ COMSIG_ATOM_BEING_OPERATED_ON,
+ COMSIG_ATOM_SURGERY_FINISHED,
+ COMSIG_LIVING_UPDATING_SURGERY_STATE,
+ ))
if (patient.external && patient.external == air_tank)
patient.close_externals()
patient = new_patient
update_appearance()
+ computer?.update_static_data_for_all_viewers()
if (!patient)
return
- RegisterSignal(patient, COMSIG_MOB_SURGERY_STARTED, PROC_REF(on_surgery_change))
- RegisterSignal(patient, COMSIG_MOB_SURGERY_FINISHED, PROC_REF(on_surgery_change))
+ RegisterSignals(patient, list(
+ SIGNAL_ADDTRAIT(TRAIT_READY_TO_OPERATE),
+ SIGNAL_REMOVETRAIT(TRAIT_READY_TO_OPERATE),
+ COMSIG_ATOM_SURGERY_FINISHED,
+ COMSIG_LIVING_UPDATING_SURGERY_STATE,
+ ), PROC_REF(on_surgery_change))
+ RegisterSignal(patient, COMSIG_ATOM_BEING_OPERATED_ON, PROC_REF(get_surgeries))
/obj/structure/table/optable/proc/on_surgery_change(datum/source)
SIGNAL_HANDLER
update_appearance()
+ computer?.update_static_data_batched()
+
+/obj/structure/table/optable/proc/get_surgeries(datum/source, mob/living/surgeon, list/operations)
+ SIGNAL_HANDLER
+
+ if(isnull(computer))
+ return
+
+ operations |= computer.advanced_surgeries
/obj/structure/table/optable/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
if (istype(tool, /obj/item/clothing/mask/breath))
@@ -1278,7 +1302,7 @@
. += mutable_appearance(icon, air_tank.tank_holder_icon_state)
if (breath_mask?.loc == src)
. += mutable_appearance(icon, "mask_[breath_mask.icon_state]")
- if (!length(patient?.surgeries))
+ if (!patient || !HAS_TRAIT(patient, TRAIT_READY_TO_OPERATE))
return
. += mutable_appearance(icon, "[icon_state]_[computer ? "" : "un"]linked")
if (computer)
@@ -1436,4 +1460,3 @@
R.add_fingerprint(user)
qdel(src)
building = FALSE
-
diff --git a/code/game/objects/structures/toiletbong.dm b/code/game/objects/structures/toiletbong.dm
index c45e58d584523c..4ff8aabe6a7c4d 100644
--- a/code/game/objects/structures/toiletbong.dm
+++ b/code/game/objects/structures/toiletbong.dm
@@ -6,12 +6,13 @@
base_icon_state = "toiletbong"
density = FALSE
anchored = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.05, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.8)
var/smokeradius = 1
var/mutable_appearance/weed_overlay
/obj/structure/toiletbong/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation, post_rotation = CALLBACK(src, PROC_REF(post_rotation)))
+ AddElement(/datum/element/simple_rotation, post_rotation_proccall = PROC_REF(post_rotation))
create_storage(storage_type = /datum/storage/toiletbong)
weed_overlay = mutable_appearance('icons/obj/watercloset.dmi', "[base_icon_state]_overlay")
@@ -93,9 +94,9 @@
if (!do_after(user, 10 SECONDS, target = src))
return FALSE
new /obj/item/flamethrower(get_turf(src))
- new /obj/item/stack/sheet/iron(get_turf(src))
var/obj/item/tank/internals/plasma/ptank = new /obj/item/tank/internals/plasma(get_turf(src))
ptank.air_contents.gases[/datum/gas/plasma][MOLES] = (0)
+ drop_costum_materials()
qdel(src)
return TRUE
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
index 420e39f627d577..34db3f53a45518 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -15,7 +15,7 @@
/obj/structure/c_transit_tube/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation, post_rotation = CALLBACK(src, PROC_REF(post_rotation)))
+ AddElement(/datum/element/simple_rotation)
/obj/structure/c_transit_tube/proc/can_wrench_in_loc(mob/user)
var/turf/source_turf = get_turf(loc)
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 11f4817b94cf79..a14a5137b02046 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -217,7 +217,7 @@
/obj/structure/trap/damage/trap_effect(mob/living/victim)
to_chat(victim, span_bolddanger("The ground quakes beneath your feet!"))
victim.Paralyze(10 SECONDS)
- victim.adjustBruteLoss(35)
+ victim.adjust_brute_loss(35)
var/obj/structure/flora/rock/style_random/giant_rock = new(get_turf(src))
QDEL_IN(giant_rock, 20 SECONDS)
diff --git a/code/game/objects/structures/votingbox.dm b/code/game/objects/structures/votingbox.dm
index f31c8510d31a75..8ab34de74ba501 100644
--- a/code/game/objects/structures/votingbox.dm
+++ b/code/game/objects/structures/votingbox.dm
@@ -9,7 +9,7 @@
icon_state = "votebox_maint"
anchored = TRUE
-
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 15)
var/obj/item/card/id/owner //Slapping the box with this ID starts/ends the vote.
var/voting_active = FALSE //Voting or Maintenance Mode
diff --git a/code/game/objects/structures/water_structures/sink.dm b/code/game/objects/structures/water_structures/sink.dm
index 7922f332653190..d140cf41e7e4f2 100644
--- a/code/game/objects/structures/water_structures/sink.dm
+++ b/code/game/objects/structures/water_structures/sink.dm
@@ -8,6 +8,8 @@
pixel_z = 1
///Something's being washed at the moment
var/busy = FALSE
+ ///Capacity of this sink
+ var/capacity = 100
///What kind of reagent is produced by this sink by default? (We now have actual plumbing, Arcane, August 2020)
var/dispensedreagent = /datum/reagent/water
///Material to drop when broken or deconstructed.
@@ -46,10 +48,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
pixel_x = pixel_shift
pixel_y = 0
- create_reagents(100, NO_REACT)
+ create_reagents(capacity, NO_REACT)
if(src.has_water_reclaimer)
- reagents.add_reagent(dispensedreagent, 100)
- AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE)
+ reagents.add_reagent(dispensedreagent, capacity)
+ AddComponent(/datum/component/plumbing/simple_demand/extended)
/obj/structure/sink/examine(mob/user)
. = ..()
@@ -105,13 +107,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
user.visible_message(span_notice("[user] washes [user.p_their()] [washing_face ? "face" : "hands"] using [src]."), \
span_notice("You wash your [washing_face ? "face" : "hands"] using [src]."))
-/obj/structure/sink/attackby(obj/item/O, mob/living/user, list/modifiers, list/attack_modifiers)
+/obj/structure/sink/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
if(busy)
to_chat(user, span_warning("Someone's already washing here!"))
return
- if(is_reagent_container(O))
- var/obj/item/reagent_containers/RG = O
+ if(is_reagent_container(attacking_item))
+ var/obj/item/reagent_containers/RG = attacking_item
if(reagents.total_volume <= 0)
to_chat(user, span_notice("\The [src] is dry."))
return FALSE
@@ -124,8 +126,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
to_chat(user, span_notice("\The [RG] is full."))
return FALSE
- if(istype(O, /obj/item/melee/baton/security))
- var/obj/item/melee/baton/security/baton = O
+ if(istype(attacking_item, /obj/item/melee/baton/security))
+ var/obj/item/melee/baton/security/baton = attacking_item
if(baton.cell?.charge && baton.active)
flick("baton_active", src)
user.Paralyze(baton.knockdown_time)
@@ -136,69 +138,69 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
playsound(src, baton.on_stun_sound, 50, TRUE)
return
- if(istype(O, /obj/item/mop))
+ if(istype(attacking_item, /obj/item/mop) || astype(attacking_item, /obj/item/rag)?.blood_level == 0)
if(reagents.total_volume <= 0)
to_chat(user, span_notice("\The [src] is dry."))
return FALSE
- reagents.trans_to(O, 5, transferred_by = user)
+ reagents.trans_to(attacking_item, 5, transferred_by = user)
begin_reclamation()
- to_chat(user, span_notice("You wet [O] in [src]."))
+ to_chat(user, span_notice("You wet [attacking_item] in [src]."))
playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
return
- if(O.tool_behaviour == TOOL_WRENCH)
- O.play_tool_sound(src)
+ if(attacking_item.tool_behaviour == TOOL_WRENCH)
+ attacking_item.play_tool_sound(src)
deconstruct()
return
- if(O.tool_behaviour == TOOL_CROWBAR)
+ if(attacking_item.tool_behaviour == TOOL_CROWBAR)
if(!has_water_reclaimer)
to_chat(user, span_warning("There isn't a water recycler to remove."))
return
- O.play_tool_sound(src)
+ attacking_item.play_tool_sound(src)
has_water_reclaimer = FALSE
new/obj/item/stock_parts/water_recycler(get_turf(loc))
to_chat(user, span_notice("You remove the water reclaimer from [src]."))
return
- if(istype(O, /obj/item/stock_parts/water_recycler))
+ if(istype(attacking_item, /obj/item/stock_parts/water_recycler))
if(has_water_reclaimer)
to_chat(user, span_warning("There is already has a water recycler installed."))
return
playsound(src, 'sound/machines/click.ogg', 20, TRUE)
- qdel(O)
+ qdel(attacking_item)
has_water_reclaimer = TRUE
begin_reclamation()
return
- if(istype(O, /obj/item/storage/fancy/pickles_jar))
- if(O.contents.len)
+ if(istype(attacking_item, /obj/item/storage/fancy/pickles_jar))
+ if(attacking_item.contents.len)
to_chat(user, span_notice("Looks like there's something left in the jar"))
return
- new /obj/item/reagent_containers/cup/beaker/large(loc)
+ qdel(attacking_item)
to_chat(user, span_notice("You washed the jar, ridding it of the brine."))
- qdel(O)
+ user.put_in_active_hand(new /obj/item/reagent_containers/cup/beaker/large(loc))
return
- if(!istype(O))
+ if(!istype(attacking_item))
return
- if(O.item_flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand.
+ if(attacking_item.item_flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand.
return
- if(!user.combat_mode || (O.item_flags & NOBLUDGEON))
- to_chat(user, span_notice("You start washing [O]..."))
+ if(!user.combat_mode || (attacking_item.item_flags & NOBLUDGEON))
+ to_chat(user, span_notice("You start washing [attacking_item]..."))
playsound(src, 'sound/machines/sink-faucet.ogg', 50)
busy = TRUE
if(!do_after(user, 4 SECONDS, target = src))
busy = FALSE
return 1
busy = FALSE
- O.wash(CLEAN_WASH)
- reagents.expose(O, TOUCH, 5 / max(reagents.total_volume, 5))
- user.visible_message(span_notice("[user] washes [O] using [src]."), \
- span_notice("You wash [O] using [src]."))
+ attacking_item.wash(CLEAN_WASH)
+ reagents.expose(attacking_item, TOUCH, 5 / max(reagents.total_volume, 5))
+ user.visible_message(span_notice("[user] washes [attacking_item] using [src]."), \
+ span_notice("You wash [attacking_item] using [src]."))
return 1
else
return ..()
@@ -224,7 +226,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
new M.sheet_type(loc, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1))
/obj/structure/sink/proc/begin_reclamation()
- START_PROCESSING(SSplumbing, src)
+ START_PROCESSING(SSobj, src)
/obj/structure/sink/kitchen
name = "kitchen sink"
@@ -256,7 +258,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16))
/obj/structure/sinkframe/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
/obj/structure/sinkframe/attackby(obj/item/tool, mob/living/user, list/modifiers, list/attack_modifiers)
if(istype(tool, /obj/item/stock_parts/water_recycler))
diff --git a/code/game/objects/structures/water_structures/toilet.dm b/code/game/objects/structures/water_structures/toilet.dm
index cd9fcfe6604708..5b7dd6068aed17 100644
--- a/code/game/objects/structures/water_structures/toilet.dm
+++ b/code/game/objects/structures/water_structures/toilet.dm
@@ -6,6 +6,7 @@
base_icon_state = "toilet"
density = FALSE
anchored = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
/// Boolean if whether the toilet is currently flushing.
var/flushing = FALSE
@@ -17,10 +18,6 @@
var/w_items = 0
/// Reference to the mob being given a swirlie.
var/mob/living/swirlie
- /// The type of material used to build the toilet.
- var/buildstacktype = /obj/item/stack/sheet/iron
- /// How much of the buildstacktype is needed to construct the toilet.
- var/buildstackamount = 1
/// Lazylist of items in the cistern.
var/list/cistern_items
/// Lazylist of fish in the toilet, not to be mixed with the items in the cistern. Max of 3
@@ -49,7 +46,7 @@
create_reagents(reagent_capacity)
if(src.has_water_reclaimer)
reagents.add_reagent(reagent_id, reagent_capacity)
- AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE)
+ AddComponent(/datum/component/plumbing/simple_demand/extended)
/obj/structure/toilet/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
@@ -104,6 +101,9 @@
. = ..()
if(gone in cistern_items)
LAZYREMOVE(cistern_items, gone)
+ if (isitem(gone))
+ var/obj/item/removed_item = gone
+ w_items -= removed_item.w_class
return
if(gone in fishes)
LAZYREMOVE(fishes, gone)
@@ -119,7 +119,7 @@
playsound(src.loc, SFX_SWING_HIT, 25, TRUE)
swirlie.visible_message(span_danger("[user] slams the toilet seat onto [swirlie]'s head!"), span_userdanger("[user] slams the toilet seat onto your head!"), span_hear("You hear reverberating porcelain."))
log_combat(user, swirlie, "swirlied (brute)")
- swirlie.adjustBruteLoss(5)
+ swirlie.adjust_brute_loss(5)
return
if(user.pulling && isliving(user.pulling))
@@ -151,10 +151,10 @@
var/mob/living/carbon/carbon_grabbed = grabbed_mob
if(!carbon_grabbed.internal)
log_combat(user, carbon_grabbed, "swirlied (oxy)")
- carbon_grabbed.adjustOxyLoss(5)
+ carbon_grabbed.adjust_oxy_loss(5)
else
log_combat(user, grabbed_mob, "swirlied (oxy)")
- grabbed_mob.adjustOxyLoss(5)
+ grabbed_mob.adjust_oxy_loss(5)
if(was_alive && swirlie.stat == DEAD && swirlie.client)
swirlie.client.give_award(/datum/award/achievement/misc/swirlie, swirlie) // just like space high school all over again!
swirlie = null
@@ -162,7 +162,7 @@
playsound(src.loc, 'sound/effects/bang.ogg', 25, TRUE)
grabbed_mob.visible_message(span_danger("[user] slams [grabbed_mob.name] into [src]!"), span_userdanger("[user] slams you into [src]!"))
log_combat(user, grabbed_mob, "toilet slammed")
- grabbed_mob.adjustBruteLoss(5)
+ grabbed_mob.adjust_brute_loss(5)
return
if(cistern_open && !cover_open && IsReachableBy(user))
@@ -175,7 +175,6 @@
else
random_cistern_item.forceMove(drop_location())
to_chat(user, span_notice("You find [random_cistern_item] in the cistern."))
- w_items -= random_cistern_item.w_class
return
if(!flushing && LAZYLEN(fishes) && cover_open)
@@ -238,11 +237,7 @@
/obj/structure/toilet/atom_deconstruct(dissambled = TRUE)
dump_contents()
- if(buildstacktype)
- new buildstacktype(loc,buildstackamount)
- else
- for(var/datum/material/M as anything in custom_materials)
- new M.sheet_type(loc, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1))
+ drop_costum_materials()
if(has_water_reclaimer)
new /obj/item/stock_parts/water_recycler(drop_location())
@@ -252,7 +247,7 @@
add_fingerprint(user)
if(cover_open && istype(tool, /obj/item/fish))
- if(fishes >= 3)
+ if(LAZYLEN(fishes) >= 3)
to_chat(user, span_warning("There's too many fishes, flush them down first."))
return ITEM_INTERACT_BLOCKING
if(!user.transferItemToLoc(tool, src))
@@ -287,8 +282,7 @@
if(!user.transferItemToLoc(tool, src))
to_chat(user, span_warning("\The [tool] is stuck to your hand, you cannot put it in the cistern!"))
return ITEM_INTERACT_BLOCKING
- LAZYADD(cistern_items, tool)
- w_items += tool.w_class
+ add_cistern_item(tool)
to_chat(user, span_notice("You carefully place [tool] into the cistern."))
return ITEM_INTERACT_SUCCESS
@@ -333,6 +327,12 @@
to_chat(user, span_notice("You fill [container] from [src]. Gross."))
return ITEM_INTERACT_SUCCESS
+/// Hides an item inside the toilet for later retrievalk
+/obj/structure/toilet/proc/add_cistern_item(obj/item/thing)
+ if (isitem(thing))
+ w_items += thing.w_class
+ LAZYADD(cistern_items, thing)
+
/obj/structure/toilet/crowbar_act(mob/living/user, obj/item/tool)
to_chat(user, span_notice("You start to [cistern_open ? "replace the lid on" : "lift the lid off"] the cistern..."))
playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, TRUE)
@@ -386,7 +386,7 @@
QDEL_LAZYLIST(fishes)
/obj/structure/toilet/proc/begin_reclamation()
- START_PROCESSING(SSplumbing, src)
+ START_PROCESSING(SSobj, src)
/obj/structure/toilet/process(seconds_per_tick)
// Water reclamation complete?
@@ -396,7 +396,7 @@
/obj/structure/toilet/greyscale
material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
- buildstacktype = null
+ custom_materials = null
has_water_reclaimer = FALSE
/obj/structure/toilet/secret
@@ -404,8 +404,37 @@
/obj/structure/toilet/secret/Initialize(mapload)
. = ..()
- if(secret_type)
- var/obj/item/secret = new secret_type(src)
- secret.desc += " It's a secret!"
- w_items += secret.w_class
- LAZYADD(cistern_items, secret)
+ if(!secret_type)
+ return
+ var/obj/item/secret = new secret_type(src)
+ secret.desc += " It's a secret!"
+ add_cistern_item(secret)
+
+///A toilet made of meat that only drops remains when deconstructed, often unleashed unto this cursed plane of existence by hopeless people off'ing themselves with experi-scanners.
+/obj/structure/toilet/greyscale/flesh
+ desc = "A horrendous mass of fused flesh resembling a standard-issue HT-451 model toilet. How it manages to function as one is beyond you. \
+ This one seems to be made out of the flesh of a devoted employee of the RnD department."
+
+/obj/structure/toilet/greyscale/flesh/Initialize(mapload, mob/living/carbon/suicide)
+ . = ..()
+ ///The suicide victim's brain that will be placed inside the toilet's cistern
+ var/obj/item/organ/brain/toilet_brain
+ if(suicide)
+ toilet_brain = suicide.get_organ_slot(ORGAN_SLOT_BRAIN)
+ for(var/obj/item/thing in suicide)
+ if (suicide.transferItemToLoc(thing, newloc = src, silent = TRUE))
+ add_cistern_item(thing)
+ suicide.gib(DROP_BRAIN) //we delete everything but the brain, as it's going to be moved to the cistern
+ set_custom_materials(list(GET_MATERIAL_REF(/datum/material/meat/mob_meat, suicide) = SHEET_MATERIAL_AMOUNT))
+ else
+ toilet_brain = new(drop_location())
+ set_custom_materials(list(/datum/material/meat = SHEET_MATERIAL_AMOUNT))
+
+ toilet_brain.forceMove(src)
+ add_cistern_item(toilet_brain)
+
+//this also prevents the toilet from dropping meat sheets. if you want to cheese the meat exepriments, sacrifice more people
+/obj/structure/toilet/greyscale/flesh/atom_deconstruct(dissambled = TRUE)
+ for(var/obj/toilet_item in cistern_items)
+ toilet_item.forceMove(drop_location())
+ new /obj/effect/decal/remains/human(loc)
diff --git a/code/game/objects/structures/water_structures/urinal.dm b/code/game/objects/structures/water_structures/urinal.dm
index 5a8fc4af277f5e..abd94d14bae60c 100644
--- a/code/game/objects/structures/water_structures/urinal.dm
+++ b/code/game/objects/structures/water_structures/urinal.dm
@@ -16,7 +16,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32)
. = ..()
if(mapload)
hidden_item = new /obj/item/food/urinalcake(src)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/structure/urinal/Exited(atom/movable/gone, direction)
. = ..()
@@ -36,8 +36,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32)
return
user.changeNext_move(CLICK_CD_MELEE)
user.visible_message(span_danger("[user] slams [grabbed_mob] into [src]!"), span_danger("You slam [grabbed_mob] into [src]!"))
- grabbed_mob.painful_scream() // DOPPLER EDIT: check for painkilling before screaming
- grabbed_mob.adjustBruteLoss(8)
+ grabbed_mob.painful_scream() // DOPPLER EDIT - Check painkiller for screaming - ORIGINAL: grabbed_mob.emote("scream")
+ grabbed_mob.adjust_brute_loss(8)
else
to_chat(user, span_warning("You need a tighter grip!"))
return
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 84073ddb317602..9107d6180c0f0a 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -11,6 +11,7 @@
obj_flags = CAN_BE_HIT | BLOCKS_CONSTRUCTION_DIR | UNIQUE_RENAME | RENAME_NO_DESC
set_dir_on_move = FALSE
can_atmos_pass = ATMOS_PASS_PROC
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5)
/// Reference to the airlock electronics inside for determining window access.
var/obj/item/electronics/airlock/electronics = null
@@ -46,7 +47,7 @@
)
AddElement(/datum/element/connect_loc, loc_connections)
- AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
+ AddElement(/datum/element/simple_rotation, ROTATION_NEEDS_ROOM)
/obj/structure/windoor_assembly/Destroy()
set_density(FALSE)
@@ -324,7 +325,7 @@
if(EAST,WEST)
windoor.unres_sides &= ~NORTH
windoor.unres_sides &= ~SOUTH
- windoor.unres_sensor = TRUE
+ windoor.unres_latch = TRUE
electronics.forceMove(windoor)
windoor.electronics = electronics
windoor.autoclose = TRUE
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index a0bd2032f05e55..9caca0a817459a 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -17,6 +17,7 @@
set_dir_on_move = FALSE
flags_ricochet = RICOCHET_HARD
receive_ricochet_chance_mod = 0.5
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT)
var/state = WINDOW_OUT_OF_FRAME
var/reinf = FALSE
var/heat_resistance = 800
@@ -68,7 +69,7 @@
flags_1 |= ALLOW_DARK_PAINTS_1
RegisterSignal(src, COMSIG_OBJ_PAINTED, PROC_REF(on_painted))
AddElement(/datum/element/atmos_sensitive, mapload)
- AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM, post_rotation = CALLBACK(src, PROC_REF(post_rotation)))
+ AddElement(/datum/element/simple_rotation, ROTATION_NEEDS_ROOM, post_rotation_proccall = PROC_REF(post_rotation))
var/static/list/loc_connections = list(
COMSIG_ATOM_EXIT = PROC_REF(on_exit),
@@ -105,7 +106,7 @@
return FALSE
/obj/structure/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_DECONSTRUCT)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_DECONSTRUCT)
qdel(src)
return TRUE
return FALSE
@@ -495,6 +496,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/unanchored/spawner, 0)
glass_type = /obj/item/stack/sheet/rglass
rad_insulation = RAD_LIGHT_INSULATION
receive_ricochet_chance_mod = 1.1
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT, /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
//this is shitcode but all of construction is shitcode and needs a refactor, it works for now
//If you find this like 4 years later and construction still hasn't been refactored, I'm so sorry for this
@@ -630,6 +632,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/unanchored/spawner,
glass_type = /obj/item/stack/sheet/plasmaglass
rad_insulation = RAD_MEDIUM_INSULATION
glass_material_datum = /datum/material/alloy/plasmaglass
+ custom_materials = list(/datum/material/alloy/plasmaglass = SHEET_MATERIAL_AMOUNT)
/datum/armor/window_plasma
melee = 80
@@ -660,6 +663,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/plasma/spawner, 0)
glass_type = /obj/item/stack/sheet/plasmarglass
rad_insulation = RAD_HEAVY_INSULATION
glass_material_datum = /datum/material/alloy/plasmaglass
+ custom_materials = list(/datum/material/alloy/plasmaglass = SHEET_MATERIAL_AMOUNT, /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
/datum/armor/reinforced_plasma
melee = 80
@@ -705,6 +709,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
glass_amount = 2
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/window/fulltile/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
if(the_rcd.mode == RCD_DECONSTRUCT)
@@ -726,6 +731,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
glass_amount = 2
+ custom_materials = list(/datum/material/alloy/plasmaglass = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/window/plasma/fulltile/unanchored
anchored = FALSE
@@ -743,6 +749,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
glass_amount = 2
+ custom_materials = list(/datum/material/alloy/plasmaglass = SHEET_MATERIAL_AMOUNT * 2, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
/obj/structure/window/reinforced/plasma/fulltile/unanchored
anchored = FALSE
@@ -763,6 +770,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
glass_amount = 2
+ custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
/obj/structure/window/reinforced/fulltile/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
if(the_rcd.mode == RCD_DECONSTRUCT)
@@ -1000,6 +1008,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
icon = 'icons/obj/smooth_structures/structure_variations.dmi'
icon_state = "clockwork_window-single"
glass_type = /obj/item/stack/sheet/bronze
+ custom_materials = list(/datum/material/bronze = SHEET_MATERIAL_AMOUNT * 1)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/bronze/spawner, 0)
@@ -1018,6 +1027,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/bronze/spawner, 0)
obj_flags = CAN_BE_HIT
max_integrity = 50
glass_amount = 2
+ custom_materials = list(/datum/material/bronze = SHEET_MATERIAL_AMOUNT * 2)
/obj/structure/window/bronze/fulltile/unanchored
anchored = FALSE
diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
index feb8f6c3dce582..d8af0f533fbf90 100644
--- a/code/game/shuttle_engines.dm
+++ b/code/game/shuttle_engines.dm
@@ -37,7 +37,7 @@
/obj/machinery/power/shuttle_engine/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
register_context()
if(!mapload)
engine_state = ENGINE_UNWRENCHED
diff --git a/code/game/sound/sound.dm b/code/game/sound/sound.dm
index d68c1794e08de8..a3d086eac3ac60 100644
--- a/code/game/sound/sound.dm
+++ b/code/game/sound/sound.dm
@@ -39,6 +39,9 @@
var/maxdistance = SOUND_RANGE + extrarange
var/source_z = turf_source.z
+ if (falloff_distance >= maxdistance)
+ CRASH("playsound(): falloff_distance is equal to or higher than maxdistance! Bump up extrarange or reduce the falloff_distance.")
+
if(vary && !frequency)
frequency = get_rand_frequency() // skips us having to do it per-sound later. should just make this a macro tbh
@@ -179,13 +182,13 @@
SEND_SOUND(src, sound_to_use)
-/proc/sound_to_playing_players(soundin, volume = 100, vary = FALSE, frequency = 0, channel = 0, pressure_affected = FALSE, sound/S)
+/proc/sound_to_playing_players(soundin, volume = 100, vary = FALSE, frequency = 0, channel = 0, pressure_affected = FALSE, sound/S, datum/preference/numeric/volume/volume_preference = null)
if(!S)
S = sound(get_sfx(soundin))
for(var/m in GLOB.player_list)
if(ismob(m) && !isnewplayer(m))
var/mob/M = m
- M.playsound_local(M, null, volume, vary, frequency, null, channel, pressure_affected, S)
+ M.playsound_local(M, null, volume, vary, frequency, null, channel, pressure_affected, S, volume_preference = volume_preference)
/mob/proc/stop_sound_channel(chan)
SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = chan))
diff --git a/code/game/turfs/baseturf_skipover.dm b/code/game/turfs/baseturf_skipover.dm
index 9bef78a15ea155..16d4f124c25736 100644
--- a/code/game/turfs/baseturf_skipover.dm
+++ b/code/game/turfs/baseturf_skipover.dm
@@ -12,6 +12,10 @@
name = "Shuttle baseturf skipover"
desc = "Acts as the bottom of the shuttle, if this isn't here the shuttle floor is broken through."
+/turf/baseturf_skipover/trapdoor
+ name = "Trapdoor baseturf skipover"
+ desc = "Acts as the bottom of a stack of baseturfs affected by a trapdoor."
+
/turf/baseturf_bottom
name = "Z-level baseturf placeholder"
desc = "Marker for z-level baseturf, usually resolves to space."
diff --git a/code/game/turfs/baseturfs.dm b/code/game/turfs/baseturfs.dm
index 09ca2b81c5ef14..0ceda1dba1b747 100644
--- a/code/game/turfs/baseturfs.dm
+++ b/code/game/turfs/baseturfs.dm
@@ -100,6 +100,13 @@
return null
return baseturfs.len - index + 1
+/// Similar to depth_to_find_baseturf, but directly returns the index of the found baseturf.
+/// This number can be passed into insert_baseturf to insert a baseturf before the found baseturf.
+/turf/proc/level_to_find_baseturf(baseturf_type)
+ if(!islist(baseturfs))
+ return baseturfs == baseturf_type ? 1 : null
+ return baseturfs.Find(baseturf_type) || null
+
/// Returns the baseturf at the given depth.
/// For example, baseturf_at_depth(1) will give the baseturf that would show up when scraping once.
/turf/proc/baseturf_at_depth(index)
@@ -181,3 +188,8 @@
insert_baseturf(search_position, stack_type)
else if(type == search_type)
insert_baseturf(turf_type = stack_type)
+
+/// Gets a copy of the baseturfs up to the specified depth
+/turf/proc/get_baseturfs_to_depth(depth)
+ var/list/baseturf_list = islist(baseturfs) ? baseturfs : list(baseturfs)
+ return baseturf_list.Copy(baseturf_list.len - depth + 1)
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index 347a3574769a1d..49ebdb577a92dc 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -193,7 +193,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
space_tile.enable_starlight()
if(old_opacity != opacity && SSticker)
- GLOB.cameranet.bareMajorChunkChange(src)
+ SScameras.bare_major_chunk_change(src)
// We will only run this logic if the tile is not on the prime z layer, since we use area overlays to cover that
if(SSmapping.z_level_to_plane_offset[z])
diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
index 82a0cca5305d0a..fc123d9f41de96 100644
--- a/code/game/turfs/closed/indestructible.dm
+++ b/code/game/turfs/closed/indestructible.dm
@@ -18,12 +18,6 @@
/turf/closed/indestructible/singularity_act()
return
-/turf/closed/indestructible/attackby(obj/item/attacking_item, mob/user, list/modifiers)
- if(istype(attacking_item, /obj/item/poster) && Adjacent(user))
- return place_poster(attacking_item, user)
-
- return ..()
-
/turf/closed/indestructible/oldshuttle
name = "strange shuttle wall"
icon = 'icons/turf/shuttleold.dmi'
diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
index 6bb8520189ec59..861533c4b175c8 100644
--- a/code/game/turfs/closed/wall/misc_walls.dm
+++ b/code/game/turfs/closed/wall/misc_walls.dm
@@ -44,15 +44,14 @@
/turf/closed/wall/rust
//SDMM supports colors, this is simply for easier mapping
- //and should be removed on initialize
- color = MAP_SWITCH(null, COLOR_ORANGE_BROWN)
+ WHEN_MAP(color = COLOR_ORANGE_BROWN)
/turf/closed/wall/rust/Initialize(mapload)
. = ..()
AddElement(/datum/element/rust)
/turf/closed/wall/heretic_rust
- color = MAP_SWITCH(null, COLOR_GREEN_GRAY)
+ WHEN_MAP(color = COLOR_GREEN_GRAY)
/turf/closed/wall/heretic_rust/Initialize(mapload)
. = ..()
@@ -60,8 +59,7 @@
/turf/closed/wall/r_wall/rust
//SDMM supports colors, this is simply for easier mapping
- //and should be removed on initialize
- color = MAP_SWITCH(null, COLOR_ORANGE_BROWN)
+ WHEN_MAP(color = COLOR_ORANGE_BROWN)
base_decon_state = "rusty_r_wall"
/turf/closed/wall/r_wall/rust/Initialize(mapload)
@@ -69,7 +67,7 @@
AddElement(/datum/element/rust)
/turf/closed/wall/r_wall/heretic_rust
- color = MAP_SWITCH(null, COLOR_GREEN_GRAY)
+ WHEN_MAP(color = COLOR_GREEN_GRAY)
/turf/closed/wall/r_wall/heretic_rust/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm
index a9cc169db26378..4a20f88d60a810 100644
--- a/code/game/turfs/closed/wall/reinf_walls.dm
+++ b/code/game/turfs/closed/wall/reinf_walls.dm
@@ -224,7 +224,7 @@
.["delay"] *= RCD_RWALL_DELAY_MULT
/turf/closed/wall/r_wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(the_rcd.canRturf || rcd_data["[RCD_DESIGN_MODE]"] == RCD_WALLFRAME)
+ if(the_rcd.canRturf || rcd_data[RCD_DESIGN_MODE] == RCD_WALLFRAME)
return ..()
/turf/closed/wall/r_wall/rust_turf()
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index b7eb985bee55a4..1df2ea0251bd09 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -92,10 +92,6 @@
if(newgirder) //maybe we don't /want/ a girder!
transfer_fingerprints_to(newgirder)
- for(var/obj/O in src.contents) //Eject contents!
- if(istype(O, /obj/structure/sign/poster))
- var/obj/structure/sign/poster/P = O
- INVOKE_ASYNC(P, TYPE_PROC_REF(/obj/structure/sign/poster, roll_and_drop), src)
if(decon_type)
ChangeTurf(decon_type, flags = CHANGETURF_INHERIT_AIR)
else
@@ -199,7 +195,7 @@
add_fingerprint(user)
//the istype cascade has been spread among various procs for easy overriding
- if(try_clean(tool, user) || try_wallmount(tool, user) || try_decon(tool, user))
+ if(try_clean(tool, user) || try_decon(tool, user))
return ITEM_INTERACT_SUCCESS
return NONE
@@ -222,20 +218,6 @@
return FALSE
-/turf/closed/wall/proc/try_wallmount(obj/item/W, mob/user)
- //check for wall mounted frames
- if(istype(W, /obj/item/wallframe))
- var/obj/item/wallframe/F = W
- if(F.try_build(src, user))
- F.attach(src, user)
- return TRUE
- return FALSE
- //Poster stuff
- else if(istype(W, /obj/item/poster) && Adjacent(user)) //no tk memes.
- return place_poster(W,user)
-
- return FALSE
-
/turf/closed/wall/proc/try_decon(obj/item/I, mob/user)
if(I.tool_behaviour == TOOL_WELDER)
if(!I.tool_start_check(user, amount=round(slicing_duration / 50), heat_required = HIGH_TEMPERATURE_REQUIRED))
@@ -283,11 +265,12 @@
return FALSE
/turf/closed/wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- switch(rcd_data["[RCD_DESIGN_MODE]"])
+ switch(rcd_data[RCD_DESIGN_MODE])
if(RCD_WALLFRAME)
- var/obj/item/wallframe/wallmount = rcd_data["[RCD_DESIGN_PATH]"]
+ var/obj/item/wallframe/wallmount = rcd_data[RCD_DESIGN_PATH]
var/obj/item/wallframe/new_wallmount = new wallmount(user.drop_location())
- return try_wallmount(new_wallmount, user, src)
+ if(new_wallmount.interact_with_atom(src, user) == ITEM_INTERACT_SUCCESS)
+ return TRUE
if(RCD_DECONSTRUCT)
ScrapeAway()
return TRUE
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index ac55ed3b27516f..4fa24bd38419ca 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -188,7 +188,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = TRUE
+ tiled_turf = TRUE
/turf/open/indestructible/Melt()
to_be_destroyed = FALSE
@@ -264,7 +264,7 @@
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
heavyfootstep = FOOTSTEP_LAVA
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/indestructible/necropolis/Initialize(mapload)
. = ..()
@@ -327,7 +327,7 @@
barefootstep = null
clawfootstep = null
heavyfootstep = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/indestructible/binary
name = "tear in the fabric of reality"
diff --git a/code/game/turfs/open/ashplanet.dm b/code/game/turfs/open/ashplanet.dm
index e6703c04eb5590..35c7ec5b1cd17d 100644
--- a/code/game/turfs/open/ashplanet.dm
+++ b/code/game/turfs/open/ashplanet.dm
@@ -14,7 +14,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
var/smooth_icon = 'icons/turf/floors/ash.dmi'
diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm
index e490abceda74b3..df1278b29d4fc2 100644
--- a/code/game/turfs/open/chasm.dm
+++ b/code/game/turfs/open/chasm.dm
@@ -42,7 +42,7 @@
return FALSE
/turf/open/chasm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE
diff --git a/code/game/turfs/open/dirtystation.dm b/code/game/turfs/open/dirtystation.dm
index 3808622982daaa..7e9c72e30ee2a3 100644
--- a/code/game/turfs/open/dirtystation.dm
+++ b/code/game/turfs/open/dirtystation.dm
@@ -95,7 +95,7 @@
//Areas where gibs will be present. Robusting probably happened some time ago.
var/static/list/gib_covered_areas = typecacheof(list(
- /area/station/ai_monitored/turret_protected,
+ /area/station/ai/satellite,
/area/station/security,
/area/station/command/heads_quarters/hos,
))
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index ec4b5ca50ada87..268af20d19e2a5 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -16,7 +16,7 @@
thermal_conductivity = 0.02
heat_capacity = 20000
- tiled_dirt = TRUE
+ tiled_turf = TRUE
overfloor_placed = TRUE
@@ -208,9 +208,6 @@
/turf/open/floor/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_TURF)
- if(the_rcd.rcd_design_path != /turf/open/floor/plating/rcd)
- return FALSE
-
var/obj/structure/girder/girder = locate() in src
if(girder)
return girder.rcd_vals(user, the_rcd)
@@ -220,6 +217,10 @@
src, RCD_MEMORY_WALL,
)
if(RCD_WINDOWGRILLE)
+ var/obj/structure/grille/grille = locate() in src
+ if(grille)
+ return grille.rcd_vals(user, the_rcd)
+
//default cost for building a grill for fulltile windows
var/cost = 4
var/delay = 1 SECONDS
@@ -266,13 +267,9 @@
return FALSE
-/// if you are updating this make to to update /turf/open/misc/rcd_act() too
/turf/open/floor/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- switch(rcd_data["[RCD_DESIGN_MODE]"])
+ switch(rcd_data[RCD_DESIGN_MODE])
if(RCD_TURF)
- if(rcd_data["[RCD_DESIGN_PATH]"] != /turf/open/floor/plating/rcd)
- return FALSE
-
var/obj/structure/girder/girder = locate() in src
if(girder)
return girder.rcd_act(user, the_rcd, rcd_data)
@@ -280,12 +277,12 @@
place_on_top(/turf/closed/wall)
return TRUE
if(RCD_WINDOWGRILLE)
- //check if we are building a window
- var/obj/structure/window/window_path = rcd_data["[RCD_DESIGN_PATH]"]
- if(!ispath(window_path))
- CRASH("Invalid window path type in RCD: [window_path]")
+ var/obj/structure/grille/grille = locate() in src
+ if(grille)
+ return grille.rcd_act(user, the_rcd, rcd_data)
//allow directional windows to be built without grills
+ var/obj/structure/window/window_path = rcd_data[RCD_DESIGN_PATH]
if(!initial(window_path.fulltile))
if(!valid_build_direction(src, user.dir, is_fulltile = FALSE))
balloon_alert(user, "window already here!")
@@ -295,13 +292,11 @@
return TRUE
//build grills to deal with full tile windows
- if(locate(/obj/structure/grille) in src)
- return FALSE
- var/obj/structure/grille/new_grille = new(src)
- new_grille.set_anchored(TRUE)
+ grille = new(src)
+ grille.set_anchored(TRUE)
return TRUE
if(RCD_AIRLOCK)
- var/obj/machinery/door/airlock_type = rcd_data["[RCD_DESIGN_PATH]"]
+ var/obj/machinery/door/airlock_type = rcd_data[RCD_DESIGN_PATH]
if(ispath(airlock_type, /obj/machinery/door/window))
if(!valid_build_direction(src, user.dir, is_fulltile = FALSE))
@@ -335,7 +330,7 @@
assembly.finish_door()
return TRUE
if(RCD_STRUCTURE)
- var/atom/movable/design_type = rcd_data["[RCD_DESIGN_PATH]"]
+ var/atom/movable/design_type = rcd_data[RCD_DESIGN_PATH]
//map absolute types to basic subtypes
var/atom/movable/locate_type = design_type
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index eea5232aa062d4..3be12306bab9e6 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -16,7 +16,7 @@
barefootstep = FOOTSTEP_WOOD_BAREFOOT
clawfootstep = FOOTSTEP_WOOD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_BASIC
/turf/open/floor/wood/broken_states()
@@ -148,7 +148,7 @@
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/floor/grass/broken_states()
@@ -202,7 +202,7 @@
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/floor/fake_snow
@@ -216,7 +216,7 @@
floor_tile = null
initial_gas_mix = FROZEN_ATMOS
bullet_bounce_sound = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
slowdown = 1.5
bullet_sizzle = TRUE
@@ -251,7 +251,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/fakebasalt/Initialize(mapload)
. = ..()
@@ -280,7 +280,7 @@
barefootstep = FOOTSTEP_CARPET_BAREFOOT
clawfootstep = FOOTSTEP_CARPET_BAREFOOT
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_BASIC
/turf/open/floor/carpet/examine(mob/user)
@@ -867,7 +867,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_TURF_CHASM
canSmoothWith = SMOOTH_GROUP_TURF_CHASM
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/fakepit/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/floors.dmi'
@@ -893,7 +893,7 @@
floor_tile = /obj/item/stack/tile/fakespace
layer = SPACE_LAYER
plane = PLANE_SPACE
- tiled_dirt = FALSE
+ tiled_turf = FALSE
damaged_dmi = 'icons/turf/space.dmi'
/turf/open/floor/fakespace/broken_states()
diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm
index 978a9ab0fdf502..6f0489acea5e51 100644
--- a/code/game/turfs/open/floor/iron_floor.dm
+++ b/code/game/turfs/open/floor/iron_floor.dm
@@ -472,7 +472,7 @@
/turf/open/floor/iron/grimy
icon_state = "grimy"
base_icon_state = "grimy"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
floor_tile = /obj/item/stack/tile/iron/grimy
/turf/open/floor/iron/vaporwave
@@ -485,13 +485,13 @@
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
icon_state = "plaque"
base_icon_state = "plaque"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
floor_tile = /obj/item/stack/tile/iron/goonplaque
/turf/open/floor/iron/stairs
icon_state = "stairs"
base_icon_state = "stairs"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/iron/stairs/airless
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm
index eaccba29aaaa46..93ae88597ad15e 100644
--- a/code/game/turfs/open/floor/light_floor.dm
+++ b/code/game/turfs/open/floor/light_floor.dm
@@ -19,7 +19,7 @@
var/currentcolor = LIGHT_COLOR_CYAN
///var to prevent changing color on certain admin spawn only tiles
var/can_modify_colour = TRUE
- tiled_dirt = FALSE
+ tiled_turf = FALSE
///icons for radial menu
var/static/list/lighttile_designs
///used for light floors that cycle colours
diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm
index 8ca8b45c101e36..8456afc084b75b 100644
--- a/code/game/turfs/open/floor/mineral_floor.dm
+++ b/code/game/turfs/open/floor/mineral_floor.dm
@@ -15,7 +15,7 @@
material_flags = MATERIAL_EFFECTS
rust_resistance = RUST_RESISTANCE_BASIC
var/list/icons
- tiled_dirt = FALSE
+ tiled_turf = FALSE
diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm
index 8aa5c2ed3935a1..2a440db7c74243 100644
--- a/code/game/turfs/open/floor/plating.dm
+++ b/code/game/turfs/open/floor/plating.dm
@@ -187,7 +187,7 @@
return list("delay" = 0, "cost" = 1)
/turf/open/floor/plating/foam/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd)
ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index 40fd7055524639..2b6fe12a158c32 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -18,7 +18,7 @@
name = "alien floor"
icon_state = "alienpod1"
base_icon_state = "alienpod1"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
// Not actually broken, just should never break...yeah.
broken = TRUE
@@ -32,7 +32,7 @@
name = "alien plating"
icon_state = "alienplating"
base_icon_state = "alienplating"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
damaged_dmi = null
diff --git a/code/game/turfs/open/floor/reinforced_floor.dm b/code/game/turfs/open/floor/reinforced_floor.dm
index 219e284db364b7..bc8f70655759bd 100644
--- a/code/game/turfs/open/floor/reinforced_floor.dm
+++ b/code/game/turfs/open/floor/reinforced_floor.dm
@@ -10,7 +10,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rcd_proof = TRUE
rust_resistance = RUST_RESISTANCE_REINFORCED
floor_tile = /obj/item/stack/rods
@@ -93,12 +93,6 @@
/turf/open/floor/engine/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)
-/turf/open/floor/engine/attack_hand(mob/user, list/modifiers)
- . = ..()
- if(.)
- return
- user.Move_Pulled(src)
-
//air filled floors; used in atmos pressure chambers
/turf/open/floor/engine/n2o
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index 2ed333ed73cde4..f318624bbcccdf 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -190,7 +190,7 @@
return FALSE
/turf/open/lava/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE
@@ -342,7 +342,7 @@
ADD_TRAIT(burn_living, TRAIT_NO_EXTINGUISH, TURF_TRAIT)
burn_living.adjust_fire_stacks(lava_firestacks * seconds_per_tick)
burn_living.ignite_mob()
- burn_living.adjustFireLoss(lava_damage * seconds_per_tick)
+ burn_living.adjust_fire_loss(lava_damage * seconds_per_tick)
return TRUE
return FALSE
@@ -406,17 +406,9 @@
immunity_resistance_flags = FREEZE_PROOF
lava_temperature = 100
-/turf/open/lava/plasma/examine(mob/user)
+/turf/open/lava/plasma/Initialize(mapload)
. = ..()
- . += span_info("Some liquid plasma could probably be scooped up with a container.")
-
-/turf/open/lava/plasma/attackby(obj/item/I, mob/user, list/modifiers)
- if(!I.is_open_container())
- return ..()
- if(!I.reagents.add_reagent(/datum/reagent/toxin/plasma, rand(5, 10)))
- to_chat(user, span_warning("[I] is full."))
- return
- user.visible_message(span_notice("[user] scoops some plasma from the [src] with [I]."), span_notice("You scoop out some plasma from the [src] using [I]."))
+ AddElement(/datum/element/reagent_scoopable_atom, /datum/reagent/toxin/plasma)
/turf/open/lava/plasma/do_burn(atom/movable/burn_target, seconds_per_tick = 1)
. = TRUE
@@ -426,8 +418,8 @@
var/mob/living/burn_living = burn_target
var/need_mob_update
// This is from plasma, so it should obey plasma biotype requirements
- need_mob_update += burn_living.adjustToxLoss(15, updating_health = FALSE, required_biotype = MOB_ORGANIC)
- need_mob_update += burn_living.adjustFireLoss(25, updating_health = FALSE)
+ need_mob_update += burn_living.adjust_tox_loss(15, updating_health = FALSE, required_biotype = MOB_ORGANIC)
+ need_mob_update += burn_living.adjust_fire_loss(25, updating_health = FALSE)
if(need_mob_update)
burn_living.updatehealth()
diff --git a/code/game/turfs/open/misc.dm b/code/game/turfs/open/misc.dm
index b9c27e3faf2639..666ad1aef8547d 100644
--- a/code/game/turfs/open/misc.dm
+++ b/code/game/turfs/open/misc.dm
@@ -19,7 +19,7 @@
thermal_conductivity = 0.02
heat_capacity = 20000
- tiled_dirt = TRUE
+ tiled_turf = TRUE
/turf/open/misc/attackby(obj/item/attacking_item, mob/user, list/modifiers)
. = ..()
@@ -89,8 +89,8 @@
return FALSE
/turf/open/misc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF)
- if(rcd_data["[RCD_DESIGN_PATH]"] != /turf/open/floor/plating/rcd)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF)
+ if(rcd_data[RCD_DESIGN_PATH] != /turf/open/floor/plating/rcd)
return FALSE
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm
index d2149766faa1db..6724cb74d2379f 100644
--- a/code/game/turfs/open/openspace.dm
+++ b/code/game/turfs/open/openspace.dm
@@ -25,8 +25,8 @@
// I am so sorry
/turf/open/openspace/Initialize(mapload) // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker
. = ..()
- if(PERFORM_ALL_TESTS(focus_only/openspace_clear) && !GET_TURF_BELOW(src))
- stack_trace("[src] was inited as openspace with nothing below it at ([x], [y], [z])")
+ if(PERFORM_ALL_TESTS(maptest_log_mapping) && !GET_TURF_BELOW(src))
+ log_mapping("[src] was inited as openspace with nothing below it at ([x], [y], [z])")
RegisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_atom_created))
var/area/our_area = loc
if(istype(our_area, /area/space))
@@ -142,7 +142,7 @@
return FALSE
/turf/open/openspace/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
+ if(rcd_data[RCD_DESIGN_MODE] == RCD_TURF && rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE
diff --git a/code/game/turfs/open/planet.dm b/code/game/turfs/open/planet.dm
index e0fe7e842b941d..55963e2cf68424 100644
--- a/code/game/turfs/open/planet.dm
+++ b/code/game/turfs/open/planet.dm
@@ -12,7 +12,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/misc/dirt/station
diff --git a/code/game/turfs/open/sand.dm b/code/game/turfs/open/sand.dm
index faccf7db1043be..71ffa6be613115 100644
--- a/code/game/turfs/open/sand.dm
+++ b/code/game/turfs/open/sand.dm
@@ -72,7 +72,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/misc/sandy_dirt/break_tile()
diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm
index d81f0b01ca4d4a..74ee7b6a879d1d 100644
--- a/code/game/turfs/open/space/space.dm
+++ b/code/game/turfs/open/space/space.dm
@@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(starlight)
/turf/open/space
icon = 'icons/turf/space.dmi'
- MAP_SWITCH(icon_state = "space", icon_state = "space_map")
+ icon_state = MAP_SWITCH("space", "space_map")
name = "\proper space"
overfloor_placed = FALSE
underfloor_accessibility = UNDERFLOOR_INTERACTABLE
@@ -72,7 +72,7 @@ GLOBAL_LIST_EMPTY(starlight)
force_no_gravity = TRUE
/turf/open/space/basic
- MAP_SWITCH(icon_state = "space", icon_state = "space_basic_map")
+ icon_state = MAP_SWITCH("space", "space_basic_map")
/turf/open/space/basic/New() //Do not convert to Initialize
SHOULD_CALL_PARENT(FALSE)
@@ -174,10 +174,10 @@ GLOBAL_LIST_EMPTY(starlight)
/turf/open/space/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
if(the_rcd.mode == RCD_TURF)
- if(rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
+ if(rcd_data[RCD_DESIGN_PATH] == /turf/open/floor/plating/rcd)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
- else if(rcd_data["[RCD_DESIGN_PATH]"] == /obj/structure/lattice/catwalk)
+ else if(rcd_data[RCD_DESIGN_PATH] == /obj/structure/lattice/catwalk)
var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src)
if(lattice)
qdel(lattice)
@@ -219,8 +219,8 @@ GLOBAL_LIST_EMPTY(starlight)
/turf/open/space/openspace/Initialize(mapload) // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker
. = ..()
- if(PERFORM_ALL_TESTS(focus_only/openspace_clear) && !GET_TURF_BELOW(src))
- stack_trace("[src] was inited as openspace with nothing below it at ([x], [y], [z])")
+ if(PERFORM_ALL_TESTS(maptest_log_mapping) && !GET_TURF_BELOW(src))
+ log_mapping("[src] was inited as openspace with nothing below it at ([x], [y], [z])")
icon_state = "pure_white"
// We make the assumption that the space plane will never be blacklisted, as an optimization
if(SSmapping.max_plane_offset)
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index 7dde7cb70b1f71..35678cc45ad3af 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -40,6 +40,8 @@
var/ticking_oxy_damage = 2
var/exhaust_swimmer_prob = 30
+ var/datum/reagent/reagent_to_extract = /datum/reagent/water
+
/turf/open/water/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_atom_inited))
@@ -47,6 +49,8 @@
if(!isnull(fishing_datum))
add_lazy_fishing(fishing_datum)
ADD_TRAIT(src, TRAIT_CATCH_AND_RELEASE, INNATE_TRAIT)
+ if(reagent_to_extract)
+ AddElement(/datum/element/reagent_scoopable_atom, reagent_to_extract)
///We lazily add the immerse element when something is spawned or crosses this turf and not before.
/turf/open/water/proc/on_atom_inited(datum/source, atom/movable/movable)
@@ -109,6 +113,7 @@
base_icon_state = "water"
baseturfs = /turf/open/water/beach
fishing_datum = /datum/fish_source/ocean/beach
+ reagent_to_extract = /datum/reagent/water/salt
/turf/open/water/beach/Initialize(mapload)
. = ..()
@@ -154,6 +159,7 @@
planetary_atmos = FALSE
immerse_overlay_alpha = 190
fishing_datum = /datum/fish_source/hot_spring
+ reagent_to_extract = /datum/reagent/water/mineral
/turf/open/water/hot_spring/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 0243b866d82ebc..3a17329e878100 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
var/bullet_sizzle = FALSE //used by ammo_casing/bounce_away() to determine if the shell casing should make a sizzle sound when it's ejected over the turf
//IE if the turf is supposed to be water, set TRUE.
- var/tiled_dirt = FALSE // use smooth tiled dirt decal
+ var/tiled_turf = FALSE // use tiled water and dirt decals
///Icon-smoothing variable to map a diagonal wall corner with a fixed underlay.
var/list/fixed_underlay = null
@@ -553,9 +553,6 @@ GLOBAL_LIST_EMPTY(station_turfs)
/turf/proc/can_lay_cable()
return can_have_cabling() && underfloor_accessibility >= UNDERFLOOR_INTERACTABLE
-/turf/proc/visibilityChanged()
- GLOB.cameranet.updateVisibility(src)
-
/turf/proc/burn_tile()
return
@@ -807,7 +804,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
/// Returns whether it is safe for an atom to move across this turf
/turf/proc/can_cross_safely(atom/movable/crossing)
- return TRUE
+ return !HAS_TRAIT(src, TRAIT_AI_AVOID_TURF)
/**
* the following are some fishing-related optimizations to shave off as much
diff --git a/code/game/world.dm b/code/game/world.dm
index e2dd3726c35ecf..b687b25256db48 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -186,6 +186,10 @@ GLOBAL_VAR(restart_counter)
setup_autowiki()
#endif
+ #ifdef PERFORMANCE_TESTS
+ queue_performance_tests()
+ #endif
+
/world/proc/HandleTestRun()
//trigger things to run the whole process
Master.sleep_offline_after_initializations = FALSE
@@ -199,6 +203,25 @@ GLOBAL_VAR(restart_counter)
#endif
SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), cb, 10 SECONDS))
+/world/proc/queue_performance_tests()
+ //trigger things to run the whole process
+ Master.sleep_offline_after_initializations = FALSE
+ SSticker.start_immediately = TRUE
+ var/datum/callback/cb = CALLBACK(src, PROC_REF(run_performance_tests))
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), cb, 10 SECONDS))
+
+/// Stub proc intended to be filled with code that does some test, profiles it, and logs that test.
+/// Intended to be used with line by line macros, but you should live your truth
+/world/proc/run_performance_tests()
+ // In case we do somethin that could otherwise end the round
+ SSticker.delay_end = TRUE
+ // Your code goes here
+
+ // Logging goes here
+ // (sample line by line) stat_tracking_export_to_csv_later("file_name.csv", GLOB.cost_list, GLOB.count_list)
+ SSticker.delay_end = FALSE
+ shutdown()
+
/// Returns a list of data about the world state, don't clutter
/world/proc/get_world_state_for_logging()
var/data = list()
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index e1159d40503288..e13afc05d769de 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -35,29 +35,44 @@
////////////////////////////////////////////////////////////////////////////////////////////////ADMIN HELPER PROCS
-ADMIN_VERB(spawn_atom, R_SPAWN, "Spawn", "Spawn an atom.", ADMIN_CATEGORY_DEBUG, object as text)
- if(!object)
- return
- var/list/preparsed = splittext(object,":")
- var/path = preparsed[1]
- var/amount = 1
- if(preparsed.len > 1)
- amount = clamp(text2num(preparsed[2]),1,ADMIN_SPAWN_CAP)
+ADMIN_VERB(spawn_atom, R_SPAWN, "Spawn", "Spawn an atom.", ADMIN_CATEGORY_DEBUG, object as text|null)
+ var/static/list/atom_types
+ if (isnull(atom_types))
+ atom_types = subtypesof(/atom)
+
+ var/chosen_path = null
+ var/list/preparsed = null
+ if (object)
+ preparsed = splittext(object, ":")
+ var/list/matches = filter_fancy_list(atom_types, preparsed[1])
+ if (length(matches) == 1)
+ chosen_path = matches[1]
+
+ if(!chosen_path)
+ var/datum/spawn_menu/menu = user.holder.spawn_menu
+ if (!menu)
+ menu = new()
+ user.holder.spawn_menu = menu
+ menu.init_value = object
+ menu.ui_interact(user.mob)
+ BLACKBOX_LOG_ADMIN_VERB("Spawn Atom")
+ return TRUE
- var/chosen = pick_closest_path(path)
- if(!chosen)
- return
- var/turf/T = get_turf(user.mob)
+ var/amount = 1
+ if (length(preparsed) > 1)
+ amount = clamp(text2num(preparsed[2]), 1, ADMIN_SPAWN_CAP)
- if(ispath(chosen, /turf))
- T.ChangeTurf(chosen)
+ var/turf/target_turf = get_turf(user.mob)
+ if (ispath(chosen_path, /turf))
+ target_turf.ChangeTurf(chosen_path)
else
- for(var/i in 1 to amount)
- var/atom/A = new chosen(T)
- A.flags_1 |= ADMIN_SPAWNED_1
+ for (var/i in 1 to amount)
+ var/atom/spawned = new chosen_path(target_turf)
+ spawned.flags_1 |= ADMIN_SPAWNED_1
- log_admin("[key_name(user)] spawned [amount] x [chosen] at [AREACOORD(user.mob)]")
+ log_admin("[key_name(user.mob)] spawned [amount] x [chosen_path] at [AREACOORD(user.mob)]")
BLACKBOX_LOG_ADMIN_VERB("Spawn Atom")
+ return TRUE
ADMIN_VERB(spawn_atom_pod, R_SPAWN, "PodSpawn", "Spawn an atom via supply drop.", ADMIN_CATEGORY_DEBUG, object as text)
var/chosen = pick_closest_path(object)
@@ -84,7 +99,7 @@ ADMIN_VERB(spawn_cargo, R_SPAWN, "Spawn Cargo", "Spawn a cargo crate.", ADMIN_CA
if(!chosen)
return
var/datum/supply_pack/S = new chosen
- S.admin_spawned = TRUE
+ S.order_flags |= ORDER_ADMIN_SPAWNED
S.generate(get_turf(user.mob))
log_admin("[key_name(user)] spawned cargo pack [chosen] at [AREACOORD(user.mob)]")
diff --git a/code/modules/admin/admin_fax_panel.dm b/code/modules/admin/admin_fax_panel.dm
index 3a9744ee3e4864..d426c48b14ddcb 100644
--- a/code/modules/admin/admin_fax_panel.dm
+++ b/code/modules/admin/admin_fax_panel.dm
@@ -25,7 +25,7 @@ ADMIN_VERB(fax_panel, R_ADMIN, "Fax Panel", "View and respond to faxes sent to C
available_faxes += WEAKREF(fax)
//Get all stamps
- for(var/stamp in subtypesof(/obj/item/stamp))
+ for(var/stamp in valid_subtypesof(/obj/item/stamp))
var/obj/item/stamp/real_stamp = new stamp()
if(!istype(real_stamp, /obj/item/stamp/chameleon) && !istype(real_stamp, /obj/item/stamp/mod))
var/stamp_detail = real_stamp.get_writing_implement_details()
diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index 823a4a9e64bf04..0bf18468906314 100644
--- a/code/modules/admin/callproc/callproc.dm
+++ b/code/modules/admin/callproc/callproc.dm
@@ -159,7 +159,10 @@ ADMIN_VERB(advanced_proc_call, R_DEBUG, "Advanced ProcCall", "Call a proc on any
returnval = WrapAdminProcCall(GLOBAL_PROC, procname, lst) // Pass the lst as an argument list to the proc
BLACKBOX_LOG_ADMIN_VERB("Advanced ProcCall")
if(get_retval)
- get_retval += returnval
+ if (islist(returnval))
+ get_retval += list(returnval) // Wrap to stop BYOND from concat-ing the lists
+ else
+ get_retval += returnval
. = get_callproc_returnval(returnval, procname)
if(.)
to_chat(usr, ., confidential = TRUE)
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index 3e8d212d0713ec..fdde0aa1cb23a6 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -135,11 +135,11 @@
var/effect_range = 5
/obj/effect/fun_balloon/scatter/effect()
- for(var/mob/living/M in range(effect_range, get_turf(src)))
- var/turf/T = find_safe_turf(zlevel = src.z)
- new /obj/effect/temp_visual/gravpush(get_turf(M))
- M.forceMove(T)
- to_chat(M, span_notice("Pop!"), confidential = TRUE)
+ for(var/mob/living/dispersed_mob in range(effect_range, get_turf(src)))
+ var/turf/drop_off = find_safe_turf(z)
+ new /obj/effect/temp_visual/gravpush(get_turf(dispersed_mob))
+ dispersed_mob.forceMove(drop_off)
+ dispersed_mob.balloon_alert(dispersed_mob, "pop!")
// ----------- Station Crash
// Can't think of anywhere better to put it right now
diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm
index c87c424661fd2b..7d3710ffb08f4b 100644
--- a/code/modules/admin/greyscale_modify_menu.dm
+++ b/code/modules/admin/greyscale_modify_menu.dm
@@ -166,12 +166,12 @@
if("pick_color")
var/group = params["color_index"]
- var/new_color = input(
+ var/new_color = tgui_color_picker(
usr,
"Choose color for greyscale color group [group]:",
"Greyscale Modification Menu",
split_colors[group]
- ) as color|null
+ )
if(new_color)
split_colors[group] = new_color
queue_refresh()
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 6be76b4df87b69..18b96318f06796 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -32,12 +32,14 @@ GLOBAL_PROTECT(href_token)
var/deadmined
- var/datum/filter_editor/filteriffic
+ var/datum/filter_editor/filterrific
var/datum/particle_editor/particle_test
var/datum/colorblind_tester/color_test
var/datum/plane_master_debug/plane_debug
var/obj/machinery/computer/libraryconsole/admin_only_do_not_map_in_you_fucker/library_manager
var/datum/pathfind_debug/path_debug
+ var/datum/spawn_menu/spawn_menu
+ var/datum/spawnpanel/spawn_panel
/// Whether or not the user tried to connect, but was blocked by 2FA
var/blocked_by_2fa = FALSE
diff --git a/code/modules/admin/poll_management.dm b/code/modules/admin/poll_management.dm
index 88a38c90166b45..80ba5ec56a0380 100644
--- a/code/modules/admin/poll_management.dm
+++ b/code/modules/admin/poll_management.dm
@@ -229,8 +229,7 @@
output += "
"
var/datum/browser/panel = new(usr, "pmpanel", "Poll Management Panel", 780, 640)
panel.add_stylesheet("admin_panelscss", 'html/admin/admin_panels.css')
- if(usr.client.prefs.read_preference(/datum/preference/toggle/tgui_fancy)) //some browsers (IE8) have trouble with unsupported css3 elements that break the panel's functionality, so we won't load those if a user is in no frills tgui mode since that's for similar compatability support
- panel.add_stylesheet("admin_panelscss3", 'html/admin/admin_panels_css3.css')
+ panel.add_stylesheet("admin_panelscss3", 'html/admin/admin_panels_css3.css')
panel.set_content(jointext(output, ""))
panel.open()
@@ -527,8 +526,7 @@
panel_height = 320
var/datum/browser/panel = new(usr, "popanel", "Poll Option Panel", 370, panel_height)
panel.add_stylesheet("admin_panelscss", 'html/admin/admin_panels.css')
- if(usr.client.prefs.read_preference(/datum/preference/toggle/tgui_fancy)) //some browsers (IE8) have trouble with unsupported css3 elements that break the panel's functionality, so we won't load those if a user is in no frills tgui mode since that's for similar compatability support
- panel.add_stylesheet("admin_panelscss3", 'html/admin/admin_panels_css3.css')
+ panel.add_stylesheet("admin_panelscss3", 'html/admin/admin_panels_css3.css')
panel.set_content(jointext(output, ""))
panel.open()
diff --git a/code/modules/admin/smites/boneless.dm b/code/modules/admin/smites/boneless.dm
index a3031ce13ffc7a..3fd1a1121f4baa 100644
--- a/code/modules/admin/smites/boneless.dm
+++ b/code/modules/admin/smites/boneless.dm
@@ -11,7 +11,7 @@
var/mob/living/carbon/carbon_target = target
for(var/obj/item/bodypart/limb as anything in carbon_target.bodyparts)
- var/severity = pick_weight(list(
+ var/severity = pick_weight(alist(
WOUND_SEVERITY_MODERATE = 1,
WOUND_SEVERITY_SEVERE = 2,
WOUND_SEVERITY_CRITICAL = 2,
diff --git a/code/modules/admin/smites/brain_damage.dm b/code/modules/admin/smites/brain_damage.dm
index ceafc49df24ca3..1d70bc60f6cd0c 100644
--- a/code/modules/admin/smites/brain_damage.dm
+++ b/code/modules/admin/smites/brain_damage.dm
@@ -4,4 +4,4 @@
/datum/smite/brain_damage/effect(client/user, mob/living/target)
. = ..()
- target.adjustOrganLoss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 1, BRAIN_DAMAGE_DEATH - 1)
+ target.adjust_organ_loss(ORGAN_SLOT_BRAIN, BRAIN_DAMAGE_DEATH - 1, BRAIN_DAMAGE_DEATH - 1)
diff --git a/code/modules/admin/smites/bsa.dm b/code/modules/admin/smites/bsa.dm
index 806de64429386e..b833af12a3a8aa 100644
--- a/code/modules/admin/smites/bsa.dm
+++ b/code/modules/admin/smites/bsa.dm
@@ -22,7 +22,7 @@
if (target.health <= 1)
target.gib(DROP_BODYPARTS)
else
- target.adjustBruteLoss(min(BSA_MAX_DAMAGE, target.health - 1))
+ target.adjust_brute_loss(min(BSA_MAX_DAMAGE, target.health - 1))
target.Paralyze(BSA_PARALYZE_TIME)
target.set_stutter(BSA_STUTTER_TIME)
diff --git a/code/modules/admin/smites/dock_pay.dm b/code/modules/admin/smites/dock_pay.dm
index a3828feb828dc2..6eaa7b53792f2f 100644
--- a/code/modules/admin/smites/dock_pay.dm
+++ b/code/modules/admin/smites/dock_pay.dm
@@ -18,14 +18,14 @@
if (card.registered_account.account_balance == 0)
to_chat(user, span_warning("ID Card lacks any funds. No pay to dock."))
return
- var/new_cost = input("How much pay are we docking? Current balance: [card.registered_account.account_balance] credits.", "BUDGET CUTS") as num|null
+ var/new_cost = input("How much pay are we docking? Current balance: [card.registered_account.account_balance] [MONEY_NAME].", "BUDGET CUTS") as num|null
if (!new_cost)
return
if (!(card.registered_account.has_money(new_cost)))
to_chat(user, span_warning("ID Card lacked funds. Emptying account."))
- card.registered_account.bank_card_talk("[new_cost] credits deducted from your account based on performance review.")
+ card.registered_account.bank_card_talk("[new_cost] [MONEY_NAME] deducted from your account based on performance review.")
card.registered_account.account_balance = 0
else
card.registered_account.account_balance = card.registered_account.account_balance - new_cost
- card.registered_account.bank_card_talk("[new_cost] credits deducted from your account based on performance review.")
+ card.registered_account.bank_card_talk("[new_cost] [MONEY_NAME] deducted from your account based on performance review.")
SEND_SOUND(target, 'sound/machines/buzz/buzz-sigh.ogg')
diff --git a/code/modules/admin/smites/lightning.dm b/code/modules/admin/smites/lightning.dm
index 99cb46bdaace3a..be015a8a1c15eb 100644
--- a/code/modules/admin/smites/lightning.dm
+++ b/code/modules/admin/smites/lightning.dm
@@ -11,7 +11,7 @@
/proc/lightningbolt(mob/living/user)
var/turf/lightning_source = get_step(get_step(user, NORTH), NORTH)
lightning_source.Beam(user, icon_state="lightning[rand(1,12)]", time = 5)
- user.adjustFireLoss(LIGHTNING_BOLT_DAMAGE)
+ user.adjust_fire_loss(LIGHTNING_BOLT_DAMAGE)
playsound(get_turf(user), 'sound/effects/magic/lightningbolt.ogg', 50, TRUE)
if(ishuman(user))
var/mob/living/carbon/human/human_target = user
diff --git a/code/modules/admin/spawn_menu.dm b/code/modules/admin/spawn_menu.dm
new file mode 100644
index 00000000000000..07e461e3957336
--- /dev/null
+++ b/code/modules/admin/spawn_menu.dm
@@ -0,0 +1,92 @@
+/datum/spawn_menu
+ /// Does the menu default to a regex prefix?
+ var/regex_search = FALSE
+ /// Does the search include atom names?
+ var/name_search = TRUE
+ /// Should we display full typepaths or the condensed versions?
+ var/fancy_types = TRUE
+ /// Should abstract types be included in the search?
+ var/include_abstracts = FALSE
+ /// Initial search value from the latest command
+ var/init_value = null
+
+/datum/spawn_menu/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if (!ui)
+ ui = new(user, src, "SpawnSearch")
+ ui.open()
+
+/datum/spawn_menu/ui_state(mob/user)
+ return ADMIN_STATE(R_SPAWN)
+
+/datum/spawn_menu/ui_act(action, params, datum/tgui/ui)
+ if (..() || !check_rights_for(ui.user.client, R_SPAWN))
+ return FALSE
+
+ switch (action)
+ if ("setRegexSearch")
+ regex_search = params["regexSearch"]
+ return TRUE
+
+ if ("setNameSearch")
+ name_search = params["searchNames"]
+ return TRUE
+
+ if ("setFancyTypes")
+ fancy_types = params["fancyTypes"]
+ return TRUE
+
+ if ("setIncludeAbstracts")
+ include_abstracts = params["includeAbstracts"]
+ return TRUE
+
+ if ("spawn")
+ var/path = text2path(params["type"])
+ if (!path)
+ return TRUE
+ var/amount = clamp(text2num(params["amount"]) || 1, 1, ADMIN_SPAWN_CAP)
+ var/turf/target_turf = get_turf(ui.user)
+ if(ispath(path, /turf))
+ target_turf.ChangeTurf(path)
+ else
+ for(var/i in 1 to amount)
+ var/atom/spawned = new path(target_turf)
+ spawned.flags_1 |= ADMIN_SPAWNED_1
+
+ log_admin("[key_name(ui.user)] spawned [amount] x [path] at [AREACOORD(ui.user)]")
+ SStgui.close_uis(src)
+ return TRUE
+
+ if ("cancel")
+ SStgui.close_uis(src)
+ return TRUE
+
+/datum/spawn_menu/ui_data(mob/user)
+ var/list/data = list()
+ data["initValue"] = init_value
+ data["searchNames"] = name_search
+ data["regexSearch"] = regex_search
+ data["fancyTypes"] = fancy_types
+ data["includeAbstracts"] = include_abstracts
+ return data
+
+/datum/spawn_menu/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/json/spawn_menu),
+ )
+
+/datum/asset/json/spawn_menu
+ name = "spawn_menu_atom_data"
+
+/datum/asset/json/spawn_menu/generate()
+ var/list/data = list()
+ var/static/list/types_list
+ if (isnull(types_list))
+ var/list/local_types = list()
+ for (var/atom/atom_type as anything in subtypesof(/atom))
+ local_types[atom_type] = atom_type::name || ""
+ types_list = local_types
+ data["types"] = types_list
+ data["abstractTypes"] = get_abstract_types()
+ data["fancyTypes"] = GLOB.fancy_type_replacements
+ return data
diff --git a/code/modules/admin/spawn_panel/spawn_panel.dm b/code/modules/admin/spawn_panel/spawn_panel.dm
index 95097d6badea4d..a5cc42a43919f2 100644
--- a/code/modules/admin/spawn_panel/spawn_panel.dm
+++ b/code/modules/admin/spawn_panel/spawn_panel.dm
@@ -15,14 +15,10 @@
#define OFFSET_ABSOLUTE "Absolute offset"
#define OFFSET_RELATIVE "Relative offset"
-GLOBAL_LIST_INIT(spawnpanels_by_ckey, list())
-
/*
An instance of a /tg/UI™ Spawn Panel. Stores preferences, spawns things, controls the UI. Unique for each user (their ckey).
*/
/datum/spawnpanel
- /// Who this instance of spawn panel belongs to. The instances are unique to correctly keep modified values between multiple admins.
- var/owner_ckey
/// Where and how the atom should be spawned.
var/where_target_type = WHERE_FLOOR_BELOW_MOB
/// The atom selected from the panel.
@@ -57,45 +53,21 @@ GLOBAL_LIST_INIT(spawnpanels_by_ckey, list())
offset = list("X" = 0, "Y" = 0, "Z" = 0)
/datum/spawnpanel/ui_interact(mob/user, datum/tgui/ui)
- if(user.client.ckey != owner_ckey)
- return
-
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "SpawnPanel")
ui.open()
-/// Returns a `spawnpanel` instance belonging to this `user`, or creates and registers a new one
-/proc/get_spawnpanel_for_admin(mob/user)
- if(!user?.client?.ckey)
- return null
-
- var/ckey = user.client.ckey
-
- if(GLOB.spawnpanels_by_ckey[ckey])
- return GLOB.spawnpanels_by_ckey[ckey]
-
- var/datum/spawnpanel/new_panel = new()
- new_panel.owner_ckey = ckey
- GLOB.spawnpanels_by_ckey[ckey] = new_panel
-
- return new_panel
-
/datum/spawnpanel/ui_close(mob/user)
. = ..()
if (precise_mode && precise_mode != PRECISE_MODE_OFF)
toggle_precise_mode(PRECISE_MODE_OFF)
/datum/spawnpanel/ui_state(mob/user)
- if(user.client.ckey != owner_ckey)
- return GLOB.never_state
- return ADMIN_STATE(R_ADMIN)
+ return ADMIN_STATE(R_SPAWN)
-/datum/spawnpanel/ui_act(action, params)
- if(..())
- return FALSE
-
- if(usr.client.ckey != owner_ckey)
+/datum/spawnpanel/ui_act(action, params, datum/tgui/ui)
+ if(..() || !check_rights_for(ui.user.client, R_SPAWN))
return FALSE
switch(action)
@@ -106,12 +78,10 @@ GLOBAL_LIST_INIT(spawnpanels_by_ckey, list())
available_icon_states = icon_states(selected_atom_icon)
if(!(selected_atom_icon_state in available_icon_states))
selected_atom_icon_state = available_icon_states[1]
- SStgui.update_uis(src)
return TRUE
if("set-apply-icon-override")
apply_icon_override = !!params["value"]
- SStgui.update_uis(src)
return TRUE
if("reset-DMI-icon")
@@ -123,35 +93,28 @@ GLOBAL_LIST_INIT(spawnpanels_by_ckey, list())
available_icon_states = icon_states(selected_atom_icon)
else
available_icon_states = list()
-
- SStgui.update_uis(src)
return TRUE
if("select-new-icon-state")
selected_atom_icon_state = params["new_state"]
- SStgui.update_uis(src)
return TRUE
if("reset-icon-state")
selected_atom_icon_state = null
if(selected_atom)
selected_atom_icon_state = initial(selected_atom.icon_state)
- SStgui.update_uis(src)
return TRUE
if("set-icon-size")
atom_icon_size = params["size"]
- SStgui.update_uis(src)
return TRUE
if("reset-icon-size")
atom_icon_size = 100
- SStgui.update_uis(src)
return TRUE
if("get-icon-states")
available_icon_states = icon_states(selected_atom_icon)
- SStgui.update_uis(src)
return TRUE
if("selected-atom-changed")
diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
index 36fa271ab80607..5aa728e376f1db 100644
--- a/code/modules/admin/sql_ban_system.dm
+++ b/code/modules/admin/sql_ban_system.dm
@@ -194,10 +194,8 @@
var/datum/browser/panel = new(usr, "banpanel", "Banning Panel", 910, panel_height)
panel.add_stylesheet("admin_panelscss", 'html/admin/admin_panels.css')
panel.add_stylesheet("banpanelcss", 'html/admin/banpanel.css')
- var/tgui_fancy = usr.client.prefs.read_preference(/datum/preference/toggle/tgui_fancy)
- if(tgui_fancy) //some browsers (IE8) have trouble with unsupported css3 elements and DOM methods that break the panel's functionality, so we won't load those if a user is in no frills tgui mode since that's for similar compatability support
- panel.add_stylesheet("admin_panelscss3", 'html/admin/admin_panels_css3.css')
- panel.add_script("banpaneljs", 'html/admin/banpanel.js')
+ panel.add_stylesheet("admin_panelscss3", 'html/admin/admin_panels_css3.css')
+ panel.add_script("banpaneljs", 'html/admin/banpanel.js')
var/list/output = list("